diff options
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | ChangeLog.pre-1-0 | 17 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 17 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 17 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 17 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 17 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 17 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | modules/devanagari/dev-ligatures.h | 34 | ||||
-rw-r--r-- | pango-config.in | 4 | ||||
-rw-r--r-- | pango/break.c | 4 | ||||
-rw-r--r-- | pango/pango-fontmap.c | 4 | ||||
-rw-r--r-- | pango/pango-utils.c | 1 |
13 files changed, 148 insertions, 24 deletions
@@ -1,5 +1,22 @@ 2000-07-19 Tor Lillqvist <tml@iki.fi> + * configure.in: Don't try to use the ! command, not available in all + systems. Move the ! inside the test instead. + + * pango-config.in: Change order of --cflags output, so that we can + build with both GLib 1.2 and 1.3 installed. + + * modules/devanagari/dev-ligatures.h: No C++ comments, thanks. + + * pango/break.c: Fix gccism, non-constant initailiser. + + * pango/pango-fontmap.c (pango_font_map_list_fonts, + pango_font_map_list_families): Don't return value from void + functions. + + * pango/pango-utils.c: Must have at least empty statement after + a label. + * examples/pangowin32.aliases: Add Tahoma and Angsana New, these common fonts have Thai characters. diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index eb5ef410..b3ec245d 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,5 +1,22 @@ 2000-07-19 Tor Lillqvist <tml@iki.fi> + * configure.in: Don't try to use the ! command, not available in all + systems. Move the ! inside the test instead. + + * pango-config.in: Change order of --cflags output, so that we can + build with both GLib 1.2 and 1.3 installed. + + * modules/devanagari/dev-ligatures.h: No C++ comments, thanks. + + * pango/break.c: Fix gccism, non-constant initailiser. + + * pango/pango-fontmap.c (pango_font_map_list_fonts, + pango_font_map_list_families): Don't return value from void + functions. + + * pango/pango-utils.c: Must have at least empty statement after + a label. + * examples/pangowin32.aliases: Add Tahoma and Angsana New, these common fonts have Thai characters. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index eb5ef410..b3ec245d 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,22 @@ 2000-07-19 Tor Lillqvist <tml@iki.fi> + * configure.in: Don't try to use the ! command, not available in all + systems. Move the ! inside the test instead. + + * pango-config.in: Change order of --cflags output, so that we can + build with both GLib 1.2 and 1.3 installed. + + * modules/devanagari/dev-ligatures.h: No C++ comments, thanks. + + * pango/break.c: Fix gccism, non-constant initailiser. + + * pango/pango-fontmap.c (pango_font_map_list_fonts, + pango_font_map_list_families): Don't return value from void + functions. + + * pango/pango-utils.c: Must have at least empty statement after + a label. + * examples/pangowin32.aliases: Add Tahoma and Angsana New, these common fonts have Thai characters. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index eb5ef410..b3ec245d 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,5 +1,22 @@ 2000-07-19 Tor Lillqvist <tml@iki.fi> + * configure.in: Don't try to use the ! command, not available in all + systems. Move the ! inside the test instead. + + * pango-config.in: Change order of --cflags output, so that we can + build with both GLib 1.2 and 1.3 installed. + + * modules/devanagari/dev-ligatures.h: No C++ comments, thanks. + + * pango/break.c: Fix gccism, non-constant initailiser. + + * pango/pango-fontmap.c (pango_font_map_list_fonts, + pango_font_map_list_families): Don't return value from void + functions. + + * pango/pango-utils.c: Must have at least empty statement after + a label. + * examples/pangowin32.aliases: Add Tahoma and Angsana New, these common fonts have Thai characters. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index eb5ef410..b3ec245d 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,5 +1,22 @@ 2000-07-19 Tor Lillqvist <tml@iki.fi> + * configure.in: Don't try to use the ! command, not available in all + systems. Move the ! inside the test instead. + + * pango-config.in: Change order of --cflags output, so that we can + build with both GLib 1.2 and 1.3 installed. + + * modules/devanagari/dev-ligatures.h: No C++ comments, thanks. + + * pango/break.c: Fix gccism, non-constant initailiser. + + * pango/pango-fontmap.c (pango_font_map_list_fonts, + pango_font_map_list_families): Don't return value from void + functions. + + * pango/pango-utils.c: Must have at least empty statement after + a label. + * examples/pangowin32.aliases: Add Tahoma and Angsana New, these common fonts have Thai characters. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index eb5ef410..b3ec245d 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,5 +1,22 @@ 2000-07-19 Tor Lillqvist <tml@iki.fi> + * configure.in: Don't try to use the ! command, not available in all + systems. Move the ! inside the test instead. + + * pango-config.in: Change order of --cflags output, so that we can + build with both GLib 1.2 and 1.3 installed. + + * modules/devanagari/dev-ligatures.h: No C++ comments, thanks. + + * pango/break.c: Fix gccism, non-constant initailiser. + + * pango/pango-fontmap.c (pango_font_map_list_fonts, + pango_font_map_list_families): Don't return value from void + functions. + + * pango/pango-utils.c: Must have at least empty statement after + a label. + * examples/pangowin32.aliases: Add Tahoma and Angsana New, these common fonts have Thai characters. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index eb5ef410..b3ec245d 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,5 +1,22 @@ 2000-07-19 Tor Lillqvist <tml@iki.fi> + * configure.in: Don't try to use the ! command, not available in all + systems. Move the ! inside the test instead. + + * pango-config.in: Change order of --cflags output, so that we can + build with both GLib 1.2 and 1.3 installed. + + * modules/devanagari/dev-ligatures.h: No C++ comments, thanks. + + * pango/break.c: Fix gccism, non-constant initailiser. + + * pango/pango-fontmap.c (pango_font_map_list_fonts, + pango_font_map_list_families): Don't return value from void + functions. + + * pango/pango-utils.c: Must have at least empty statement after + a label. + * examples/pangowin32.aliases: Add Tahoma and Angsana New, these common fonts have Thai characters. diff --git a/configure.in b/configure.in index c32cca2a..a9af7389 100644 --- a/configure.in +++ b/configure.in @@ -60,7 +60,7 @@ AC_ARG_WITH(libiconv, [ --with-libiconv Use the libiconv library ],,with_lib found_iconv=no -if ! test "x$with_libiconv" = "xyes" ; then +if test "x$with_libiconv" != "xyes" ; then # # Check in the C library # @@ -92,7 +92,7 @@ AC_SUBST(UNICODE_LIBS) AC_ARG_WITH(included_modules, [ --with-included-modules=MODULE1,MODULE2,... Build the given modules into Pango]) included_modules="" -if ! test "x$with_included_modules" = xno || test "x$with_included_modules" = x ; then +if test "x$with_included_modules" != xno || test "x$with_included_modules" = x ; then # If no modules specified, include all modules if test "x$with_included_modules" = xyes ; then @@ -143,7 +143,7 @@ if test "x$with_qt" = xyes ; then done else - if ! test "x$with_qt" = xno ; then + if test "x$with_qt" != xno ; then if test -x $with_qt/bin/moc ; then QTDIR=$with_qt fi diff --git a/modules/devanagari/dev-ligatures.h b/modules/devanagari/dev-ligatures.h index c890c74d..fff44ba7 100644 --- a/modules/devanagari/dev-ligatures.h +++ b/modules/devanagari/dev-ligatures.h @@ -21,29 +21,29 @@ { 0xE940, { 0x0915, VIRAMA, 0x0915 } }, { 0xE941, { 0x0915, VIRAMA, 0x0924 } }, -{ 0xE942, { 0x0919, VIRAMA, 0x0915 } }, // ! -{ 0xE943, { 0x0919, VIRAMA, 0x0916 } }, // ! -{ 0xE944, { 0x0919, VIRAMA, 0x0917 } }, // ! -{ 0xE945, { 0x0919, VIRAMA, 0x0918 } }, // ! -{ 0xE946, { 0x091e, VIRAMA, 0x091e } }, // ! +{ 0xE942, { 0x0919, VIRAMA, 0x0915 } }, /* ! */ +{ 0xE943, { 0x0919, VIRAMA, 0x0916 } }, /* ! */ +{ 0xE944, { 0x0919, VIRAMA, 0x0917 } }, /* ! */ +{ 0xE945, { 0x0919, VIRAMA, 0x0918 } }, /* ! */ +{ 0xE946, { 0x091e, VIRAMA, 0x091e } }, /* ! */ { 0xE947, { 0x0926, VIRAMA, 0x0918 } }, -{ 0xE948, { 0x0926, VIRAMA, 0x0926 } }, // ! +{ 0xE948, { 0x0926, VIRAMA, 0x0926 } }, /* ! */ { 0xE949, { 0x0926, VIRAMA, 0x0927 } }, -{ 0xE94A, { 0x0926, VIRAMA, 0x0937 } }, // ! -{ 0xE94B, { 0x0926, VIRAMA, 0x092D } }, // ! -{ 0xE94C, { 0x0926, VIRAMA, 0x092E } }, // ! +{ 0xE94A, { 0x0926, VIRAMA, 0x0937 } }, /* ! */ +{ 0xE94B, { 0x0926, VIRAMA, 0x092D } }, /* ! */ +{ 0xE94C, { 0x0926, VIRAMA, 0x092E } }, /* ! */ { 0xE94D, { 0x0926, VIRAMA, 0x092F } }, { 0xE94E, { 0x0926, VIRAMA, 0x0935 } }, { 0xE94F, { 0x091F, VIRAMA, 0x091F } }, { 0xE950, { 0x091F, VIRAMA, 0x0920 } }, -{ 0xE951, { 0x0920, VIRAMA, 0x0920 } }, // ! +{ 0xE951, { 0x0920, VIRAMA, 0x0920 } }, /* ! */ { 0xE952, { 0x0921, VIRAMA, 0x0917 } }, -{ 0xE953, { 0x0921, VIRAMA, 0x0921 } }, // ! -{ 0xE954, { 0x0921, VIRAMA, 0x0922 } }, // ! +{ 0xE953, { 0x0921, VIRAMA, 0x0921 } }, /* ! */ +{ 0xE954, { 0x0921, VIRAMA, 0x0922 } }, /* ! */ { 0xE955, { 0x0928, VIRAMA, 0x0928 } }, -{ 0xE956, { 0x0939, VIRAMA, 0x092e } }, // ! -{ 0xE957, { 0x0939, VIRAMA, 0x092f } }, // ! -{ 0xE958, { 0x0939, VIRAMA, 0x0932 } }, // ! -{ 0xE959, { 0x0939, VIRAMA, 0x0935 } }, // ! -// { 0xE95a, { 0x0939, VIRAMA, 0x0e903 } }, // ! +{ 0xE956, { 0x0939, VIRAMA, 0x092e } }, /* ! */ +{ 0xE957, { 0x0939, VIRAMA, 0x092f } }, /* ! */ +{ 0xE958, { 0x0939, VIRAMA, 0x0932 } }, /* ! */ +{ 0xE959, { 0x0939, VIRAMA, 0x0935 } }, /* ! */ +/* { 0xE95a, { 0x0939, VIRAMA, 0x0e903 } }, ! */ diff --git a/pango-config.in b/pango-config.in index d0c88437..83a8cc1f 100644 --- a/pango-config.in +++ b/pango-config.in @@ -83,7 +83,9 @@ if test "$echo_exec_prefix" = "yes"; then fi if test "$echo_cflags" = "yes"; then cflags="@UNICODE_CFLAGS@ @GLIB_CFLAGS@" - echo $includes $cflags + # Put $cflags first, in case $includes contains a + # location with GLib 1.2 headers, but we build with GLib 2.0. + echo $cflags $includes fi if test "$echo_libs" = "yes"; then libs="-lpango @FRIBIDI_LIBS@ @UNICODE_LIBS@ @GLIB_LIBS@" diff --git a/pango/break.c b/pango/break.c index 0f9d3dfe..3dc0465b 100644 --- a/pango/break.c +++ b/pango/break.c @@ -86,7 +86,9 @@ pango_get_log_attrs (const char *text, int chars_in_range; static guint engine_type_id = 0; static guint render_type_id = 0; - PangoAnalysis analysis = { NULL, NULL, NULL, (guint8)level }; + PangoAnalysis analysis = { NULL, NULL, NULL, 0 }; + + analysis.level = level; g_return_if_fail (length == 0 || text != NULL); g_return_if_fail (log_attrs != NULL); diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c index 58a9eee7..96d7bd0d 100644 --- a/pango/pango-fontmap.c +++ b/pango/pango-fontmap.c @@ -87,7 +87,7 @@ pango_font_map_list_fonts (PangoFontMap *fontmap, { g_return_if_fail (fontmap != NULL); - return PANGO_FONT_MAP_GET_CLASS (fontmap)->list_fonts (fontmap, family, descs, n_descs); + PANGO_FONT_MAP_GET_CLASS (fontmap)->list_fonts (fontmap, family, descs, n_descs); } /** @@ -106,7 +106,7 @@ pango_font_map_list_families (PangoFontMap *fontmap, { g_return_if_fail (fontmap != NULL); - return PANGO_FONT_MAP_GET_CLASS (fontmap)->list_families (fontmap, families, n_families); + PANGO_FONT_MAP_GET_CLASS (fontmap)->list_families (fontmap, families, n_families); } /** diff --git a/pango/pango-utils.c b/pango/pango-utils.c index f54bd340..717d7728 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -362,6 +362,7 @@ pango_scan_string (const char **pos, GString *out) p++; } done: + ; } else { |