From ed25c88382d48b935436a14a259183b7bb88b748 Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Fri, 12 Oct 2007 05:42:45 +0000
Subject: [PATCH] * m17n.h: Move database related declarations to m17n-core.h
 (Mharset): Don't extern it.

* m17n-flt.c: Include m17n-core.h instead of m17n.h.
(Mexist): New variable.
(enum FontLayoutCmdRuleSrcType): New enum SRC_EXIST.
(FontLayoutCmdRule): New member src.exist.
(parse_otf_command): Handle gsub_count and gpos_count separately.
(load_otf_command): Adjusted for the change of MFLTOtfSpec.
(load_command): Handle the command "exist".
(free_flt_command): Adjusted for the change of MFLTOtfSpec.
(run_rule): Handle the case SRC_EXIST.
(run_otf): Adjusted for the change of MFLTOtfSpec.
(run_command): Check the range of FROM.
(check_otf_spec): Delete it.
(m17n_init_flt): Call m17n_init_core instead of m17n_init.
Initialize Mexist.
(m17n_fini_flt): Call m17n_fini_core instead of m17n_fiini.
(mflt_find): Call font->check_otf instead of check_otf_spec.
(mflt_run): Keep the metrics in 26.6 fixed point.

* database.c: Include m17n-core.h instead of m17n.h.
(load_chartable): Use mtext__from_data.
(load_charset): Moved to charset.c
(load_database): Call mdatabase__load_charset_func instead of
load_charset.
(mdatabase__load_charset_func): New variable.
(mdatabase__init): Initialize mdatabase__load_charset_func and
Mcharset.  Don't set mdatabase__finder and mdatabase__loader.
(mdatabase__save): Use fwrite, not mconv_encode_stream.
(Mcharset): Declare it here.
---
 src/m17n.h |   47 -----------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/src/m17n.h b/src/m17n.h
index da3338b..5e5d278 100644
--- a/src/m17n.h
+++ b/src/m17n.h
@@ -52,51 +52,6 @@ extern void m17n_fini (void);
  */
 /*=*/
 
-/*** @ingroup m17nShell */
-/***en @defgroup m17nDatabase Database */
-/***ja @defgroup m17nDatabase ¥Ç¡¼¥¿¥Ù¡¼¥¹ */
-/*=*/
-
-/* Directory of an application specific databases.  */
-extern char *mdatabase_dir;
-/*=*/
-/***
-    @ingroup m17nDatabase  */ 
-/***en
-    @brief Type of database.
-
-    The type #MDatabase is for a database object.  Its internal
-    structure is concealed from an application program.  */
-/***ja 
-    @brief ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î·¿Àë¸À.
-
-    #MDatabase ·¿¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹¥ª¥Ö¥¸¥§¥¯¥ÈÍѤι½Â¤ÂΤǤ¢¤ë¡£
-    ÆâÉô¹½Â¤¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à¤«¤é¤Ï¸«¤¨¤Ê¤¤¡£
-    */
-
-typedef struct MDatabase MDatabase;
-
-/*=*/
-
-/* Look for a data.  */
-extern MDatabase *mdatabase_find (MSymbol tag1, MSymbol tag2,
-				  MSymbol tag3, MSymbol tag4);
-
-extern MPlist *mdatabase_list (MSymbol tag0, MSymbol tag1,
-			       MSymbol tag2, MSymbol tag3);
-
-/* Load a data.  */
-void *mdatabase_load (MDatabase *mdb);
-
-/* Get tags of a data.  */
-extern MSymbol *mdatabase_tag (MDatabase *mdb);
-
-/* Define a data.  */
-extern MDatabase *mdatabase_define (MSymbol tag1, MSymbol tag2,
-				    MSymbol tag3, MSymbol tag4,
-				    void *(*loader) (MSymbol *, void *),
-				    void *extra_info);
-
 /*=*/
 /* (S2) Charset staffs */
 /*=*/
@@ -142,8 +97,6 @@ extern MSymbol Msubset;
 extern MSymbol Msuperset;
 
 /* etc. */
-extern MSymbol Mcharset;
-
 extern MSymbol mchar_define_charset (const char *name, MPlist *plist);
 
 extern MSymbol mchar_resolve_charset (MSymbol symbol);
-- 
1.7.10.4