Up version to match 0.6 release that was made yesterday.

Thu Feb 10 23:45:27 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in: Up version to match 0.6 release that
	was made yesterday.

	* examples/viewer.c (main): Look for fixed if sans
	isn't found as an initial font.

	* modules/Makefile.am: Add an install rule to
	run pango-querymodules.

	* modules/*/Makefile.am (module_LTLIBRARIES): Set up
	appropriate install rules.

	* libpango/Makefile.am: Break the X code out into a
	separate library.

17 files changed, 191 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f8c6743..d605bbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Thu Feb 10 23:45:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Up version to match 0.6 release that
+	was made yesterday.
+
+	* examples/viewer.c (main): Look for fixed if sans
+	isn't found as an initial font.
+
+	* modules/Makefile.am: Add an install rule to
+	run pango-querymodules.
+
+	* modules/*/Makefile.am (module_LTLIBRARIES): Set up
+	appropriate install rules.
+
+	* libpango/Makefile.am: Break the X code out into a
+	separate library.
+
 Thu Feb 10 20:19:39 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* examples/viewer.c: Fix some runtime and compile-time warnings.
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 8f8c6743..d605bbf3 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,20 @@
+Thu Feb 10 23:45:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Up version to match 0.6 release that
+	was made yesterday.
+
+	* examples/viewer.c (main): Look for fixed if sans
+	isn't found as an initial font.
+
+	* modules/Makefile.am: Add an install rule to
+	run pango-querymodules.
+
+	* modules/*/Makefile.am (module_LTLIBRARIES): Set up
+	appropriate install rules.
+
+	* libpango/Makefile.am: Break the X code out into a
+	separate library.
+
 Thu Feb 10 20:19:39 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* examples/viewer.c: Fix some runtime and compile-time warnings.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 8f8c6743..d605bbf3 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,20 @@
+Thu Feb 10 23:45:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Up version to match 0.6 release that
+	was made yesterday.
+
+	* examples/viewer.c (main): Look for fixed if sans
+	isn't found as an initial font.
+
+	* modules/Makefile.am: Add an install rule to
+	run pango-querymodules.
+
+	* modules/*/Makefile.am (module_LTLIBRARIES): Set up
+	appropriate install rules.
+
+	* libpango/Makefile.am: Break the X code out into a
+	separate library.
+
 Thu Feb 10 20:19:39 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* examples/viewer.c: Fix some runtime and compile-time warnings.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 8f8c6743..d605bbf3 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,20 @@
+Thu Feb 10 23:45:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Up version to match 0.6 release that
+	was made yesterday.
+
+	* examples/viewer.c (main): Look for fixed if sans
+	isn't found as an initial font.
+
+	* modules/Makefile.am: Add an install rule to
+	run pango-querymodules.
+
+	* modules/*/Makefile.am (module_LTLIBRARIES): Set up
+	appropriate install rules.
+
+	* libpango/Makefile.am: Break the X code out into a
+	separate library.
+
 Thu Feb 10 20:19:39 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* examples/viewer.c: Fix some runtime and compile-time warnings.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 8f8c6743..d605bbf3 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,20 @@
+Thu Feb 10 23:45:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Up version to match 0.6 release that
+	was made yesterday.
+
+	* examples/viewer.c (main): Look for fixed if sans
+	isn't found as an initial font.
+
+	* modules/Makefile.am: Add an install rule to
+	run pango-querymodules.
+
+	* modules/*/Makefile.am (module_LTLIBRARIES): Set up
+	appropriate install rules.
+
+	* libpango/Makefile.am: Break the X code out into a
+	separate library.
+
 Thu Feb 10 20:19:39 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* examples/viewer.c: Fix some runtime and compile-time warnings.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 8f8c6743..d605bbf3 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,20 @@
