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: <ma...@us...> - 2007-04-25 07:35:57
|
Revision: 1212
http://tomoe.svn.sourceforge.net/tomoe/?rev=1212&view=rev
Author: makeinu
Date: 2007-04-25 00:35:56 -0700 (Wed, 25 Apr 2007)
Log Message:
-----------
Use gi18n-lib.h instead of gi18n.h.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/configure.ac
tomoe/trunk/lib/glib-utils.h
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-recognizer.c
tomoe/trunk/module/dict/tomoe-dict-est.c
tomoe/trunk/module/dict/tomoe-dict-mysql.c
tomoe/trunk/module/dict/tomoe-dict-ruby.c
tomoe/trunk/module/dict/tomoe-dict-svn.c
tomoe/trunk/module/dict/tomoe-dict-unihan.c
tomoe/trunk/module/dict/tomoe-dict-xml.c
tomoe/trunk/module/recognizer/tomoe-recognizer-simple.c
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/ChangeLog 2007-04-25 07:35:56 UTC (rev 1212)
@@ -1,3 +1,13 @@
+2007-04-25 Takuro Ashie <as...@ho...>
+
+ * module/dict/tomoe-dict-xml.c, module/dict/tomoe-dict-ruby.c,
+ module/dict/tomoe-dict-unihan.c, module/dict/tomoe-dict-mysql.c,
+ module/dict/tomoe-dict-svn.c, module/dict/tomoe-dict-est.c,
+ module/recognizer/tomoe-recognizer-simple.c, configure.ac,
+ lib/tomoe-char.c, lib/tomoe-query.c, lib/tomoe-config.c,
+ lib/tomoe-recognizer.c, lib/glib-utils.h, lib/tomoe-reading.c:
+ Use gi18n-lib.h instead of gi18n.h.
+
2007-04-20 Kouhei Sutou <ko...@co...>
* test/data/one_stroke.data: followed the expected test result to
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/configure.ac 2007-04-25 07:35:56 UTC (rev 1212)
@@ -102,6 +102,7 @@
])
GETTEXT_PACKAGE=tomoe
AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package])
dnl **************************************************************
dnl Checks for xsltproc
Modified: tomoe/trunk/lib/glib-utils.h
===================================================================
--- tomoe/trunk/lib/glib-utils.h 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/lib/glib-utils.h 2007-04-25 07:35:56 UTC (rev 1212)
@@ -24,8 +24,12 @@
#ifndef __GLIB_UTILS_H__
#define __GLIB_UTILS_H__
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <glib/garray.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "glib-compat-file-utilities.h"
#include "glib-compat-key-file.h"
Modified: tomoe/trunk/lib/tomoe-char.c
===================================================================
--- tomoe/trunk/lib/tomoe-char.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/lib/tomoe-char.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -21,10 +21,14 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tomoe-char.h"
#include "tomoe-dict.h"
Modified: tomoe/trunk/lib/tomoe-config.c
===================================================================
--- tomoe/trunk/lib/tomoe-config.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/lib/tomoe-config.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -28,7 +28,7 @@
#include <string.h>
#include <sys/stat.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tomoe-config.h"
#include "tomoe-dict.h"
Modified: tomoe/trunk/lib/tomoe-query.c
===================================================================
--- tomoe/trunk/lib/tomoe-query.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/lib/tomoe-query.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -20,10 +20,14 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tomoe-enum-types.h"
#include "tomoe-query.h"
Modified: tomoe/trunk/lib/tomoe-reading.c
===================================================================
--- tomoe/trunk/lib/tomoe-reading.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/lib/tomoe-reading.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -20,10 +20,14 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tomoe-enum-types.h"
#include "tomoe-reading.h"
Modified: tomoe/trunk/lib/tomoe-recognizer.c
===================================================================
--- tomoe/trunk/lib/tomoe-recognizer.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/lib/tomoe-recognizer.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -21,8 +21,12 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tomoe-module.h"
#include "tomoe-recognizer.h"
Modified: tomoe/trunk/module/dict/tomoe-dict-est.c
===================================================================
--- tomoe/trunk/module/dict/tomoe-dict-est.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/module/dict/tomoe-dict-est.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -20,11 +20,15 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <estraier.h>
Modified: tomoe/trunk/module/dict/tomoe-dict-mysql.c
===================================================================
--- tomoe/trunk/module/dict/tomoe-dict-mysql.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/module/dict/tomoe-dict-mysql.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -20,11 +20,15 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <string.h>
#include <stdlib.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <mysql.h>
Modified: tomoe/trunk/module/dict/tomoe-dict-ruby.c
===================================================================
--- tomoe/trunk/module/dict/tomoe-dict-ruby.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/module/dict/tomoe-dict-ruby.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -33,7 +33,7 @@
#endif
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <tomoe-module-impl.h>
Modified: tomoe/trunk/module/dict/tomoe-dict-svn.c
===================================================================
--- tomoe/trunk/module/dict/tomoe-dict-svn.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/module/dict/tomoe-dict-svn.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -20,8 +20,12 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <svn_pools.h>
Modified: tomoe/trunk/module/dict/tomoe-dict-unihan.c
===================================================================
--- tomoe/trunk/module/dict/tomoe-dict-unihan.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/module/dict/tomoe-dict-unihan.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -20,11 +20,15 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <tomoe-module-impl.h>
Modified: tomoe/trunk/module/dict/tomoe-dict-xml.c
===================================================================
--- tomoe/trunk/module/dict/tomoe-dict-xml.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/module/dict/tomoe-dict-xml.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -24,12 +24,16 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <tomoe-module-impl.h>
Modified: tomoe/trunk/module/recognizer/tomoe-recognizer-simple.c
===================================================================
--- tomoe/trunk/module/recognizer/tomoe-recognizer-simple.c 2007-04-20 12:00:18 UTC (rev 1211)
+++ tomoe/trunk/module/recognizer/tomoe-recognizer-simple.c 2007-04-25 07:35:56 UTC (rev 1212)
@@ -20,10 +20,14 @@
* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdlib.h>
#include <gmodule.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <tomoe-module-impl.h>
#include <tomoe-recognizer.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-20 12:00:17
|
Revision: 1211
http://tomoe.svn.sourceforge.net/tomoe/?rev=1211&view=rev
Author: makeinu
Date: 2007-04-20 05:00:18 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
Fix search path of scim-helper-launcher again.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/configure.ac
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-20 11:47:20 UTC (rev 1210)
+++ scim-tomoe/trunk/ChangeLog 2007-04-20 12:00:18 UTC (rev 1211)
@@ -1,5 +1,9 @@
2007-04-20 Takuro Ashie <as...@ho...>
+ * configure.ac: Fix search path of scim-helper-launcher again.
+
+2007-04-20 Takuro Ashie <as...@ho...>
+
* src/scim_tomoe.cpp, src/scim_tomoe_prefs_widget.cpp:
Include gi18n-lib.h instead of gi18n.h.
Modified: scim-tomoe/trunk/configure.ac
===================================================================
--- scim-tomoe/trunk/configure.ac 2007-04-20 11:47:20 UTC (rev 1210)
+++ scim-tomoe/trunk/configure.ac 2007-04-20 12:00:18 UTC (rev 1211)
@@ -112,7 +112,7 @@
SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
-dnl SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`
+SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=libdir scim`/scim-1.0
if test "x$SCIM_DATADIR" = "x"; then
SCIM_DATADIR=${datadir}/scim
@@ -126,7 +126,7 @@
SCIM_MODULEDIR=${libdir}/scim-1.0
fi
-if test "x$SCIM_LIBEXECDIR" = "x"; then
+if test "x$SCIM_LIBEXECDIR" = "x/scim-1.0"; then
SCIM_LIBEXECDIR=${libdir}/scim-1.0
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-20 11:47:19
|
Revision: 1210
http://tomoe.svn.sourceforge.net/tomoe/?rev=1210&view=rev
Author: makeinu
Date: 2007-04-20 04:47:20 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
Include gi18n-lib.h instead of gi18n.h.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/src/scim_tomoe.cpp
scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-20 11:45:05 UTC (rev 1209)
+++ scim-tomoe/trunk/ChangeLog 2007-04-20 11:47:20 UTC (rev 1210)
@@ -1,5 +1,10 @@
2007-04-20 Takuro Ashie <as...@ho...>
+ * src/scim_tomoe.cpp, src/scim_tomoe_prefs_widget.cpp:
+ Include gi18n-lib.h instead of gi18n.h.
+
+2007-04-20 Takuro Ashie <as...@ho...>
+
* po/ja.po: Update.
2007-04-19 Takuro Ashie <as...@ho...>
Modified: scim-tomoe/trunk/src/scim_tomoe.cpp
===================================================================
--- scim-tomoe/trunk/src/scim_tomoe.cpp 2007-04-20 11:45:05 UTC (rev 1209)
+++ scim-tomoe/trunk/src/scim_tomoe.cpp 2007-04-20 11:47:20 UTC (rev 1210)
@@ -42,7 +42,7 @@
#include <config.h>
#endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "scim_tomoe_prefs.h"
#include "scim_tomoe_prefs_widget.h"
Modified: scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp
===================================================================
--- scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp 2007-04-20 11:45:05 UTC (rev 1209)
+++ scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp 2007-04-20 11:47:20 UTC (rev 1210)
@@ -21,7 +21,7 @@
#include <config.h>
#endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "scim_tomoe_prefs_widget.h"
#include "scim_tomoe_prefs.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-20 11:45:05
|
Revision: 1209
http://tomoe.svn.sourceforge.net/tomoe/?rev=1209&view=rev
Author: makeinu
Date: 2007-04-20 04:45:05 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
Include gi18n-lib.h instead of gi18n.h. Remove textdomain().
Modified Paths:
--------------
tomoe-gtk/trunk/ChangeLog
tomoe-gtk/trunk/src/tomoe-canvas.c
tomoe-gtk/trunk/src/tomoe-details.c
tomoe-gtk/trunk/src/tomoe-edit-char.c
tomoe-gtk/trunk/src/tomoe-edit-meta.c
tomoe-gtk/trunk/src/tomoe-edit-strokes.c
tomoe-gtk/trunk/src/tomoe-gucharmap.c
tomoe-gtk/trunk/src/tomoe-handwriting.c
tomoe-gtk/trunk/src/tomoe-reading-search.c
tomoe-gtk/trunk/src/tomoe-window.c
Modified: tomoe-gtk/trunk/ChangeLog
===================================================================
--- tomoe-gtk/trunk/ChangeLog 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/ChangeLog 2007-04-20 11:45:05 UTC (rev 1209)
@@ -1,3 +1,11 @@
+2007-04-20 Takuro Ashie <as...@ho...>
+
+ * src/tomoe-edit-strokes.c, src/tomoe-handwriting.c,
+ src/tomoe-details.c, src/tomoe-edit-char.c, src/tomoe-gucharmap.c,
+ src/tomoe-window.c, src/tomoe-edit-meta.c, src/tomoe-canvas.c,
+ src/tomoe-reading-search.c:
+ Include gi18n-lib.h instead of gi18n.h. Remove textdomain().
+
2007-03-22 Takuro Ashie <as...@ho...>
* libtomoe-gtk.pc.in: Removed.
Modified: tomoe-gtk/trunk/src/tomoe-canvas.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-canvas.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-canvas.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -19,12 +19,12 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
#include <stdlib.h>
#include <math.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tomoe-canvas.h"
Modified: tomoe-gtk/trunk/src/tomoe-details.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-details.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-details.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -18,10 +18,10 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <tomoe.h>
#include "tomoe-details.h"
Modified: tomoe-gtk/trunk/src/tomoe-edit-char.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-edit-char.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-edit-char.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -18,11 +18,11 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
#include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <tomoe.h>
#include "tomoe-edit-char.h"
Modified: tomoe-gtk/trunk/src/tomoe-edit-meta.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-edit-meta.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-edit-meta.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -18,11 +18,11 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
#include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <tomoe.h>
Modified: tomoe-gtk/trunk/src/tomoe-edit-strokes.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-edit-strokes.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-edit-strokes.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -18,10 +18,10 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <tomoe.h>
Modified: tomoe-gtk/trunk/src/tomoe-gucharmap.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-gucharmap.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-gucharmap.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -18,10 +18,10 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tomoe-gucharmap.h"
enum {
Modified: tomoe-gtk/trunk/src/tomoe-handwriting.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-handwriting.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-handwriting.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -19,10 +19,10 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "tomoe-handwriting.h"
#include "tomoe-canvas.h"
Modified: tomoe-gtk/trunk/src/tomoe-reading-search.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-reading-search.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-reading-search.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -18,11 +18,11 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
#include <glib/gprintf.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include "tomoe-reading-search.h"
Modified: tomoe-gtk/trunk/src/tomoe-window.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-window.c 2007-04-20 11:27:46 UTC (rev 1208)
+++ tomoe-gtk/trunk/src/tomoe-window.c 2007-04-20 11:45:05 UTC (rev 1209)
@@ -19,10 +19,10 @@
*/
#ifdef HAVE_CONFIG_H
- #include <config.h>
+# include <config.h>
#endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <tomoe.h>
#include "tomoe-window.h"
@@ -146,7 +146,6 @@
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, TOMOE_GTK_LOCALEDIR);
- textdomain (GETTEXT_PACKAGE);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-20 11:27:50
|
Revision: 1208
http://tomoe.svn.sourceforge.net/tomoe/?rev=1208&view=rev
Author: makeinu
Date: 2007-04-20 04:27:46 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
Add tomoe-unihan-data.h into subversion repository.
Yes, it is a auto-generated file, but I think it is too hard to solve ruby-dependencies for testers. It is too hard even for me on old environment.
Added Paths:
-----------
tomoe/trunk/module/dict/tomoe-unihan-data.h
Added: tomoe/trunk/module/dict/tomoe-unihan-data.h
===================================================================
--- tomoe/trunk/module/dict/tomoe-unihan-data.h (rev 0)
+++ tomoe/trunk/module/dict/tomoe-unihan-data.h 2007-04-20 11:27:46 UTC (rev 1208)
@@ -0,0 +1,363003 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ DO NOT EDIT!
+ THIS FILE IS GENERATED FROM Unihan.txt:
+ ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
+*/
+
+
+#include "tomoe-unihan.h"
+
+#include <tomoe-char.h>
+
+typedef struct _TomoeUnihanReading TomoeUnihanReading;
+typedef struct _TomoeUnihanMetaData TomoeUnihanMetaData;
+typedef struct _TomoeUnihanInfo TomoeUnihanInfo;
+
+struct _TomoeUnihanReading {
+ TomoeReadingType type;
+ gchar *reading;
+};
+
+struct _TomoeUnihanMetaData {
+ gchar *key;
+ gchar *value;
+};
+
+struct _TomoeUnihanInfo {
+ gchar *utf8;
+ gint n_strokes;
+ TomoeUnihanReading *readings;
+ gint readings_size;
+ gchar **radicals;
+ gint radicals_size;
+ gchar **variants;
+ gint variants_size;
+ TomoeUnihanMetaData *meta_data;
+ gint meta_data_size;
+};
+
+static TomoeUnihanReading tomoe_unihan_readings_2000B[] = {
+ {TOMOE_READING_JA_ON, "ジョウ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2000B[] = {
+ {"jis213", "1-14-2"},
+ {"ucs", "2000B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20089[] = {
+ {"jis213", "2-1-1"},
+ {"ucs", "20089"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_200A2[] = {
+ {"jis213", "2-1-11"},
+ {"ucs", "200A2"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_200A4[] = {
+ {"jis213", "2-1-14"},
+ {"ucs", "200A4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_201A2[] = {
+ {"jis213", "2-1-22"},
+ {"ucs", "201A2"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20213[] = {
+ {"jis213", "2-1-38"},
+ {"ucs", "20213"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2032B[] = {
+ {"jis213", "2-1-80"},
+ {"ucs", "2032B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20371[] = {
+ {"jis213", "2-1-89"},
+ {"ucs", "20371"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20381[] = {
+ {"jis213", "2-1-87"},
+ {"ucs", "20381"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_203F9[] = {
+ {"jis213", "2-3-2"},
+ {"ucs", "203F9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2044A[] = {
+ {"jis213", "2-3-5"},
+ {"ucs", "2044A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20509[] = {
+ {"jis213", "2-3-7"},
+ {"ucs", "20509"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_205D6[] = {
+ {"jis213", "2-3-17"},
+ {"ucs", "205D6"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20628[] = {
+ {"jis213", "2-3-18"},
+ {"ucs", "20628"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2074F[] = {
+ {"jis213", "2-3-24"},
+ {"ucs", "2074F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20807[] = {
+ {"jis213", "2-3-31"},
+ {"ucs", "20807"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2083A[] = {
+ {"jis213", "2-3-33"},
+ {"ucs", "2083A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_208B9[] = {
+ {"jis213", "2-3-42"},
+ {"ucs", "208B9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2097C[] = {
+ {"jis213", "2-3-50"},
+ {"ucs", "2097C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2099D[] = {
+ {"jis213", "2-3-51"},
+ {"ucs", "2099D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20AD3[] = {
+ {"jis213", "2-3-57"},
+ {"ucs", "20AD3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20B1D[] = {
+ {"jis213", "2-3-60"},
+ {"ucs", "20B1D"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_20BEE[] = {
+ {TOMOE_READING_JA_KUN, "しな"},
+ {TOMOE_READING_JA_ON, "ヒン"},
+ {TOMOE_READING_JA_ON, "ホン"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20D45[] = {
+ {"jis213", "2-3-87"},
+ {"ucs", "20D45"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20DE1[] = {
+ {"jis213", "2-4-10"},
+ {"ucs", "20DE1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20E64[] = {
+ {"jis213", "2-4-26"},
+ {"ucs", "20E64"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20E6D[] = {
+ {"jis213", "2-4-18"},
+ {"ucs", "20E6D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20E95[] = {
+ {"jis213", "2-4-17"},
+ {"ucs", "20E95"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_20F5F[] = {
+ {"jis213", "2-4-29"},
+ {"ucs", "20F5F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21201[] = {
+ {"jis213", "2-4-57"},
+ {"ucs", "21201"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2123D[] = {
+ {"jis213", "1-15-34"},
+ {"ucs", "2123D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21255[] = {
+ {"jis213", "2-4-60"},
+ {"ucs", "21255"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21274[] = {
+ {"jis213", "2-4-67"},
+ {"ucs", "21274"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2127B[] = {
+ {"jis213", "2-4-62"},
+ {"ucs", "2127B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_212D7[] = {
+ {"jis213", "2-4-75"},
+ {"ucs", "212D7"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_212E4[] = {
+ {"jis213", "2-4-74"},
+ {"ucs", "212E4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_212FD[] = {
+ {"jis213", "2-4-82"},
+ {"ucs", "212FD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2131B[] = {
+ {"jis213", "1-15-44"},
+ {"ucs", "2131B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21336[] = {
+ {"jis213", "2-4-84"},
+ {"ucs", "21336"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21344[] = {
+ {"jis213", "2-4-85"},
+ {"ucs", "21344"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_213C4[] = {
+ {"jis213", "2-5-5"},
+ {"ucs", "213C4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2146D[] = {
+ {"jis213", "2-5-18"},
+ {"ucs", "2146D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2146E[] = {
+ {"jis213", "1-15-64"},
+ {"ucs", "2146E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_215D7[] = {
+ {"jis213", "2-5-30"},
+ {"ucs", "215D7"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21647[] = {
+ {"jis213", "2-5-39"},
+ {"ucs", "21647"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_216B4[] = {
+ {"jis213", "1-47-67"},
+ {"ucs", "216B4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21706[] = {
+ {"jis213", "2-5-53"},
+ {"ucs", "21706"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21742[] = {
+ {"jis213", "2-5-54"},
+ {"ucs", "21742"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_218BD[] = {
+ {"jis213", "1-15-91"},
+ {"ucs", "218BD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_219C3[] = {
+ {"jis213", "2-5-94"},
+ {"ucs", "219C3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21C56[] = {
+ {"jis213", "2-8-16"},
+ {"ucs", "21C56"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21D2D[] = {
+ {"jis213", "2-8-23"},
+ {"ucs", "21D2D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21D45[] = {
+ {"jis213", "2-8-24"},
+ {"ucs", "21D45"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21D62[] = {
+ {"jis213", "2-8-27"},
+ {"ucs", "21D62"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21D78[] = {
+ {"jis213", "2-8-26"},
+ {"ucs", "21D78"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21D92[] = {
+ {"jis213", "2-8-37"},
+ {"ucs", "21D92"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21D9C[] = {
+ {"jis213", "2-8-32"},
+ {"ucs", "21D9C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21DA1[] = {
+ {"jis213", "2-8-31"},
+ {"ucs", "21DA1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21DB7[] = {
+ {"jis213", "2-8-40"},
+ {"ucs", "21DB7"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21DE0[] = {
+ {"jis213", "2-8-42"},
+ {"ucs", "21DE0"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21E33[] = {
+ {"jis213", "2-8-43"},
+ {"ucs", "21E33"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21E34[] = {
+ {"jis213", "1-47-78"},
+ {"ucs", "21E34"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21F1E[] = {
+ {"jis213", "2-8-59"},
+ {"ucs", "21F1E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21F76[] = {
+ {"jis213", "2-8-70"},
+ {"ucs", "21F76"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_21FFA[] = {
+ {"jis213", "2-8-76"},
+ {"ucs", "21FFA"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_22165[] = {
+ {TOMOE_READING_JA_ON, "ジュ"},
+ {TOMOE_READING_JA_ON, "チュ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2217B[] = {
+ {"jis213", "2-12-2"},
+ {"ucs", "2217B"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_22218[] = {
+ {TOMOE_READING_JA_KUN, "しか"},
+ {TOMOE_READING_JA_KUN, "か"},
+ {TOMOE_READING_JA_ON, "ロク"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22218[] = {
+ {"jis213", "2-94-51"},
+ {"ucs", "22218"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_2228D[] = {
+ {TOMOE_READING_JA_KUN, "くりや"},
+ {TOMOE_READING_JA_ON, "ズ"},
+ {TOMOE_READING_JA_ON, "チュウ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2231E[] = {
+ {"jis213", "2-12-11"},
+ {"ucs", "2231E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_223AD[] = {
+ {"jis213", "2-12-16"},
+ {"ucs", "223AD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_226F3[] = {
+ {"jis213", "2-12-48"},
+ {"ucs", "226F3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2285B[] = {
+ {"jis213", "2-12-69"},
+ {"ucs", "2285B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_228AB[] = {
+ {"jis213", "2-12-77"},
+ {"ucs", "228AB"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2298F[] = {
+ {"meaning", "to cut, wound, hurt"},
+ {"jis213", "2-12-82"},
+ {"ucs", "2298F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22AB8[] = {
+ {"jis213", "2-13-4"},
+ {"ucs", "22AB8"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_22AE6[] = {
+ {TOMOE_READING_JA_KUN, "うつ"},
+ {TOMOE_READING_JA_ON, "ハク"},
+ {TOMOE_READING_JA_ON, "ヒョウ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22B46[] = {
+ {"jis213", "2-13-18"},
+ {"ucs", "22B46"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22B4F[] = {
+ {"jis213", "2-13-9"},
+ {"ucs", "22B4F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22B50[] = {
+ {"jis213", "2-13-10"},
+ {"ucs", "22B50"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22BA6[] = {
+ {"jis213", "2-13-21"},
+ {"ucs", "22BA6"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22C1D[] = {
+ {"jis213", "2-13-20"},
+ {"ucs", "22C1D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22C24[] = {
+ {"jis213", "2-13-25"},
+ {"ucs", "22C24"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_22DE1[] = {
+ {"jis213", "2-13-54"},
+ {"ucs", "22DE1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_231B6[] = {
+ {"jis213", "2-14-4"},
+ {"ucs", "231B6"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_231C3[] = {
+ {"jis213", "2-13-93"},
+ {"ucs", "231C3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_231C4[] = {
+ {"jis213", "1-85-26"},
+ {"ucs", "231C4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_231F5[] = {
+ {"jis213", "2-14-3"},
+ {"ucs", "231F5"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23372[] = {
+ {"jis213", "2-14-26"},
+ {"ucs", "23372"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_233D0[] = {
+ {"jis213", "2-14-34"},
+ {"ucs", "233D0"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_233D2[] = {
+ {"jis213", "2-14-29"},
+ {"ucs", "233D2"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_233D3[] = {
+ {"jis213", "2-14-28"},
+ {"ucs", "233D3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_233D5[] = {
+ {"jis213", "2-14-36"},
+ {"ucs", "233D5"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_233DA[] = {
+ {"jis213", "2-14-39"},
+ {"ucs", "233DA"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_233DF[] = {
+ {"jis213", "2-14-41"},
+ {"ucs", "233DF"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_233E4[] = {
+ {"jis213", "2-14-35"},
+ {"ucs", "233E4"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_233FE[] = {
+ {TOMOE_READING_JA_KUN, "まるた"},
+ {TOMOE_READING_JA_ON, "ザイ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2344A[] = {
+ {"jis213", "2-14-53"},
+ {"ucs", "2344A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2344B[] = {
+ {"jis213", "2-14-55"},
+ {"ucs", "2344B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23451[] = {
+ {"jis213", "2-14-54"},
+ {"ucs", "23451"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23465[] = {
+ {"jis213", "2-14-59"},
+ {"ucs", "23465"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_234E4[] = {
+ {"jis213", "2-14-87"},
+ {"ucs", "234E4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2355A[] = {
+ {"jis213", "2-14-88"},
+ {"ucs", "2355A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23594[] = {
+ {"jis213", "2-15-10"},
+ {"ucs", "23594"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_235C4[] = {
+ {"jis213", "1-85-82"},
+ {"ucs", "235C4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23638[] = {
+ {"jis213", "2-15-34"},
+ {"ucs", "23638"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23639[] = {
+ {"jis213", "2-15-31"},
+ {"ucs", "23639"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2363A[] = {
+ {"jis213", "2-15-35"},
+ {"ucs", "2363A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23647[] = {
+ {"jis213", "2-15-32"},
+ {"ucs", "23647"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2370C[] = {
+ {"jis213", "2-15-57"},
+ {"ucs", "2370C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2371C[] = {
+ {"jis213", "2-15-46"},
+ {"ucs", "2371C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2373F[] = {
+ {"jis213", "1-86-9"},
+ {"ucs", "2373F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23763[] = {
+ {"jis213", "1-86-18"},
+ {"ucs", "23763"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23764[] = {
+ {"jis213", "2-15-65"},
+ {"ucs", "23764"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_237E7[] = {
+ {"jis213", "2-15-74"},
+ {"ucs", "237E7"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_237EC[] = {
+ {TOMOE_READING_JA_KUN, "てすり"},
+ {TOMOE_READING_JA_ON, "ラン"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_237F1[] = {
+ {TOMOE_READING_JA_KUN, "けやき"},
+ {TOMOE_READING_JA_ON, "キョ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_237FF[] = {
+ {"jis213", "2-15-73"},
+ {"ucs", "237FF"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23824[] = {
+ {"jis213", "2-15-80"},
+ {"ucs", "23824"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_2383D[] = {
+ {TOMOE_READING_JA_KUN, "つか"},
+ {TOMOE_READING_JA_ON, "ハ"},
+ {TOMOE_READING_JA_ON, "ヘ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2383D[] = {
+ {"jis213", "2-15-85"},
+ {"ucs", "2383D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23A98[] = {
+ {"jis213", "2-78-3"},
+ {"ucs", "23A98"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23C7F[] = {
+ {"jis213", "2-78-20"},
+ {"ucs", "23C7F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23CFE[] = {
+ {"jis213", "1-86-64"},
+ {"ucs", "23CFE"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23D00[] = {
+ {"jis213", "2-78-41"},
+ {"ucs", "23D00"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23D0E[] = {
+ {"jis213", "2-84-85"},
+ {"ucs", "23D0E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23D40[] = {
+ {"jis213", "2-78-60"},
+ {"ucs", "23D40"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23DD3[] = {
+ {"jis213", "2-78-64"},
+ {"ucs", "23DD3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23DF9[] = {
+ {"jis213", "2-78-63"},
+ {"ucs", "23DF9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23DFA[] = {
+ {"jis213", "2-78-62"},
+ {"ucs", "23DFA"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_23F7E[] = {
+ {"jis213", "2-79-18"},
+ {"ucs", "23F7E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24096[] = {
+ {"jis213", "2-79-39"},
+ {"ucs", "24096"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24103[] = {
+ {"jis213", "2-79-45"},
+ {"ucs", "24103"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_241C6[] = {
+ {"jis213", "2-79-65"},
+ {"ucs", "241C6"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_241FE[] = {
+ {"jis213", "2-79-68"},
+ {"ucs", "241FE"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_243BC[] = {
+ {"jis213", "2-80-2"},
+ {"ucs", "243BC"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24629[] = {
+ {"jis213", "2-80-19"},
+ {"ucs", "24629"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_246A5[] = {
+ {"jis213", "2-80-25"},
+ {"ucs", "246A5"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_247F1[] = {
+ {"jis213", "1-87-76"},
+ {"ucs", "247F1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24896[] = {
+ {"jis213", "2-80-51"},
+ {"ucs", "24896"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24A4D[] = {
+ {"jis213", "2-80-91"},
+ {"ucs", "24A4D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24B56[] = {
+ {"jis213", "2-81-14"},
+ {"ucs", "24B56"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24B6F[] = {
+ {"jis213", "2-81-16"},
+ {"ucs", "24B6F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24C16[] = {
+ {"jis213", "2-81-21"},
+ {"ucs", "24C16"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24D14[] = {
+ {"jis213", "2-81-36"},
+ {"ucs", "24D14"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24E0E[] = {
+ {"jis213", "2-81-61"},
+ {"ucs", "24E0E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24E37[] = {
+ {"jis213", "2-81-65"},
+ {"ucs", "24E37"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24E6A[] = {
+ {"jis213", "2-81-70"},
+ {"ucs", "24E6A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_24E8B[] = {
+ {"jis213", "2-81-73"},
+ {"ucs", "24E8B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2504A[] = {
+ {"jis213", "2-81-85"},
+ {"ucs", "2504A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25055[] = {
+ {"jis213", "2-81-87"},
+ {"ucs", "25055"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25122[] = {
+ {"jis213", "2-81-90"},
+ {"ucs", "25122"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_251A9[] = {
+ {"jis213", "2-82-1"},
+ {"ucs", "251A9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_251CD[] = {
+ {"jis213", "2-82-4"},
+ {"ucs", "251CD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_251E5[] = {
+ {"jis213", "2-82-3"},
+ {"ucs", "251E5"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2521E[] = {
+ {"jis213", "2-82-8"},
+ {"ucs", "2521E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2524C[] = {
+ {"jis213", "2-82-12"},
+ {"ucs", "2524C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2542E[] = {
+ {"jis213", "2-82-29"},
+ {"ucs", "2542E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2548E[] = {
+ {"jis213", "1-88-94"},
+ {"ucs", "2548E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_254D9[] = {
+ {"jis213", "2-82-40"},
+ {"ucs", "254D9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2550E[] = {
+ {"jis213", "1-89-9"},
+ {"ucs", "2550E"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_25535[] = {
+ {TOMOE_READING_JA_KUN, "じしゃく"},
+ {TOMOE_READING_JA_KUN, "やきもの"},
+ {TOMOE_READING_JA_ON, "ジ"},
+ {TOMOE_READING_JA_ON, "シ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_255A7[] = {
+ {"jis213", "2-82-59"},
+ {"ucs", "255A7"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25771[] = {
+ {"jis213", "1-89-39"},
+ {"ucs", "25771"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_257A9[] = {
+ {"jis213", "2-82-85"},
+ {"ucs", "257A9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_257B4[] = {
+ {"jis213", "2-82-86"},
+ {"ucs", "257B4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_259C4[] = {
+ {"jis213", "1-89-52"},
+ {"ucs", "259C4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_259D4[] = {
+ {"jis213", "2-83-18"},
+ {"ucs", "259D4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25AE3[] = {
+ {"jis213", "2-83-30"},
+ {"ucs", "25AE3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25AE4[] = {
+ {"jis213", "2-83-29"},
+ {"ucs", "25AE4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25AF1[] = {
+ {"jis213", "2-83-32"},
+ {"ucs", "25AF1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25BB2[] = {
+ {"jis213", "2-83-50"},
+ {"ucs", "25BB2"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25C4B[] = {
+ {"jis213", "2-83-61"},
+ {"ucs", "25C4B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25C64[] = {
+ {"jis213", "2-83-62"},
+ {"ucs", "25C64"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25DA1[] = {
+ {"jis213", "1-89-78"},
+ {"ucs", "25DA1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25E2E[] = {
+ {"jis213", "2-83-83"},
+ {"ucs", "25E2E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25E56[] = {
+ {"jis213", "2-83-84"},
+ {"ucs", "25E56"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25E62[] = {
+ {"jis213", "2-83-87"},
+ {"ucs", "25E62"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25E65[] = {
+ {"jis213", "2-83-85"},
+ {"ucs", "25E65"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25EC2[] = {
+ {"jis213", "2-83-93"},
+ {"ucs", "25EC2"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25ED8[] = {
+ {"jis213", "2-83-91"},
+ {"ucs", "25ED8"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25EE8[] = {
+ {"jis213", "2-84-2"},
+ {"ucs", "25EE8"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25F23[] = {
+ {"jis213", "2-84-4"},
+ {"ucs", "25F23"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25F5C[] = {
+ {"jis213", "2-84-7"},
+ {"ucs", "25F5C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25FD4[] = {
+ {"jis213", "2-84-15"},
+ {"ucs", "25FD4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25FE0[] = {
+ {"jis213", "2-84-14"},
+ {"ucs", "25FE0"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_25FFB[] = {
+ {"jis213", "2-84-21"},
+ {"ucs", "25FFB"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2600C[] = {
+ {"jis213", "2-84-20"},
+ {"ucs", "2600C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26017[] = {
+ {"jis213", "2-84-29"},
+ {"ucs", "26017"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26060[] = {
+ {"jis213", "2-84-34"},
+ {"ucs", "26060"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_260ED[] = {
+ {"jis213", "2-84-47"},
+ {"ucs", "260ED"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26270[] = {
+ {"jis213", "2-84-73"},
+ {"ucs", "26270"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26286[] = {
+ {"jis213", "2-84-75"},
+ {"ucs", "26286"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2634C[] = {
+ {"jis213", "2-84-82"},
+ {"ucs", "2634C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26402[] = {
+ {"jis213", "2-84-89"},
+ {"ucs", "26402"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_264B7[] = {
+ {TOMOE_READING_JA_ON, "ボウ"},
+ {TOMOE_READING_JA_ON, "モウ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2667E[] = {
+ {"jis213", "2-85-21"},
+ {"ucs", "2667E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_266B0[] = {
+ {"jis213", "2-85-26"},
+ {"ucs", "266B0"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2671D[] = {
+ {"jis213", "2-85-38"},
+ {"ucs", "2671D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_268DD[] = {
+ {"jis213", "2-85-54"},
+ {"ucs", "268DD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_268EA[] = {
+ {"jis213", "2-85-56"},
+ {"ucs", "268EA"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26951[] = {
+ {"jis213", "2-85-58"},
+ {"ucs", "26951"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2696F[] = {
+ {"jis213", "2-85-61"},
+ {"ucs", "2696F"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_26999[] = {
+ {TOMOE_READING_JA_KUN, "あげる"},
+ {TOMOE_READING_JA_KUN, "あがる"},
+ {TOMOE_READING_JA_KUN, "こぞる"},
+ {TOMOE_READING_JA_ON, "キョ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_269DD[] = {
+ {"jis213", "2-85-63"},
+ {"ucs", "269DD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26A1E[] = {
+ {"jis213", "2-85-67"},
+ {"ucs", "26A1E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26A58[] = {
+ {"jis213", "2-85-74"},
+ {"ucs", "26A58"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26A8C[] = {
+ {"jis213", "2-85-80"},
+ {"ucs", "26A8C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26AB7[] = {
+ {"jis213", "2-85-83"},
+ {"ucs", "26AB7"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26AFF[] = {
+ {"jis213", "1-90-61"},
+ {"ucs", "26AFF"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26C29[] = {
+ {"jis213", "2-5-36"},
+ {"ucs", "26C29"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26C73[] = {
+ {"jis213", "2-86-36"},
+ {"ucs", "26C73"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26CDD[] = {
+ {"jis213", "2-86-46"},
+ {"ucs", "26CDD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26E40[] = {
+ {"jis213", "1-91-19"},
+ {"ucs", "26E40"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26E65[] = {
+ {"jis213", "2-86-61"},
+ {"ucs", "26E65"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26F94[] = {
+ {"jis213", "2-86-85"},
+ {"ucs", "26F94"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26FF6[] = {
+ {"jis213", "2-87-1"},
+ {"ucs", "26FF6"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26FF7[] = {
+ {"jis213", "2-87-2"},
+ {"ucs", "26FF7"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_26FF8[] = {
+ {"jis213", "2-86-94"},
+ {"ucs", "26FF8"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_270F4[] = {
+ {"jis213", "1-91-41"},
+ {"ucs", "270F4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2710D[] = {
+ {"jis213", "2-87-19"},
+ {"ucs", "2710D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27139[] = {
+ {"jis213", "2-87-22"},
+ {"ucs", "27139"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_273DA[] = {
+ {"jis213", "2-87-69"},
+ {"ucs", "273DA"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_273DB[] = {
+ {"jis213", "2-87-68"},
+ {"ucs", "273DB"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_273FE[] = {
+ {"jis213", "2-87-75"},
+ {"ucs", "273FE"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27410[] = {
+ {"jis213", "2-87-78"},
+ {"ucs", "27410"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27449[] = {
+ {"jis213", "2-87-83"},
+ {"ucs", "27449"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_275D7[] = {
+ {TOMOE_READING_JA_KUN, "はなじ"},
+ {TOMOE_READING_JA_ON, "ジク"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_275F7[] = {
+ {TOMOE_READING_JA_KUN, "みち"},
+ {TOMOE_READING_JA_KUN, "すべ"},
+ {TOMOE_READING_JA_KUN, "わざ"},
+ {TOMOE_READING_JA_ON, "ジュツ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27614[] = {
+ {"jis213", "2-88-10"},
+ {"ucs", "27614"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27615[] = {
+ {"jis213", "2-88-9"},
+ {"ucs", "27615"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27631[] = {
+ {"jis213", "2-88-12"},
+ {"ucs", "27631"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27684[] = {
+ {"jis213", "1-91-76"},
+ {"ucs", "27684"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27693[] = {
+ {"jis213", "2-88-20"},
+ {"ucs", "27693"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2770E[] = {
+ {"jis213", "2-88-28"},
+ {"ucs", "2770E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27723[] = {
+ {"jis213", "2-88-30"},
+ {"ucs", "27723"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27752[] = {
+ {"jis213", "2-88-34"},
+ {"ucs", "27752"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27985[] = {
+ {"jis213", "2-88-54"},
+ {"ucs", "27985"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27A84[] = {
+ {"jis213", "2-88-67"},
+ {"ucs", "27A84"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27BB3[] = {
+ {"jis213", "2-88-87"},
+ {"ucs", "27BB3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27BBE[] = {
+ {"jis213", "2-88-89"},
+ {"ucs", "27BBE"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27BC7[] = {
+ {"jis213", "2-88-90"},
+ {"ucs", "27BC7"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_27C27[] = {
+ {TOMOE_READING_JA_ON, "シュウ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27CB8[] = {
+ {"jis213", "2-89-5"},
+ {"ucs", "27CB8"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27DA0[] = {
+ {"jis213", "2-89-15"},
+ {"ucs", "27DA0"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27E10[] = {
+ {"jis213", "2-89-18"},
+ {"ucs", "27E10"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_27FB7[] = {
+ {"jis213", "2-89-25"},
+ {"ucs", "27FB7"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2808A[] = {
+ {"jis213", "2-89-34"},
+ {"ucs", "2808A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_280BB[] = {
+ {"jis213", "2-89-40"},
+ {"ucs", "280BB"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28277[] = {
+ {"jis213", "1-92-41"},
+ {"ucs", "28277"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28282[] = {
+ {"jis213", "2-89-57"},
+ {"ucs", "28282"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_282F3[] = {
+ {"jis213", "2-89-62"},
+ {"ucs", "282F3"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_283CD[] = {
+ {"jis213", "1-92-49"},
+ {"ucs", "283CD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2840C[] = {
+ {"jis213", "2-89-70"},
+ {"ucs", "2840C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28455[] = {
+ {"jis213", "2-89-75"},
+ {"ucs", "28455"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2856B[] = {
+ {"jis213", "2-89-90"},
+ {"ucs", "2856B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_285C8[] = {
+ {"jis213", "2-89-94"},
+ {"ucs", "285C8"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_285C9[] = {
+ {"jis213", "2-90-1"},
+ {"ucs", "285C9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_286D7[] = {
+ {"jis213", "2-90-12"},
+ {"ucs", "286D7"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_286FA[] = {
+ {"jis213", "2-90-15"},
+ {"ucs", "286FA"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28946[] = {
+ {"jis213", "2-90-48"},
+ {"ucs", "28946"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28949[] = {
+ {"jis213", "2-90-47"},
+ {"ucs", "28949"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2896B[] = {
+ {"jis213", "2-90-55"},
+ {"ucs", "2896B"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28987[] = {
+ {"jis213", "2-90-69"},
+ {"ucs", "28987"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28988[] = {
+ {"jis213", "2-90-70"},
+ {"ucs", "28988"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_289BA[] = {
+ {"jis213", "2-90-81"},
+ {"ucs", "289BA"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_289BB[] = {
+ {"jis213", "2-90-82"},
+ {"ucs", "289BB"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28A1E[] = {
+ {"jis213", "2-90-94"},
+ {"ucs", "28A1E"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28A29[] = {
+ {"jis213", "2-91-1"},
+ {"ucs", "28A29"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28A43[] = {
+ {"jis213", "2-91-13"},
+ {"ucs", "28A43"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28A71[] = {
+ {"jis213", "2-91-12"},
+ {"ucs", "28A71"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28A99[] = {
+ {"jis213", "2-91-22"},
+ {"ucs", "28A99"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28ACD[] = {
+ {"jis213", "2-91-23"},
+ {"ucs", "28ACD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28ADD[] = {
+ {"jis213", "2-91-30"},
+ {"ucs", "28ADD"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28AE4[] = {
+ {"jis213", "2-91-29"},
+ {"ucs", "28AE4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28BC1[] = {
+ {"jis213", "2-91-46"},
+ {"ucs", "28BC1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28BEF[] = {
+ {"jis213", "2-91-47"},
+ {"ucs", "28BEF"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28D10[] = {
+ {"jis213", "2-91-55"},
+ {"ucs", "28D10"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28D71[] = {
+ {"jis213", "2-91-58"},
+ {"ucs", "28D71"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28DFB[] = {
+ {"jis213", "2-91-60"},
+ {"ucs", "28DFB"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28E1F[] = {
+ {"jis213", "2-91-61"},
+ {"ucs", "28E1F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28E36[] = {
+ {"jis213", "2-91-65"},
+ {"ucs", "28E36"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28E89[] = {
+ {"jis213", "2-91-69"},
+ {"ucs", "28E89"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28EEB[] = {
+ {"jis213", "2-91-71"},
+ {"ucs", "28EEB"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_28EF6[] = {
+ {TOMOE_READING_JA_KUN, "すかす"},
+ {TOMOE_READING_JA_KUN, "ひま"},
+ {TOMOE_READING_JA_ON, "ゲキ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28F32[] = {
+ {"jis213", "2-91-73"},
+ {"ucs", "28F32"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_28FF8[] = {
+ {"jis213", "2-91-81"},
+ {"ucs", "28FF8"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_290B3[] = {
+ {TOMOE_READING_JA_KUN, "たま"},
+ {TOMOE_READING_JA_ON, "レイ"},
+ {TOMOE_READING_JA_ON, "リョウ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_292A0[] = {
+ {"jis213", "2-92-2"},
+ {"ucs", "292A0"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_292B1[] = {
+ {"jis213", "2-92-3"},
+ {"ucs", "292B1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29490[] = {
+ {"jis213", "2-92-24"},
+ {"ucs", "29490"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_295CF[] = {
+ {"jis213", "2-92-34"},
+ {"ucs", "295CF"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2967F[] = {
+ {"jis213", "2-92-44"},
+ {"ucs", "2967F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_296F0[] = {
+ {"jis213", "2-92-54"},
+ {"ucs", "296F0"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29719[] = {
+ {"jis213", "2-92-57"},
+ {"ucs", "29719"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29750[] = {
+ {"jis213", "2-92-61"},
+ {"ucs", "29750"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_298C6[] = {
+ {"jis213", "2-92-86"},
+ {"ucs", "298C6"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29A72[] = {
+ {"jis213", "2-93-12"},
+ {"ucs", "29A72"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_29D4B[] = {
+ {TOMOE_READING_JA_KUN, "うお"},
+ {TOMOE_READING_JA_KUN, "さかな"},
+ {TOMOE_READING_JA_KUN, "すなどる"},
+ {TOMOE_READING_JA_ON, "ギョ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29DDB[] = {
+ {"jis213", "2-93-43"},
+ {"ucs", "29DDB"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29E15[] = {
+ {"jis213", "2-93-57"},
+ {"ucs", "29E15"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29E3D[] = {
+ {"jis213", "2-93-44"},
+ {"ucs", "29E3D"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29E49[] = {
+ {"jis213", "2-93-61"},
+ {"ucs", "29E49"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29E8A[] = {
+ {"jis213", "2-93-59"},
+ {"ucs", "29E8A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29EC4[] = {
+ {"jis213", "2-93-71"},
+ {"ucs", "29EC4"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29EDB[] = {
+ {"jis213", "2-93-80"},
+ {"ucs", "29EDB"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29EE9[] = {
+ {"jis213", "2-93-77"},
+ {"ucs", "29EE9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_29FCE[] = {
+ {"jis213", "2-94-5"},
+ {"ucs", "29FCE"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_2A012[] = {
+ {TOMOE_READING_JA_KUN, "とび"},
+ {TOMOE_READING_JA_ON, "シ"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A01A[] = {
+ {"jis213", "2-94-11"},
+ {"ucs", "2A01A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A02F[] = {
+ {"jis213", "2-94-9"},
+ {"ucs", "2A02F"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A082[] = {
+ {"jis213", "2-94-21"},
+ {"ucs", "2A082"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A0F9[] = {
+ {"jis213", "2-94-18"},
+ {"ucs", "2A0F9"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A190[] = {
+ {"jis213", "1-94-70"},
+ {"ucs", "2A190"},
+};
+static TomoeUnihanReading tomoe_unihan_readings_2A269[] = {
+ {TOMOE_READING_JA_KUN, "しお"},
+ {TOMOE_READING_JA_ON, "エン"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A38C[] = {
+ {"jis213", "2-94-56"},
+ {"ucs", "2A38C"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A437[] = {
+ {"jis213", "2-94-58"},
+ {"ucs", "2A437"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A5F1[] = {
+ {"jis213", "2-94-78"},
+ {"ucs", "2A5F1"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A602[] = {
+ {"jis213", "2-94-80"},
+ {"ucs", "2A602"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A61A[] = {
+ {"jis213", "2-94-82"},
+ {"ucs", "2A61A"},
+};
+static TomoeUnihanMetaData tomoe_unihan_meta_data_2A6B2[] = {
+ {"jis213", "2-94-86"},
+ {"ucs", "2A6B2"},
+};
+static gchar *tomoe_unihan_variants_2F800[] = {
+ "丽",
+};
+static gchar *tomoe_unihan_variants_2F801[] = {
+ "丸",
+};
+static gchar *tomoe_unihan_variants_2F802[] = {
+ "乁",
+};
+static gchar *tomoe_unihan_variants_2F803[] = {
+ "Ģ",
+};
+static gchar *tomoe_unihan_variants_2F804[] = {
+ "你",
+};
+static gchar *tomoe_unihan_variants_2F805[] = {
+ "侮",
+};
+static gchar *tomoe_unihan_variants_2F806[] = {
+ "侻",
+};
+static gchar *tomoe_unihan_variants_2F807[] = {
+ "倂",
+};
+static gchar *tomoe_unihan_variants_2F808[] = {
+ "偺",
+};
+static gchar *tomoe_unihan_variants_2F809[] = {
+ "備",
+};
+static gchar *tomoe_unihan_variants_2F80A[] = {
+ "僧",
+};
+static gchar *tomoe_unihan_variants_2F80B[] = {
+ "像",
+};
+static gchar *tomoe_unihan_variants_2F80C[] = {
+ "㒞",
+};
+static gchar *tomoe_unihan_variants_2F80D[] = {
+ "غ",
+};
+static gchar *tomoe_unihan_variants_2F80E[] = {
+ "免",
+};
+static gchar *tomoe_unihan_variants_2F80F[] = {
+ "兔",
+};
+static gchar *tomoe_unihan_variants_2F810[] = {
+ "兤",
+};
+static gchar *tomoe_unihan_variants_2F811[] = {
+ "具",
+};
+static gchar *tomoe_unihan_variants_2F812[] = {
+ "Ԝ",
+};
+static gchar *tomoe_unihan_variants_2F813[] = {
+ "㒹",
+};
+static gchar *tomoe_unihan_variants_2F814[] = {
+ "內",
+};
+static gchar *tomoe_unihan_variants_2F815[] = {
+ "再",
+};
+static gchar *tomoe_unihan_variants_2F816[] = {
+ "Ջ",
+};
+static gchar *tomoe_unihan_variants_2F817[] = {
+ "冗",
+};
+static gchar *tomoe_unihan_variants_2F818[] = {
+ "冤",
+};
+static gchar *tomoe_unihan_variants_2F819[] = {
+ "仌",
+};
+static gchar *tomoe_unihan_variants_2F81A[] = {
+ "冬",
+};
+static gchar *tomoe_unihan_variants_2F81B[] = {
+ "况",
+};
+static gchar *tomoe_unihan_variants_2F81C[] = {
+ "釟",
+};
+static gchar *tomoe_unihan_variants_2F81D[] = {
+ "凵",
+};
+static gchar *tomoe_unihan_variants_2F81E[] = {
+ "刃",
+};
+static gchar *tomoe_unihan_variants_2F81F[] = {
+ "㓟",
+};
+static gchar *tomoe_unihan_variants_2F820[] = {
+ "刻",
+};
+static gchar *tomoe_unihan_variants_2F821[] = {
+ "剆",
+};
+static gchar *tomoe_unihan_variants_2F822[] = {
+ "割",
+};
+static gchar *tomoe_unihan_variants_2F823[] = {
+ "剷",
+};
+static gchar *tomoe_unihan_variants_2F824[] = {
+ "㔕",
+};
+static gchar *tomoe_unihan_variants_2F825[] = {
+ "勇",
+};
+static gchar *tomoe_unihan_variants_2F826[] = {
+ "勉",
+};
+static gchar *tomoe_unihan_variants_2F827[] = {
+ "勤",
+};
+static gchar *tomoe_unihan_variants_2F828[] = {
+ "勺",
+};
+static gchar *tomoe_unihan_variants_2F829[] = {
+ "包",
+};
+static gchar *tomoe_unihan_variants_2F82A[] = {
+ "匆",
+};
+static gchar *tomoe_unihan_variants_2F82B[] = {
+ "北",
+};
+static gchar *tomoe_unihan_variants_2F82C[] = {
+ "卉",
+};
+static gchar *tomoe_unihan_variants_2F82D[] = {
+ "卑",
+};
+static gchar *tomoe_unihan_variants_2F82E[] = {
+ "博",
+};
+static gchar *tomoe_unihan_variants_2F82F[] = {
+ "即",
+};
+static gchar *tomoe_unihan_variants_2F830[] = {
+ "卽",
+};
+static gchar *tomoe_unihan_variants_2F831[] = {
+ "卿",
+};
+static gchar *tomoe_unihan_variants_2F832[] = {
+ "卿",
+};
+static gchar *tomoe_unihan_variants_2F833[] = {
+ "卿",
+};
+static gchar *tomoe_unihan_variants_2F834[] = {
+ "ਬ",
+};
+static gchar *tomoe_unihan_variants_2F835[] = {
+ "灰",
+};
+static gchar *tomoe_unihan_variants_2F836[] = {
+ "及",
+};
+static gchar *tomoe_unihan_variants_2F837[] = {
+ "叟",
+};
+static gchar *tomoe_unihan_variants_2F838[] = {
+ "ୣ",
+};
+static gchar *tomoe_unihan_variants_2F839[] = {
+ "叫",
+};
+static gchar *tomoe_unihan_variants_2F83A[] = {
+ "叱",
+};
+static gchar *tomoe_unihan_variants_2F83B[] = {
+ "吆",
+};
+static gchar *tomoe_unihan_variants_2F83C[] = {
+ "咞",
+};
+static gchar *tomoe_unihan_variants_2F83D[] = {
+ "吸",
+};
+static gchar *tomoe_unihan_variants_2F83E[] = {
+ "呈",
+};
+static gchar *tomoe_unihan_variants_2F83F[] = {
+ "周",
+};
+static gchar *tomoe_unihan_variants_2F840[] = {
+ "咢",
+};
+static gchar *tomoe_unihan_variants_2F841[] = {
+ "哶",
+};
+static gchar *tomoe_unihan_variants_2F842[] = {
+ "唐",
+};
+static gchar *tomoe_unihan_variants_2F843[] = {
+ "啓",
+};
+static gchar *tomoe_unihan_variants_2F844[] = {
+ "啣",
+};
+static gchar *tomoe_unihan_variants_2F845[] = {
+ "善",
+};
+static gchar *tomoe_unihan_variants_2F846[] = {
+ "善",
+};
+static gchar *tomoe_unihan_variants_2F847[] = {
+ "喙",
+};
+static gchar *tomoe_unihan_variants_2F848[] = {
+ "喫",
+};
+static gchar *tomoe_unihan_variants_2F849[] = {
+ "喳",
+};
+static gchar *tomoe_unihan_variants_2F84A[] = {
+ "嗂",
+};
+static gchar *tomoe_unihan_variants_2F84B[] = {
+ "圖",
+};
+static gchar *tomoe_unihan_variants_2F84C[] = {
+ "嘆",
+};
+static gchar *tomoe_unihan_variants_2F84D[] = {
+ "圗",
+};
+static gchar *tomoe_unihan_variants_2F84E[] = {
+ "噑",
+};
+static gchar *tomoe_unihan_variants_2F84F[] = {
+ "噴",
+};
+static gchar *tomoe_unihan_variants_2F850[] = {
+ "切",
+};
+static gchar *tomoe_unihan_variants_2F851[] = {
+ "壮",
+};
+static gchar *tomoe_unihan_variants_2F852[] = {
+ "城",
+};
+static gchar *tomoe_unihan_variants_2F853[] = {
+ "埴",
+};
+static gchar *tomoe_unihan_variants_2F854[] = {
+ "堍",
+};
+static gchar *tomoe_unihan_variants_2F855[] = {
+ "型",
+};
+static gchar *tomoe_unihan_variants_2F856[] = {
+ "堲",
+};
+static gchar *tomoe_unihan_variants_2F857[] = {
+ "報",
+};
+static gchar *tomoe_unihan_variants_2F858[] = {
+ "墬",
+};
+static gchar *tomoe_unihan_variants_2F859[] = {
+ "ᓤ",
+};
+static gchar *tomoe_unihan_variants_2F85A[] = {
+ "売",
+};
+static gchar *tomoe_unihan_variants_2F85B[] = {
+ "壷",
+};
+static gchar *tomoe_unihan_variants_2F85C[] = {
+ "夆",
+};
+static gchar *tomoe_unihan_variants_2F85D[] = {
+ "多",
+};
+static gchar *tomoe_unihan_variants_2F85E[] = {
+ "夢",
+};
+static gchar *tomoe_unihan_variants_2F85F[] = {
+ "奢",
+};
+static gchar *tomoe_unihan_variants_2F860[] = {
+ "ᚨ",
+};
+static gchar *tomoe_unihan_variants_2F861[] = {
+ "ᛪ",
+};
+static gchar *tomoe_unihan_variants_2F862[] = {
+ "姬",
+};
+static gchar *tomoe_unihan_variants_2F863[] = {
+ "娛",
+};
+static gchar *tomoe_unihan_variants_2F864[] = {
+ "娧",
+};
+static gchar *tomoe_unihan_variants_2F865[] = {
+ "姘",
+};
+static gchar *tomoe_unihan_variants_2F866[] = {
+ "婦",
+};
+static gchar *tomoe_unihan_variants_2F867[] = {
+ "㛮",
+};
+static gchar *tomoe_unihan_variants_2F868[] = {
+ "㛼",
+};
+static gchar *tomoe_unihan_variants_2F869[] = {
+ "嬈",
+};
+static gchar *tomoe_unihan_variants_2F86A[] = {
+ "嬾",
+};
+static gchar *tomoe_unihan_variants_2F86B[] = {
+ "嬾",
+};
+static gchar *tomoe_unihan_variants_2F86C[] = {
+ "ᧈ",
+};
+static gchar *tomoe_unihan_variants_2F86D[] = {
+ "寃",
+};
+static gchar *tomoe_unihan_variants_2F86E[] = {
+ "寘",
+};
+static gchar *tomoe_unihan_variants_2F86F[] = {
+ "寧",
+};
+static gchar *tomoe_unihan_variants_2F870[] = {
+ "寳",
+};
+static gchar *tomoe_unihan_variants_2F871[] = {
+ "ᬘ",
+};
+static gchar *tomoe_unihan_variants_2F872[] = {
+ "寿",
+};
+static gchar *tomoe_unihan_variants_2F873[] = {
+ "将",
+};
+static gchar *tomoe_unihan_variants_2F874[] = {
+ "当",
+};
+static gchar *tomoe_unihan_variants_2F875[] = {
+ "尢",
+};
+static gchar *tomoe_unihan_variants_2F876[] = {
+ "㞁",
+};
+static gchar *tomoe_unihan_variants_2F877[] = {
+ "屠",
+};
+static gchar *tomoe_unihan_variants_2F878[] = {
+ "屮",
+};
+static gchar *tomoe_unihan_variants_2F879[] = {
+ "峀",
+};
+static gchar *tomoe_unihan_variants_2F87A[] = {
+ "岍",
+};
+static gchar *tomoe_unihan_variants_2F87B[] = {
+ "ᷤ",
+};
+static gchar *tomoe_unihan_variants_2F87C[] = {
+ "嵃",
+};
+static gchar *tomoe_unihan_variants_2F87D[] = {
+ "ᷦ",
+};
+static gchar *tomoe_unihan_variants_2F87E[] = {
+ "嵮",
+};
+static gchar *tomoe_unihan_variants_2F87F[] = {
+ "嵫",
+};
+static gchar *tomoe_unihan_variants_2F880[] = {
+ "嵼",
+};
+static gchar *tomoe_unihan_variants_2F881[] = {
+ "巡",
+};
+static gchar *tomoe_unihan_variants_2F882[] = {
+ "巢",
+};
+static gchar *tomoe_unihan_variants_2F883[] = {
+ "㠯",
+};
+static gchar *tomoe_unihan_variants_2F884[] = {
+ "巽",
+};
+static gchar *tomoe_unihan_variants_2F885[] = {
+ "帨",
+};
+static gchar *tomoe_unihan_variants_2F886[] = {
+ "帽",
+};
+static gchar *tomoe_unihan_variants_2F887[] = {
+ "幩",
+};
+static gchar *tomoe_unihan_variants_2F888[] = {
+ "㡢",
+};
+static gchar *tomoe_unihan_variants_2F889[] = {
+ "Ↄ",
+};
+static gchar *tomoe_unihan_variants_2F88A[] = {
+ "㡼",
+};
+static gchar *tomoe_unihan_variants_2F88B[] = {
+ "庰",
+};
+static gchar *tomoe_unihan_variants_2F88C[] = {
+ "庳",
+};
+static gchar *tomoe_unihan_variants_2F88D[] = {
+ "庶",
+};
+static gchar *tomoe_unihan_variants_2F88E[] = {
+ "廊",
+};
+static gchar *tomoe_unihan_variants_2F88F[] = {
+ "ꎒ",
+};
+static gchar *tomoe_unihan_variants_2F890[] = {
+ "廾",
+};
+static gchar *tomoe_unihan_variants_2F891[] = {
+ "⌱",
+};
+static gchar *tomoe_unihan_variants_2F892[] = {
+ "⌱",
+};
+static gchar *tomoe_unihan_variants_2F893[] = {
+ "舁",
+};
+static gchar *tomoe_unihan_variants_2F894[] = {
+ "弢",
+};
+static gchar *tomoe_unihan_variants_2F895[] = {
+ "弢",
+};
+static gchar *tomoe_unihan_variants_2F896[] = {
+ "㣇",
+};
+static gchar *tomoe_unihan_variants_2F897[] = {
+ "㊸",
+};
+static gchar *tomoe_unihan_variants_2F898[] = {
+ "懚",
+};
+static gchar *tomoe_unihan_variants_2F899[] = {
+ "形",
+};
+static gchar *tomoe_unihan_variants_2F89A[] = {
+ "彫",
+};
+static gchar *tomoe_unihan_variants_2F89B[] = {
+ "㣣",
+};
+static gchar *tomoe_unihan_variants_2F89C[] = {
+ "徚",
+};
+static gchar *tomoe_unihan_variants_2F89D[] = {
+ "忍",
+};
+static gchar *tomoe_unihan_variants_2F89E[] = {
+ "志",
+};
+static gchar *tomoe_unihan_variants_2F89F[] = {
+ "忹",
+};
+static gchar *tomoe_unihan_variants_2F8A0[] = {
+ "悁",
+};
+static gchar *tomoe_unihan_variants_2F8A1[] = {
+ "㤺",
+};
+static gchar *tomoe_unihan_variants_2F8A2[] = {
+ "㤜",
+};
+static gchar *tomoe_unihan_variants_2F8A3[] = {
+ "悔",
+};
+static gchar *tomoe_unihan_variants_2F8A4[] = {
+ "⛔",
+};
+static gchar *tomoe_unihan_variants_2F8A5[] = {
+ "惇",
+};
+static gchar *tomoe_unihan_variants_2F8A6[] = {
+ "慈",
+};
+static gchar *tomoe_unihan_variants_2F8A7[] = {
+ "慌",
+};
+static gchar *tomoe_unihan_variants_2F8A8[] = {
+ "慎",
+};
+static gchar *tomoe_unihan_variants_2F8A9[] = {
+ "慌",
+};
+static gchar *tomoe_unihan_variants_2F8AA[] = {
+ "慺",
+};
+static gchar *tomoe_unihan_variants_2F8AB[] = {
+ "憎",
+};
+static gchar *tomoe_unihan_variants_2F8AC[] = {
+ "憲",
+};
+static gchar *tomoe_unihan_variants_2F8AD[] = {
+ "憤",
+};
+static gchar *tomoe_unihan_variants_2F8AE[] = {
+ "憯",
+};
+static gchar *tomoe_unihan_variants_2F8AF[] = {
+ "懞",
+};
+static gchar *tomoe_unihan_variants_2F8B0[] = {
+ "懲",
+};
+static gchar *tomoe_unihan_variants_2F8B1[] = {
+ "懶",
+};
+static gchar *tomoe_unihan_variants_2F8B2[] = {
+ "成",
+};
+static gchar *tomoe_unihan_variants_2F8B3[] = {
+ "戛",
+};
+static gchar *tomoe_unihan_variants_2F8B4[] = {
+ "扝",
+};
+static gchar *tomoe_unihan_variants_2F8B5[] = {
+ "抱",
+};
+static gchar *tomoe_unihan_variants_2F8B6[] = {
+ "拔",
+};
+static gchar *tomoe_unihan_variants_2F8B7[] = {
+ "捐",
+};
+static gchar *tomoe_unihan_variants_2F8B8[] = {
+ "⬌",
+};
+static gchar *tomoe_unihan_variants_2F8B9[] = {
+ "挽",
+};
+static gchar *tomoe_unihan_variants_2F8BA[] = {
+ "拼",
+};
+static gchar *tomoe_unihan_variants_2F8BB[] = {
+ "捨",
+};
+static gchar *tomoe_unihan_variants_2F8BC[] = {
+ "掃",
+};
+static gchar *tomoe_unihan_variants_2F8BD[] = {
+ "揤",
+};
+static gchar *tomoe_unihan_variants_2F8BE[] = {
+ "⯱",
+};
+static gchar *tomoe_unihan_variants_2F8BF[] = {
+ "搢",
+};
+static gchar *tomoe_unihan_variants_2F8C0[] = {
+ "揅",
+};
+static gchar *tomoe_unihan_variants_2F8C1[] = {
+ "掩",
+};
+static gchar *tomoe_unihan_variants_2F8C2[] = {
+ "㨮",
+};
+static gchar *tomoe_unihan_variants_2F8C3[] = {
+ "摩",
+};
+static gchar *tomoe_unihan_variants_2F8C4[] = {
+ "摾",
+};
+static gchar *tomoe_unihan_variants_2F8C5[] = {
+ "撝",
+};
+static gchar *tomoe_unihan_variants_2F8C6[] = {
+ "摷",
+};
+static gchar *tomoe_unihan_variants_2F8C7[] = {
+ "㩬",
+};
+static gchar *tomoe_unihan_variants_2F8C8[] = {
+ "敏",
+};
+static gchar *tomoe_unihan_variants_2F8C9[] = {
+ "敬",
+};
+static gchar *tomoe_unihan_variants_2F8CA[] = {
+ "《",
+};
+static gchar *tomoe_unihan_variants_2F8CB[] = {
+ "旣",
+};
+static gchar *tomoe_unihan_variants_2F8CC[] = {
+ "書",
+};
+static gchar *tomoe_unihan_variants_2F8CD[] = {
+ "晉",
+};
+static gchar *tomoe_unihan_variants_2F8CE[] = {
+ "㬙",
+};
+static gchar *tomoe_unihan_variants_2F8CF[] = {
+ "暑",
+};
+static gchar *tomoe_unihan_variants_2F8D0[] = {
+ "㬈",
+};
+static gchar *tomoe_unihan_variants_2F8D1[] = {
+ "㫤",
+};
+static gchar *tomoe_unihan_variants_2F8D2[] = {
+ "冒",
+};
+static gchar *tomoe_unihan_variants_2F8D3[] = {
+ "冕",
+};
+static gchar *tomoe_unihan_variants_2F8D4[] = {
+ "最",
+};
+static gchar *tomoe_unihan_variants_2F8D5[] = {
+ "暜",
+};
+static gchar *tomoe_unihan_variants_2F8D6[] = {
+ "肭",
+};
+static gchar *tomoe_unihan_variants_2F8D7[] = {
+ "䏙",
+};
+static gchar *tomoe_unihan_variants_2F8D8[] = {
+ "朗",
+};
+static gchar *tomoe_unihan_variants_2F8D9[] = {
+ "望",
+};
+static gchar *tomoe_unihan_variants_2F8DA[] = {
+ "朡",
+};
+static gchar *tomoe_unihan_variants_2F8DB[] = {
+ "杞",
+};
+static gchar *tomoe_unihan_variants_2F8DC[] = {
+ "杓",
+};
+static gchar *tomoe_unihan_variants_2F8DD[] = {
+ "㏃",
+};
+static gchar *tomoe_unihan_variants_2F8DE[] = {
+ "㭉",
+};
+static gchar *tomoe_unihan_variants_2F8DF[] = {
+ "柺",
+};
+static gchar *tomoe_unihan_variants_2F8E0[] = {
+ "枅",
+};
+static gchar *tomoe_unihan_variants_2F8E1[] = {
+ "桒",
+};
+static gchar *tomoe_unihan_variants_2F8E2[] = {
+ "梅",
+};
+static gchar *tomoe_unihan_variants_2F8E3[] = {
+ "㑭",
+};
+static gchar *tomoe_unihan_variants_2F8E4[] = {
+ "梎",
+};
+static gchar *tomoe_unihan_variants_2F8E5[] = {
+ "栟",
+};
+static gchar *tomoe_unihan_variants_2F8E6[] = {
+ "椔",
+};
+static gchar *tomoe_unihan_variants_2F8E7[] = {
+ "㮝",
+};
+static gchar *tomoe_unihan_variants_2F8E8[] = {
+ "楂",
+};
+static gchar *tomoe_unihan_variants_2F8E9[] = {
+ "榣",
+};
+static gchar *tomoe_unihan_variants_2F8EA[] = {
+ "槪",
+};
+static gchar *tomoe_unihan_variants_2F8EB[] = {
+ "檨",
+};
+static gchar *tomoe_unihan_variants_2F8EC[] = {
+ "㚣",
+};
+static gchar *tomoe_unihan_variants_2F8ED[] = {
+ "櫛",
+};
+static gchar *tomoe_unihan_variants_2F8EE[] = {
+ "㰘",
+};
+static gchar *tomoe_unihan_variants_2F8EF[] = {
+ "次",
+};
+static gchar *tomoe_unihan_variants_2F8F0[] = {
+ "㢧",
+};
+static gchar *tomoe_unihan_variants_2F8F1[] = {
+ "歔",
+};
+static gchar *tomoe_unihan_variants_2F8F2[] = {
+ "㱎",
+};
+static gchar *tomoe_unihan_variants_2F8F3[] = {
+ "歲",
+};
+static gchar *tomoe_unihan_variants_2F8F4[] = {
+ "殟",
+};
+static gchar *tomoe_unihan_variants_2F8F5[] = {
+ "殺",
+};
+static gchar *tomoe_unihan_variants_2F8F6[] = {
+ "殻",
+};
+static gchar *tomoe_unihan_variants_2F8F7[] = {
+ "㪍",
+};
+static gchar *tomoe_unihan_variants_2F8F8[] = {
+ "ᴋ",
+};
+static gchar *tomoe_unihan_variants_2F8F9[] = {
+ "㫺",
+};
+static gchar *tomoe_unihan_variants_2F8FA[] = {
+ "汎",
+};
+static gchar *tomoe_unihan_variants_2F8FB[] = {
+ "㲼",
+};
+static gchar *tomoe_unihan_variants_2F8FC[] = {
+ "沿",
+};
+static gchar *tomoe_unihan_variants_2F8FD[] = {
+ "泍",
+};
+static gchar *tomoe_unihan_variants_2F8FE[] = {
+ "汧",
+};
+static gchar *tomoe_unihan_variants_2F8FF[] = {
+ "洖",
+};
+static gchar *tomoe_unihan_variants_2F900[] = {
+ "派",
+};
+static gchar *tomoe_unihan_variants_2F901[] = {
+ "海",
+};
+static gchar *tomoe_unihan_variants_2F902[] = {
+ "流",
+};
+static gchar *tomoe_unihan_variants_2F903[] = {
+ "浩",
+};
+static gchar *tomoe_unihan_variants_2F904[] = {
+ "浸",
+};
+static gchar *tomoe_unihan_variants_2F905[] = {
+ "涅",
+};
+static gchar *tomoe_unihan_variants_2F906[] = {
+ "㴞",
+};
+static gchar *tomoe_unihan_variants_2F907[] = {
+ "洴",
+};
+static gchar *tomoe_unihan_variants_2F908[] = {
+ "港",
+};
+static gchar *tomoe_unihan_variants_2F909[] = {
+ "湮",
+};
+static gchar *tomoe_unihan_variants_2F90A[] = {
+ "㴳",
+};
+static gchar *tomoe_unihan_variants_2F90B[] = {
+ "滋",
+};
+static gchar *tomoe_unihan_variants_2F90C[] = {
+ "滇",
+};
+static gchar *tomoe_unihan_variants_2F90D[] = {
+ "㻑",
+};
+static gchar *tomoe_unihan_variants_2F90E[] = {
+ "淹",
+};
+static gchar *tomoe_unihan_variants_2F90F[] = {
+ "潮",
+};
+static gchar *tomoe_unihan_variants_2F910[] = {
+ "㽞",
+};
+static gchar *tomoe_unihan_variants_2F911[] = {
+ "㾎",
+};
+static gchar *tomoe_unihan_variants_2F912[] = {
+ "濆",
+};
+static gchar *tomoe_unihan_variants_2F913[] = {
+ "瀹",
+};
+static gchar *tomoe_unihan_variants_2F914[] = {
+ "瀞",
+};
+static gchar *tomoe_unihan_variants_2F915[] = {
+ "瀛",
+};
+static gchar *tomoe_unihan_variants_2F916[] = {
+ "㶖",
+};
+static gchar *tomoe_unihan_variants_2F917[] = {
+ "灊",
+};
+static gchar *tomoe_unihan_variants_2F918[] = {
+ "災",
+};
+static gchar *tomoe_unihan_variants_2F919[] = {
+ "灷",
+};
+static gchar *tomoe_unihan_variants_2F91A[] = {
+ "炭",
+};
+static gchar *tomoe_unihan_variants_2F91B[] = {
+ "ԥ",
+};
+static gchar *tomoe_unihan_variants_2F91C[] = {
+ "煅",
+};
+static gchar *tomoe_unihan_variants_2F91D[] = {
+ "䉣",
+};
+static gchar *tomoe_unihan_variants_2F91E[] = {
+ "熜",
+};
+static gchar *tomoe_unihan_variants_2F91F[] = {
+ "䎫",
+};
+static gchar *tomoe_unihan_variants_2F920[] = {
+ "爨",
+};
+static gchar *tomoe_unihan_variants_2F921[] = {
+ "爵",
+};
+static gchar *tomoe_unihan_variants_2F922[] = {
+ "牐",
+};
+static gchar *tomoe_unihan_variants_2F923[] = {
+ "䘈",
+};
+static gchar *tomoe_unihan_variants_2F924[] = {
+ "犀",
+};
+static gchar *tomoe_unihan_variants_2F925[] = {
+ "犕",
+};
+static gchar *tomoe_unihan_variants_2F926[] = {
+ "䜵",
+};
+static gchar *tomoe_unihan_variants_2F927[] = {
+ "䠔",
+};
+static gchar *tomoe_unihan_variants_2F928[] = {
+ "獺",
+};
+static gchar *tomoe_unihan_variants_2F929[] = {
+ "王",
+};
+static gchar *tomoe_unihan_variants_2F92A[] = {
+ "㺬",
+};
+static gchar *tomoe_unihan_variants_2F92B[] = {
+ "玥",
+};
+static gchar *tomoe_unihan_variants_2F92C[] = {
+ "㺸",
+};
+static gchar *tomoe_unihan_variants_2F92D[] = {
+ "㺸",
+};
+static gchar *tomoe_unihan_variants_2F92E[] = {
+ "瑇",
+};
+static gchar *tomoe_unihan_variants_2F92F[] = {
+ "瑜",
+};
+static gchar *tomoe_unihan_variants_2F930[] = {
+ "瑱",
+};
+static gchar *tomoe_unihan_variants_2F931[] = {
+ "璅",
+};
+static gchar *tomoe_unihan_variants_2F932[] = {
+ "瓊",
+};
+static gchar *tomoe_unihan_variants_2F933[] = {
+ "㼛",
+};
+static gchar *tomoe_unihan_variants_2F934[] = {
+ "甤",
+};
+static gchar *tomoe_unihan_variants_2F935[] = {
+ "䰶",
+};
+static gchar *tomoe_unihan_variants_2F936[] = {
+ "甾",
+};
+static gchar *tomoe_unihan_variants_2F937[] = {
+ "䲒",
+};
+static gchar *tomoe_unihan_variants_2F938[] = {
+ "異",
+};
+static gchar *tomoe_unihan_variants_2F939[] = {
+ "↟",
+};
+static gchar *tomoe_unihan_variants_2F93A[] = {
+ "瘐",
+};
+static gchar *tomoe_unihan_variants_2F93B[] = {
+ "価",
+};
+static gchar *tomoe_unihan_variants_2F93C[] = {
+ "侸",
+};
+static gchar *tomoe_unihan_variants_2F93D[] = {
+ "偄",
+};
+static gchar *tomoe_unihan_variants_2F93E[] =...
[truncated message content] |
|
From: <kt...@us...> - 2007-04-20 10:32:17
|
Revision: 1207
http://tomoe.svn.sourceforge.net/tomoe/?rev=1207&view=rev
Author: ktou
Date: 2007-04-20 03:32:18 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
* test/data/one_stroke.data: followed the expected test result to
dictionary data change.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/test/data/one_stroke.data
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-20 10:29:28 UTC (rev 1206)
+++ tomoe/trunk/ChangeLog 2007-04-20 10:32:18 UTC (rev 1207)
@@ -1,5 +1,8 @@
2007-04-20 Kouhei Sutou <ko...@co...>
+ * test/data/one_stroke.data: followed the expected test result to
+ dictionary data change.
+
* lib/tomoe.c, lib/tomoe-module.[ch], lib/tomoe-dict.[ch],
lib/tomoe-recognizer.[ch], ext/ruby/:
- supported dynamic loading on demand.
Modified: tomoe/trunk/test/data/one_stroke.data
===================================================================
--- tomoe/trunk/test/data/one_stroke.data 2007-04-20 10:29:28 UTC (rev 1206)
+++ tomoe/trunk/test/data/one_stroke.data 2007-04-20 10:32:18 UTC (rev 1207)
@@ -1,2 +1,2 @@
-久 夕 勺 亡 乞 と 乏 そ 千 ン 之 む 叉 糟 粍 鈎 銅 銚 精 却 受 鐙 叛 粒 類 糎 鍛 鎗 鈴 鉢 劫 鈍 采 鼓 領 舗 飯 顛 斡 頬 燐 粘 飲 剣 柔 趣 粉 歌 錬 登 料 轟 発 弊 頒 畑 奇 鎚 煮 鍵 靭 焚 趨 燥 煙 鞠 炉 堅 麹 数 粕 預 需 愛 勘 鎖 到 煩 飴 煽 燈 餓 宰 糖 幣 熔 鞭 麺 貢 蛋 費 少 圭 煉 去 筑 恭 糧 爆 穿 鞍 焼 窺 路 恕 炊 感 雫 老 灯 毒 虜 躍 晋 索 兎 敬 燭 考 貫 卓 聴 黄 膏 走 粧 鞄 歎 震 寺 灼 慮 燃 専 勤 赤 宜 者 敷 展 窟 蹄 支 寄 寡 煤 窒 窃 憲 貼 豪 眉 召 雲 事 責 匿 零 靴 孝 青 泰 雑 虐 表 燦 尭 虎 雪 巷 耳 喜 歯 矩 覆 麦 蒸 亥 壱 宮 而 蚕 顕 昔 憂 斎 森 頁 声 霧 令 劉 敏 票 裏 忍 幸 顎 属 霊 窮 姦 査 素 基 知 唇 殴 享 竃 売 点 使 凸 屡 野 蕉 真 修 聖 犀 嚢 屑 仰 参 監 呪 栗 杓 壷 償 寿 哀 吾 草 霜 芸 薩 嘉 覇 偲 柁 南 雰 儒 甚 衷 賦 若 志 佼 樹 百 賑 萄 巌 杏 喫 克 電 茸 虞 蛇 車 粁 盃 傑 燕 露 倹 導 弄 層 辱 嵩 肯 惹 霞 今 茅 妻 倒 侃 停 京 竹 道 昨 苧 暖 董 某 欄 慶 蕊 芹 苔 芝 藷 嫁 魔 駐 芙 胸 逼 牧 璽 便 厚 遵 適 奪 鴨 恵 悪 苫 陀 芳 借 萱 杵 傍 蔦 棺 芋 糊 吃 埠 柳 遥 隙 腺 棋 極 芦 廉 遷 蔑 微 陛 噌 糠 櫛 椴 楢 喧 著 倣 蒋 件 儀 惇 鶴 芭 雷 脚 近 桁 職 暢 面 喚 牙 夢 棲 隠 吉 働 嘆 樵 萌 芯 薪 陥 儲 薗 束 虚 侶 峰 幌 曙 株 賭 平 葱 募 配 僕 菟 模 薄 蒲 膨 吹 咋 茨 慨 耽 財 喝 格 菖 則 侮 独 擦 蕪 榔 侠 楼 枕 蕃 蔚 槻 唖 陵 粟 院 幕 菌 爾 椙 椀 萎 臣 仲 栃 来 否 宿 速 蔽 蔀 揮 援 吏 李 皮 腔 腕 莞 横 戚 俄 晩 莫 倦 歳 更 蒼 栢 轍 癌 薮 奔 蔭 軟 茎 豚 傷 蕩 蕎 埋 伶 傾 蒐 柊 馴 莱 咲 薙 蔵 要 葡 祈 痔 菰 連 併 保 喪 茂 橡 菊 榊 伯 藤 蒔 藩 蓬 慌 慕 逆 醍 桝 蓋 酢 古 韮 葵 俺 逐 樫 低 塙 苗 聯 枚 剛 荊 雁 権 菜 逃 机 帯 楊 瞳 掛 座 吻 椎 堺 橘 貰 壕 際 僧 杉 珠 嬬 葛 薦 瞬 促 俗 碇 僚 直 薯 荘 勝 英 薫 漸 標 革 噛 慢 唱 伴 周 姓 礁 蓑 像 均 搾 畷 返 似 啄 苅 機 葺 墓 歪 梅 苓 彫 蒜 藻 橿 喉 備 葦 盛 馳 枇 華 腸 鳶 匠 例 辺 碗 俣 梯 腰 物 荒 梼 葎 膳 茜 透 樋 牲 雌 葉 瑠 核 蓉 脈 桶 菩 夏 撒 胞 験 荏 菱 携 贋 樗 朕 砲 駁 股 滴 附 班 捗 曝 藁 帽 確 蝿 蓮 槌 桃 隈 擁 惚 碍 押 暮 膿 蕗 壊 悩 櫓 優 蓄 拠 噺 栴 擬 且 陶 遭 原 痩 峨 控 堤 降 医 抱 鵬 攻 娩 羽 茶 芥 噸 隊 蒙 授 菅 辻 花 投 慣 落 奮 堆 苛 椛 騰 園 喰 達 揺 腹 俳 擾 悔 蘭 按 葬 松 拐 遼 磯 狗 推 狛 惟 臓 輪 繭 柾 撤 遂 槙 逝 陽 随 捺 菓 偶 逓 棒 隅 萩 藍 曜 挫 送 倫 獄 芽 世 癒 溶 挑 救 猟 退 蜂 採 苦 眺 晦 損 蔓 贈 提 憶 掻 塚 遁 玖 捨 厭 理 略 蜘 換 抑 拘 遮 捌 撫 除 濫 腿 嘩 暦 硲 雄 螺 服 歴 薬 通 撚 惑 荷 塩 探 斑 賜 扮 隆 丹 掬 図 (^^) 撹 厘 遅 揚 迂 性 遍 途 岡 掲 排 膝 胤 泡 茄 週 撮 違 選 巡 温 隣 述 厨 蛾 駒 貯 浴 迅 逗 敗 挽 洋 遠 苑 非 瞭 威 蕨 牌 憤 巴 片 這 拶 搬 荻 肉 怜 氷 逮 摩 狼 辿 賂 孜 兆 超 版 識 逢 円 蘇 母 込 迦 故 追 遜 臨 牒 圏 風 爽 夙 鳳 斗 臥 塑 幽
+久 夕 勺 亡 乞 と 乏 そ 千 ン 之 む 叉 糟 粍 鈎 銅 銚 精 却 受 鐙 叛 粒 類 糎 鍛 鎗 鈴 鉢 劫 鈍 采 鼓 領 舗 飯 顛 斡 頬 燐 粘 飲 剣 柔 趣 粉 歌 錬 登 料 轟 発 弊 頒 畑 奇 鎚 煮 鍵 靭 焚 趨 燥 煙 鞠 炉 堅 麹 数 粕 預 需 愛 勘 鎖 到 煩 飴 煽 燈 餓 宰 糖 幣 熔 鞭 麺 貢 蛋 費 少 圭 煉 去 筑 恭 糧 爆 穿 鞍 焼 窺 路 恕 炊 感 雫 老 灯 毒 虜 躍 晋 索 兎 敬 燭 考 貫 卓 聴 黄 膏 走 粧 鞄 歎 震 寺 灼 慮 燃 専 勤 赤 宜 者 敷 展 窟 蹄 支 寄 寡 煤 窒 窃 憲 貼 豪 眉 召 雲 事 責 匿 零 靴 孝 青 泰 雑 虐 表 燦 尭 虎 雪 巷 耳 喜 歯 矩 覆 麦 蒸 亥 壱 宮 而 蚕 顕 昔 憂 斎 森 頁 声 霧 令 劉 敏 票 裏 忍 幸 顎 属 霊 窮 姦 査 素 基 知 唇 殴 享 竃 売 点 使 凸 屡 野 蕉 真 修 聖 犀 嚢 屑 仰 参 監 呪 栗 杓 壷 償 寿 哀 吾 草 霜 芸 薩 嘉 覇 偲 柁 南 雰 儒 甚 衷 賦 若 志 佼 樹 百 賑 萄 巌 杏 喫 克 電 茸 虞 蛇 車 粁 盃 傑 燕 露 倹 導 弄 層 辱 嵩 肯 惹 霞 今 茅 妻 倒 侃 停 京 竹 道 昨 苧 暖 董 某 欄 慶 蕊 芹 苔 芝 藷 嫁 魔 駐 芙 胸 逼 牧 璽 便 厚 遵 適 奪 鴨 恵 悪 苫 陀 芳 借 萱 杵 傍 蔦 棺 芋 糊 吃 埠 柳 遥 隙 腺 棋 極 芦 廉 遷 蔑 微 陛 噌 糠 櫛 椴 楢 喧 著 倣 蒋 件 儀 惇 鶴 芭 雷 脚 近 桁 職 暢 面 喚 牙 夢 棲 隠 吉 働 嘆 樵 萌 芯 薪 陥 儲 薗 束 虚 侶 峰 幌 曙 株 賭 平 葱 募 配 僕 菟 模 薄 蒲 膨 吹 咋 茨 慨 耽 財 喝 格 菖 則 侮 独 擦 蕪 榔 侠 楼 枕 蕃 蔚 槻 唖 陵 粟 院 幕 菌 爾 椙 椀 萎 臣 仲 栃 来 否 速 蔽 蔀 揮 援 吏 李 皮 腔 腕 莞 横 戚 俄 晩 莫 倦 歳 更 蒼 栢 轍 癌 薮 奔 蔭 軟 茎 豚 傷 蕩 蕎 埋 伶 傾 蒐 柊 馴 莱 咲 薙 蔵 要 葡 祈 痔 菰 連 併 保 喪 茂 橡 菊 榊 伯 藤 蒔 藩 蓬 慌 慕 逆 醍 桝 蓋 酢 古 韮 葵 俺 逐 樫 低 塙 苗 聯 枚 剛 荊 雁 権 菜 逃 机 帯 楊 瞳 掛 座 吻 椎 堺 橘 貰 壕 際 僧 杉 珠 嬬 葛 薦 瞬 促 俗 碇 僚 直 薯 荘 勝 英 薫 漸 標 革 噛 慢 唱 伴 周 姓 礁 蓑 像 均 搾 畷 返 似 啄 苅 機 葺 墓 歪 梅 苓 彫 蒜 藻 橿 喉 備 葦 盛 馳 枇 華 腸 鳶 匠 例 辺 碗 俣 梯 腰 物 荒 梼 葎 膳 茜 透 樋 牲 雌 葉 瑠 核 蓉 脈 桶 菩 夏 撒 胞 験 荏 菱 携 贋 樗 朕 砲 駁 股 滴 附 班 捗 曝 藁 帽 確 蝿 蓮 槌 桃 隈 擁 惚 碍 押 暮 膿 蕗 壊 悩 櫓 優 蓄 拠 噺 栴 擬 且 陶 遭 原 痩 峨 控 堤 降 医 抱 鵬 攻 娩 羽 茶 芥 噸 隊 蒙 授 菅 辻 花 投 慣 落 奮 堆 苛 椛 騰 園 喰 達 揺 腹 俳 擾 悔 蘭 按 葬 松 拐 遼 磯 狗 推 狛 惟 臓 輪 繭 柾 撤 遂 槙 逝 陽 随 捺 菓 偶 逓 棒 隅 萩 藍 曜 挫 送 倫 獄 芽 世 癒 溶 挑 救 猟 退 蜂 採 苦 眺 晦 損 蔓 贈 提 憶 掻 塚 遁 玖 捨 厭 理 略 蜘 換 抑 拘 遮 捌 撫 除 濫 腿 嘩 暦 硲 雄 螺 服 歴 薬 通 撚 惑 荷 塩 探 斑 賜 扮 隆 丹 掬 図 (^^) 撹 厘 遅 揚 迂 性 遍 途 岡 掲 排 膝 胤 泡 茄 週 撮 違 選 巡 温 隣 述 厨 蛾 駒 貯 浴 迅 逗 敗 挽 洋 遠 苑 非 瞭 威 蕨 牌 憤 巴 片 這 拶 搬 荻 肉 怜 氷 逮 摩 狼 辿 賂 孜 兆 超 版 識 逢 円 蘇 母 込 迦 故 追 遜 臨 牒 圏 風 爽 夙 鳳 斗 臥 塑 幽
376 183, 373 190, 373 196, 366 216, 366 222, 366 229, 366 232, 360 251, 353 270, 346 290, 343 296, 343 299, 336 319
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-20 10:29:30
|
Revision: 1206
http://tomoe.svn.sourceforge.net/tomoe/?rev=1206&view=rev
Author: ktou
Date: 2007-04-20 03:29:28 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
* lib/tomoe.c, lib/tomoe-module.[ch], lib/tomoe-dict.[ch],
lib/tomoe-recognizer.[ch], ext/ruby/:
- supported dynamic loading on demand.
- added default module directory configuration interfaces.
* test/tomoe-spec-utils.rb: used default module directory
configuration interface instead of environment variable.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/ext/ruby/Makefile.am
tomoe/trunk/ext/ruby/tomoe-rb-dict.c
tomoe/trunk/ext/ruby/tomoe-rb-recognizer.c
tomoe/trunk/ext/ruby/tomoe-rb.c
tomoe/trunk/ext/ruby/tomoe-rb.h
tomoe/trunk/ext/ruby/tomoe.rb
tomoe/trunk/lib/tomoe-dict.c
tomoe/trunk/lib/tomoe-dict.h
tomoe/trunk/lib/tomoe-module.c
tomoe/trunk/lib/tomoe-module.h
tomoe/trunk/lib/tomoe-recognizer.c
tomoe/trunk/lib/tomoe-recognizer.h
tomoe/trunk/lib/tomoe.c
tomoe/trunk/test/tomoe-spec-utils.rb
Removed Paths:
-------------
tomoe/trunk/ext/ruby/tomoe-rb-module.c
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/ChangeLog 2007-04-20 10:29:28 UTC (rev 1206)
@@ -1,3 +1,12 @@
+2007-04-20 Kouhei Sutou <ko...@co...>
+
+ * lib/tomoe.c, lib/tomoe-module.[ch], lib/tomoe-dict.[ch],
+ lib/tomoe-recognizer.[ch], ext/ruby/:
+ - supported dynamic loading on demand.
+ - added default module directory configuration interfaces.
+ * test/tomoe-spec-utils.rb: used default module directory
+ configuration interface instead of environment variable.
+
2007-04-19 Takuro Ashie <as...@ho...>
* data/handwriting.xml: Fix stroke data of U+5BBF.
Modified: tomoe/trunk/ext/ruby/Makefile.am
===================================================================
--- tomoe/trunk/ext/ruby/Makefile.am 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/ext/ruby/Makefile.am 2007-04-20 10:29:28 UTC (rev 1206)
@@ -18,7 +18,6 @@
tomoe-rb-config.c \
tomoe-rb-context.c \
tomoe-rb-dict.c \
- tomoe-rb-module.c \
tomoe-rb-query.c \
tomoe-rb-reading.c \
tomoe-rb-recognizer.c \
Modified: tomoe/trunk/ext/ruby/tomoe-rb-dict.c
===================================================================
--- tomoe/trunk/ext/ruby/tomoe-rb-dict.c 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/ext/ruby/tomoe-rb-dict.c 2007-04-20 10:29:28 UTC (rev 1206)
@@ -2,37 +2,49 @@
#define _SELF(obj) RVAL2TDIC(obj)
-#define DICT_PREFIX "Dict"
-
static VALUE mTomoe;
-void
-_tomoe_rb_dict_module_load(void)
+static VALUE
+td_s_load(VALUE self, VALUE name)
{
- _tomoe_rb_module_load(tomoe_dict_get_registered_types(), mTomoe,
- tomoe_dict_get_log_domains(), DICT_PREFIX);
-}
+ VALUE loaded = Qfalse;
+ VALUE normalized_name;
+ TomoeModule *module;
-static void
-_tomoe_rb_dict_module_unload(void)
-{
- _tomoe_rb_module_unload(tomoe_dict_get_registered_types(), mTomoe,
- DICT_PREFIX);
+ normalized_name = rb_funcall(name, rb_intern("downcase"), 0);
+ module = tomoe_dict_load_module(RVAL2CSTR(normalized_name));
+ if (module)
+ {
+ gchar *type_name, *class_name;
+ GType type;
+
+ class_name = g_strconcat("Dict", RVAL2CSTR(name), NULL);
+ type_name = g_strconcat("Tomoe", class_name, NULL);
+ type = g_type_from_name(type_name);
+ if (type) {
+ if (!rb_const_defined(mTomoe, rb_intern(class_name)))
+ G_DEF_CLASS3(type_name, class_name, mTomoe);
+
+ if (rbgobj_lookup_class_by_gtype(type, Qnil))
+ loaded = Qtrue;
+ }
+ g_free(class_name);
+ g_free(type_name);
+ }
+
+ return loaded;
}
static VALUE
-td_s_load(VALUE self, VALUE base_dir)
+td_s_default_module_dir(VALUE self)
{
- tomoe_dict_load(NIL_P(base_dir) ? NULL : RVAL2CSTR(base_dir));
- _tomoe_rb_dict_module_load();
- return Qnil;
+ return CSTR2RVAL(tomoe_dict_get_default_module_dir());
}
static VALUE
-td_s_unload(VALUE self)
+td_s_set_default_module_dir(VALUE self, VALUE dir)
{
- _tomoe_rb_dict_module_unload();
- tomoe_dict_unload();
+ tomoe_dict_set_default_module_dir(RVAL2CSTR2(dir));
return Qnil;
}
@@ -81,7 +93,12 @@
cTomoeDict = G_DEF_CLASS(TOMOE_TYPE_DICT, "Dict", mTomoe);
rb_define_singleton_method(cTomoeDict, "load", td_s_load, 1);
- rb_define_singleton_method(cTomoeDict, "unload", td_s_unload, 0);
+ rb_define_singleton_method(cTomoeDict, "default_module_dir",
+ td_s_default_module_dir, 0);
+ rb_define_singleton_method(cTomoeDict, "set_default_module_dir",
+ td_s_set_default_module_dir, 1);
+ rb_define_singleton_method(cTomoeDict, "default_module_dir=",
+ td_s_set_default_module_dir, 1);
rb_define_method(cTomoeDict, "[]", td_get_char, 1);
rb_define_method(cTomoeDict, "register", td_register_char, 1);
Deleted: tomoe/trunk/ext/ruby/tomoe-rb-module.c
===================================================================
--- tomoe/trunk/ext/ruby/tomoe-rb-module.c 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/ext/ruby/tomoe-rb-module.c 2007-04-20 10:29:28 UTC (rev 1206)
@@ -1,57 +0,0 @@
-#include "tomoe-rb.h"
-
-#define TOMOE_PREFIX "Tomoe"
-
-void
-_tomoe_rb_module_load (GList *registered_types, VALUE klass,
- GList *log_domains, const gchar *prefix)
-{
- GList *node;
- gchar *full_prefix;
- gint tomoe_prefix_len;
-
- full_prefix = g_strconcat(TOMOE_PREFIX, prefix, NULL);
- tomoe_prefix_len = strlen(TOMOE_PREFIX);
- for (node = registered_types; node; node = g_list_next(node)) {
- const gchar *name = node->data;
- GType type;
-
- type = g_type_from_name(name);
- if (type && g_str_has_prefix(name, full_prefix)) {
- G_DEF_CLASS(type, name + tomoe_prefix_len, klass);
- }
- }
- g_free(full_prefix);
- g_list_free(registered_types);
-
- for (node = log_domains; node; node = g_list_next(node)) {
- gchar *log_domain = node->data;
- _tomoe_rb_set_log_domain(log_domain);
- g_free(log_domain);
- }
- g_list_free(log_domains);
-}
-
-void
-_tomoe_rb_module_unload (GList *registered_types, VALUE klass,
- const gchar *prefix)
-{
- GList *node;
- gchar *full_prefix;
- gint tomoe_prefix_len;
-
- full_prefix = g_strconcat(TOMOE_PREFIX, prefix, NULL);
- tomoe_prefix_len = strlen(TOMOE_PREFIX);
- for (node = registered_types; node; node = g_list_next (node)) {
- const gchar *name = node->data;
-
- if (g_str_has_prefix(name, full_prefix)) {
- const gchar *klass_name = name + tomoe_prefix_len;
- if (rb_const_defined (klass, rb_intern(klass_name))) {
- rb_mod_remove_const (klass, rb_str_new2(klass_name));
- }
- }
- }
- g_free(full_prefix);
- g_list_free (registered_types);
-}
Modified: tomoe/trunk/ext/ruby/tomoe-rb-recognizer.c
===================================================================
--- tomoe/trunk/ext/ruby/tomoe-rb-recognizer.c 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/ext/ruby/tomoe-rb-recognizer.c 2007-04-20 10:29:28 UTC (rev 1206)
@@ -2,38 +2,49 @@
#define _SELF(obj) RVAL2TREC(obj)
-#define RECOGNIZER_PREFIX "Recognizer"
-
static VALUE mTomoe;
-void
-_tomoe_rb_recognizer_module_load(void)
+static VALUE
+td_s_load(VALUE self, VALUE name)
{
- _tomoe_rb_module_load(tomoe_recognizer_get_registered_types(), mTomoe,
- tomoe_recognizer_get_log_domains(),
- RECOGNIZER_PREFIX);
-}
+ VALUE loaded = Qfalse;
+ VALUE normalized_name;
+ TomoeModule *module;
-static void
-_tomoe_rb_recognizer_module_unload(void)
-{
- _tomoe_rb_module_unload(tomoe_recognizer_get_registered_types(), mTomoe,
- RECOGNIZER_PREFIX);
+ normalized_name = rb_funcall(name, rb_intern("downcase"), 0);
+ module = tomoe_recognizer_load_module(RVAL2CSTR(normalized_name));
+ if (module)
+ {
+ gchar *type_name, *class_name;
+ GType type;
+
+ class_name = g_strconcat("Recognizer", RVAL2CSTR(name), NULL);
+ type_name = g_strconcat("Tomoe", class_name, NULL);
+ type = g_type_from_name(type_name);
+ if (type) {
+ if (!rb_const_defined(mTomoe, rb_intern(class_name)))
+ G_DEF_CLASS3(type_name, class_name, mTomoe);
+
+ if (rbgobj_lookup_class_by_gtype(type, Qnil))
+ loaded = Qtrue;
+ }
+ g_free(class_name);
+ g_free(type_name);
+ }
+
+ return loaded;
}
static VALUE
-tr_s_load(VALUE self, VALUE base_dir)
+td_s_default_module_dir(VALUE self)
{
- tomoe_recognizer_load(NIL_P(base_dir) ? NULL : RVAL2CSTR(base_dir));
- _tomoe_rb_recognizer_module_load();
- return Qnil;
+ return CSTR2RVAL(tomoe_recognizer_get_default_module_dir());
}
static VALUE
-tr_s_unload(VALUE self)
+td_s_set_default_module_dir(VALUE self, VALUE dir)
{
- _tomoe_rb_recognizer_module_unload();
- tomoe_recognizer_unload();
+ tomoe_recognizer_set_default_module_dir(RVAL2CSTR2(dir));
return Qnil;
}
@@ -57,8 +68,13 @@
mTomoe = _mTomoe;
cTomoeRecognizer = G_DEF_CLASS(TOMOE_TYPE_RECOGNIZER, "Recognizer", mTomoe);
- rb_define_singleton_method(cTomoeRecognizer, "load", tr_s_load, 1);
- rb_define_singleton_method(cTomoeRecognizer, "unload", tr_s_unload, 0);
+ rb_define_singleton_method(cTomoeRecognizer, "load", td_s_load, 1);
+ rb_define_singleton_method(cTomoeRecognizer, "default_module_dir",
+ td_s_default_module_dir, 0);
+ rb_define_singleton_method(cTomoeRecognizer, "set_default_module_dir",
+ td_s_set_default_module_dir, 1);
+ rb_define_singleton_method(cTomoeRecognizer, "default_module_dir=",
+ td_s_set_default_module_dir, 1);
rb_define_method(cTomoeRecognizer, "language", tr_language, 0);
}
Modified: tomoe/trunk/ext/ruby/tomoe-rb.c
===================================================================
--- tomoe/trunk/ext/ruby/tomoe-rb.c 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/ext/ruby/tomoe-rb.c 2007-04-20 10:29:28 UTC (rev 1206)
@@ -45,7 +45,4 @@
mGLibLog = rb_const_get(mGLib, rb_intern("Log"));
set_log_domain = rb_intern("set_log_domain");
-
- _tomoe_rb_dict_module_load();
- _tomoe_rb_recognizer_module_load();
}
Modified: tomoe/trunk/ext/ruby/tomoe-rb.h
===================================================================
--- tomoe/trunk/ext/ruby/tomoe-rb.h 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/ext/ruby/tomoe-rb.h 2007-04-20 10:29:28 UTC (rev 1206)
@@ -54,14 +54,6 @@
void _tomoe_rb_set_log_domain(const gchar *domain);
-void _tomoe_rb_module_load (GList *registered_types, VALUE klass,
- GList *log_domains, const gchar *prefix);
-void _tomoe_rb_module_unload (GList *registered_types, VALUE klass,
- const gchar *prefix);
-
-void _tomoe_rb_dict_module_load(void);
-void _tomoe_rb_recognizer_module_load(void);
-
G_END_DECLS
#endif /* __TOMOE_RB_H__ */
Modified: tomoe/trunk/ext/ruby/tomoe.rb
===================================================================
--- tomoe/trunk/ext/ruby/tomoe.rb 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/ext/ruby/tomoe.rb 2007-04-20 10:29:28 UTC (rev 1206)
@@ -3,6 +3,26 @@
module Tomoe
LOG_DOMAIN = "Tomoe"
+
+ class << self
+ @missing = false
+ def const_missing(name)
+ super if @missing
+ begin
+ missing = @missing
+ @missing = true
+ case name.to_s
+ when /^Dict(.+)$/
+ return const_get(name) if Dict.load($1)
+ when /^Recognizer(.+)$/
+ return const_get(name) if Recognizer.load($1)
+ end
+ super
+ ensure
+ @missing = missing
+ end
+ end
+ end
end
GLib::Log.set_log_domain(Tomoe::LOG_DOMAIN)
Modified: tomoe/trunk/lib/tomoe-dict.c
===================================================================
--- tomoe/trunk/lib/tomoe-dict.c 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/lib/tomoe-dict.c 2007-04-20 10:29:28 UTC (rev 1206)
@@ -24,18 +24,79 @@
#include "tomoe-module.h"
static GList *dicts = NULL;
+static gchar *module_dir = NULL;
+void tomoe_dict_init (void)
+{
+}
+
+void tomoe_dict_quit (void)
+{
+ tomoe_dict_unload ();
+ tomoe_dict_set_default_module_dir (NULL);
+}
+
+const gchar *
+tomoe_dict_get_default_module_dir (void)
+{
+ return module_dir;
+}
+
void
+tomoe_dict_set_default_module_dir (const gchar *dir)
+{
+ if (module_dir)
+ g_free (module_dir);
+ module_dir = NULL;
+
+ if (dir)
+ module_dir = g_strdup (dir);
+}
+
+static const gchar *
+_tomoe_dict_module_dir (void)
+{
+ const gchar *dir;
+
+ if (module_dir)
+ return module_dir;
+
+ dir = g_getenv ("TOMOE_DICT_MODULE_DIR");
+ if (dir)
+ return dir;
+
+ return DICT_MODULEDIR;
+}
+
+void
tomoe_dict_load (const gchar *base_dir)
{
if (!base_dir)
- base_dir = g_getenv ("TOMOE_DICT_MODULE_DIR");
- if (!base_dir)
- base_dir = DICT_MODULEDIR;
+ base_dir = _tomoe_dict_module_dir ();
dicts = g_list_concat (tomoe_module_load_modules (base_dir), dicts);
}
+TomoeModule *
+tomoe_dict_load_module (const gchar *name)
+{
+ TomoeModule *module;
+
+ module = tomoe_module_find (dicts, name);
+ if (module)
+ return module;
+
+ module = tomoe_module_load_module (_tomoe_dict_module_dir (), name);
+ if (module) {
+ if (g_type_module_use (G_TYPE_MODULE (module))) {
+ dicts = g_list_prepend (dicts, module);
+ g_type_module_unuse (G_TYPE_MODULE (module));
+ }
+ }
+
+ return module;
+}
+
void
tomoe_dict_unload (void)
{
@@ -56,7 +117,9 @@
return tomoe_module_collect_log_domains (dicts);
}
+#define tomoe_dict_init init
G_DEFINE_ABSTRACT_TYPE (TomoeDict, tomoe_dict, G_TYPE_OBJECT)
+#undef tomoe_dict_init
static void
tomoe_dict_class_init (TomoeDictClass *klass)
@@ -73,7 +136,7 @@
}
static void
-tomoe_dict_init (TomoeDict *dict)
+init (TomoeDict *dict)
{
}
@@ -90,11 +153,15 @@
TomoeDict *
tomoe_dict_new (const gchar *name, const gchar *first_property, ...)
{
+ TomoeModule *module;
GObject *dict;
va_list var_args;
+ module = tomoe_dict_load_module (name);
+ g_return_val_if_fail (module != NULL, NULL);
+
va_start (var_args, first_property);
- dict = tomoe_module_instantiate (dicts, name, first_property, var_args);
+ dict = tomoe_module_instantiate (module, first_property, var_args);
va_end (var_args);
return TOMOE_DICT (dict);
Modified: tomoe/trunk/lib/tomoe-dict.h
===================================================================
--- tomoe/trunk/lib/tomoe-dict.h 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/lib/tomoe-dict.h 2007-04-20 10:29:28 UTC (rev 1206)
@@ -31,6 +31,7 @@
G_BEGIN_DECLS
+#include "tomoe-module.h"
#include "tomoe-char.h"
#include "tomoe-query.h"
@@ -70,7 +71,14 @@
GType tomoe_dict_get_type (void) G_GNUC_CONST;
+void tomoe_dict_init (void);
+void tomoe_dict_quit (void);
+
+const gchar *tomoe_dict_get_default_module_dir (void);
+void tomoe_dict_set_default_module_dir (const gchar *dir);
+
void tomoe_dict_load (const gchar *base_dir);
+TomoeModule *tomoe_dict_load_module (const gchar *name);
void tomoe_dict_unload (void);
GList *tomoe_dict_get_registered_types (void);
GList *tomoe_dict_get_log_domains (void);
Modified: tomoe/trunk/lib/tomoe-module.c
===================================================================
--- tomoe/trunk/lib/tomoe-module.c 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/lib/tomoe-module.c 2007-04-20 10:29:28 UTC (rev 1206)
@@ -31,7 +31,7 @@
#define TOMOE_MODULE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOMOE_TYPE_MODULE, TomoeModulePrivate))
-typedef struct _TomoeModulePrivate TomoeModulePrivate;
+typedef struct _TomoeModulePrivate TomoeModulePrivate;
struct _TomoeModulePrivate
{
GModule *library;
@@ -226,30 +226,40 @@
g_free (message);
}
-GObject *
-tomoe_module_instantiate (GList *modules, const gchar *name,
- const gchar *first_property, va_list var_args)
+TomoeModule *
+tomoe_module_find (GList *modules, const gchar *name)
{
GList *node;
- for (node = modules; node; node = g_list_next (node)) {
+ for (node = modules; node; node = g_list_next(node)) {
TomoeModule *module = node->data;
TomoeModulePrivate *priv;
- priv = TOMOE_MODULE_GET_PRIVATE (module);
- if (_tomoe_module_match_name (priv->mod_path, name) &&
- g_type_module_use (G_TYPE_MODULE (module))) {
- GObject *object = NULL;
- object = priv->instantiate (first_property, var_args);
- g_type_module_unuse (G_TYPE_MODULE (module));
- if (object)
- return object;
- }
+ priv = TOMOE_MODULE_GET_PRIVATE(module);
+ if (_tomoe_module_match_name(priv->mod_path, name))
+ return module;
}
return NULL;
}
+GObject *
+tomoe_module_instantiate (TomoeModule *module,
+ const gchar *first_property, va_list var_args)
+{
+ GObject *object = NULL;
+ TomoeModulePrivate *priv;
+
+ priv = TOMOE_MODULE_GET_PRIVATE (module);
+ if (g_type_module_use (G_TYPE_MODULE(module))) {
+ object = priv->instantiate (first_property, var_args);
+ g_type_module_unuse (G_TYPE_MODULE(module));
+ }
+
+ return object;
+}
+
+
static GModule *
_tomoe_module_open (const gchar *mod_path)
{
@@ -271,6 +281,12 @@
}
}
+static gchar *
+_tomoe_module_module_file_name (const gchar *name)
+{
+ return g_strconcat(name, "." G_MODULE_SUFFIX, NULL);
+}
+
static gboolean
_tomoe_module_load_func (GModule *module, const gchar *func_name,
gpointer *symbol)
@@ -285,28 +301,39 @@
}
}
-static TomoeModule *
-_tomoe_module_load (const gchar *base_dir, const gchar *name)
+TomoeModule *
+tomoe_module_load_module (const gchar *base_dir, const gchar *name)
{
gchar *mod_base_name, *mod_path;
TomoeModule *module = NULL;
- mod_base_name = g_build_filename (base_dir, name, NULL);
- if (g_str_has_suffix (mod_base_name, G_MODULE_SUFFIX)) {
+ mod_base_name = g_build_filename(base_dir, name, NULL);
+ if (g_str_has_suffix(mod_base_name, G_MODULE_SUFFIX)) {
mod_path = mod_base_name;
} else {
- mod_path = g_strconcat (mod_base_name, "." G_MODULE_SUFFIX, NULL);
- g_free (mod_base_name);
+ mod_path = _tomoe_module_module_file_name(mod_base_name);
+ g_free(mod_base_name);
}
- if (g_file_test (mod_path, G_FILE_TEST_EXISTS)) {
+ if (g_file_test(mod_path, G_FILE_TEST_EXISTS)) {
TomoeModulePrivate *priv;
- module = g_object_new (TOMOE_TYPE_MODULE, NULL);
- priv = TOMOE_MODULE_GET_PRIVATE (module);
- priv->mod_path = g_strdup (mod_path);
- g_type_module_set_name (G_TYPE_MODULE (module), priv->mod_path);
+ gchar *mod_name;
+
+ module = g_object_new(TOMOE_TYPE_MODULE, NULL);
+ priv = TOMOE_MODULE_GET_PRIVATE(module);
+ priv->mod_path = g_strdup(mod_path);
+
+ mod_name = g_strdup(name);
+ if (g_str_has_suffix(mod_name, "."G_MODULE_SUFFIX)) {
+ guint last_index;
+ last_index =
+ strlen(mod_name) - strlen("."G_MODULE_SUFFIX);
+ mod_name[last_index] = '\0';
+ }
+ g_type_module_set_name(G_TYPE_MODULE(module), mod_name);
+ g_free(mod_name);
}
- g_free (mod_path);
+ g_free(mod_path);
return module;
}
@@ -314,22 +341,36 @@
GList *
tomoe_module_load_modules (const gchar *base_dir)
{
+ return tomoe_module_load_modules_unique(base_dir, NULL);
+}
+
+GList *
+tomoe_module_load_modules_unique (const gchar *base_dir, GList *exist_modules)
+{
GDir *dir;
GList *modules = NULL;
+ const gchar *entry;
- dir = g_dir_open (base_dir, 0, NULL);
- if (dir) {
- const gchar *entry;
+ dir = g_dir_open(base_dir, 0, NULL);
+ if (!dir)
+ return modules;
- while ((entry = g_dir_read_name(dir))) {
- TomoeModule *module;
- module = _tomoe_module_load (base_dir, entry);
- if (module)
- modules = g_list_prepend (modules, module);
+ while ((entry = g_dir_read_name(dir))) {
+ TomoeModule *module;
+
+ module = tomoe_module_load_module(base_dir, entry);
+ if (module)
+ {
+ GTypeModule *g_module;
+
+ g_module = G_TYPE_MODULE(module);
+ if (tomoe_module_find(exist_modules, g_module->name))
+ tomoe_module_unload(module);
+ else
+ modules = g_list_prepend(modules, module);
}
-
- g_dir_close(dir);
}
+ g_dir_close(dir);
return modules;
}
Modified: tomoe/trunk/lib/tomoe-module.h
===================================================================
--- tomoe/trunk/lib/tomoe-module.h 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/lib/tomoe-module.h 2007-04-20 10:29:28 UTC (rev 1206)
@@ -50,10 +50,16 @@
GType tomoe_module_get_type (void) G_GNUC_CONST;
-GList *tomoe_module_load_modules (const gchar *base_dir);
+TomoeModule *tomoe_module_load_module (const gchar *base_dir,
+ const gchar *name);
+GList *tomoe_module_load_modules (const gchar *base_dir);
+GList *tomoe_module_load_modules_unique (const gchar *base_dir,
+ GList *modules);
-GObject *tomoe_module_instantiate (GList *modules,
- const gchar *name,
+TomoeModule *tomoe_module_find (GList *modules,
+ const gchar *name);
+
+GObject *tomoe_module_instantiate (TomoeModule *module,
const gchar *first_property,
va_list var_args);
Modified: tomoe/trunk/lib/tomoe-recognizer.c
===================================================================
--- tomoe/trunk/lib/tomoe-recognizer.c 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/lib/tomoe-recognizer.c 2007-04-20 10:29:28 UTC (rev 1206)
@@ -28,19 +28,81 @@
#include "tomoe-recognizer.h"
static GList *recognizers = NULL;
+static gchar *module_dir = NULL;
+void tomoe_recognizer_init (void)
+{
+}
+
+void tomoe_recognizer_quit (void)
+{
+ tomoe_recognizer_unload ();
+ if (module_dir)
+ g_free (module_dir);
+ module_dir = NULL;
+}
+
+const gchar *
+tomoe_recognizer_get_default_module_dir (void)
+{
+ return module_dir;
+}
+
void
+tomoe_recognizer_set_default_module_dir (const gchar *dir)
+{
+ if (module_dir)
+ g_free (module_dir);
+ module_dir = NULL;
+
+ if (dir)
+ module_dir = g_strdup (dir);
+}
+
+static const gchar *
+_tomoe_recognizer_module_dir (void)
+{
+ const gchar *dir;
+ if (module_dir)
+ return module_dir;
+
+ dir = g_getenv ("TOMOE_RECOGNIZER_MODULE_DIR");
+ if (dir)
+ return dir;
+
+ return RECOGNIZER_MODULEDIR;
+}
+
+void
tomoe_recognizer_load (const gchar *base_dir)
{
if (!base_dir)
- base_dir = g_getenv ("TOMOE_RECOGNIZER_MODULE_DIR");
- if (!base_dir)
- base_dir = RECOGNIZER_MODULEDIR;
+ base_dir = _tomoe_recognizer_module_dir ();
recognizers = g_list_concat (tomoe_module_load_modules (base_dir),
recognizers);
}
+TomoeModule *
+tomoe_recognizer_load_module (const gchar *name)
+{
+ TomoeModule *module;
+
+ module = tomoe_module_find (recognizers, name);
+ if (module)
+ return module;
+
+ module = tomoe_module_load_module (_tomoe_recognizer_module_dir (), name);
+ if (module) {
+ if (g_type_module_use (G_TYPE_MODULE (module))) {
+ recognizers = g_list_prepend (recognizers, module);
+ g_type_module_unuse (G_TYPE_MODULE (module));
+ }
+ }
+
+ return module;
+}
+
void
tomoe_recognizer_unload (void)
{
@@ -64,10 +126,10 @@
#define TOMOE_RECOGNIZER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOMOE_TYPE_RECOGNIZER, TomoeRecognizerPrivate))
-typedef struct _TomoeRecognizerPrivate TomoeRecognizerPrivate;
+typedef struct _TomoeRecognizerPrivate TomoeRecognizerPrivate;
struct _TomoeRecognizerPrivate
{
- gchar *language;
+ gchar *language;
};
enum {
@@ -75,14 +137,16 @@
PROP_LANGUAGE
};
+#define tomoe_recognizer_init init
G_DEFINE_ABSTRACT_TYPE (TomoeRecognizer, tomoe_recognizer, G_TYPE_OBJECT)
+#undef tomoe_recognizer_init
-static void dispose (GObject *object);
-static void set_property (GObject *object,
+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,
+static void get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
@@ -114,7 +178,7 @@
}
static void
-tomoe_recognizer_init (TomoeRecognizer *recognizer)
+init (TomoeRecognizer *recognizer)
{
TomoeRecognizerPrivate *priv = TOMOE_RECOGNIZER_GET_PRIVATE (recognizer);
@@ -129,7 +193,7 @@
if (priv->language)
g_free (priv->language);
- priv->language = NULL;
+ priv->language = NULL;
G_OBJECT_CLASS (tomoe_recognizer_parent_class)->dispose (object);
}
@@ -193,12 +257,15 @@
TomoeRecognizer *
tomoe_recognizer_new (const gchar *name, const gchar *first_property, ...)
{
+ TomoeModule *module;
GObject *recognizer;
va_list var_args;
+ module = tomoe_recognizer_load_module (name);
+ g_return_val_if_fail (module != NULL, NULL);
+
va_start (var_args, first_property);
- recognizer = tomoe_module_instantiate (recognizers, name,
- first_property, var_args);
+ recognizer = tomoe_module_instantiate (module, first_property, var_args);
va_end (var_args);
return TOMOE_RECOGNIZER (recognizer);
Modified: tomoe/trunk/lib/tomoe-recognizer.h
===================================================================
--- tomoe/trunk/lib/tomoe-recognizer.h 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/lib/tomoe-recognizer.h 2007-04-20 10:29:28 UTC (rev 1206)
@@ -49,15 +49,22 @@
{
GObjectClass parent_class;
- GList *(*search) (TomoeRecognizer *recognizer,
+ GList *(*search) (TomoeRecognizer *recognizer,
TomoeWriting *input);
- gboolean (*is_available) (TomoeRecognizer *recognizer);
+ gboolean (*is_available) (TomoeRecognizer *recognizer);
};
GType tomoe_recognizer_get_type (void) G_GNUC_CONST;
+void tomoe_recognizer_init (void);
+void tomoe_recognizer_quit (void);
+
+const gchar *tomoe_recognizer_get_default_module_dir (void);
+void tomoe_recognizer_set_default_module_dir (const gchar *dir);
+
void tomoe_recognizer_load (const gchar *base_dir);
+TomoeModule *tomoe_recognizer_load_module (const gchar *name);
void tomoe_recognizer_unload (void);
GList *tomoe_recognizer_get_registered_types (void);
GList *tomoe_recognizer_get_log_domains (void);
@@ -69,9 +76,9 @@
GList *tomoe_recognizer_search (TomoeRecognizer *recognizer,
TomoeWriting *input);
-const gchar *tomoe_recognizer_get_language (TomoeRecognizer *recognizer);
+const gchar *tomoe_recognizer_get_language (TomoeRecognizer *recognizer);
-gboolean tomoe_recognizer_is_available (TomoeRecognizer *recognizer);
+gboolean tomoe_recognizer_is_available (TomoeRecognizer *recognizer);
G_END_DECLS
Modified: tomoe/trunk/lib/tomoe.c
===================================================================
--- tomoe/trunk/lib/tomoe.c 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/lib/tomoe.c 2007-04-20 10:29:28 UTC (rev 1206)
@@ -44,8 +44,8 @@
initialized = TRUE;
GTypeDebugFlags debug_flag = G_TYPE_DEBUG_NONE;
g_type_init_with_debug_flags (debug_flag);
- tomoe_dict_load (NULL);
- tomoe_recognizer_load (NULL);
+ tomoe_dict_init ();
+ tomoe_recognizer_init ();
}
}
@@ -60,8 +60,8 @@
{
if (initialized) {
initialized = FALSE;
- tomoe_dict_unload ();
- tomoe_recognizer_unload ();
+ tomoe_dict_quit ();
+ tomoe_dict_quit ();
}
}
Modified: tomoe/trunk/test/tomoe-spec-utils.rb
===================================================================
--- tomoe/trunk/test/tomoe-spec-utils.rb 2007-04-20 06:19:49 UTC (rev 1205)
+++ tomoe/trunk/test/tomoe-spec-utils.rb 2007-04-20 10:29:28 UTC (rev 1206)
@@ -340,7 +340,7 @@
end
end
-ENV["TOMOE_DICT_MODULE_DIR"] ||= TomoeSpecUtils::Path.dict_dir
-ENV["TOMOE_RECOGNIZER_MODULE_DIR"] ||= TomoeSpecUtils::Path.recognizer_dir
+require 'tomoe'
-require 'tomoe'
+Tomoe::Dict.default_module_dir = TomoeSpecUtils::Path.dict_dir
+Tomoe::Recognizer.default_module_dir = TomoeSpecUtils::Path.recognizer_dir
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-20 06:19:48
|
Revision: 1205
http://tomoe.svn.sourceforge.net/tomoe/?rev=1205&view=rev
Author: makeinu
Date: 2007-04-19 23:19:49 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
Update ja.po.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/po/ja.po
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-20 03:07:05 UTC (rev 1204)
+++ scim-tomoe/trunk/ChangeLog 2007-04-20 06:19:49 UTC (rev 1205)
@@ -1,3 +1,7 @@
+2007-04-20 Takuro Ashie <as...@ho...>
+
+ * po/ja.po: Update.
+
2007-04-19 Takuro Ashie <as...@ho...>
* configure.ac: Fix search path of scim-helper-launcher.
Modified: scim-tomoe/trunk/po/ja.po
===================================================================
--- scim-tomoe/trunk/po/ja.po 2007-04-20 03:07:05 UTC (rev 1204)
+++ scim-tomoe/trunk/po/ja.po 2007-04-20 06:19:49 UTC (rev 1205)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: scim-tomoe\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-19 17:42+0900\n"
+"POT-Creation-Date: 2007-04-20 15:17+0900\n"
"PO-Revision-Date: 2005-08-05 19:16+0900\n"
"Last-Translator: Hiroyuki Ikezoe <poi...@ik...>\n"
"Language-Team: Japanese <ja...@li...>\n"
@@ -26,12 +26,11 @@
#: ../src/scim_tomoe.cpp:217
msgid "Tomoe"
-msgstr ""
+msgstr "Tomoe"
#: ../src/scim_tomoe.cpp:219
-#, fuzzy
msgid "Show/Hide Tomoe."
-msgstr "TOMOEを表示/非表示"
+msgstr "Tomoeを表示/非表示"
#: ../src/scim_tomoe.cpp:259
msgid "Space"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-20 03:07:04
|
Revision: 1204
http://tomoe.svn.sourceforge.net/tomoe/?rev=1204&view=rev
Author: makeinu
Date: 2007-04-19 20:07:05 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
Update.
Modified Paths:
--------------
tools/stroke-editor/ChangeLog
Modified: tools/stroke-editor/ChangeLog
===================================================================
--- tools/stroke-editor/ChangeLog 2007-04-20 02:52:39 UTC (rev 1203)
+++ tools/stroke-editor/ChangeLog 2007-04-20 03:07:05 UTC (rev 1204)
@@ -1,3 +1,8 @@
+2007.4.19 Mathieu Blondel <mbl...@ru...>
+- remove the "select all" stock and put a normal label instead
+- put the options related to the strokes in a "stroke" submenu
+- make the options sensitive only if they are available
+
2007.4.12
Get the 1.0 version. Add into tomoe project.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-04-20 02:52:38
|
Revision: 1203
http://tomoe.svn.sourceforge.net/tomoe/?rev=1203&view=rev
Author: huzheng
Date: 2007-04-19 19:52:39 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
update stroke-editor
Modified Paths:
--------------
tomoe/trunk/data/dict.dtd
tools/stroke-editor/src/canvas.py
tools/stroke-editor/src/main.py
tools/stroke-editor/src/workview.py
Added Paths:
-----------
tools/stroke-editor/data/indic.utf
tools/stroke-editor/utils/indic-codes.py
Modified: tomoe/trunk/data/dict.dtd
===================================================================
--- tomoe/trunk/data/dict.dtd 2007-04-19 08:55:57 UTC (rev 1202)
+++ tomoe/trunk/data/dict.dtd 2007-04-20 02:52:39 UTC (rev 1203)
@@ -2,7 +2,7 @@
<!ATTLIST dictionary
name CDATA #IMPLIED
>
-<!ELEMENT character (utf8, variant? number-of-strokes?, strokes?,
+<!ELEMENT character (utf8, variant?, number-of-strokes?, strokes?,
readings?, radicals?, meta?)*>
<!ELEMENT utf8 (#PCDATA)>
<!ELEMENT variant (#PCDATA)>
Added: tools/stroke-editor/data/indic.utf
===================================================================
(Binary files differ)
Property changes on: tools/stroke-editor/data/indic.utf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: tools/stroke-editor/src/canvas.py
===================================================================
--- tools/stroke-editor/src/canvas.py 2007-04-19 08:55:57 UTC (rev 1202)
+++ tools/stroke-editor/src/canvas.py 2007-04-20 02:52:39 UTC (rev 1203)
@@ -6,6 +6,7 @@
import cairo
import gobject
import locale
+import math
SCALE = 1000.
FONT = "Sans 24"
@@ -179,11 +180,12 @@
cr.line_to (x, y)
# Draw stroke number
i = i + 1
- x, y= stroke[0]
+ x1, y1= stroke[0]
+ x2, y2= stroke[1]
cr.save ()
cr.set_source_rgba (*COLOR_NUMBER)
layout.set_text (str (i))
- cr.move_to (x + 4, y + 4)
+ cr.move_to ((x1 * 2 + x2) / 3 + 6, (y1 * 2 + y2) / 3 + 6)
cr.show_layout (layout)
cr.restore ()
@@ -206,7 +208,10 @@
# Draw current stroke
cr.save ()
cr.scale (float (self._width) / SCALE, float (self._height) / SCALE)
- if len (self._curr_stroke) >= 2:
+ stroke_num = len (self._curr_stroke)
+ if stroke_num == 1:
+ cr.arc(self._curr_stroke[0][0], self._curr_stroke[0][1], 3, 0, 2.0 * math.pi)
+ if stroke_num >= 2:
cr.move_to (*self._curr_stroke[0])
for x, y in self._curr_stroke[1:]:
cr.line_to (x, y)
Modified: tools/stroke-editor/src/main.py
===================================================================
--- tools/stroke-editor/src/main.py 2007-04-19 08:55:57 UTC (rev 1202)
+++ tools/stroke-editor/src/main.py 2007-04-20 02:52:39 UTC (rev 1203)
@@ -28,13 +28,15 @@
<menuitem action="Search"/>
<menuitem action="DeleteChar"/>
<separator/>
- <menuitem action="Cut"/>
- <menuitem action="Copy"/>
- <menuitem action="Paste"/>
- <menuitem action="Delete"/>
+ <menu action="StrokeMenu">
+ <menuitem action="Cut"/>
+ <menuitem action="Copy"/>
+ <menuitem action="Paste"/>
+ <menuitem action="Delete"/>
+ <separator/>
+ <menuitem action="SelectAll"/>
+ </menu>
<separator/>
- <menuitem action="SelectAll"/>
- <separator/>
<menuitem action="Font"/>
</menu>
<menu action="HelpMenu">
@@ -70,6 +72,8 @@
( "FileMenu", None, "_File" ),
( "EditMenu", None, "_Edit" ),
( "HelpMenu", None, "_Help" ),
+ ( "StrokeMenu", None, "_Stroke" ),
+ # (action name, stock id, label, accelerator, tooltip, callback)
( "Open", gtk.STOCK_OPEN,
None, None, None, self.do_open),
( "Import", gtk.STOCK_CONVERT,
@@ -88,8 +92,10 @@
None, None, None, self.do_paste),
( "Delete", gtk.STOCK_DELETE,
None, None, None, self.do_delete),
- ( "SelectAll", gtk.STOCK_SELECT_ALL,
- None, "<Ctrl>A", None, self.do_select_all),
+# ( "SelectAll", gtk.STOCK_SELECT_ALL,
+# None, "<Ctrl>A", None, self.do_select_all),
+ ( "SelectAll", None,
+ "Select _All", "<Ctrl>A", None, self.do_select_all),
( "Add", gtk.STOCK_ADD,
None, None, None, self.do_newchar),
( "Search", gtk.STOCK_FIND,
@@ -124,10 +130,13 @@
self.workview = WorkView(self.config)
self.workview.connect("strokes-changed", self.on_workview_strokes_changed)
+ self.workview.get_selection().connect ("changed", self.on_workview_selection_changed)
hbox.pack_start(self.workview, True, True)
self.statusbar = gtk.Statusbar()
vbox.pack_start(self.statusbar, False)
+ self._manager.get_action("/MenuBar/EditMenu/StrokeMenu").set_sensitive(False)
+
self.update_statusbar()
self.enable_network = False
self._current_code = -1
@@ -135,6 +144,7 @@
self._url = self.config.get("server", "url", "http://10.66.0.143:1980")
def create_charlist(self):
+ self._manager.get_action("/Toolbar/DeleteChar").set_sensitive(False)
self.char_liststore = gtk.ListStore(gobject.TYPE_STRING, object, gobject.TYPE_BOOLEAN)
self.char_treeview = gtk.TreeView(self.char_liststore)
charcolumn = gtk.TreeViewColumn("Char")
@@ -159,7 +169,8 @@
def on_char_treeview_selected(self, treeselection):
(model, iter) = treeselection.get_selected()
- if iter:
+ self._manager.get_action("/Toolbar/DeleteChar").set_sensitive(bool(iter))
+ if iter:
if self.enable_network:
if self._current_code != -1:
strokes = self.workview.get_strokes()
@@ -184,6 +195,12 @@
model.set_value(iter, 2, bool(strokes))
self.update_statusbar ()
+ def on_workview_selection_changed(self, selection):
+ if selection:
+ list, rows = selection.get_selected_rows ()
+ sel = (len(rows) >= 1)
+ self._manager.get_action("/MenuBar/EditMenu/StrokeMenu").set_sensitive(sel)
+
def do_connect(self, widget):
dlg = gtk.Dialog ("Select Unit",
buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
Modified: tools/stroke-editor/src/workview.py
===================================================================
--- tools/stroke-editor/src/workview.py 2007-04-19 08:55:57 UTC (rev 1202)
+++ tools/stroke-editor/src/workview.py 2007-04-20 02:52:39 UTC (rev 1203)
@@ -71,6 +71,9 @@
column = gtk.TreeViewColumn ("stroke", renderer, text=COLUMN_STROKE)
tv.append_column (column)
+ def get_selection(self):
+ return self._treeview.get_selection()
+
def set_char (self, char, strokes = [], modified = False):
"""set_char (self, char, strokes = [])
char: unicode char index
Added: tools/stroke-editor/utils/indic-codes.py
===================================================================
--- tools/stroke-editor/utils/indic-codes.py (rev 0)
+++ tools/stroke-editor/utils/indic-codes.py 2007-04-20 02:52:39 UTC (rev 1203)
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+import encodings
+
+def gen_indic():
+ if os.path.exists("../data/indic.utf"):
+ return
+
+ output = open("../data/indic.utf", 'w')
+ base = 0x0900
+ limit = 0x0DFF
+ exclude = [0x0900]
+
+ indicChars= []
+ for charCode in range(base, limit):
+ if(not (exclude.__contains__(charCode))):
+ indicChars.append(encodings.codecs.utf_8_encode(unichr(charCode))[0])
+
+ charCount = 0
+ line = []
+ for i in indicChars:
+ line.append(i)
+ charCount=(charCount+1)%20
+ if(charCount==0):
+ line.append('\n')
+ output.write(''.join(line))
+ line = []
+ if line:
+ line.append('\n')
+ output.write(''.join(line))
+ output.close()
+
+if __name__ == "__main__":
+ gen_indic()
Property changes on: tools/stroke-editor/utils/indic-codes.py
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-19 08:55:56
|
Revision: 1202
http://tomoe.svn.sourceforge.net/tomoe/?rev=1202&view=rev
Author: makeinu
Date: 2007-04-19 01:55:57 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
Fix search path of scim-helper-lancuher.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/configure.ac
scim-tomoe/trunk/po/ja.po
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-19 04:12:38 UTC (rev 1201)
+++ scim-tomoe/trunk/ChangeLog 2007-04-19 08:55:57 UTC (rev 1202)
@@ -1,3 +1,7 @@
+2007-04-19 Takuro Ashie <as...@ho...>
+
+ * configure.ac: Fix search path of scim-helper-launcher.
+
2007-04-13 Kouhei Sutou <ko...@co...>
* configure.ac (SCIM_TOMOE_UUID): added.
Modified: scim-tomoe/trunk/configure.ac
===================================================================
--- scim-tomoe/trunk/configure.ac 2007-04-19 04:12:38 UTC (rev 1201)
+++ scim-tomoe/trunk/configure.ac 2007-04-19 08:55:57 UTC (rev 1202)
@@ -112,7 +112,7 @@
SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
-SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`
+dnl SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`
if test "x$SCIM_DATADIR" = "x"; then
SCIM_DATADIR=${datadir}/scim
@@ -126,6 +126,10 @@
SCIM_MODULEDIR=${libdir}/scim-1.0
fi
+if test "x$SCIM_LIBEXECDIR" = "x"; then
+ SCIM_LIBEXECDIR=${libdir}/scim-1.0
+fi
+
SCIM_TOMOE_DATADIR=${SCIM_DATADIR}/tomoe
AC_SUBST(SCIM_DATADIR)
Modified: scim-tomoe/trunk/po/ja.po
===================================================================
--- scim-tomoe/trunk/po/ja.po 2007-04-19 04:12:38 UTC (rev 1201)
+++ scim-tomoe/trunk/po/ja.po 2007-04-19 08:55:57 UTC (rev 1202)
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: scim-tomoe\n"
-"Report-Msgid-Bugs-To: as...@ho...\n"
-"POT-Creation-Date: 2006-12-11 15:28+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-04-19 17:42+0900\n"
"PO-Revision-Date: 2005-08-05 19:16+0900\n"
"Last-Translator: Hiroyuki Ikezoe <poi...@ik...>\n"
"Language-Team: Japanese <ja...@li...>\n"
@@ -15,72 +15,77 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/scim_tomoe.cpp:105 src/scim_tomoe_prefs_widget.cpp:88
+#. "Handwriting recognition" page
+#: ../src/scim_tomoe.cpp:106 ../src/scim_tomoe_prefs_widget.cpp:89
msgid "Handwriting recognition"
msgstr "手書き認識"
-#: src/scim_tomoe.cpp:107
+#: ../src/scim_tomoe.cpp:108
msgid "A front-end for handwriting recognition engine"
msgstr "手書き認識エンジン用のフロントエンド"
-#: src/scim_tomoe.cpp:216
+#: ../src/scim_tomoe.cpp:217
msgid "Tomoe"
msgstr ""
-#: src/scim_tomoe.cpp:218
+#: ../src/scim_tomoe.cpp:219
#, fuzzy
msgid "Show/Hide Tomoe."
msgstr "TOMOEを表示/非表示"
-#: src/scim_tomoe.cpp:258
+#: ../src/scim_tomoe.cpp:259
msgid "Space"
msgstr "Space"
-#: src/scim_tomoe.cpp:266
+#: ../src/scim_tomoe.cpp:267
msgid "BackSpace"
msgstr "BackSpace"
-#: src/scim_tomoe.cpp:274
+#: ../src/scim_tomoe.cpp:275
msgid "Enter"
msgstr "Enter"
-#: src/scim_tomoe.cpp:295
+#: ../src/scim_tomoe.cpp:296
msgid "Preferences for scim-tomoe"
msgstr "scim-tomoeの設定"
-#: src/scim_tomoe_prefs_widget.cpp:81
+#. "Window" page
+#: ../src/scim_tomoe_prefs_widget.cpp:82
msgid "Window"
msgstr "ウィンドウ"
-#: src/scim_tomoe_prefs_widget.cpp:95
+#. "Unicode table" page
+#: ../src/scim_tomoe_prefs_widget.cpp:96
msgid "Unicode table"
msgstr "Unicode表"
-#: src/scim_tomoe_prefs_widget.cpp:263
+#: ../src/scim_tomoe_prefs_widget.cpp:264
msgid "Show on _top of other windows"
msgstr "常に他のウインドウより前に表示する(_T)"
-#: src/scim_tomoe_prefs_widget.cpp:282
+#. use auto find
+#: ../src/scim_tomoe_prefs_widget.cpp:283
msgid "Use auto _find"
msgstr "自動検索を使用する(_F)"
-#: src/scim_tomoe_prefs_widget.cpp:296
+#: ../src/scim_tomoe_prefs_widget.cpp:297
msgid "_Interval time until start auto find:"
msgstr "自動検索を開始するまでの時間(_I):"
-#: src/scim_tomoe_prefs_widget.cpp:297
+#: ../src/scim_tomoe_prefs_widget.cpp:298
msgid "[msec]"
msgstr "[msec]"
-#: src/scim_tomoe_prefs_widget.cpp:312
+#: ../src/scim_tomoe_prefs_widget.cpp:313
msgid "_Clear the canvas when select a candidate"
msgstr "候補選択時にクリアする(_C)"
-#: src/scim_tomoe_prefs_widget.cpp:317
+#. font for the candidate view
+#: ../src/scim_tomoe_prefs_widget.cpp:318
msgid "Font for the candidates view:"
msgstr "候補一覧のフォント："
-#: src/scim_tomoe_prefs_widget.cpp:333
+#: ../src/scim_tomoe_prefs_widget.cpp:334
msgid "Font for the Unicode table:"
msgstr "Unicode表のフォント："
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-19 04:12:41
|
Revision: 1201
http://tomoe.svn.sourceforge.net/tomoe/?rev=1201&view=rev
Author: makeinu
Date: 2007-04-18 21:12:38 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
Fix stroke data of U+5BBF. Thanks David <dav...@gm...>.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/data/handwriting.xml
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-19 04:08:44 UTC (rev 1200)
+++ tomoe/trunk/ChangeLog 2007-04-19 04:12:38 UTC (rev 1201)
@@ -1,3 +1,8 @@
+2007-04-19 Takuro Ashie <as...@ho...>
+
+ * data/handwriting.xml: Fix stroke data of U+5BBF.
+ Thanks David <dav...@gm...>.
+
2007-04-16 Kouhei Sutou <ko...@co...>
* Makefile.am (EXTRA_DIST): added intltool related files.
Modified: tomoe/trunk/data/handwriting.xml
===================================================================
--- tomoe/trunk/data/handwriting.xml 2007-04-19 04:08:44 UTC (rev 1200)
+++ tomoe/trunk/data/handwriting.xml 2007-04-19 04:12:38 UTC (rev 1201)
@@ -65300,9 +65300,8 @@
<utf8>宿</utf8>
<strokes>
<stroke>
- <point x="416" y="550"/>
- <point x="500" y="616"/>
- <point x="493" y="150"/>
+ <point x="490" y="140"/>
+ <point x="490" y="175"/>
</stroke>
<stroke>
<point x="160" y="186"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-19 04:08:48
|
Revision: 1200
http://tomoe.svn.sourceforge.net/tomoe/?rev=1200&view=rev
Author: makeinu
Date: 2007-04-18 21:08:44 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
Fix stroke data of U+5BBF. Thanks David <dav...@gm...>.
Modified Paths:
--------------
tools/stroke-editor/data/handwriting-ja.xml
Modified: tools/stroke-editor/data/handwriting-ja.xml
===================================================================
--- tools/stroke-editor/data/handwriting-ja.xml 2007-04-16 01:50:16 UTC (rev 1199)
+++ tools/stroke-editor/data/handwriting-ja.xml 2007-04-19 04:08:44 UTC (rev 1200)
@@ -65300,9 +65300,8 @@
<utf8>宿</utf8>
<strokes>
<stroke>
- <point x="416" y="550"/>
- <point x="500" y="616"/>
- <point x="493" y="150"/>
+ <point x="490" y="140"/>
+ <point x="490" y="175"/>
</stroke>
<stroke>
<point x="160" y="186"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-16 02:14:17
|
Revision: 1199
http://tomoe.svn.sourceforge.net/tomoe/?rev=1199&view=rev
Author: ktou
Date: 2007-04-15 18:50:16 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
* ./: used glib-gettextize and intltoolize.
Modified Paths:
--------------
uim-tomoe-gtk/trunk/ChangeLog
uim-tomoe-gtk/trunk/Makefile.am
uim-tomoe-gtk/trunk/autogen.sh
uim-tomoe-gtk/trunk/configure.ac
uim-tomoe-gtk/trunk/src/uim-tomoe-gtk.c
Added Paths:
-----------
uim-tomoe-gtk/trunk/po/LINGUAS
Removed Paths:
-------------
uim-tomoe-gtk/trunk/po/Makefile.in.in
uim-tomoe-gtk/trunk/src/intl.h
Property Changed:
----------------
uim-tomoe-gtk/trunk/po/
uim-tomoe-gtk/trunk/src/
Modified: uim-tomoe-gtk/trunk/ChangeLog
===================================================================
--- uim-tomoe-gtk/trunk/ChangeLog 2007-04-16 01:29:42 UTC (rev 1198)
+++ uim-tomoe-gtk/trunk/ChangeLog 2007-04-16 01:50:16 UTC (rev 1199)
@@ -1,5 +1,7 @@
2007-04-16 Kouhei Sutou <ko...@co...>
+ * ./: used glib-gettextize and intltoolize.
+
* configure.ac: renamed from configure.in.
* **/.cvsignore: removed.
Modified: uim-tomoe-gtk/trunk/Makefile.am
===================================================================
--- uim-tomoe-gtk/trunk/Makefile.am 2007-04-16 01:29:42 UTC (rev 1198)
+++ uim-tomoe-gtk/trunk/Makefile.am 2007-04-16 01:50:16 UTC (rev 1199)
@@ -2,4 +2,8 @@
SUBDIRS = src po
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = \
+ autogen.sh \
+ intltool-update.in \
+ intltool-merge.in \
+ intltool-extract.in
Modified: uim-tomoe-gtk/trunk/autogen.sh
===================================================================
--- uim-tomoe-gtk/trunk/autogen.sh 2007-04-16 01:29:42 UTC (rev 1198)
+++ uim-tomoe-gtk/trunk/autogen.sh 2007-04-16 01:50:16 UTC (rev 1199)
@@ -3,8 +3,19 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-libtoolize --copy --force \
- && aclocal \
- && autoheader \
- && automake --add-missing --foreign --copy \
- && autoconf
+run()
+{
+ $@
+ if test $? -ne 0; then
+ echo "Failed $@"
+ exit 1
+ fi
+}
+
+run libtoolize --copy --force
+run glib-gettextize --force --copy
+run intltoolize --force --copy --automake
+run aclocal
+run autoheader
+run automake --add-missing --foreign --copy
+run autoconf
Modified: uim-tomoe-gtk/trunk/configure.ac
===================================================================
--- uim-tomoe-gtk/trunk/configure.ac 2007-04-16 01:29:42 UTC (rev 1198)
+++ uim-tomoe-gtk/trunk/configure.ac 2007-04-16 01:50:16 UTC (rev 1199)
@@ -38,12 +38,21 @@
dnl **************************************************************
dnl Check for gettext.
dnl **************************************************************
-ALL_LINGUAS="ja"
+
+IT_PROG_INTLTOOL([0.35.0])
+
GETTEXT_PACKAGE=uim-tomoe-gtk
AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The gettext domain])
+
AM_GLIB_GNU_GETTEXT
-localedir="${datadir}/locale"
-AC_SUBST(localedir)
+dnl should run after AM_GLIB_GNU_GETTEXT
+AC_CONFIG_COMMANDS([modify-itlocaledir], [
+sed \
+ -i'' \
+ -e "s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /" \
+ po/Makefile
+])
dnl
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
Property changes on: uim-tomoe-gtk/trunk/po
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
POTFILES
remove-potcdate.sed
stamp-po
*.rej
*.orig
*.gmo
*.bak
*~
uim-tomoe-gtk.pot
+ Makefile
Makefile.in
POTFILES
remove-potcdate.sed
stamp-po
*.rej
*.orig
*.gmo
*.bak
*~
uim-tomoe-gtk.pot
stamp-it
Added: uim-tomoe-gtk/trunk/po/LINGUAS
===================================================================
--- uim-tomoe-gtk/trunk/po/LINGUAS (rev 0)
+++ uim-tomoe-gtk/trunk/po/LINGUAS 2007-04-16 01:50:16 UTC (rev 1199)
@@ -0,0 +1,2 @@
+# please keep this list sorted alphabetically
+ja
Deleted: uim-tomoe-gtk/trunk/po/Makefile.in.in
===================================================================
--- uim-tomoe-gtk/trunk/po/Makefile.in.in 2007-04-16 01:29:42 UTC (rev 1198)
+++ uim-tomoe-gtk/trunk/po/Makefile.in.in 2007-04-16 01:50:16 UTC (rev 1199)
@@ -1,254 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <dr...@gn...>
-#
-# This file file be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-#
-# - Modified by Owen Taylor <ot...@re...> to use GETTEXT_PACKAGE
-# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <ja...@xi...> to install
-# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-subdir = po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES =
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
-$(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
- $(COMPILE) $<
-
-.po.pox:
- $(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
- $(MSGFMT) -o $@ $<
-
-.po.gmo:
- file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
- sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
- --files-from=$(srcdir)/POTFILES.in \
- && test ! -f $(GETTEXT_PACKAGE).po \
- || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
- && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- fi
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $$dir; \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
- fi; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
- fi; \
- if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
- else \
- if test -r $(srcdir)/$$cat.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
- else \
- true; \
- fi; \
- fi; \
- done
- if test "$(PACKAGE)" = "glib"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- done
- if test "$(PACKAGE)" = "glib"; then \
- rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- fi
-
-check: all
-
-dvi info tags TAGS ID:
-
-mostlyclean:
- rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
- rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
- rm -f $(GMOFILES)
-
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
- dists="$(DISTFILES)"; \
- for file in $$dists; do \
- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
- || cp -p $(srcdir)/$$file $(distdir); \
- done
-
-update-po: Makefile
- $(MAKE) $(GETTEXT_PACKAGE).pot
- tmpdir=`pwd`; \
- cd $(srcdir); \
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- echo "$$lang:"; \
- if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \
- if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
- rm -f $$tmpdir/$$lang.new.po; \
- else \
- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
- :; \
- else \
- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
- exit 1; \
- fi; \
- fi; \
- else \
- echo "msgmerge for $$cat failed!"; \
- rm -f $$tmpdir/$$lang.new.po; \
- fi; \
- done
-
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
- ( if test 'x$(srcdir)' != 'x.'; then \
- posrcprefix='$(top_srcdir)/'; \
- else \
- posrcprefix="../"; \
- fi; \
- rm -f $@-t $@ \
- && (sed -e '/^#/d' \
- -e "s/^\[.*\] +//" \
- -e '/^[ ]*$$/d' \
- -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
- | sed -e '$$s/\\$$//') > $@-t \
- && chmod a-w $@-t \
- && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
- cd .. \
- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
- $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Property changes on: uim-tomoe-gtk/trunk/src
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.deps
.libs
*.o
*.lo
*.la
*.bak
*~
*.rej
*.orig
+ Makefile
Makefile.in
.deps
.libs
*.o
*.lo
*.la
*.bak
*~
*.rej
*.orig
uim-tomoe-gtk
Deleted: uim-tomoe-gtk/trunk/src/intl.h
===================================================================
--- uim-tomoe-gtk/trunk/src/intl.h 2007-04-16 01:29:42 UTC (rev 1198)
+++ uim-tomoe-gtk/trunk/src/intl.h 2007-04-16 01:50:16 UTC (rev 1199)
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 3 -*- */
-
-/*
- * GImageView
- * Copyright (C) 2001 Takuro Ashie
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- */
-
-#ifndef __INTL_H__
-#define __INTL_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(String) dgettext(PACKAGE,String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop(String)
-# else
-# define N_(String) (String)
-# endif /* gettext_noop */
-#else
-# define _(String) (String)
-# define N_(String) (String)
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,String) (String)
-# define dcgettext(Domain,String,Type) (String)
-# define bindtextdomain(Domain,Directory) (Domain)
-# define bind_textdomain_codeset(Domain,Codeset) (Domain)
-#endif /* ENABLE_NLS */
-
-#endif /* __INTL_H__ */
Modified: uim-tomoe-gtk/trunk/src/uim-tomoe-gtk.c
===================================================================
--- uim-tomoe-gtk/trunk/src/uim-tomoe-gtk.c 2007-04-16 01:29:42 UTC (rev 1198)
+++ uim-tomoe-gtk/trunk/src/uim-tomoe-gtk.c 2007-04-16 01:50:16 UTC (rev 1199)
@@ -22,13 +22,13 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <uim/uim.h>
#include <uim/uim-helper.h>
#include <tomoe-gtk.h>
-#include "intl.h"
/* for uim */
static void helper_disconnect_cb (void);
@@ -91,10 +91,9 @@
TomoeWindow *tomoe;
TomoeHandwriting *page;
- setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, LOCALEDIR);
- textdomain (PACKAGE);
- bind_textdomain_codeset (PACKAGE, "UTF-8");
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ textdomain (GETTEXT_PACKAGE);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
gtk_init (&argc, &argv);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-16 01:29:41
|
Revision: 1198
http://tomoe.svn.sourceforge.net/tomoe/?rev=1198&view=rev
Author: ktou
Date: 2007-04-15 18:29:42 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
* Makefile.am (EXTRA_DIST): added intltool related files.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/Makefile.am
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-16 01:26:06 UTC (rev 1197)
+++ tomoe/trunk/ChangeLog 2007-04-16 01:29:42 UTC (rev 1198)
@@ -1,3 +1,7 @@
+2007-04-16 Kouhei Sutou <ko...@co...>
+
+ * Makefile.am (EXTRA_DIST): added intltool related files.
+
2007-04-12 Kouhei Sutou <ko...@co...>
* ext/ruby/tomoe-rb-recognizer.c, ext/ruby/rbtomoe.h: implemented
Modified: tomoe/trunk/Makefile.am
===================================================================
--- tomoe/trunk/Makefile.am 2007-04-16 01:26:06 UTC (rev 1197)
+++ tomoe/trunk/Makefile.am 2007-04-16 01:29:42 UTC (rev 1198)
@@ -22,7 +22,12 @@
SUBDIRS = po lib ext module data db test benchmark doc spec
-EXTRA_DIST = autogen.sh tomoe.pc
+EXTRA_DIST = \
+ autogen.sh \
+ tomoe.pc \
+ intltool-update.in \
+ intltool-merge.in \
+ intltool-extract.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA= tomoe.pc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-16 01:26:06
|
Revision: 1197
http://tomoe.svn.sourceforge.net/tomoe/?rev=1197&view=rev
Author: ktou
Date: 2007-04-15 18:26:06 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
* **/.cvsignore: removed.
Removed Paths:
-------------
uim-tomoe-gtk/trunk/.cvsignore
uim-tomoe-gtk/trunk/po/.cvsignore
uim-tomoe-gtk/trunk/src/.cvsignore
Deleted: uim-tomoe-gtk/trunk/.cvsignore
===================================================================
--- uim-tomoe-gtk/trunk/.cvsignore 2007-04-16 01:25:22 UTC (rev 1196)
+++ uim-tomoe-gtk/trunk/.cvsignore 2007-04-16 01:26:06 UTC (rev 1197)
@@ -1,31 +0,0 @@
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-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*
-*.bak
-*~
-*.log
-*.rej
-*.orig
Deleted: uim-tomoe-gtk/trunk/po/.cvsignore
===================================================================
--- uim-tomoe-gtk/trunk/po/.cvsignore 2007-04-16 01:25:22 UTC (rev 1196)
+++ uim-tomoe-gtk/trunk/po/.cvsignore 2007-04-16 01:26:06 UTC (rev 1197)
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-POTFILES
-remove-potcdate.sed
-stamp-po
-*.rej
-*.orig
-*.gmo
-*.bak
-*~
-uim-tomoe-gtk.pot
Deleted: uim-tomoe-gtk/trunk/src/.cvsignore
===================================================================
--- uim-tomoe-gtk/trunk/src/.cvsignore 2007-04-16 01:25:22 UTC (rev 1196)
+++ uim-tomoe-gtk/trunk/src/.cvsignore 2007-04-16 01:26:06 UTC (rev 1197)
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.o
-*.lo
-*.la
-*.bak
-*~
-*.rej
-*.orig
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-16 01:25:24
|
Revision: 1196
http://tomoe.svn.sourceforge.net/tomoe/?rev=1196&view=rev
Author: ktou
Date: 2007-04-15 18:25:22 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
* configure.ac: renamed from configure.in.
Modified Paths:
--------------
uim-tomoe-gtk/trunk/ChangeLog
Added Paths:
-----------
uim-tomoe-gtk/trunk/configure.ac
Removed Paths:
-------------
uim-tomoe-gtk/trunk/configure.in
Modified: uim-tomoe-gtk/trunk/ChangeLog
===================================================================
--- uim-tomoe-gtk/trunk/ChangeLog 2007-04-16 01:24:36 UTC (rev 1195)
+++ uim-tomoe-gtk/trunk/ChangeLog 2007-04-16 01:25:22 UTC (rev 1196)
@@ -1,5 +1,7 @@
2007-04-16 Kouhei Sutou <ko...@co...>
+ * configure.ac: renamed from configure.in.
+
* **/.cvsignore: removed.
2006-12-29 Takuro Ashie <as...@ho...>
Copied: uim-tomoe-gtk/trunk/configure.ac (from rev 1194, uim-tomoe-gtk/trunk/configure.in)
===================================================================
--- uim-tomoe-gtk/trunk/configure.ac (rev 0)
+++ uim-tomoe-gtk/trunk/configure.ac 2007-04-16 01:25:22 UTC (rev 1196)
@@ -0,0 +1,141 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.57)
+
+AC_INIT(uim-tomoe-gtk, 0.5.0)
+AM_INIT_AUTOMAKE(1.6)
+AM_CONFIG_HEADER(config.h)
+
+AC_ENABLE_SHARED(yes)
+AC_ENABLE_STATIC(no)
+AM_PROG_LIBTOOL
+
+
+dnl **************************************************************
+dnl Check for Gtk+2.
+dnl **************************************************************
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
+dnl pass to pkg-config
+AM_PATH_GTK_2_0(2.4.0)
+
+dnl **************************************************************
+dnl Check for uim.
+dnl **************************************************************
+PKG_CHECK_MODULES(UIM, uim)
+AC_SUBST(UIM_CFLAGS)
+AC_SUBST(UIM_LIBS)
+
+dnl **************************************************************
+dnl Check for tomoe-gtk.
+dnl **************************************************************
+PKG_CHECK_MODULES(TOMOE, tomoe >= 0.4.0)
+AC_SUBST(TOMOE_CFLAGS)
+AC_SUBST(TOMOE_LIBS)
+
+PKG_CHECK_MODULES(TOMOEGTK, tomoe-gtk >= 0.4.0)
+AC_SUBST(TOMOEGTK_CFLAGS)
+AC_SUBST(TOMOEGTK_LIBS)
+
+dnl **************************************************************
+dnl Check for gettext.
+dnl **************************************************************
+ALL_LINGUAS="ja"
+GETTEXT_PACKAGE=uim-tomoe-gtk
+AC_SUBST(GETTEXT_PACKAGE)
+AM_GLIB_GNU_GETTEXT
+localedir="${datadir}/locale"
+AC_SUBST(localedir)
+
+dnl
+dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
+dnl
+tomoe_save_LIBS=$LIBS
+LIBS="$LIBS $GTK_LIBS"
+AC_CHECK_FUNCS(bind_textdomain_codeset)
+LIBS=$tomoe_save_LIBS
+
+
+dnl **************************************************************
+dnl Checks for programs.
+dnl **************************************************************
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_AWK
+
+
+if test "x$GCC" = "xyes"; then
+ case " $CFLAGS " in
+ *[\ \ ]-Wall[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -Wall" ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-Wmissing-declarations[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-Wmissing-prototypes[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-Wpointer-arith[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-Wcast-align[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -Wcast-align" ;;
+ esac
+
+ if test "x$enable_ansi" = "xyes"; then
+ case " $CFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -ansi" ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) CFLAGS="$CFLAGS -pedantic" ;;
+ esac
+ fi
+fi
+
+dnl **************************************************************
+dnl Checks for libraries.
+dnl **************************************************************
+# FIXME: Replace `main' with a function in `-le':
+AC_CHECK_LIB([e], [main])
+# FIXME: Replace `main' with a function in `-links':
+AC_CHECK_LIB([inks], [main])
+
+
+dnl **************************************************************
+dnl Checks for header files.
+dnl **************************************************************
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h libintl.h stdlib.h string.h unistd.h])
+
+
+dnl **************************************************************
+dnl Checks for typedefs, structures, and compiler characteristics.
+dnl **************************************************************
+AC_C_CONST
+
+
+dnl **************************************************************
+dnl Checks for library functions.
+dnl **************************************************************
+AC_CHECK_FUNCS([setlocale strchr strtol uname memmove strerror])
+
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+po/Makefile.in
+])
+
+AC_OUTPUT
Deleted: uim-tomoe-gtk/trunk/configure.in
===================================================================
--- uim-tomoe-gtk/trunk/configure.in 2007-04-16 01:24:36 UTC (rev 1195)
+++ uim-tomoe-gtk/trunk/configure.in 2007-04-16 01:25:22 UTC (rev 1196)
@@ -1,141 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.57)
-
-AC_INIT(uim-tomoe-gtk, 0.5.0)
-AM_INIT_AUTOMAKE(1.6)
-AM_CONFIG_HEADER(config.h)
-
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-AM_PROG_LIBTOOL
-
-
-dnl **************************************************************
-dnl Check for Gtk+2.
-dnl **************************************************************
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
-AM_PATH_GTK_2_0(2.4.0)
-
-dnl **************************************************************
-dnl Check for uim.
-dnl **************************************************************
-PKG_CHECK_MODULES(UIM, uim)
-AC_SUBST(UIM_CFLAGS)
-AC_SUBST(UIM_LIBS)
-
-dnl **************************************************************
-dnl Check for tomoe-gtk.
-dnl **************************************************************
-PKG_CHECK_MODULES(TOMOE, tomoe >= 0.4.0)
-AC_SUBST(TOMOE_CFLAGS)
-AC_SUBST(TOMOE_LIBS)
-
-PKG_CHECK_MODULES(TOMOEGTK, tomoe-gtk >= 0.4.0)
-AC_SUBST(TOMOEGTK_CFLAGS)
-AC_SUBST(TOMOEGTK_LIBS)
-
-dnl **************************************************************
-dnl Check for gettext.
-dnl **************************************************************
-ALL_LINGUAS="ja"
-GETTEXT_PACKAGE=uim-tomoe-gtk
-AC_SUBST(GETTEXT_PACKAGE)
-AM_GLIB_GNU_GETTEXT
-localedir="${datadir}/locale"
-AC_SUBST(localedir)
-
-dnl
-dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
-dnl
-tomoe_save_LIBS=$LIBS
-LIBS="$LIBS $GTK_LIBS"
-AC_CHECK_FUNCS(bind_textdomain_codeset)
-LIBS=$tomoe_save_LIBS
-
-
-dnl **************************************************************
-dnl Checks for programs.
-dnl **************************************************************
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_AWK
-
-
-if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wall" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wmissing-declarations[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wmissing-prototypes[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wpointer-arith[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-Wcast-align[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wcast-align" ;;
- esac
-
- if test "x$enable_ansi" = "xyes"; then
- case " $CFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -ansi" ;;
- esac
-
- case " $CFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -pedantic" ;;
- esac
- fi
-fi
-
-dnl **************************************************************
-dnl Checks for libraries.
-dnl **************************************************************
-# FIXME: Replace `main' with a function in `-le':
-AC_CHECK_LIB([e], [main])
-# FIXME: Replace `main' with a function in `-links':
-AC_CHECK_LIB([inks], [main])
-
-
-dnl **************************************************************
-dnl Checks for header files.
-dnl **************************************************************
-AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h libintl.h stdlib.h string.h unistd.h])
-
-
-dnl **************************************************************
-dnl Checks for typedefs, structures, and compiler characteristics.
-dnl **************************************************************
-AC_C_CONST
-
-
-dnl **************************************************************
-dnl Checks for library functions.
-dnl **************************************************************
-AC_CHECK_FUNCS([setlocale strchr strtol uname memmove strerror])
-
-AC_CONFIG_FILES([
-Makefile
-src/Makefile
-po/Makefile.in
-])
-
-AC_OUTPUT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-16 01:24:36
|
Revision: 1195
http://tomoe.svn.sourceforge.net/tomoe/?rev=1195&view=rev
Author: ktou
Date: 2007-04-15 18:24:36 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
* **/.cvsignore: removed.
Modified Paths:
--------------
uim-tomoe-gtk/trunk/ChangeLog
Modified: uim-tomoe-gtk/trunk/ChangeLog
===================================================================
--- uim-tomoe-gtk/trunk/ChangeLog 2007-04-13 02:03:39 UTC (rev 1194)
+++ uim-tomoe-gtk/trunk/ChangeLog 2007-04-16 01:24:36 UTC (rev 1195)
@@ -1,3 +1,7 @@
+2007-04-16 Kouhei Sutou <ko...@co...>
+
+ * **/.cvsignore: removed.
+
2006-12-29 Takuro Ashie <as...@ho...>
* Version-0.5.0.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-13 02:03:45
|
Revision: 1194
http://tomoe.svn.sourceforge.net/tomoe/?rev=1194&view=rev
Author: ktou
Date: 2007-04-12 19:03:39 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
* configure.ac (SCIM_TOMOE_UUID): added.
* src/scim-tomoe.in, src/scim_tomoe.cpp: used SCIM_TOMOE_UUID.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/configure.ac
scim-tomoe/trunk/src/scim-tomoe.in
scim-tomoe/trunk/src/scim_tomoe.cpp
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-13 01:58:34 UTC (rev 1193)
+++ scim-tomoe/trunk/ChangeLog 2007-04-13 02:03:39 UTC (rev 1194)
@@ -1,5 +1,9 @@
2007-04-13 Kouhei Sutou <ko...@co...>
+ * configure.ac (SCIM_TOMOE_UUID): added.
+
+ * src/scim-tomoe.in, src/scim_tomoe.cpp: used SCIM_TOMOE_UUID.
+
* src/scim-tomoe.in (datarootdir): added.
* po/Makefile.in.in: added to svn:ignore.
Modified: scim-tomoe/trunk/configure.ac
===================================================================
--- scim-tomoe/trunk/configure.ac 2007-04-13 01:58:34 UTC (rev 1193)
+++ scim-tomoe/trunk/configure.ac 2007-04-13 02:03:39 UTC (rev 1194)
@@ -23,6 +23,11 @@
AM_INIT_AUTOMAKE(1.9)
AM_CONFIG_HEADER(config.h)
+# Init UUID of scim-tomoe
+SCIM_TOMOE_UUID=b1bfe2b4-6930-41b0-8c07-d05bce8c92e2
+AC_SUBST(SCIM_TOMOE_UUID)
+AC_DEFINE_UNQUOTED(SCIM_TOMOE_UUID, "$SCIM_TOMOE_UUID", [The UUID of scim-tomoe])
+
# Init gettext
IT_PROG_INTLTOOL([0.35.0])
Modified: scim-tomoe/trunk/src/scim-tomoe.in
===================================================================
--- scim-tomoe/trunk/src/scim-tomoe.in 2007-04-13 01:58:34 UTC (rev 1193)
+++ scim-tomoe/trunk/src/scim-tomoe.in 2007-04-13 02:03:39 UTC (rev 1194)
@@ -30,4 +30,4 @@
datadir=@datadir@
sysconfdir=@sysconfdir@
-@SCIM_LIBEXECDIR@/scim-helper-launcher tomoe b1bfe2b4-6930-41b0-8c07-d05bce8c92e2 $*
+@SCIM_LIBEXECDIR@/scim-helper-launcher tomoe @SCIM_TOMOE_UUID@ $*
Modified: scim-tomoe/trunk/src/scim_tomoe.cpp
===================================================================
--- scim-tomoe/trunk/src/scim_tomoe.cpp 2007-04-13 01:58:34 UTC (rev 1193)
+++ scim-tomoe/trunk/src/scim_tomoe.cpp 2007-04-13 02:03:39 UTC (rev 1194)
@@ -88,7 +88,7 @@
static ConfigPointer m_config = NULL;
-static HelperInfo helper_info (String ("b1bfe2b4-6930-41b0-8c07-d05bce8c92e2"),
+static HelperInfo helper_info (String (SCIM_TOMOE_UUID),
"",
String (SCIM_TOMOE_ICON),
"",
@@ -132,7 +132,7 @@
{
SCIM_DEBUG_MAIN(1) << "tomoe_LTX_scim_helper_module_run_helper ()\n";
- if (uuid == "b1bfe2b4-6930-41b0-8c07-d05bce8c92e2") {
+ if (uuid == SCIM_TOMOE_UUID) {
run (display, config);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-13 01:58:32
|
Revision: 1193
http://tomoe.svn.sourceforge.net/tomoe/?rev=1193&view=rev
Author: ktou
Date: 2007-04-12 18:58:34 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
* src/scim-tomoe.in (datarootdir): added.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/src/scim-tomoe.in
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-13 01:56:41 UTC (rev 1192)
+++ scim-tomoe/trunk/ChangeLog 2007-04-13 01:58:34 UTC (rev 1193)
@@ -1,5 +1,7 @@
2007-04-13 Kouhei Sutou <ko...@co...>
+ * src/scim-tomoe.in (datarootdir): added.
+
* po/Makefile.in.in: added to svn:ignore.
* ./: used glib-gettextize and intltoolize.
Modified: scim-tomoe/trunk/src/scim-tomoe.in
===================================================================
--- scim-tomoe/trunk/src/scim-tomoe.in 2007-04-13 01:56:41 UTC (rev 1192)
+++ scim-tomoe/trunk/src/scim-tomoe.in 2007-04-13 01:58:34 UTC (rev 1193)
@@ -26,6 +26,7 @@
libdir=@libdir@
includedir=@includedir@
localedir=@datadir@/locale
+datarootdir=@datarootdir@
datadir=@datadir@
sysconfdir=@sysconfdir@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-13 01:56:39
|
Revision: 1192
http://tomoe.svn.sourceforge.net/tomoe/?rev=1192&view=rev
Author: ktou
Date: 2007-04-12 18:56:41 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
* po/Makefile.in.in: added to svn:ignore.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
Property Changed:
----------------
scim-tomoe/trunk/po/
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-13 01:55:46 UTC (rev 1191)
+++ scim-tomoe/trunk/ChangeLog 2007-04-13 01:56:41 UTC (rev 1192)
@@ -1,5 +1,7 @@
2007-04-13 Kouhei Sutou <ko...@co...>
+ * po/Makefile.in.in: added to svn:ignore.
+
* ./: used glib-gettextize and intltoolize.
* intl/, m4/: removed.
* po/: cleanup.
Property changes on: scim-tomoe/trunk/po
___________________________________________________________________
Name: svn:ignore
- POTFILES
Makefile.in
Makefile
ja.gmo
stamp-it
+ POTFILES
Makefile.in
Makefile
ja.gmo
stamp-it
Makefile.in.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-13 01:55:47
|
Revision: 1191
http://tomoe.svn.sourceforge.net/tomoe/?rev=1191&view=rev
Author: ktou
Date: 2007-04-12 18:55:46 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
* ./: used glib-gettextize and intltoolize.
* intl/, m4/: removed.
* po/: cleanup.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/Makefile.am
scim-tomoe/trunk/configure.ac
scim-tomoe/trunk/src/Makefile.am
scim-tomoe/trunk/src/scim_tomoe.cpp
scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp
Added Paths:
-----------
scim-tomoe/trunk/autogen.sh
scim-tomoe/trunk/po/LINGUAS
Removed Paths:
-------------
scim-tomoe/trunk/ABOUT-NLS
scim-tomoe/trunk/bootstrap
scim-tomoe/trunk/intl/
scim-tomoe/trunk/m4/
scim-tomoe/trunk/po/Makefile.in.in
scim-tomoe/trunk/po/Makevars
scim-tomoe/trunk/po/Makevars.template
scim-tomoe/trunk/po/Rules-quot
scim-tomoe/trunk/po/boldquot.sed
scim-tomoe/trunk/po/en...@bo...
scim-tomoe/trunk/po/en...@qu...
scim-tomoe/trunk/po/insert-header.sin
scim-tomoe/trunk/po/quot.sed
scim-tomoe/trunk/po/remove-potcdate.sin
scim-tomoe/trunk/po/scim-tomoe.pot
scim-tomoe/trunk/src/.deps/
scim-tomoe/trunk/src/intl.h
Property Changed:
----------------
scim-tomoe/trunk/
scim-tomoe/trunk/data/
scim-tomoe/trunk/po/
scim-tomoe/trunk/src/
Property changes on: scim-tomoe/trunk
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
aclocal.m4
autom4te.cache
config.guess
config.h.in
config.log
config.sub
configure
depcomp
install-sh
intltool-extract.in
intltool-merge.in
intltool-update.in
ltmain.sh
missing
mkinstalldirs
libtool
stamp-h1
Makefile
config.h
config.status
intltool-extract
intltool-merge
intltool-update
Deleted: scim-tomoe/trunk/ABOUT-NLS
===================================================================
--- scim-tomoe/trunk/ABOUT-NLS 2007-04-13 01:31:33 UTC (rev 1190)
+++ scim-tomoe/trunk/ABOUT-NLS 2007-04-13 01:55:46 UTC (rev 1191)
@@ -1,769 +0,0 @@
-Notes on the Free Translation Project
-*************************************
-
-Free software is going international! The Free Translation Project is
-a way to get maintainers of free software, translators, and users all
-together, so that free software will gradually become able to speak many
-languages. A few packages already provide translations for their
-messages.
-
- If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site. But you do _not_
-need to install GNU `gettext' prior to configuring, installing or using
-this package with messages translated.
-
- Installers will find here some useful hints. These notes also
-explain how users should proceed for getting the programs to use the
-available translations. They tell how people wanting to contribute and
-work on translations can contact the appropriate team.
-
- When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used. The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-Quick configuration advice
-==========================
-
-If you want to exploit the full power of internationalization, you
-should configure it using
-
- ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed. So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias, message inheritance, automatic
-charset conversion or plural form handling) as the implementation here.
-It is also not possible to offer this additional functionality on top
-of a `catgets' implementation. Future versions of GNU `gettext' will
-very likely convey even more functionality. So it might be a good idea
-to change to GNU `gettext' as soon as possible.
-
- So you need _not_ provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-INSTALL Matters
-===============
-
-Some packages are "localizable" when properly installed; the programs
-they contain can be made to speak your own native language. Most such
-packages use GNU `gettext'. Other packages have their own ways to
-internationalization, predating GNU `gettext'.
-
- By default, this package will be installed to allow translation of
-messages. It will automatically detect whether the system already
-provides the GNU `gettext' functions. If not, the included GNU
-`gettext' library will be used. This library is wholly contained
-within this package, usually in the `intl/' subdirectory, so prior
-installation of the GNU `gettext' package is _not_ required.
-Installers may use special options at configuration time for changing
-the default behaviour. The commands:
-
- ./configure --with-included-gettext
- ./configure --disable-nls
-
-will, respectively, bypass any pre-existing `gettext' to use the
-internationalizing routines provided within this package, or else,
-_totally_ disable translation of messages.
-
- When you already have GNU `gettext' installed on your system and run
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this. This might not be desirable. You should use
-the more recent version of the GNU `gettext' library. I.e. if the file
-`intl/VERSION' shows that the library which comes with this package is
-more recent, you should use
-
- ./configure --with-included-gettext
-
-to prevent auto-detection.
-
- The configuration process will not test for the `catgets' function
-and therefore it will not be used. The reason is that even an
-emulation of `gettext' on top of `catgets' could not provide all the
-extensions of the GNU `gettext' library.
-
- Internationalized packages usually have many `po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language. Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package. However, the environment variable `LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-Using This Package
-==================
-
-As a user, if your language has been installed for this package, you
-only have to set the `LANG' environment variable to the appropriate
-`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
-and `CC' is an ISO 3166 two-letter country code. For example, let's
-suppose that you speak German and live in Germany. At the shell
-prompt, merely execute `setenv LANG de_DE' (in `csh'),
-`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
-This can be done from your `.login' or `.profile' file, once and for
-all.
-
- You might think that the country code specification is redundant.
-But in fact, some languages have dialects in different countries. For
-example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
-country code serves to distinguish the dialects.
-
- The locale naming convention of `LL_CC', with `LL' denoting the
-language and `CC' denoting the country, is the one use on systems based
-on GNU libc. On other systems, some variations of this scheme are
-used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
-locales supported by your system for your country by running the command
-`locale -a | grep '^LL''.
-
- Not all programs have translations for all languages. By default, an
-English message is shown in place of a nonexistent translation. If you
-understand other languages, you can set up a priority list of languages.
-This is done through a different environment variable, called
-`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
-for the purpose of message handling, but you still need to have `LANG'
-set to the primary language; this is required by other parts of the
-system libraries. For example, some Swedish users who would rather
-read translations in German than English for when Swedish is not
-available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
-
- Special advice for Norwegian users: The language code for Norwegian
-bokma*l changed from `no' to `nb' recently (in 2003). During the
-transition period, while some message catalogs for this language are
-installed under `nb' and some older ones under `no', it's recommended
-for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
-older translations are used.
-
- In the `LANGUAGE' environment variable, but not in the `LANG'
-environment variable, `LL_CC' combinations can be abbreviated as `LL'
-to denote the language's main dialect. For example, `de' is equivalent
-to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
-(Portuguese as spoken in Portugal) in this context.
-
-Translating Teams
-=================
-
-For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list. The up-to-date list of
-teams can be found at the Free Translation Project's homepage,
-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
-area.
-
- If you'd like to volunteer to _work_ at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is _not_ the same as the list itself, it has
-`-request' appended. For example, speakers of Swedish can send a
-message to `sv-...@li...', having this message body:
-
- subscribe
-
- Keep in mind that team members are expected to participate
-_actively_ in translations, or at solving translational difficulties,
-rather than merely lurking around. If your team does not exist yet and
-you want to start one, or if you are unsure about what to do or how to
-get started, please write to `tra...@ir...' to reach the
-coordinator for all translator teams.
-
- The English team is special. It works at improving and uniformizing
-the terminology in use. Proven linguistic skill are praised more than
-programming skill, here.
-
-Available Packages
-==================
-
-Languages are not equally supported in all packages. The following
-matrix shows the current state of internationalization, as of January
-2004. The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination, with a
-translation percentage of at least 50%.
-
- Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es
- +----------------------------------------------------+
- a2ps | [] [] [] [] |
- aegis | () |
- ant-phone | () |
- anubis | |
- ap-utils | |
- aspell | [] |
- bash | [] [] [] [] |
- batchelor | |
- bfd | [] [] |
- binutils | [] [] |
- bison | [] [] [] |
- bluez-pin | [] [] [] |
- clisp | |
- clisp | [] [] [] |
- console-tools | [] [] |
- coreutils | [] [] [] [] |
- cpio | [] [] [] |
- darkstat | [] () [] |
- diffutils | [] [] [] [] [] [] [] |
- e2fsprogs | [] [] [] |
- enscript | [] [] [] [] |
- error | [] [] [] [] [] |
- fetchmail | [] () [] [] [] [] |
- fileutils | [] [] [] |
- findutils | [] [] [] [] [] [] [] |
- flex | [] [] [] [] |
- fslint | |
- gas | [] |
- gawk | [] [] [] [] |
- gbiff | [] |
- gcal | [] |
- gcc | [] [] |
- gettext | [] [] [] [] [] |
- gettext-examples | [] [] [] [] |
- gettext-runtime | [] [] [] [] [] |
- gettext-tools | [] [] [] |
- gimp-print | [] [] [] [] [] |
- gliv | |
- glunarclock | [] [] |
- gnubiff | [] |
- gnucash | [] () [] [] |
- gnucash-glossary | [] () [] |
- gnupg | [] () [] [] [] [] |
- gpe-aerial | [] |
- gpe-beam | [] [] |
- gpe-calendar | [] [] |
- gpe-clock | [] [] |
- gpe-conf | [] [] |
- gpe-contacts | [] [] |
- gpe-edit | [] |
- gpe-go | [] |
- gpe-login | [] [] |
- gpe-ownerinfo | [] [] |
- gpe-sketchbook | [] [] |
- gpe-su | [] [] |
- gpe-taskmanager | [] [] |
- gpe-timesheet | [] |
- gpe-today | [] [] |
- gpe-todo | [] [] |
- gphoto2 | [] [] [] [] |
- gprof | [] [] [] |
- gpsdrive | () () () |
- gramadoir | [] |
- grep | [] [] [] [] [] [] |
- gretl | [] |
- gtick | [] () |
- hello | [] [] [] [] [] [] |
- id-utils | [] [] |
- indent | [] [] [] [] |
- iso_3166 | [] [] [] [] [] [] [] [] [] [] |
- iso_3166_1 | [] [] [] [] [] [] |
- iso_3166_2 | |
- iso_3166_3 | [] |
- iso_4217 | [] [] [] [] |
- iso_639 | |
- jpilot | [] [] [] |
- jtag | |
- jwhois | [] |
- kbd | [] [] [] [] [] |
- latrine | () |
- ld | [] [] |
- libc | [] [] [] [] [] [] |
- libgpewidget | [] [] |
- libiconv | [] [] [] [] [] |
- lifelines | [] () |
- lilypond | [] |
- lingoteach | |
- lingoteach_lessons | () () |
- lynx | [] [] [] [] |
- m4 | [] [] [] [] |
- mailutils | [] [] |
- make | [] [] [] |
- man-db | [] () [] [] () |
- minicom | [] [] [] |
- mysecretdiary | [] [] [] |
- nano | [] () [] [] [] |
- nano_1_0 | [] () [] [] [] |
- opcodes | [] |
- parted | [] [] [] [] [] |
- ptx | [] [] [] [] [] |
- python | |
- radius | [] |
- recode | [] [] [] [] [] [] [] |
- rpm | [] [] |
- screem | |
- scrollkeeper | [] [] [] [] [] [] |
- sed | [] [] [] [] [] [] |
- sh-utils | [] [] [] |
- shared-mime-info | |
- sharutils | [] [] [] [] [] [] |
- silky | () |
- skencil | [] () [] |
- sketch | [] () [] |
- soundtracker | [] [] [] |
- sp | [] |
- tar | [] [] [] [] |
- texinfo | [] [] [] |
- textutils | [] [] [] [] |
- tin | () () |
- tp-robot | |
- tuxpaint | [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | |
- util-linux | [] [] [] [] [] |
- vorbis-tools | [] [] [] [] |
- wastesedge | () |
- wdiff | [] [] [] [] |
- wget | [] [] [] [] [] [] |
- xchat | [] [] [] [] |
- xfree86_xkb_xml | [] [] |
- xpad | [] |
- +----------------------------------------------------+
- af am ar az be bg bs ca cs da de el en en_GB eo es
- 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68
-
- et eu fa fi fr ga gl he hr hu id is it ja ko lg
- +-------------------------------------------------+
- a2ps | [] [] [] () () |
- aegis | |
- ant-phone | [] |
- anubis | [] |
- ap-utils | [] |
- aspell | [] [] |
- bash | [] [] |
- batchelor | [] [] |
- bfd | [] |
- binutils | [] [] |
- bison | [] [] [] [] |
- bluez-pin | [] [] [] [] [] |
- clisp | |
- clisp | [] |
- console-tools | |
- coreutils | [] [] [] [] [] [] |
- cpio | [] [] [] [] |
- darkstat | () [] [] [] |
- diffutils | [] [] [] [] [] [] [] |
- e2fsprogs | |
- enscript | [] [] |
- error | [] [] [] [] |
- fetchmail | [] |
- fileutils | [] [] [] [] [] [] |
- findutils | [] [] [] [] [] [] [] [] [] [] [] |
- flex | [] [] [] |
- fslint | [] |
- gas | [] |
- gawk | [] [] [] |
- gbiff | [] |
- gcal | [] |
- gcc | [] |
- gettext | [] [] [] |
- gettext-examples | [] [] |
- gettext-runtime | [] [] [] [] [] |
- gettext-tools | [] [] [] |
- gimp-print | [] [] |
- gliv | () |
- glunarclock | [] [] [] [] |
- gnubiff | [] |
- gnucash | () [] |
- gnucash-glossary | [] |
- gnupg | [] [] [] [] [] [] [] |
- gpe-aerial | [] |
- gpe-beam | [] |
- gpe-calendar | [] [] [] |
- gpe-clock | [] |
- gpe-conf | [] |
- gpe-contacts | [] [] |
- gpe-edit | [] [] |
- gpe-go | [] |
- gpe-login | [] [] |
- gpe-ownerinfo | [] [] [] |
- gpe-sketchbook | [] |
- gpe-su | [] |
- gpe-taskmanager | [] |
- gpe-timesheet | [] [] [] |
- gpe-today | [] [] |
- gpe-todo | [] [] |
- gphoto2 | [] [] [] |
- gprof | [] [] |
- gpsdrive | () () () |
- gramadoir | [] [] |
- grep | [] [] [] [] [] [] [] [] [] [] [] |
- gretl | [] [] |
- gtick | [] [] [] |
- hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
- id-utils | [] [] [] [] |
- indent | [] [] [] [] [] [] [] [] [] |
- iso_3166 | [] [] [] [] [] [] [] |
- iso_3166_1 | [] [] [] [] [] |
- iso_3166_2 | |
- iso_3166_3 | |
- iso_4217 | [] [] [] [] [] [] |
- iso_639 | |
- jpilot | [] () |
- jtag | [] |
- jwhois | [] [] [] [] |
- kbd | [] |
- latrine | [] |
- ld | [] |
- libc | [] [] [] [] [] [] |
- libgpewidget | [] [] [] [] |
- libiconv | [] [] [] [] [] [] [] [] [] |
- lifelines | () |
- lilypond | [] |
- lingoteach | [] [] |
- lingoteach_lessons | |
- lynx | [] [] [] [] |
- m4 | [] [] [] [] |
- mailutils | |
- make | [] [] [] [] [] [] |
- man-db | () () |
- minicom | [] [] [] [] |
- mysecretdiary | [] [] |
- nano | [] [] [] [] |
- nano_1_0 | [] [] [] [] |
- opcodes | [] |
- parted | [] [] [] |
- ptx | [] [] [] [] [] [] [] |
- python | |
- radius | [] |
- recode | [] [] [] [] [] [] |
- rpm | [] [] |
- screem | |
- scrollkeeper | [] |
- sed | [] [] [] [] [] [] [] [] [] |
- sh-utils | [] [] [] [] [] [] [] |
- shared-mime-info | [] [] [] |
- sharutils | [] [] [] [] [] |
- silky | () [] () () |
- skencil | [] |
- sketch | [] |
- soundtracker | [] [] |
- sp | [] () |
- tar | [] [] [] [] [] [] [] [] [] |
- texinfo | [] [] [] [] |
- textutils | [] [] [] [] [] [] |
- tin | [] () |
- tp-robot | [] |
- tuxpaint | [] [] [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | [] [] |
- util-linux | [] [] [] [] () [] |
- vorbis-tools | [] |
- wastesedge | () |
- wdiff | [] [] [] [] [] [] |
- wget | [] [] [] [] [] [] [] |
- xchat | [] [] [] |
- xfree86_xkb_xml | [] [] |
- xpad | [] [] |
- +-------------------------------------------------+
- et eu fa fi fr ga gl he hr hu id is it ja ko lg
- 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0
-
- lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
- +-----------------------------------------------------+
- a2ps | [] [] () () [] [] [] |
- aegis | () () () |
- ant-phone | [] [] |
- anubis | [] [] [] [] [] [] |
- ap-utils | [] () [] |
- aspell | [] |
- bash | [] [] [] |
- batchelor | [] |
- bfd | [] |
- binutils | [] |
- bison | [] [] [] [] [] |
- bluez-pin | [] [] [] |
- clisp | |
- clisp | [] |
- console-tools | [] |
- coreutils | [] [] |
- cpio | [] [] [] [] [] |
- darkstat | [] [] [] [] |
- diffutils | [] [] [] [] [] [] |
- e2fsprogs | [] |
- enscript | [] [] [] [] |
- error | [] [] [] |
- fetchmail | [] [] () [] |
- fileutils | [] [] [] |
- findutils | [] [] [] [] [] |
- flex | [] [] [] [] |
- fslint | [] [] |
- gas | |
- gawk | [] [] [] |
- gbiff | [] [] |
- gcal | |
- gcc | |
- gettext | [] [] [] |
- gettext-examples | [] [] [] |
- gettext-runtime | [] [] [] [] |
- gettext-tools | [] [] |
- gimp-print | [] |
- gliv | [] [] [] |
- glunarclock | [] [] [] [] |
- gnubiff | [] |
- gnucash | [] [] () [] |
- gnucash-glossary | [] [] |
- gnupg | [] |
- gpe-aerial | [] [] [] [] |
- gpe-beam | [] [] [] [] |
- gpe-calendar | [] [] [] [] |
- gpe-clock | [] [] [] [] |
- gpe-conf | [] [] [] [] |
- gpe-contacts | [] [] [] [] |
- gpe-edit | [] [] [] [] |
- gpe-go | [] [] [] |
- gpe-login | [] [] [] [] |
- gpe-ownerinfo | [] [] [] [] |
- gpe-sketchbook | [] [] [] [] |
- gpe-su | [] [] [] [] |
- gpe-taskmanager | [] [] [] [] |
- gpe-timesheet | [] [] [] [] |
- gpe-today | [] [] [] [] |
- gpe-todo | [] [] [] [] |
- gphoto2 | [] |
- gprof | [] [] |
- gpsdrive | () () [] |
- gramadoir | () [] |
- grep | [] [] [] [] [] |
- gretl | |
- gtick | [] [] [] |
- hello | [] [] [] [] [] [] [] [] [] [] |
- id-utils | [] [] [] [] |
- indent | [] [] [] [] |
- iso_3166 | [] [] [] |
- iso_3166_1 | [] [] |
- iso_3166_2 | |
- iso_3166_3 | [] |
- iso_4217 | [] [] [] [] [] [] [] [] |
- iso_639 | [] |
- jpilot | () () |
- jtag | |
- jwhois | [] [] [] [] () |
- kbd | [] [] [] |
- latrine | [] |
- ld | |
- libc | [] [] [] [] |
- libgpewidget | [] [] [] |
- libiconv | [] [] [] [] [] |
- lifelines | |
- lilypond | |
- lingoteach | |
- lingoteach_lessons | |
- lynx | [] [] [] |
- m4 | [] [] [] [] [] |
- mailutils | [] [] [] |
- make | [] [] [] [] |
- man-db | [] |
- minicom | [] [] [] [] |
- mysecretdiary | [] [] [] |
- nano | [] [] [] [] [] |
- nano_1_0 | [] [] [] [] [] [] |
- opcodes | [] [] |
- parted | [] [] [] [] |
- ptx | [] [] [] [] [] [] [] [] |
- python | |
- radius | [] [] |
- recode | [] [] [] [] |
- rpm | [] [] [] |
- screem | |
- scrollkeeper | [] [] [] [] [] |
- sed | [] [] [] |
- sh-utils | [] [] |
- shared-mime-info | [] [] |
- sharutils | [] [] |
- silky | () |
- skencil | [] [] |
- sketch | [] [] |
- soundtracker | |
- sp | |
- tar | [] [] [] [] [] [] |
- texinfo | [] [] [] [] |
- textutils | [] [] |
- tin | |
- tp-robot | [] |
- tuxpaint | [] [] [] [] [] [] [] [] |
- unicode-han-tra... | |
- unicode-transla... | |
- util-linux | [] [] [] |
- vorbis-tools | [] [] [] |
- wastesedge | |
- wdiff | [] [] [] [] [] |
- wget | [] [] [] |
- xchat | [] [] [] |
- xfree86_xkb_xml | [] [] |
- xpad | [] [] |
- +-----------------------------------------------------+
- lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
- 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63
-
- sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
- +-----------------------------------------------------+
- a2ps | [] [] [] [] | 16
- aegis | | 0
- ant-phone | | 3
- anubis | [] [] | 9
- ap-utils | () | 3
- aspell | | 4
- bash | | 9
- batchelor | | 3
- bfd | [] [] | 6
- binutils | [] [] [] | 8
- bison | [] [] | 14
- bluez-pin | [] [] [] | 14
- clisp | | 0
- clisp | | 5
- console-tools | | 3
- coreutils | [] [] [] [] | 16
- cpio | [] [] | 14
- darkstat | [] [] [] () () | 12
- diffutils | [] [] [] | 23
- e2fsprogs | [] [] | 6
- enscript | [] [] | 12
- error | [] [] [] | 15
- fetchmail | [] [] | 11
- fileutils | [] [] [] [] [] | 17
- findutils | [] [] [] [] [] [] | 29
- flex | [] [] | 13
- fslint | | 3
- gas | [] | 3
- gawk | [] [] | 12
- gbiff | | 4
- gcal | [] [] | 4
- gcc | [] | 4
- gettext | [] [] [] [] [] | 16
- gettext-examples | [] [] [] [] [] | 14
- gettext-runtime | [] [] [] [] [] [] [] [] | 22
- gettext-tools | [] [] [] [] [] [] | 14
- gimp-print | [] [] | 10
- gliv | | 3
- glunarclock | [] [] [] | 13
- gnubiff | | 3
- gnucash | [] [] | 9
- gnucash-glossary | [] [] [] | 8
- gnupg | [] [] [] [] | 17
- gpe-aerial | [] | 7
- gpe-beam | [] | 8
- gpe-calendar | [] [] [] [] | 13
- gpe-clock | [] [] [] | 10
- gpe-conf | [] [] | 9
- gpe-contacts | [] [] [] | 11
- gpe-edit | [] [] [] [] [] | 12
- gpe-go | | 5
- gpe-login | [] [] [] [] [] | 13
- gpe-ownerinfo | [] [] [] [] | 13
- gpe-sketchbook | [] [] | 9
- gpe-su | [] [] [] | 10
- gpe-taskmanager | [] [] [] | 10
- gpe-timesheet | [] [] [] [] | 12
- gpe-today | [] [] [] [] [] | 13
- gpe-todo | [] [] [] [] | 12
- gphoto2 | [] [] [] | 11
- gprof | [] [] | 9
- gpsdrive | [] [] | 3
- gramadoir | [] | 5
- grep | [] [] [] [] | 26
- gretl | | 3
- gtick | | 7
- hello | [] [] [] [] [] | 34
- id-utils | [] [] | 12
- indent | [] [] [] [] | 21
- iso_3166 | [] [] [] [] [] [] [] | 27
- iso_3166_1 | [] [] [] | 16
- iso_3166_2 | | 0
- iso_3166_3 | | 2
- iso_4217 | [] [] [] [] [] [] | 24
- iso_639 | | 1
- jpilot | [] [] [] [] [] | 9
- jtag | [] | 2
- jwhois | () [] [] | 11
- kbd | [] [] | 11
- latrine | | 2
- ld | [] [] | 5
- libc | [] [] [] [] | 20
- libgpewidget | [] [] [] [] | 13
- libiconv | [] [] [] [] [] [] [] [] | 27
- lifelines | [] | 2
- lilypond | [] | 3
- lingoteach | | 2
- lingoteach_lessons | () | 0
- lynx | [] [] [] | 14
- m4 | [] [] | 15
- mailutils | | 5
- make | [] [] [] | 16
- man-db | [] | 5
- minicom | | 11
- mysecretdiary | [] [] | 10
- nano | [] [] [] [] | 17
- nano_1_0 | [] [] [] | 17
- opcodes | [] [] | 6
- parted | [] [] [] | 15
- ptx | [] [] | 22
- python | | 0
- radius | | 4
- recode | [] [] [] | 20
- rpm | [] [] | 9
- screem | [] [] | 2
- scrollkeeper | [] [] [] | 15
- sed | [] [] [] [] [] [] | 24
- sh-utils | [] [] | 14
- shared-mime-info | [] [] | 7
- sharutils | [] [] [] [] | 17
- silky | () | 3
- skencil | [] | 6
- sketch | [] | 6
- soundtracker | [] [] | 7
- sp | [] | 3
- tar | [] [] [] [] [] | 24
- texinfo | [] [] [] | 14
- textutils | [] [] [] [] | 16
- tin | | 1
- tp-robot | | 2
- tuxpaint | [] [] [] [] [] | 29
- unicode-han-tra... | | 0
- unicode-transla... | | 2
- util-linux | [] [] | 15
- vorbis-tools | | 8
- wastesedge | | 0
- wdiff | [] [] [] | 18
- wget | [] [] [] [] [] [] [] [] | 24
- xchat | [] [] [] [] [] | 15
- xfree86_xkb_xml | [] [] [] [] [] | 11
- xpad | | 5
- +-----------------------------------------------------+
- 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
- 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373
-
- Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect. This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
- For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-distributed as such by its maintainer. There might be an observable
-lag between the mere existence a PO file and its wide availability in a
-distribution.
-
- If January 2004 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
-matrix with full percentage details can be found at
-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
-
-Using `gettext' in new packages
-===============================
-
-If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU `gettext' in your
-package. Of course you have to respect the GNU Library General Public
-License which covers the use of the GNU `gettext' library. This means
-in particular that even non-free programs can use `libintl' as a shared
-library, whereas only free software can use `libintl' as a static
-library or use modified versions of `libintl'.
-
- Once the sources are changed appropriately and the setup can handle
-the use of `gettext' the only thing missing are the translations. The
-Free Translation Project is also available for packages which are not
-developed inside the GNU project. Therefore the information given above
-applies also for every other Free Software Project. Contact
-`tra...@ir...' to make the `.pot' files available to
-the translation teams.
-
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-13 01:31:33 UTC (rev 1190)
+++ scim-tomoe/trunk/ChangeLog 2007-04-13 01:55:46 UTC (rev 1191)
@@ -1,3 +1,9 @@
+2007-04-13 Kouhei Sutou <ko...@co...>
+
+ * ./: used glib-gettextize and intltoolize.
+ * intl/, m4/: removed.
+ * po/: cleanup.
+
2007-03-22 Takuro Ashie <as...@ho...>
* configure.ac, src/Makefile.am: Rename libtomoe-gtk to tomoe-gtk.
Modified: scim-tomoe/trunk/Makefile.am
===================================================================
--- scim-tomoe/trunk/Makefile.am 2007-04-13 01:31:33 UTC (rev 1190)
+++ scim-tomoe/trunk/Makefile.am 2007-04-13 01:55:46 UTC (rev 1191)
@@ -1,5 +1,7 @@
-SUBDIRS = intl po m4 src data
+SUBDIRS = po src data
-ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = config.rpath mkinstalldirs
+EXTRA_DIST = \
+ autogen.sh \
+ intltool-update.in \
+ intltool-merge.in \
+ intltool-extract.in
Copied: scim-tomoe/trunk/autogen.sh (from rev 1184, tomoe/trunk/autogen.sh)
===================================================================
--- scim-tomoe/trunk/autogen.sh (rev 0)
+++ scim-tomoe/trunk/autogen.sh 2007-04-13 01:55:46 UTC (rev 1191)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+run()
+{
+ $@
+ if test $? -ne 0; then
+ echo "Failed $@"
+ exit 1
+ fi
+}
+
+run libtoolize --copy --force
+run glib-gettextize --force --copy
+run intltoolize --force --copy --automake
+run aclocal
+run autoheader
+run automake --add-missing --foreign --copy
+run autoconf
Deleted: scim-tomoe/trunk/bootstrap
===================================================================
--- scim-tomoe/trunk/bootstrap 2007-04-13 01:31:33 UTC (rev 1190)
+++ scim-tomoe/trunk/bootstrap 2007-04-13 01:55:46 UTC (rev 1191)
@@ -1,28 +0,0 @@
-#! /bin/sh
-# bootstrap -- Use this script to create generated files from the CVS dist
-# Copyright (C) 2000 Gary V. Vaughan
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-## @start 1
-#! /bin/sh
-
-set -x
-aclocal -I m4 --force
-autoheader --force
-libtoolize --force -c --automake
-automake --force --add-missing --copy --include-deps
-autoconf --force
-## @end 1
Modified: scim-tomoe/trunk/configure.ac
===================================================================
--- scim-tomoe/trunk/configure.ac 2007-04-13 01:31:33 UTC (rev 1190)
+++ scim-tomoe/trunk/configure.ac 2007-04-13 01:55:46 UTC (rev 1191)
@@ -24,17 +24,23 @@
AM_CONFIG_HEADER(config.h)
# Init gettext
-ALL_LINGUAS="ja"
-AM_GNU_GETTEXT
+IT_PROG_INTLTOOL([0.35.0])
+AM_GLIB_GNU_GETTEXT
+dnl should run after AM_GLIB_GNU_GETTEXT
+AC_CONFIG_COMMANDS([modify-itlocaledir], [
+sed \
+ -i'' \
+ -e "s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /" \
+ po/Makefile
+])
GETTEXT_PACKAGE=scim-tomoe
AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The gettext domain])
# Init libtool
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
-AC_LIB_LTDL
AC_SUBST(LIBTOOL_DEPS)
# Checks for programs.
@@ -122,12 +128,10 @@
AC_SUBST(SCIM_MODULEDIR)
AC_SUBST(SCIM_LIBEXECDIR)
AC_SUBST(SCIM_TOMOE_DATADIR)
-
+
AC_CONFIG_FILES([
Makefile
-intl/Makefile
po/Makefile.in
-m4/Makefile
src/...
[truncated message content] |
|
From: <kt...@us...> - 2007-04-13 01:31:32
|
Revision: 1190
http://tomoe.svn.sourceforge.net/tomoe/?rev=1190&view=rev
Author: ktou
Date: 2007-04-12 18:31:33 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
* made a trunk for scim-tomoe.
Added Paths:
-----------
scim-tomoe/trunk/
Removed Paths:
-------------
scim-tomoe-src/
Copied: scim-tomoe/trunk (from rev 1189, scim-tomoe-src)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-13 01:31:07
|
Revision: 1189
http://tomoe.svn.sourceforge.net/tomoe/?rev=1189&view=rev
Author: ktou
Date: 2007-04-12 18:31:05 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
* re-made a path for scim-tomoe.
Added Paths:
-----------
scim-tomoe/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-13 01:30:43
|
Revision: 1188
http://tomoe.svn.sourceforge.net/tomoe/?rev=1188&view=rev
Author: ktou
Date: 2007-04-12 18:30:44 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
* moved temporary.
Added Paths:
-----------
scim-tomoe-src/
Removed Paths:
-------------
scim-tomoe/
Copied: scim-tomoe-src (from rev 1187, scim-tomoe)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|