Allow '+' in the filename.

2001-01-07  Tor Lillqvist  <tml@iki.fi>

	* pango/fonts.c (pango_font_description_to_filename): Allow '+' in
	the filename.

	* pango/pangowin32.c (get_font_metrics_from_string): Adopt to new
	prototype for g_utf8_to_ucs4).

	* pango/module-defs.c.win32: Removed.

	* pango/module-defs-ft2.c.win32: New file, hand-written until GNU
	configure is used on Win32, too.

	* pango/makefile.mingw.in
	* pango/Makefile.am (EXTRA_DIST): Corresponding changes.

	* pango/pango.def: Update.

14 files changed, 141 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d8150ce..0039b2c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/fonts.c (pango_font_description_to_filename): Allow '+' in
+	the filename.
+
+	* pango/pangowin32.c (get_font_metrics_from_string): Adopt to new
+	prototype for g_utf8_to_ucs4).
+
+	* pango/module-defs.c.win32: Removed.
+
+	* pango/module-defs-ft2.c.win32: New file, hand-written until GNU
+	configure is used on Win32, too.
+
+	* pango/makefile.mingw.in
+	* pango/Makefile.am (EXTRA_DIST): Corresponding changes.
+
+	* pango/pango.def: Update.
+
 Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 3d8150ce..0039b2c1 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,21 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/fonts.c (pango_font_description_to_filename): Allow '+' in
+	the filename.
+
+	* pango/pangowin32.c (get_font_metrics_from_string): Adopt to new
+	prototype for g_utf8_to_ucs4).
+
+	* pango/module-defs.c.win32: Removed.
+
+	* pango/module-defs-ft2.c.win32: New file, hand-written until GNU
+	configure is used on Win32, too.
+
+	* pango/makefile.mingw.in
+	* pango/Makefile.am (EXTRA_DIST): Corresponding changes.
+
+	* pango/pango.def: Update.
+
 Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3d8150ce..0039b2c1 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,21 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/fonts.c (pango_font_description_to_filename): Allow '+' in
+	the filename.
+
+	* pango/pangowin32.c (get_font_metrics_from_string): Adopt to new
+	prototype for g_utf8_to_ucs4).
+
+	* pango/module-defs.c.win32: Removed.
+
+	* pango/module-defs-ft2.c.win32: New file, hand-written until GNU
+	configure is used on Win32, too.
+
+	* pango/makefile.mingw.in
+	* pango/Makefile.am (EXTRA_DIST): Corresponding changes.
+
+	* pango/pango.def: Update.
+
 Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 3d8150ce..0039b2c1 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,21 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/fonts.c (pango_font_description_to_filename): Allow '+' in
+	the filename.
+
+	* pango/pangowin32.c (get_font_metrics_from_string): Adopt to new
+	prototype for g_utf8_to_ucs4).
+
+	* pango/module-defs.c.win32: Removed.
+
+	* pango/module-defs-ft2.c.win32: New file, hand-written until GNU
+	configure is used on Win32, too.
+
+	* pango/makefile.mingw.in
+	* pango/Makefile.am (EXTRA_DIST): Corresponding changes.
+
+	* pango/pango.def: Update.
+
 Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3d8150ce..0039b2c1 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,21 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/fonts.c (pango_font_description_to_filename): Allow '+' in
+	the filename.
+
+	* pango/pangowin32.c (get_font_metrics_from_string): Adopt to new
+	prototype for g_utf8_to_ucs4).
+
+	* pango/module-defs.c.win32: Removed.
+
+	* pango/module-defs-ft2.c.win32: New file, hand-written until GNU
+	configure is used on Win32, too.
+
+	* pango/makefile.mingw.in
+	* pango/Makefile.am (EXTRA_DIST): Corresponding changes.
+
+	* pango/pango.def: Update.
+
 Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3d8150ce..0039b2c1 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,21 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/fonts.c (pango_font_description_to_filename): Allow '+' in
+	the filename.
+
+	* pango/pangowin32.c (get_font_metrics_from_string): Adopt to new
+	prototype for g_utf8_to_ucs4).
+
+	* pango/module-defs.c.win32: Removed.
+
+	* pango/module-defs-ft2.c.win32: New file, hand-written until GNU
+	configure is used on Win32, too.
+
+	* pango/makefile.mingw.in
+	* pango/Makefile.am (EXTRA_DIST): Corresponding changes.
+
+	* pango/pango.def: Update.
+
 Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3d8150ce..0039b2c1 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,21 @@