+Thu Feb 10 23:45:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Up version to match 0.6 release that
+	was made yesterday.
+
+	* examples/viewer.c (main): Look for fixed if sans
+	isn't found as an initial font.
+
+	* modules/Makefile.am: Add an install rule to
+	run pango-querymodules.
+
+	* modules/*/Makefile.am (module_LTLIBRARIES): Set up
+	appropriate install rules.
+
+	* libpango/Makefile.am: Break the X code out into a
+	separate library.
+
 Thu Feb 10 20:19:39 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* examples/viewer.c: Fix some runtime and compile-time warnings.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 8f8c6743..d605bbf3 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,20 @@
+Thu Feb 10 23:45:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Up version to match 0.6 release that
+	was made yesterday.
+
+	* examples/viewer.c (main): Look for fixed if sans
+	isn't found as an initial font.
+
+	* modules/Makefile.am: Add an install rule to
+	run pango-querymodules.
+
+	* modules/*/Makefile.am (module_LTLIBRARIES): Set up
+	appropriate install rules.
+
+	* libpango/Makefile.am: Break the X code out into a
+	separate library.
+
 Thu Feb 10 20:19:39 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* examples/viewer.c: Fix some runtime and compile-time warnings.
diff --git a/TODO b/TODO
index 984a7386..7b7b505c 100644
--- a/TODO
+++ b/TODO
@@ -63,6 +63,11 @@ Documentation
 General
 =======
 
+* Add a "make test" target to examples/, add environment variables
+  to point to module and font alias files, remove the code that
+  loads these from the current directory.  (There are security
+  implications with the current stuff)
+
 * pango_context_list_fonts does not properly suppress duplicates
   when multiple font maps are involved
 
diff --git a/configure.in b/configure.in
index db35e89a..c9503ec2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to create configure.
 
 AC_INIT(ChangeLog)
-AM_INIT_AUTOMAKE(pango, 0.5)
+AM_INIT_AUTOMAKE(pango, 0.6)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index dc6591cf..cd9fb182 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/libpango/
 
 pango_viewer_SOURCES = \
 	viewer.c
-pango_viewer_LDADD = ../libpango/libpango.la $(GTK_LIBS) -lfribidi $(UNICODE_LIBS)
+pango_viewer_LDADD = ../libpango/libpango.la ../libpango/libpangox.la $(GTK_LIBS) -lfribidi $(UNICODE_LIBS)
 
 all-local: pango.modules
 
diff --git a/examples/viewer.c b/examples/viewer.c
index 4fe00d2a..4967a35e 100644
--- a/examples/viewer.c
+++ b/examples/viewer.c
@@ -1177,6 +1177,18 @@ main (int argc, char **argv)
   font_description.stretch = PANGO_STRETCH_NORMAL;
 
   font = pango_context_load_font (context, &font_description, font_size);
+  if (!font)
+    {
+      g_free (font_description.family_name);
+      font_description.family_name = g_strdup ("fixed");
+      font = pango_context_load_font (context, &font_description, font_size);
+
+      if (!font)
+	{
+	  g_warning ("Can't load an initial font!\n");
+	  exit (1);
+	}
+    }
   
   /* Create the user interface
    */
diff --git a/modules/Makefile.am b/modules/Makefile.am
index f51d2bd6..718707d6 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,3 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 
-SUBDIRS=basic hangul tamil
\ No newline at end of file
+SUBDIRS=basic hangul tamil
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango
+	$(top_builddir)/libpango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so > $(DESTDIR)$(sysconfdir)/pango/pango.modules
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 11fde994..505b9dad 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -1,12 +1,14 @@
 ## Process this file with automake to create Makefile.in.
 
-noinst_LTLIBRARIES = pango-basic.la
-
-INCLUDES = -I$(top_srcdir)/libpango/
+moduledir = $(libdir)/pango/modules
+module_LTLIBRARIES = pango-basic.la
 
 pango_basic_la_SOURCES = basic.c
 pango_basic_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
 
+INCLUDES = -I$(top_srcdir)/libpango/
+
+
 EXTRA_DIST= \
 	tables-small.i \
 	tables-big.i
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index 4c39984e..6c341960 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 
-noinst_LTLIBRARIES = pango-hangul.la
+moduledir = $(libdir)/pango/modules
+module_LTLIBRARIES = pango-hangul.la
 
 INCLUDES = -I$(top_srcdir)/libpango
 
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am
index 476a14fa..c9966ef2 100644
--- a/modules/tamil/Makefile.am
+++ b/modules/tamil/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 
-noinst_LTLIBRARIES = pango-tamil.la
+moduledir = $(libdir)/pango/modules
+module_LTLIBRARIES = pango-tamil.la
 
 INCLUDES = -I$(top_srcdir)/libpango/
 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 0a2bcf6e..dd4af86b 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -2,31 +2,41 @@
 
 INCLUDES=-DSYSCONFDIR=\"$(sysconfdir)\"
 
