Minor spacing fixes, comment the Unicode ranges covered.

2002-09-23  Tor Lillqvist  <tml@iki.fi>

	* modules/basic/basic-win32.c: Minor spacing fixes, comment the
	Unicode ranges covered.

	* modules/basic/makefile.mingw.in: Remove. Not maintained.

	* modules/basic/Makefile.am: Remove from here, too.

	* pango/makefile.msc
	* pango/module-defs-win32.c.win32: Change according to change
	below so that build also with the manually written makefile for
	MSVC, which always uses included modules, still works.

Mon Sep 16 12:03:54  2002  Arnaud Charlet <charlet@gnat.com>

	* modules/basic/basic-win32.c: Check for correct macro, use
	correct module entry name, so that --with-included-modules works
	with autoconfiscated build for Windows. (#93372)

11 files changed, 186 insertions, 47 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d93f179..19bbf17b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2002-09-23  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/basic/basic-win32.c: Minor spacing fixes, comment the
+	Unicode ranges covered.
+
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
+
+	* modules/basic/Makefile.am: Remove from here, too.
+
+	* pango/makefile.msc
+	* pango/module-defs-win32.c.win32: Change according to change
+	below so that build also with the manually written makefile for
+	MSVC, which always uses included modules, still works.
+
+Mon Sep 16 12:03:54  2002  Arnaud Charlet <charlet@gnat.com>
+
+	* modules/basic/basic-win32.c: Check for correct macro, use
+	correct module entry name, so that --with-included-modules works
+	with autoconfiscated build for Windows. (#93372)
+
 2002-09-21  Tor Lillqvist  <tml@iki.fi>
 
 	* pango-zip.sh.in: Distribute specifically pango.aliases and
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 6d93f179..19bbf17b 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,23 @@
+2002-09-23  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/basic/basic-win32.c: Minor spacing fixes, comment the
+	Unicode ranges covered.
+
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
+
+	* modules/basic/Makefile.am: Remove from here, too.
+
+	* pango/makefile.msc
+	* pango/module-defs-win32.c.win32: Change according to change
+	below so that build also with the manually written makefile for
+	MSVC, which always uses included modules, still works.
+
+Mon Sep 16 12:03:54  2002  Arnaud Charlet <charlet@gnat.com>
+
+	* modules/basic/basic-win32.c: Check for correct macro, use
+	correct module entry name, so that --with-included-modules works
+	with autoconfiscated build for Windows. (#93372)
+
 2002-09-21  Tor Lillqvist  <tml@iki.fi>
 
 	* pango-zip.sh.in: Distribute specifically pango.aliases and
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 6d93f179..19bbf17b 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,23 @@
+2002-09-23  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/basic/basic-win32.c: Minor spacing fixes, comment the
+	Unicode ranges covered.
+
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
+
+	* modules/basic/Makefile.am: Remove from here, too.
+
+	* pango/makefile.msc
+	* pango/module-defs-win32.c.win32: Change according to change
+	below so that build also with the manually written makefile for
+	MSVC, which always uses included modules, still works.
+
+Mon Sep 16 12:03:54  2002  Arnaud Charlet <charlet@gnat.com>
+
+	* modules/basic/basic-win32.c: Check for correct macro, use
+	correct module entry name, so that --with-included-modules works
+	with autoconfiscated build for Windows. (#93372)
+
 2002-09-21  Tor Lillqvist  <tml@iki.fi>
 
 	* pango-zip.sh.in: Distribute specifically pango.aliases and
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 6d93f179..19bbf17b 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,23 @@
+2002-09-23  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/basic/basic-win32.c: Minor spacing fixes, comment the
+	Unicode ranges covered.
+
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
+
+	* modules/basic/Makefile.am: Remove from here, too.
+
+	* pango/makefile.msc
+	* pango/module-defs-win32.c.win32: Change according to change
+	below so that build also with the manually written makefile for
+	MSVC, which always uses included modules, still works.
+
+Mon Sep 16 12:03:54  2002  Arnaud Charlet <charlet@gnat.com>
+
+	* modules/basic/basic-win32.c: Check for correct macro, use
+	correct module entry name, so that --with-included-modules works
+	with autoconfiscated build for Windows. (#93372)
+
 2002-09-21  Tor Lillqvist  <tml@iki.fi>
 
 	* pango-zip.sh.in: Distribute specifically pango.aliases and
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 6d93f179..19bbf17b 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,23 @@
+2002-09-23  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/basic/basic-win32.c: Minor spacing fixes, comment the
+	Unicode ranges covered.
+
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
+
+	* modules/basic/Makefile.am: Remove from here, too.
+
+	* pango/makefile.msc
+	* pango/module-defs-win32.c.win32: Change according to change
+	below so that build also with the manually written makefile for
+	MSVC, which always uses included modules, still works.
+
+Mon Sep 16 12:03:54  2002  Arnaud Charlet <charlet@gnat.com>
+
+	* modules/basic/basic-win32.c: Check for correct macro, use
+	correct module entry name, so that --with-included-modules works
+	with autoconfiscated build for Windows. (#93372)
+
 2002-09-21  Tor Lillqvist  <tml@iki.fi>
 
 	* pango-zip.sh.in: Distribute specifically pango.aliases and
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 6d93f179..19bbf17b 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,23 @@
+2002-09-23  Tor Lillqvist  <tml@iki.fi>
+
+	* modules/basic/basic-win32.c: Minor spacing fixes, comment the
+	Unicode ranges covered.
+
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
+
+	* modules/basic/Makefile.am: Remove from here, too.
+
+	* pango/makefile.msc
+	* pango/module-defs-win32.c.win32: Change according to change
+	below so that build also with the manually written makefile for
+	MSVC, which always uses included modules, still works.
+
+Mon Sep 16 12:03:54  2002  Arnaud Charlet <charlet@gnat.com>
+
+	* modules/basic/basic-win32.c: Check for correct macro, use
+	correct module entry name, so that --with-included-modules works
+	with autoconfiscated build for Windows. (#93372)
+
 2002-09-21  Tor Lillqvist  <tml@iki.fi>
 
 	* pango-zip.sh.in: Distribute specifically pango.aliases and
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index c22cadca..a3d5aada 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -117,9 +117,7 @@ libpango_basic_win32_la_SOURCES = basic-win32.c
 EXTRA_DIST =		\
 	basic-common.h	\
 	tables-big.i	\
-	tables-small.i	\
-	makefile.mingw	\
-	makefile.mingw.in
+	tables-small.i
 
 included-modules: $(noinst_LTLIBRARIES)
 
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index b5c61f6a..b278717b 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -30,19 +30,71 @@
 #define SCRIPT_ENGINE_NAME "BasicScriptEngineWin32"
 
 static PangoEngineRange basic_ranges[] = {
-  /* Language characters */
-  { 0x0000, 0x02af, "*" },
+  /* Basic Latin, Latin-1 Supplement, Latin Extended-A, Latin Extended-B,
+   * IPA Extensions
+   */
+  { 0x0020, 0x02af, "*" },
+
+  /* Spacing Modifier Letters */
   { 0x02b0, 0x02ff, "" },
+
+  /* Not covered: Combining Diacritical Marks */
+
+  /* Greek, Cyrillic, Armenian */
   { 0x0380, 0x058f, "*" },
-  { 0x0591, 0x05f4, "*" }, /* Hebrew */
-  { 0x060c, 0x06f9, "" }, /* Arabic */
-  { 0x0e01, 0x0e5b, "" },  /* Thai */
-  { 0x10a0, 0x10ff, "*" }, /* Georgian */
-  { 0x1200, 0x16ff, "*" }, /* Ethiopic,Cherokee,Canadian,Ogham,Runic */
+
+  /* Hebrew */
+  { 0x0591, 0x05f4, "*" },
+
+  /* Arabic */
+  { 0x060c, 0x06f9, "" },
+
+  /* Not covered: Syriac, Thaana, Devanagari, Bengali, Gurmukhi, Gujarati,
+   * Oriya, Tamil, Telugu, Kannada, Malayalam, Sinhala
+   */
+
+  /* Thai */
+  { 0x0e01, 0x0e5b, "" },
+
+  /* Not covered: Lao, Tibetan, Myanmar, Georgian, Hangul Jamo, Ethiopic,
+   * Cherokee, Unified Canadian Aboriginal Syllabics, Ogham, Runic,
+   * Khmer, Mongolian
+   */
+
+  /* Latin Extended Additional, Greek Extended */
   { 0x1e00, 0x1fff, "*" },
+
+  /* General Punctuation, Superscripts and Subscripts, Currency Symbols,
+   * Combining Marks for Symbols, Letterlike Symbols, Number Forms,
+   * Arrows, Mathematical Operators, Miscellaneous Technical,
+   * Control Pictures, Optical Character Recognition, Enclosed Alphanumerics,
+   * Box Drawing, Block Elements, Geometric Shapes, Miscellaneous Symbols,
+   * Dingbats, Braille Patterns, CJK Radicals Supplement, Kangxi Radicals,
+   * Ideographic Description Characters, CJK Symbols and Punctuation,
+   * Hiragana, Katakana, Bopomofo, Hangul Compatibility Jamo, Kanbun,
+   * Bopomofo Extended, Enclosed CJK Letters and Months, CJK Compatibility,
+   * CJK Unified Ideographs Extension A, CJK Unified Ideographs
+   */
   { 0x2000, 0x9fff, "*" },
+
+  /* Not covered: Yi Syllables, Yi Radicals */
+
+  /* Hangul Syllables */
   { 0xac00, 0xd7a3, "kr" },
+
+  /* Not covered: Private Use */
+
+  /* CJK Compatibility Ideographs (partly) */
   { 0xf900, 0xfa0b, "kr" },
+
+  /* Not covered: CJK Compatibility Ideographs (partly),
+   * Alphabetic Presentation Forms, Arabic Presentation Forms-A,
+   * Combining Half Marks, CJK Compatibility Forms,
+   * Small Form Variants, Arabic Presentation Forms-B,
+   * Specials
+   */
+
+  /* Halfwidth and Fullwidth Forms (partly) */
   { 0xff00, 0xffe3, "*" }
 };
 
@@ -65,7 +117,7 @@ static PangoGlyph
 find_char (PangoFont *font,
 	   gunichar   wc)
 {
-  return  pango_win32_font_get_glyph_index (font, wc);
+  return pango_win32_font_get_glyph_index (font, wc);
 }
 
 static void
@@ -208,7 +260,7 @@ basic_engine_shape (PangoFont        *font,
 }
 
 static PangoCoverage *
-basic_engine_get_coverage (PangoFont  *font,
+basic_engine_get_coverage (PangoFont     *font,
 			   PangoLanguage *lang)
 {
   return pango_font_get_coverage (font, lang);
@@ -233,8 +285,8 @@ basic_engine_win32_new (void)
 /* The following three functions provide the public module API for
  * Pango
  */
-#ifdef MODULE_PREFIX
-#define MODULE_ENTRY(func) _pango_basic_##func
+#ifdef WIN32_MODULE_PREFIX
+#define MODULE_ENTRY(func) _pango_basic_win32_##func
 #else
 #define MODULE_ENTRY(func) func
 #endif
diff --git a/modules/basic/makefile.mingw.in b/modules/basic/makefile.mingw.in
deleted file mode 100644
index 64cb1a51..00000000
--- a/modules/basic/makefile.mingw.in
+++ /dev/null
@@ -1,31 +0,0 @@
-TOP = ../../..
-
-include $(TOP)/build/win32/make.mingw
-
-# Possibly override Pango version from build/win32/module.defs
-PANGO_VER = @VERSION@
-
-OPTIMIZE = -g -Wall
-
-INCLUDES = -I ../../pango -I ../..
-DEFINES = 
-DEPCFLAGS = $(GLIB_CFLAGS) $(FRIBIDI_CFLAGS) $(FREETYPE2_CFLAGS)
-
-all : \
-	../../config.h \
-	pango-basic-win32.dll \
-	pango-basic-ft2.dll
-
-../../config.h : ../../config.h.win32
-	cp $< $@
-
-pango-basic-win32.dll : basic-win32.o
-	$(GLIB)/build-dll pango-basic-win32 - ../module.def $< -L ../../pango -lpango-$(PANGO_VER) -lpangowin32-$(PANGO_VER) $(GLIB_LIBS) $(FRIBIDI_LIBS)
-
-pango-basic-ft2.dll : basic-ft2.o
-	$(GLIB)/build-dll pango-basic-ft2 - ../module.def $< -L ../../pango -lpango-$(PANGO_VER) -lpangoft2-$(PANGO_VER) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(FREETYPE2_LIBS)
-
-# Hack to get an updated makefile.mingw automatically after updating
-# makefile.mingw.in. Only for developer use.
-makefile.mingw: makefile.mingw.in
-	sed -e 's,@VER[S]ION@,@VERSION@,' <$< >$@
diff --git a/pango/makefile.msc b/pango/makefile.msc
index 75dc6641..3ee3a239 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -101,7 +101,7 @@ OBJECTS = \
 !ENDIF
 
 basic-win32.obj : ..\modules\basic\basic-win32.c
-	$(CC) $(PKG_CFLAGS) -GD -DMODULE_PREFIX -c ..\modules\basic\basic-win32.c
+	$(CC) $(PKG_CFLAGS) -GD -DWIN32_MODULE_PREFIX -c ..\modules\basic\basic-win32.c
 
 basic-ft2.obj : ..\modules\basic\basic-ft2.c
 	$(CC) $(PKG_CFLAGS) -GD -DFT2_MODULE_PREFIX -c ..\modules\basic\basic-ft2.c
diff --git a/pango/module-defs-win32.c.win32 b/pango/module-defs-win32.c.win32
index e0b0cfd4..e9a7f406 100644
--- a/pango/module-defs-win32.c.win32
+++ b/pango/module-defs-win32.c.win32
@@ -11,6 +11,6 @@ void         _pango_basic_script_engine_unload (PangoEngine      *engine);
 
 
 PangoIncludedModule _pango_included_win32_modules[] = {
- { _pango_basic_script_engine_list,  _pango_basic_script_engine_load,  _pango_basic_script_engine_unload },
+ { _pango_basic_win32_script_engine_list,  _pango_basic_win32_script_engine_load,  _pango_basic_win32_script_engine_unload },
  { NULL, NULL, NULL },
 };