+2001-01-07  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/fonts.c (pango_font_description_to_filename): Allow '+' in
+	the filename.
+
+	* pango/pangowin32.c (get_font_metrics_from_string): Adopt to new
+	prototype for g_utf8_to_ucs4).
+
+	* pango/module-defs.c.win32: Removed.
+
+	* pango/module-defs-ft2.c.win32: New file, hand-written until GNU
+	configure is used on Win32, too.
+
+	* pango/makefile.mingw.in
+	* pango/Makefile.am (EXTRA_DIST): Corresponding changes.
+
+	* pango/pango.def: Update.
+
 Sat Jan  6 20:23:54 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/arabic/arabic-x.c (arabic_engine_shape): Adapt
diff --git a/pango/Makefile.am b/pango/Makefile.am
index aa8a40de..8fdc5350 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -155,7 +155,7 @@ endif
 EXTRA_DIST =			\
 	$(pango_built_headers)	\
 	makeenums.pl		\
-	module-defs.c.win32	\
+	module-defs-ft2.c.win32	\
 	module-defs.h	        \
 	pango.def		\
 	pangowin32.def		\
diff --git a/pango/fonts.c b/pango/fonts.c
index 379ad294..c8d58201 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -388,7 +388,7 @@ pango_font_description_to_filename (const PangoFontDescription  *desc)
   p = result;
   while (*p)
     {
-      if (strchr ("-_.", *p) == NULL && !isalnum (*p))
+      if (strchr ("-+_.", *p) == NULL && !isalnum (*p))
 	*p = '_';
       p++;
     }
diff --git a/pango/makefile.mingw.in b/pango/makefile.mingw.in
index c410fb0c..eb6da574 100644
--- a/pango/makefile.mingw.in
+++ b/pango/makefile.mingw.in
@@ -30,7 +30,6 @@ PANGO_OBJS =					\
 	glyphstring.o				\
 	mapping.o				\
 	modules.o				\
-	module-defs.o				\
 	pango-attributes.o			\
 	pango-context.o				\
 	pango-coverage.o			\
@@ -51,6 +50,7 @@ PANGOWIN32_OBJS =				\
 	pangowin32-fontmap.o
 
 PANGOFT2_OBJS =					\
+	module-defs-ft2.o			\
 	pangoft2.o				\
 	pangoft2-fontcache.o			\
 	pangoft2-fontmap.o
@@ -79,7 +79,7 @@ pango_headers=		   \
 ../config.h : ../config.h.win32
 	cp $< $@
 
-module-defs.c : module-defs.c.win32
+module-defs-ft2.c : module-defs-ft2.c.win32
 	cp $< $@
 
 pango-$(PANGO_VER).dll : $(PANGO_OBJS) pango.def
diff --git a/pango/module-defs-ft2.c.win32 b/pango/module-defs-ft2.c.win32
new file mode 100644
index 00000000..9f63d926
--- /dev/null
+++ b/pango/module-defs-ft2.c.win32
@@ -0,0 +1,9 @@
+/* Hand-written. Once the GNU configure mechanism is used
+ * on Win32, too, can be generated.
+*/
+
+#include "modules.h"
+
+PangoIncludedModule _pango_included_ft2_modules[] = {
+ { NULL, NULL, NULL },
+};
diff --git a/pango/module-defs.c.win32 b/pango/module-defs.c.win32
deleted file mode 100644
index 68cb3ead..00000000
--- a/pango/module-defs.c.win32
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Hand-written for Win32. */
-
-#include "modules.h"
-
-PangoIncludedModule _pango_included_modules[] = {
- { NULL, NULL, NULL },
-};
diff --git a/pango/pango.def b/pango/pango.def
index 7aec2c30..1828f007 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -154,6 +154,7 @@ EXPORTS
 	pango_log2vis_get_embedding_levels
 	pango_map_get_engine
 	pango_map_get_entry
+	pango_module_register
 	pango_parse_markup
 	pango_parse_style
 	pango_parse_variant
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index 5c434a7a..464fb81a 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -679,7 +679,7 @@ get_font_metrics_from_string (PangoFont        *font,
   
   n_chars = g_utf8_strlen (str, -1);
 
-  text_ucs4 = g_utf8_to_ucs4 (str, strlen (str));
+  text_ucs4 = g_utf8_to_ucs4 (str, strlen (str), NULL, NULL, NULL);
   if (!text_ucs4)
     return;