-lib_LTLIBRARIES = libpango.la
+lib_LTLIBRARIES = libpango.la libpangox.la
 bin_PROGRAMS = pango-querymodules
 
-libpango_la_SOURCES = \
-	break.c \
-	fonts.c \
-	glyphstring.c \
-	pangox.c \
-	mapping.c \
-	modules.c \
-	modules.h \
-	pango-context.c \
+libpango_la_SOURCES = 	 \
+	break.c 	 \
+	fonts.c 	 \
+	glyphstring.c 	 \
+	mapping.c 	 \
+	modules.c 	 \
+	modules.h 	 \
+	pango-context.c  \
 	pango-coverage.c \
-	reorder-items.c \
-	shape.c \
-	utils.c \
+	reorder-items.c  \
+	shape.c 	 \
+	utils.c  	 \
 	utils.h
 
+libpangox_la_SOURCES = 	 \
+	pangox.c
+
 # We use the -release flag for now until the API settles
 # down at which point we'll either use the GTK+ versioning
 # scheme or the standard libtool scheme.
 #
 libpango_la_LDFLAGS = -release $(VERSION)
 
-include_HEADERS = pango.h pangox.h
+include_HEADERS = 	 \
+	pango.h		 \
+	pango-context.h	 \
+	pango-coverage.h \
+	pango-engine.h	 \
+	pango-font.h     \
+	pango-glyph.h	 \
+	pango-layout.h	 \
+	pangox.h	
 
 pango_querymodules_SOURCES = \
 	querymodules.c
diff --git a/pango/modules.c b/pango/modules.c
index 91dce07d..54ee1e52 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -172,21 +172,6 @@ readline(FILE *file)
     return g_strdup (bufstring->str);
 }
 
-static char *
-my_strdupn (char *p, gint n)
-{
-  gchar *result;
-  
-  if (n == 0)
-    return NULL;
-  
-  result = g_malloc (n + 1);
-  strncpy (result, p, n);
-  result[n] = '\0';
-
-  return result;
-}
-
 static void
 read_modules (void)
 {
@@ -198,12 +183,19 @@ read_modules (void)
     return;
   else
     init = TRUE;
-  
+
+  /* FIXME FIXME FIXME - this is a potential security problem from leaving
+   * pango.modules files scattered around to trojan modules.
+   */
   module_file = fopen ("pango.modules", "r");
   if (!module_file)
     {
-      fprintf(stderr, "Cannot load module file!\n");
-      return;			/* FIXME: Error */
+      module_file = fopen (SYSCONFDIR "/pango/pango.modules", "r");
+      if (!module_file)
+	{
+	  fprintf(stderr, "Cannot load module file!\n");
+	  return;			/* FIXME: Error */
+	}
     }
 
   engines = NULL;
@@ -231,16 +223,16 @@ read_modules (void)
 	      switch (i)
 		{
 		case 0:
-		  pair->module = my_strdupn (q, p-q);
+		  pair->module = g_strndup (q, p-q);
 		  break;
 		case 1:
-		  pair->info.id = my_strdupn (q, p-q);
+		  pair->info.id = g_strndup (q, p-q);
 		  break;
 		case 2:
-		  pair->info.engine_type = my_strdupn (q, p-q);
+		  pair->info.engine_type = g_strndup (q, p-q);
 		  break;
 		case 3:
-		  pair->info.render_type = my_strdupn (q, p-q);
+		  pair->info.render_type = g_strndup (q, p-q);
 		  break;
 		default:
 		  range = g_new (PangoEngineRange, 1);
@@ -258,7 +250,7 @@ read_modules (void)
 		  q++;
 		  range->start = start;
 		  range->end = end;
-		  range->langs = my_strdupn (q, p-q);
+		  range->langs = g_strndup (q, p-q);
 
 		  ranges = g_list_prepend (ranges, range);
 		}