*** empty log message ***

10 files changed, 28 insertions, 40 deletions

diff --git a/pango/Makefile.am b/pango/Makefile.am
index 076e183e..168f014e 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -52,6 +52,7 @@ pangoinclude_HEADERS = 	   \
 	pango-glyph.h	   \
 	pango-item.h	   \
 	pango-layout.h	   \
+	pango-modules.h	   \
 	pango-types.h	   \
 	pangox.h	
 
diff --git a/pango/itemize.c b/pango/itemize.c
index 27e2c81a..ed877fc0 100644
--- a/pango/itemize.c
+++ b/pango/itemize.c
@@ -204,9 +204,9 @@ add_engines (PangoContext     *context,
 	  (last_lang == 0 || lang == 0 ||
 	   strcmp (lang, last_lang) != 0))
 	{
-	  lang_map = _pango_find_map (lang, PANGO_ENGINE_TYPE_LANG,
+	  lang_map = pango_find_map (lang, PANGO_ENGINE_TYPE_LANG,
 				      PANGO_RENDER_TYPE_NONE);
-	  shape_map = _pango_find_map (lang, PANGO_ENGINE_TYPE_SHAPE,
+	  shape_map = pango_find_map (lang, PANGO_ENGINE_TYPE_SHAPE,
 				       context->render_type);
 	  last_lang = lang;
 	}
diff --git a/pango/modules.c b/pango/modules.c
index db173e88..c109c3ef 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -24,8 +24,8 @@
 #include <string.h>
 
 #include <gmodule.h>
-#include <pango/pango.h>
 
+#include "pango-modules.h"
 #include "modules.h"
 #include "utils.h"
 
@@ -71,9 +71,9 @@ static void      build_map      (PangoMapInfo       *info);
 static void      init_modules   (void);
 
 PangoMap *
-_pango_find_map (const char *lang,
-		 guint       engine_type_id,
-		 guint       render_type_id)
+pango_find_map (const char *lang,
+		guint       engine_type_id,
+		guint       render_type_id)
 {
   GList *tmp_list = maps;
   PangoMapInfo *map_info = NULL;
@@ -461,16 +461,16 @@ build_map (PangoMapInfo *info)
 }
 
 PangoMapEntry *
-_pango_map_get_entry (PangoMap   *map,
-		      guint32     wc)
+pango_map_get_entry (PangoMap   *map,
+		     guint32     wc)
 {
   PangoSubmap *submap = &map->submaps[wc / 256];
   return submap->is_leaf ? &submap->d.entry : &submap->d.leaves[wc % 256];
 }
 
 PangoEngine *
-_pango_map_get_engine (PangoMap *map,
-		       guint32   wc)
+pango_map_get_engine (PangoMap *map,
+		      guint32   wc)
 {
   PangoSubmap *submap = &map->submaps[wc / 256];
   PangoMapEntry *entry = submap->is_leaf ? &submap->d.entry : &submap->d.leaves[wc % 256];
diff --git a/pango/modules.h b/pango/modules.h
index 3b0ca0e6..2ddc4999 100644
--- a/pango/modules.h
+++ b/pango/modules.h
@@ -25,15 +25,7 @@
 #define __MODULES_H__
 
 typedef struct _PangoIncludedModule PangoIncludedModule;
-typedef struct _PangoMap PangoMap;
 
-typedef struct _PangoMapEntry PangoMapEntry;
-
-struct _PangoMapEntry 
-{
-  PangoEngineInfo *info;
-  gboolean is_exact;
-};
 struct _PangoIncludedModule
 {
   void (*list) (PangoEngineInfo **engines, int *n_engines);
@@ -41,14 +33,6 @@ struct _PangoIncludedModule
   void (*unload) (PangoEngine *engine);
 };
 
-PangoMap *     _pango_find_map       (const char *lang,
-				      guint       engine_type_id,
-				      guint       render_type_id);
-PangoMapEntry *_pango_map_get_entry  (PangoMap   *map,
-				      guint32     wc);
-PangoEngine *  _pango_map_get_engine (PangoMap   *map,
-				      guint32     wc);
-
 extern PangoIncludedModule _pango_included_modules[];
 
 #endif /* __MODULES_H__ */
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 04325402..cc672383 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -23,8 +23,9 @@
 #include <fribidi/fribidi.h>
 #include <unicode.h>
 #include "iconv.h"
+
 #include "utils.h"
-#include "modules.h"
+#include "pango-modules.h"
 
 struct _PangoContext
 {
@@ -732,7 +733,7 @@ add_engines (PangoContext      *context,
 		  render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_NONE);
 		}
 	       
-	      lang_map = _pango_find_map (next_lang,
+	      lang_map = pango_find_map (next_lang,
 					  engine_type_id, render_type_id);
 	    }
 
@@ -780,7 +781,7 @@ add_engines (PangoContext      *context,
 
       pos  = unicode_get_utf8 (pos, &wc);
 	  
-      lang_engines[i] = (PangoEngineLang *)_pango_map_get_engine (lang_map, wc);
+      lang_engines[i] = (PangoEngineLang *)pango_map_get_engine (lang_map, wc);
       fonts[i] = get_font (current_fonts, current_coverages, n_families, wc);
 
       /* FIXME: handle reference counting properly on the shapers */
diff --git a/pango/pango-font.h b/pango/pango-font.h
index eefae335..2ea64df9 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -34,6 +34,14 @@ extern "C" {
 typedef struct _PangoFontDescription PangoFontDescription;
 typedef struct _PangoFontMetrics PangoFontMetrics;
 
+/**
+ * PangoStyle:
+ * @PANGO_STYLE_NORMAL: the font is upright.
+ * @PANGO_STYLE_OBLIQUE: the font is slanted, but in a roman style.
+ * @PANGO_STYLE_ITALIC: the font is slanted in an italic style.
+ *
+ * An enumeration specifying the various slant styles possible for a font.
+ **/
 typedef enum {
   PANGO_STYLE_NORMAL,
   PANGO_STYLE_OBLIQUE,
diff --git a/pango/pango-types.h b/pango/pango-types.h
index 8c518cb4..cabdf232 100644
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -24,12 +24,6 @@
 
 #include <glib.h>
 
-/* Include this here, since we don't depend on GLib 1.3 yet */
-
-#ifndef G_N_ELEMENTS
-#define G_N_ELEMENTS(arr)		(sizeof(arr) / sizeof((arr)[0]))
-#endif
-
 typedef struct _PangoLangRange PangoLangRange;
 typedef struct _PangoLogAttr PangoLogAttr;
 
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index 4421f4a6..7f20a52a 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -1403,13 +1403,13 @@ pango_x_font_entry_get_coverage (PangoXFontEntry *entry,
 
   for (ch = 0; ch < 65536; ch++)
     {
-      map_entry = _pango_map_get_entry (shape_map, ch);
+      map_entry = pango_map_get_entry (shape_map, ch);
       if (map_entry->info)
 	{
 	  coverage = g_hash_table_lookup (coverage_hash, map_entry->info->id);
 	  if (!coverage)
 	    {
-	      PangoEngineShape *engine = (PangoEngineShape *)_pango_map_get_engine (shape_map, ch);
+	      PangoEngineShape *engine = (PangoEngineShape *)pango_map_get_engine (shape_map, ch);
 	      coverage = engine->get_coverage (font, lang);
 	      g_hash_table_insert (coverage_hash, map_entry->info->id, coverage);
 	    }
diff --git a/pango/pangox-private.h b/pango/pangox-private.h
index 7d581178..ec59df50 100644
--- a/pango/pangox-private.h
+++ b/pango/pangox-private.h
@@ -22,7 +22,7 @@
 #ifndef __PANGOX_PRIVATE_H__
 #define __PANGOX_PRIVATE_H__
 
-#include "modules.h"
+#include "pango-modules.h"
 #include "pangox.h"
 #include "pangox-private.h"
 
diff --git a/pango/pangox.c b/pango/pangox.c
index 37ab9c7c..b0da8d7b 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -987,7 +987,7 @@ pango_x_get_shaper_map (const char *lang)
       render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_X);
     }
   
-  return _pango_find_map (lang, engine_type_id, render_type_id);
+  return pango_find_map (lang, engine_type_id, render_type_id);
 }
 
 static PangoCoverage *
@@ -1007,7 +1007,7 @@ pango_x_font_find_shaper (PangoFont   *font,
   PangoMap *shape_map = NULL;
 
   shape_map = pango_x_get_shaper_map (lang);
-  return (PangoEngineShape *)_pango_map_get_engine (shape_map, ch);
+  return (PangoEngineShape *)pango_map_get_engine (shape_map, ch);
 }
 
 /* Utility functions */