From 38d96db577cbb5e50f45e05bd26f4af08f1cc7ca Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Wed, 3 Mar 2004 22:35:19 +0000 Subject: if PANGO_MODULE_PREFIX is defined include the basic backend shaper (should 2004-03-03 Hans Breuer * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is defined include the basic backend shaper (should have been commited at 2003-12-12, too) * pango/makefile.msc : generate correct type for PangoFontMask (bug #135892, John Ehresman) * pango/opentype/makefile.msc : updated * pango/pango.def pango/pangoft2.def : more updatd externals --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-1-10 | 12 ++++++++++++ ChangeLog.pre-1-4 | 12 ++++++++++++ ChangeLog.pre-1-6 | 12 ++++++++++++ ChangeLog.pre-1-8 | 12 ++++++++++++ pango/makefile.msc | 4 ++-- pango/module-defs-win32.c.win32 | 19 ++++++++++++++----- pango/opentype/makefile.msc | 6 ++++-- pango/pango.def | 2 ++ pango/pangoft2.def | 1 + 10 files changed, 83 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28dad9a0..041d92b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-03-03 Hans Breuer + + * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is + defined include the basic backend shaper (should have been + commited at 2003-12-12, too) + + * pango/makefile.msc : generate correct type for PangoFontMask + (bug #135892, John Ehresman) + * pango/opentype/makefile.msc : updated + + * pango/pango.def pango/pangoft2.def : more updatd externals + Wed Mar 3 16:00:10 2004 Owen Taylor * configure.in: Strip out the "export-dynamic" libtool diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 28dad9a0..041d92b4 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,15 @@ +2004-03-03 Hans Breuer + + * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is + defined include the basic backend shaper (should have been + commited at 2003-12-12, too) + + * pango/makefile.msc : generate correct type for PangoFontMask + (bug #135892, John Ehresman) + * pango/opentype/makefile.msc : updated + + * pango/pango.def pango/pangoft2.def : more updatd externals + Wed Mar 3 16:00:10 2004 Owen Taylor * configure.in: Strip out the "export-dynamic" libtool diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 28dad9a0..041d92b4 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,15 @@ +2004-03-03 Hans Breuer + + * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is + defined include the basic backend shaper (should have been + commited at 2003-12-12, too) + + * pango/makefile.msc : generate correct type for PangoFontMask + (bug #135892, John Ehresman) + * pango/opentype/makefile.msc : updated + + * pango/pango.def pango/pangoft2.def : more updatd externals + Wed Mar 3 16:00:10 2004 Owen Taylor * configure.in: Strip out the "export-dynamic" libtool diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 28dad9a0..041d92b4 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,15 @@ +2004-03-03 Hans Breuer + + * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is + defined include the basic backend shaper (should have been + commited at 2003-12-12, too) + + * pango/makefile.msc : generate correct type for PangoFontMask + (bug #135892, John Ehresman) + * pango/opentype/makefile.msc : updated + + * pango/pango.def pango/pangoft2.def : more updatd externals + Wed Mar 3 16:00:10 2004 Owen Taylor * configure.in: Strip out the "export-dynamic" libtool diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 28dad9a0..041d92b4 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,15 @@ +2004-03-03 Hans Breuer + + * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is + defined include the basic backend shaper (should have been + commited at 2003-12-12, too) + + * pango/makefile.msc : generate correct type for PangoFontMask + (bug #135892, John Ehresman) + * pango/opentype/makefile.msc : updated + + * pango/pango.def pango/pangoft2.def : more updatd externals + Wed Mar 3 16:00:10 2004 Owen Taylor * configure.in: Strip out the "export-dynamic" libtool diff --git a/pango/makefile.msc b/pango/makefile.msc index ed6726b0..136c38d4 100644 --- a/pango/makefile.msc +++ b/pango/makefile.msc @@ -203,9 +203,9 @@ pango-enum-types.c: $(pango_headers) pango-enum-types.h makefile.msc $(PERL) $(GLIB)\gobject\glib-mkenums \ --fhead "#include " \ --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const GEnumValue values[] = {" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_enum_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ $(pango_headers) > pango-enum-types.c $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS) $(PRJ_TOP)\config.h diff --git a/pango/module-defs-win32.c.win32 b/pango/module-defs-win32.c.win32 index 9aea59b9..5538dac5 100644 --- a/pango/module-defs-win32.c.win32 +++ b/pango/module-defs-win32.c.win32 @@ -4,13 +4,22 @@ #include "modules.h" +#ifdef PANGO_MODULE_PREFIX void _pango_basic_win32_script_engine_list (PangoEngineInfo **engines, - gint *n_engines); -PangoEngine *_pango_basic_win32_script_engine_load (const char *id); -void _pango_basic_win32_script_engine_unload (PangoEngine *engine); - + gint *n_engines); +void _pango_basic_win32_script_engine_init (GTypeModule *module); +void _pango_basic_win32_script_engine_exit (void); +PangoEngine *_pango_basic_win32_script_engine_create (const char *id); +#endif PangoIncludedModule _pango_included_win32_modules[] = { - { _pango_basic_win32_script_engine_list, _pango_basic_win32_script_engine_load, _pango_basic_win32_script_engine_unload }, +#ifdef PANGO_MODULE_PREFIX + { + _pango_basic_win32_script_engine_list, + _pango_basic_win32_script_engine_init, + _pango_basic_win32_script_engine_exit, + _pango_basic_win32_script_engine_create + }, +#endif { NULL, NULL, NULL }, }; diff --git a/pango/opentype/makefile.msc b/pango/opentype/makefile.msc index f30a0fa0..fedfbf35 100644 --- a/pango/opentype/makefile.msc +++ b/pango/opentype/makefile.msc @@ -1,7 +1,7 @@ TOP = ..\..\.. !INCLUDE $(TOP)\glib\build\win32\make.msc -INCLUDES = -I ..\.. $(FREETYPE2_CFLAGS) $(GLIB_CFLAGS) +INCLUDES = -I . -I ..\.. $(FREETYPE2_CFLAGS) $(GLIB_CFLAGS) DEFINES = -DPANGO_ENABLE_ENGINE OBJECTS = \ @@ -10,7 +10,9 @@ OBJECTS = \ ftxgpos.obj \ ftxgsub.obj \ ftxopen.obj \ - ottest.obj \ + otlbuffer.obj \ +# ottest.obj \ + pango-ot-buffer.obj \ pango-ot-info.obj \ pango-ot-ruleset.obj \ diff --git a/pango/pango.def b/pango/pango.def index 3c23d2c1..c67355d6 100644 --- a/pango/pango.def +++ b/pango/pango.def @@ -159,6 +159,7 @@ EXPORTS pango_item_new pango_item_split pango_itemize + pango_itemize_with_base_dir pango_language_from_string pango_language_get_sample_string pango_language_get_type @@ -168,6 +169,7 @@ EXPORTS pango_layout_copy pango_layout_get_alignment pango_layout_get_attributes + pango_layout_get_auto_dir pango_layout_get_context pango_layout_get_cursor_pos pango_layout_get_extents diff --git a/pango/pangoft2.def b/pango/pangoft2.def index 4b0c0661..313beee4 100644 --- a/pango/pangoft2.def +++ b/pango/pangoft2.def @@ -22,6 +22,7 @@ EXPORTS pango_ft2_render_layout_line pango_ft2_shutdown_display pango_ot_buffer_add_glyph + pango_ot_buffer_clear pango_ot_buffer_destroy pango_ot_buffer_get_glyphs pango_ot_buffer_new -- cgit v1.2.1