diff -Nru pango1.0-1.29.5/aclocal.m4 pango1.0-1.30.0/aclocal.m4 --- pango1.0-1.29.5/aclocal.m4 2011-11-22 19:07:52.000000000 +0000 +++ pango1.0-1.30.0/aclocal.m4 2012-03-27 01:38:48.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,12 +20,15 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -34,7 +38,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,19 +54,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -144,14 +150,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -191,6 +197,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -255,7 +262,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -320,10 +327,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -557,12 +567,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -694,12 +707,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -722,13 +738,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -736,13 +753,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -818,13 +835,13 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # AM_SILENT_RULES([DEFAULT]) # -------------------------- @@ -839,18 +856,50 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using `$V' instead of `$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -873,13 +922,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -888,13 +937,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -916,10 +965,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -991,8 +1041,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -1001,8 +1051,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -1136,6 +1186,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -1621,7 +1673,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1785,6 +1837,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1806,6 +1859,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1836,6 +1912,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1938,7 +2018,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1946,6 +2032,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1957,6 +2044,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1974,7 +2062,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -2019,8 +2109,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -2031,6 +2121,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -2314,14 +2406,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -2398,13 +2503,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2584,6 +2689,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -2623,7 +2733,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -3169,7 +3279,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -3178,7 +3288,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -3243,7 +3353,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -3382,7 +3492,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -3390,10 +3500,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -3401,7 +3507,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3419,7 +3525,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3439,17 +3545,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -3510,7 +3617,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -3526,7 +3633,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3563,9 +3670,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3632,7 +3739,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3701,7 +3808,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3726,7 +3833,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3750,7 +3857,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -3781,7 +3888,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3791,7 +3898,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -4213,7 +4320,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4633,6 +4740,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -5217,7 +5325,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -5309,18 +5419,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -5480,7 +5605,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -5505,7 +5632,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5756,8 +5882,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -6052,6 +6177,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -6098,10 +6224,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -6114,7 +6236,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -6153,7 +6275,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -6595,9 +6716,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -6751,7 +6869,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -7121,7 +7238,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -7882,12 +7999,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -8084,7 +8207,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -8217,7 +8339,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -8400,6 +8521,73 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -8469,6 +8657,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -9133,9 +9328,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -9307,15 +9517,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru pango1.0-1.29.5/build/Makefile.in pango1.0-1.30.0/build/Makefile.in --- pango1.0-1.29.5/build/Makefile.in 2011-11-22 19:07:56.000000000 +0000 +++ pango1.0-1.30.0/build/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -44,11 +44,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -526,10 +526,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/build/win32/Makefile.in pango1.0-1.30.0/build/win32/Makefile.in --- pango1.0-1.29.5/build/win32/Makefile.in 2011-11-22 19:07:57.000000000 +0000 +++ pango1.0-1.30.0/build/win32/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -44,11 +44,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -527,10 +527,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/build/win32/vs10/Makefile.in pango1.0-1.30.0/build/win32/vs10/Makefile.in --- pango1.0-1.29.5/build/win32/vs10/Makefile.in 2011-11-22 19:07:57.000000000 +0000 +++ pango1.0-1.30.0/build/win32/vs10/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -44,11 +44,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -352,10 +352,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/build/win32/vs10/pango.props pango1.0-1.30.0/build/win32/vs10/pango.props --- pango1.0-1.29.5/build/win32/vs10/pango.props 2011-11-22 18:59:54.000000000 +0000 +++ pango1.0-1.30.0/build/win32/vs10/pango.props 2012-03-27 00:33:41.000000000 +0000 @@ -6,7 +6,7 @@ /dummy G_LOG_DOMAIN="Pango";PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR="$(PangoDummyPrefix)/etc";LIBDIR="$(PangoDummyPrefix)/lib" PANGO_VISUALC_NO_FC - ..\..\..\..\..\vs10\$(Platform) + ..\..\..\..\vs10\$(Platform) $(GlibEtcInstallRoot) echo on diff -Nru pango1.0-1.29.5/build/win32/vs9/Makefile.in pango1.0-1.30.0/build/win32/vs9/Makefile.in --- pango1.0-1.29.5/build/win32/vs9/Makefile.in 2011-11-22 19:07:57.000000000 +0000 +++ pango1.0-1.30.0/build/win32/vs9/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -44,11 +44,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -342,10 +342,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/build/win32/vs9/pango.vsprops pango1.0-1.30.0/build/win32/vs9/pango.vsprops --- pango1.0-1.29.5/build/win32/vs9/pango.vsprops 2011-11-22 18:59:54.000000000 +0000 +++ pango1.0-1.30.0/build/win32/vs9/pango.vsprops 2012-03-27 00:33:41.000000000 +0000 @@ -153,6 +153,6 @@ /> diff -Nru pango1.0-1.29.5/ChangeLog pango1.0-1.30.0/ChangeLog --- pango1.0-1.29.5/ChangeLog 2011-11-22 20:29:30.000000000 +0000 +++ pango1.0-1.30.0/ChangeLog 2012-03-27 01:41:04.000000000 +0000 @@ -1,3 +1,182 @@ +commit 020aeadc1a41bea3fa95dfd7ddace50d97b9f78c +Author: Matthias Clasen +Date: Mon Mar 26 21:28:57 2012 -0400 + + 1.30.0 + + NEWS | 10 ++++++++++ + configure.in | 4 ++-- + 2 files changed, 12 insertions(+), 2 deletions(-) + +commit 4ed7cd1a9e61f969bcdb616a5ba9a1290b7e43b4 +Author: Kristian Rietveld +Date: Sun Mar 18 10:40:50 2012 +0100 + + Guard for an accumulated glyph count of zero in CoreText shape engine + + modules/basic/basic-coretext.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit ded299c755fd472bc0eb19789a1f40ab4d61a098 +Author: Behdad Esfahbod +Date: Sat Mar 17 15:27:26 2012 -0400 + + Make relative paths work in pango.modules files + + Part of Bug 454017 - Make relative paths in pango.modules and pangorc + files work relative to the file + + Patch from Anselm Kruis. + + pango/modules.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 8206a1c0eccba741423ba67c94cb18faf6fd7daf +Author: Chun-wei Fan +Date: Thu Mar 15 16:43:45 2012 +0800 + + Fix "install" paths in VS property sheets + + build/win32/vs10/pango.props | 2 +- + build/win32/vs9/pango.vsprops | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9df28e2e0a2ce5580beb317b9ff7fce6322da25a +Author: Kristian Rietveld +Date: Sun Feb 19 21:03:23 2012 +0100 + + Make CoreText shaping engine more robust + + This commit makes the CoreText shaping engine much more robust against + the output from the CoreText typesetter. Refer to the source code + comments for exhaustive details. + + Furthermore, this patch fixing cursor navigation in strings with + zero-width spaces. + + modules/basic/basic-coretext.c | 417 + ++++++++++++++++++++++++++++++++-------- + 1 file changed, 338 insertions(+), 79 deletions(-) + +commit 38ada127bfb53911ecd64ced26fd23ec67138b43 +Author: Kristian Rietveld +Date: Sat Jan 28 10:34:52 2012 +0100 + + Make CoreText backend more robust against broken fonts + + Patch written in collaboration with Michael Natterer. + + Some CTFontDescriptors apparently do not have a style name or font + family name set. This patch makes the code take such corner cases into + account. The font family problem only appears to occur on Snow Leopard + systems, we try to fall back on the font name (postscript name), + if that + fails, we fall back on a default fallback. + + In some cases a coverage is also not set. (This seems to happen + when we + cannot map a broken font back to a correct font descriptor). In such + cases we simply return an empty PangoCoverage, which will likely cause + the engine to fallback on a different font. + + pango/pangocoretext-fontmap.c | 71 + ++++++++++++++++++++++++++++++++++------- + pango/pangocoretext.c | 4 +++ + 2 files changed, 64 insertions(+), 11 deletions(-) + +commit 37e74619215ede8a4fa7f5edabab14b517e673b2 +Author: Kristian Rietveld +Date: Fri Oct 14 11:25:21 2011 +0200 + + CoreText backend: implement font fallbacks + + We implement font fallbacks by making use of + CTFontCopyDefaultCascadeList, a public, non-exposed, symbol in the + CoreText library. We might want to handle this differently. + + The code now also uses a PangoCoreTextFontsetKey and + PangoCoreTextFontKey, similar to the font config backend. This + has also + helped to clean up the code in general. + + This patch contains two fixes by Michael Natterer: + 1. Fix a bug in pango_core_text_font_key_equal() where the return + value + of memcmp() was wrongly interpreted. + 2. Cache PangoCoverage in PangoCoreTextFont. + + pango/pangocairo-coretext.h | 4 +- + pango/pangocairo-coretextfont.c | 50 +- + pango/pangocairo-coretextfontmap.c | 72 +- + pango/pangocoretext-fontmap.c | 1308 + ++++++++++++++++++++++++++---------- + pango/pangocoretext-private.h | 31 +- + pango/pangocoretext.c | 94 ++- + 6 files changed, 1131 insertions(+), 428 deletions(-) + +commit 2edc014f3c244be31deab6e584db54f87d223965 +Author: Behdad Esfahbod +Date: Wed Jan 25 13:05:02 2012 -0500 + + Update git.mk. git.mk lives in its own upstream repo now. + + git.mk | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +commit dbf40154eb5804f4e8c582f12b30b8291c9c3532 +Author: Kristian Rietveld +Date: Sat Nov 26 17:27:43 2011 +0100 + + Bug 664125 - Zero-width spaces cause missing characters + + This is fixed by using the characters obtained from CoreText's + mapping from + glyphs back to the original string instead of blindly iterating + over the + original gchar string. Take notice that we have to convert these + indices + from the mapping back to a byte index in the original UTF8 string. + + Zero-width spaces are already removed from the list of CGGlyphs, + so we were + mismatching CGGlyphs and characters from the original string. Using + CoreText's list of string indices instead eliminates the mismatches. + + modules/basic/basic-coretext.c | 80 + +++++++++++++++++++--------------------- + 1 file changed, 37 insertions(+), 43 deletions(-) + +commit 92c58b4372833db6974da73b75d457177f402bb6 +Author: Dan Winship +Date: Thu Jan 12 13:22:10 2012 -0500 + + Fix cross-compiling bug in configure.in + + https://bugzilla.gnome.org/show_bug.cgi?id=667799 + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b7eeb5abdd188624ad473628f180c4126adfa298 +Author: Chun-wei Fan +Date: Fri Dec 30 15:44:54 2011 +0800 + + config.h.win32.in: Update a bit + + Make the config entries more like the standard config.h.in + + config.h.win32.in | 3 +++ + 1 file changed, 3 insertions(+) + +commit 8bb4db0212c1885eb983b630e7944c928f069b5a +Author: Matthias Clasen +Date: Tue Nov 22 15:42:32 2011 -0500 + + Switch to dist-xz + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit f195700f548418069520dcacb6aeed93e86ea397 Author: Matthias Clasen Date: Tue Nov 22 15:09:18 2011 -0500 @@ -6,7 +185,7 @@ NEWS | 16 ++++++++++++++++ configure.in | 2 +- - 2 files changed, 17 insertions(+), 1 deletions(-) + 2 files changed, 17 insertions(+), 1 deletion(-) commit 04cd4589009fcda0b975731a07ca77ef50c7c772 Author: Matthias Clasen @@ -27,7 +206,7 @@ Include corefont docs docs/pango-docs.sgml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 352ff18989cc5dfc95370c25b8ac76ae8649ae27 Author: Matthias Clasen @@ -40,7 +219,7 @@ cause link failures. docs/Makefile.am | 24 ++++-------------------- - 1 files changed, 4 insertions(+), 20 deletions(-) + 1 file changed, 4 insertions(+), 20 deletions(-) commit dbd05f231e271e7952b4c7fc230ede3ee6a536cb Author: Matthias Clasen @@ -71,7 +250,7 @@ and do a stricter bit mask check for certainty. pango/pangocoretext-fontmap.c | 16 +++++++++++----- - 1 files changed, 11 insertions(+), 5 deletions(-) + 1 file changed, 11 insertions(+), 5 deletions(-) commit c21b1bfe1278de08673c495ba398fbdee874a778 Author: Kristian Rietveld @@ -80,7 +259,7 @@ Get _pango_get_lc_ctype from system prefs on Mac OS X pango/pango-language.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) + 1 file changed, 21 insertions(+) commit 6dc1e34f5910fbfc1b62fdf83eeda67edc25bc91 Author: Chun-wei Fan @@ -107,7 +286,7 @@ Bye, bye, build breakage. configure.in | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) + 1 file changed, 7 deletions(-) commit 0e091322c494b1523617ca7488ea22e58f8a2c13 Author: Matthias Clasen @@ -130,7 +309,7 @@ pango/pangowin32.h | 2 ++ pango/pangox.h | 21 +++++++++++++++++++++ pango/pangoxft.h | 5 +++++ - 9 files changed, 41 insertions(+), 1 deletions(-) + 9 files changed, 41 insertions(+), 1 deletion(-) commit c403250103234ad09cd90e3e8a9ea838ce82d72e Author: Matthias Clasen @@ -141,7 +320,7 @@ 1.29.4 got released off a side-branch, but bump version here too. configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit dfd872568e3fb7dce3bc32410f8eb247899d5bc1 Author: Chun-wei Fan @@ -158,7 +337,7 @@ being used. build/win32/vs9/pangoft2.vcprojin | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 3adf1c4f8fcd8fdadddbdb542cac745519d8d5eb Author: Chun-wei Fan @@ -171,7 +350,7 @@ landed into master. README.win32 | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit c820da4fa40e02bf64d27b0467a530d990c93358 Author: Chun-wei Fan @@ -201,7 +380,7 @@ for GLib 2.29.6, so use g_atomic_int_add for GLib versions 2.29.5+. pango/opentype/hb-private.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit 8952c88b75d8ce439397c94e1327641c128e2073 Author: Chun-wei Fan @@ -231,8 +410,8 @@ -Fix some errors in some of the words used here. build/win32/vs10/README.txt | 184 - ++++++++++++++++++++++-------------------- - 1 files changed, 96 insertions(+), 88 deletions(-) + ++++++++++++++++++++++--------------------- + 1 file changed, 96 insertions(+), 88 deletions(-) commit e4128227861446f1068f32b1458f8d6d88fbbd02 Author: Chun-wei Fan @@ -244,7 +423,7 @@ VS9 project in commit 552ffc231. build/win32/vs10/pangowin32.vcxproj | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) + 1 file changed, 10 insertions(+), 1 deletion(-) commit 67cd2728810c8b5abdfbd71af68294a59f1e2fcf Author: Chun-wei Fan @@ -256,7 +435,7 @@ build/win32/vs10/pango.sln | 110 +++++++++++++++++----------------- build/win32/vs10/pango_fc.sln | 130 - ++++++++++++++++++++-------------------- + ++++++++++++++++++++--------------------- 2 files changed, 120 insertions(+), 120 deletions(-) commit 5e4d95ff2a619eb747ac6d937206824de198a5bc @@ -267,7 +446,7 @@ build/win32/vs10/README.txt | 88 +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 88 insertions(+), 0 deletions(-) + 1 file changed, 88 insertions(+) commit 59be42675a3bc166a8ecf0ee95207a2d7fdd4f2b Author: Chun-wei Fan @@ -305,7 +484,7 @@ build/win32/vs10/pangowin32.vcxproj | 315 +++++++++++++++++++++ build/win32/vs10/pangowin32.vcxproj.filters | 39 +++ - 14 files changed, 1940 insertions(+), 0 deletions(-) + 14 files changed, 1940 insertions(+) commit d1b609184e1bab1c0fd01d8457fef68fc99e7658 Author: Chun-wei Fan @@ -340,7 +519,7 @@ Fix annotation syntax pango/pango-context.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit c6633eec387739d8dc4d0cf1541bf95258f6029d Author: Behdad Esfahbod @@ -350,7 +529,7 @@ Pango.Context.get_font_description() pango/pango-context.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 5ee82b1a032128d90810fa9b156ebe936796777f Author: Behdad Esfahbod @@ -359,7 +538,7 @@ Minor configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f340e2f38a9fa6ee94905029848199aa36de31b3 Author: Behdad Esfahbod @@ -368,7 +547,7 @@ Add comment modules/basic/basic-win32.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit a7ce7a1a2ba2072e847c6592127dd184dab692a1 Author: Behdad Esfahbod @@ -377,7 +556,7 @@ Remove dead code modules/basic/basic-win32.c | 17 ----------------- - 1 files changed, 0 insertions(+), 17 deletions(-) + 1 file changed, 17 deletions(-) commit a1f4357d98d072761fe085197de53e01da46f2fc Author: Matthias Clasen @@ -388,7 +567,7 @@ As requested in bug 403499. docs/pango_markup.sgml | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) + 1 file changed, 9 insertions(+), 3 deletions(-) commit 3641b7abc78bc4ba85031e2ad9bb3ce99077098e Author: Chun-wei Fan @@ -404,7 +583,7 @@ in better detail. README.win32 | 77 - ++++++++++++++++++++++++------------------- + +++++++++++++++++++++++++------------------- build/win32/vs9/README.txt | 5 +++ 2 files changed, 48 insertions(+), 34 deletions(-) @@ -420,7 +599,7 @@ successfully. pango/opentype/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit c37ae57816ac22543fd9fbcf880518406cd1457d Author: Khaled Hosny @@ -445,7 +624,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=656014 pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 7ac3b46beaa57703aa46e85d7300b3d5184eb028 Author: Chun-wei Fan @@ -456,7 +635,7 @@ Tell people not to compile Pango in paths with spaces in them. build/win32/vs9/README.txt | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 file changed, 4 insertions(+), 1 deletion(-) commit 2574242575e6a1d7184bb43c61ba3090de611971 Author: Colin Walters @@ -465,7 +644,7 @@ build: Fix srcdir != builddir pango/Makefile.am | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 file changed, 5 insertions(+), 4 deletions(-) commit 8de0841234c9e9b07ba5be19833ef40476102952 Author: Rico Tzschichholz @@ -476,7 +655,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=654689 pango/Makefile.am | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 42c1f6c71abf625e4086f05af84f712cbc45eea4 Author: Behdad Esfahbod @@ -488,7 +667,7 @@ https://secure.wikimedia.org/wikipedia/en/wiki/Shi_shi_shi_shi_shi pango-view/test-chinese.txt | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + 1 file changed, 14 insertions(+) commit f42a399b94d123f2153ce874825aed414666d9bc Author: Evan Nemerson @@ -497,7 +676,7 @@ Bug 635399 - Add C include and exported packages information to GIRs pango/Makefile.am | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) + 1 file changed, 8 insertions(+), 3 deletions(-) commit 552ffc23118960bc598d6bd83db6661fe4bbf63b Author: Behdad Esfahbod @@ -529,7 +708,7 @@ abstract. pango/pango-engine.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit cbc881d42159e9a72e6ed408695f59df1a34513e Author: Kristian Rietveld @@ -569,7 +748,7 @@ docs: pangofc-fontmap: Fix typo in "Since" tag pango/pangofc-fontmap.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit b2974d3dc741e4e9f8d9b1b3bf879ac560484502 Author: Javier Jardon @@ -578,8 +757,8 @@ pango-docs.sgml: Add xml index pages to avoid warnings docs/pango-docs.sgml | 55 - +++++++++++++++++++++++++++++++++---------------- - 1 files changed, 37 insertions(+), 18 deletions(-) + +++++++++++++++++++++++++++++++++----------------- + 1 file changed, 37 insertions(+), 18 deletions(-) commit eeed1f21dd72e38f4b8aaecd31d17f5d015c0c63 Author: Javier Jardón @@ -588,7 +767,7 @@ docs: Fix typo pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1e76e41aabf02158a3669646ea4b0c039f95dc52 Author: Javier Jardón @@ -597,7 +776,7 @@ docs: Fix references to PangoFcFontmap -> PangoFcFontMap pango/pangofc-fontmap.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit a4338eeb5489ac9c093d01d9cda95361ff0dd84e Author: Stefan Kost @@ -609,9 +788,9 @@ docs build faster and makes it easier to conditionally include stuff. - docs/Makefile.am | 7 +-- + docs/Makefile.am | 7 ++-- docs/pango-docs.sgml | 101 - ++++++++++++++++++------------------------------- + ++++++++++++++++++-------------------------------- 2 files changed, 40 insertions(+), 68 deletions(-) commit a0296ccbdd570b66a36bf4226760aed312d020d4 @@ -642,7 +821,7 @@ NEWS | 4 ++++ configure.in | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) + 2 files changed, 5 insertions(+), 1 deletion(-) commit f895a8644b45dce0cce5d2005e53e4de67ec0041 Author: Javier Jardón @@ -653,7 +832,7 @@ This reverts commit 6d1c98aed05ad10111c896708aca86436fc2328a. docs/check.docs | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + 1 file changed, 5 insertions(+), 3 deletions(-) commit 6d1c98aed05ad10111c896708aca86436fc2328a Author: Javier Jardón @@ -662,7 +841,7 @@ asd docs/check.docs | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) + 1 file changed, 3 insertions(+), 5 deletions(-) commit 8cf8ef31973b80901be403b490a88b144b67863c Author: Javier Jardón @@ -671,7 +850,7 @@ Bump version to 2.29.1 configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 4156c5a892731f5b047ede9c0e05e06fc9ed3f48 Author: Behdad Esfahbod @@ -680,7 +859,7 @@ Update NEWS NEWS | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 56 insertions(+), 0 deletions(-) + 1 file changed, 56 insertions(+) commit 2f3adfb762a0af6414f1c93627c2bd26ee90e7f8 Author: Colin Walters @@ -707,7 +886,7 @@ that we excluded but allows us to distcheck on linux. docs/Makefile.am | 20 +++++++++++++++++++- - 1 files changed, 19 insertions(+), 1 deletions(-) + 1 file changed, 19 insertions(+), 1 deletion(-) commit b895d225346084dd9bd167c39ae1f3e2c2526252 Author: Behdad Esfahbod @@ -718,7 +897,7 @@ This reverts commit 00d2842d8a5ded059fc058d05b2cffcf16186710. pango/pango-layout.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit d415fb6aaffcfacdebcf94b05de5e055f3c9e70a Author: Matthias Clasen @@ -732,7 +911,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=652616 pango/pango-layout.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit 00d2842d8a5ded059fc058d05b2cffcf16186710 Author: Benjamin Otte @@ -749,7 +928,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=649783 pango/pango-layout.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit 8e0fa0d1ab97c256829dab28a5c371689584bcd3 Author: Behdad Esfahbod @@ -758,7 +937,7 @@ Bug 652227 - Unconditional use of stdint.h pango/opentype/hb-common.h | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 file changed, 5 insertions(+), 1 deletion(-) commit 4c7807daee7189f481d7c18b56b06d7b7dba7884 Author: Ryan Lortie @@ -802,7 +981,7 @@ Fix make check pango/pangox.def | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 77f8691aee23357feea015d4c3d008a2335ee5f0 Author: Matej Knopp @@ -813,7 +992,7 @@ Fix CoreText backend to not use the casefold string as family name. pango/pangocoretext-fontmap.c | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) + 1 file changed, 5 insertions(+), 7 deletions(-) commit d69e2462d6fa52114662c1e4122d081f14675541 Author: Chun-wei Fan @@ -824,7 +1003,7 @@ accidently removed that during my last changes...doh. build/win32/vs9/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 104055ffcb95be030052340a26183609471afeaf Author: Chun-wei Fan @@ -835,7 +1014,7 @@ There were some typoes in the autotools macros used-fix them up. config.h.win32.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit a2541fc641826b8442fee48f9b42cdbd002045db Author: Chun-wei Fan @@ -846,7 +1025,7 @@ Make pathnames Windows-like... missed them just now. doh. build/win32/vs9/README.txt | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 26e8f0e5f0744fc56829a40aadf1c5eedc98bd3f Author: Chun-wei Fan @@ -858,8 +1037,8 @@ clearer. build/win32/vs9/README.txt | 57 - ++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 55 insertions(+), 2 deletions(-) + ++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 55 insertions(+), 2 deletions(-) commit 5abf6bd16b4ee121f86db6d7f676957b382b96db Author: Behdad Esfahbod @@ -868,7 +1047,7 @@ Part of Bug 377539 - Make Pango thread-safe pango/pango-utils.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 0e3aac21285509566fac9c9974e1ab194a88a126 Author: Behdad Esfahbod @@ -877,7 +1056,7 @@ [docs] Update templates docs/tmpl/layout.sgml | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) + 1 file changed, 19 insertions(+) commit cdf228e0d70baef19022d35c1a7540ea0f71890d Author: Chun-wei Fan @@ -891,7 +1070,7 @@ Fix that here. pango/pango.def | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ce24c762004000d588441ed530dc681688ff728f Author: Chun-wei Fan @@ -904,7 +1083,7 @@ suggested in README.win32 build/win32/vs9/pango.vsprops | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) commit 43096d64a9766fd56f974de26de7d9a4930ba222 Author: Behdad Esfahbod @@ -925,7 +1104,7 @@ Turns out the index for 1.28 additions was mislabeled, too. docs/pango-docs.sgml | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 file changed, 4 insertions(+), 1 deletion(-) commit ff16b948572c1bdc301d27af41b34566d28c6610 Author: Matthias Clasen @@ -942,7 +1121,7 @@ pango/pango-layout.c | 20 ++++++++++++++++++++ pango/pango-layout.h | 2 ++ pango/pango.def | 1 + - 4 files changed, 24 insertions(+), 0 deletions(-) + 4 files changed, 24 insertions(+) commit 4587e5d2231b717dd116253a49badc1ba3aa5db5 Author: Matthias Clasen @@ -959,7 +1138,7 @@ pango/pango-layout.c | 35 +++++++++++++++++++++++++++++++++++ pango/pango-layout.h | 3 +++ pango/pango.def | 1 + - 4 files changed, 40 insertions(+), 0 deletions(-) + 4 files changed, 40 insertions(+) commit c43c4884bf4b405f58a0c966384ee751f82ee69c Author: Chun-wei Fan @@ -988,12 +1167,12 @@ build/win32/vs9/install.vcproj | 67 ++++++++- build/win32/vs9/pango.sln | 20 +-- build/win32/vs9/pango.vcprojin | 200 ++++++++++++++++++------- - build/win32/vs9/pango.vsprops | 11 ++- + build/win32/vs9/pango.vsprops | 11 +- build/win32/vs9/pango_fc.sln | 82 ++++++++++ build/win32/vs9/pangocairo.vcprojin | 157 +++++++++++++++++++- build/win32/vs9/pangoft2.vcprojin | 280 +++++++---------------------------- - build/win32/vs9/pangowin32.vcproj | 146 +++++++++++++++++-- + build/win32/vs9/pangowin32.vcproj | 146 ++++++++++++++++-- build/win32/vs9/stdint.h | 36 +++++ 12 files changed, 683 insertions(+), 358 deletions(-) @@ -1009,7 +1188,7 @@ -Allow option to not use FontConfig config.h.win32.in | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) + 1 file changed, 8 insertions(+), 2 deletions(-) commit ae9013c6a598eb589449bac0fedda58a624f9240 Author: Chun-wei Fan @@ -1022,7 +1201,7 @@ the main Pango/PangoWin32/PangoFT2 DLL(s) build/win32/vs9/pango.vsprops | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) + 1 file changed, 6 insertions(+), 3 deletions(-) commit 3b0ec344f0c8af11192decb3ab3c7795f83416c1 Author: Chun-wei Fan @@ -1057,7 +1236,7 @@ the board. build/win32/vs9/pangoft2.vcprojin | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) + 1 file changed, 6 insertions(+), 3 deletions(-) commit 094e17cc0666206b336976f63ac8e4239f58a66c Author: Chun-wei Fan @@ -1069,7 +1248,7 @@ files. build/win32/vs9/pangowin32.vcproj | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit 632dbd4a7c30805cb42f632933806e6218d65ed0 Author: Behdad Esfahbod @@ -1078,7 +1257,7 @@ Fix doc templates docs/pango-sections.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 42 insertions(+), 0 deletions(-) + 1 file changed, 42 insertions(+) commit 6e9478e1d552c3c71ff72f707cd1dee8f60e902a Author: Behdad Esfahbod @@ -1089,7 +1268,7 @@ That part of code is to be removed thanks to HarfBuzz move though. pango/pango-ot-info.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit beecf8f88188391132d30b940c2a312ecaebba3a Author: Behdad Esfahbod @@ -1118,7 +1297,7 @@ pango/pangocoretext-fontmap.c | 96 +++++++++++++++++++---------------------- - 1 files changed, 44 insertions(+), 52 deletions(-) + 1 file changed, 44 insertions(+), 52 deletions(-) commit 0cc03a0a8e91627267236ff94cc424203c39b03a Author: John Ralls @@ -1130,7 +1309,7 @@ pango/pangocoretext-fontmap.c | 93 ++++++++++++++++++++++------------------- - 1 files changed, 50 insertions(+), 43 deletions(-) + 1 file changed, 50 insertions(+), 43 deletions(-) commit 726ae04375c47fb314d70ea952f811bb223f998a Author: Javier Jardón @@ -1151,7 +1330,7 @@ pango/pangocoretext-fontmap.c | 37 ++----------------------------------- - 1 files changed, 2 insertions(+), 35 deletions(-) + 1 file changed, 2 insertions(+), 35 deletions(-) commit 02f80c9acdec53f58fef0e12f41363c3c4ea1efe Author: Javier Jardón @@ -1160,7 +1339,7 @@ pango/pangoatsui-fontmap.c: Use G_DEFINE_TYPE pango/pangoatsui-fontmap.c | 39 +++------------------------------------ - 1 files changed, 3 insertions(+), 36 deletions(-) + 1 file changed, 3 insertions(+), 36 deletions(-) commit e250030b45c7744e23fcd5c78aa916f1b4f4aee1 Author: Javier Jardón @@ -1170,7 +1349,7 @@ G_DEFINE_ABSTRACT_TYPE pango/pango-renderer.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) + 1 file changed, 1 insertion(+), 5 deletions(-) commit c8aed76aefe5b2dc81420cf9498df831ff2a0d65 Author: Javier Jardón @@ -1179,7 +1358,7 @@ ngo/pango-ot-ruleset.c: Use G_DEFINE_TYPE pango/pango-ot-ruleset.c | 39 ++++----------------------------------- - 1 files changed, 4 insertions(+), 35 deletions(-) + 1 file changed, 4 insertions(+), 35 deletions(-) commit 57ebe449bf7a14397548905ad006b093b28bb876 Author: Javier Jardón @@ -1188,7 +1367,7 @@ pango/pango-ot-info.c: Use G_DEFINE_TYPE pango/pango-ot-info.c | 37 ++++++------------------------------- - 1 files changed, 6 insertions(+), 31 deletions(-) + 1 file changed, 6 insertions(+), 31 deletions(-) commit cdf841adb0bddcd790a2230d04749a680d827015 Author: Javier Jardón @@ -1197,7 +1376,7 @@ pango/pangox.c: Use G_DEFINE_TYPE pango/pangox.c | 37 +++---------------------------------- - 1 files changed, 3 insertions(+), 34 deletions(-) + 1 file changed, 3 insertions(+), 34 deletions(-) commit f2653e1d45b79613395fbf71452d40a493431a5c Author: Javier Jardón @@ -1207,7 +1386,7 @@ pango/pango-impl-utils.h | 46 ---------------------------------------------- - 1 files changed, 0 insertions(+), 46 deletions(-) + 1 file changed, 46 deletions(-) commit b428d5ef171375b7aa1101aaef56ef7a2ceb544e Author: Javier Jardón @@ -1216,7 +1395,7 @@ pango/pangofc-fontmap.c: Use G_DEFINE_TYPE instead custom macro pango/pangofc-fontmap.c | 37 +++++++++++++------------------------ - 1 files changed, 13 insertions(+), 24 deletions(-) + 1 file changed, 13 insertions(+), 24 deletions(-) commit 446aeb6991c1dd4e6f688ac8fbface1dc67faa41 Author: Javier Jardón @@ -1225,7 +1404,7 @@ pango/pango-fontset.c: Use G_DEFINE_TYPE instead custom macro pango/pango-fontset.c | 21 ++++++++++----------- - 1 files changed, 10 insertions(+), 11 deletions(-) + 1 file changed, 10 insertions(+), 11 deletions(-) commit ea702f4c4feac29e6366a04c02953c425bb5f288 Author: Javier Jardón @@ -1235,7 +1414,7 @@ pango/pango-engine.c | 49 ++++++++++++++++++++++++++++++++++++------------- - 1 files changed, 36 insertions(+), 13 deletions(-) + 1 file changed, 36 insertions(+), 13 deletions(-) commit a8fe5748d8a921a18c203e0c3e5cb7d15ef01dd8 Author: Javier Jardón @@ -1246,7 +1425,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=578018 pango/modules.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) + 1 file changed, 8 insertions(+), 8 deletions(-) commit cf183c9ed22d0f906deb584a9ea4959881d9795f Author: Javier Jardón @@ -1255,7 +1434,7 @@ Use G_DEFINE_INTERFACE in PangoCairoFontMap pango/pangocairo-fontmap.c | 32 +++++--------------------------- - 1 files changed, 5 insertions(+), 27 deletions(-) + 1 file changed, 5 insertions(+), 27 deletions(-) commit 9a2a18ddd107370adbe4194e19cda136c1e507f4 Author: Javier Jardón @@ -1264,7 +1443,7 @@ Use G_DEFINE_INTERFACE in PangoCairoFont pango/pangocairo-font.c | 34 ++++++---------------------------- - 1 files changed, 6 insertions(+), 28 deletions(-) + 1 file changed, 6 insertions(+), 28 deletions(-) commit f646ce13531b046a7c2530df2253e6b61362f0fb Author: Alberto Ruiz @@ -1273,7 +1452,7 @@ Removing introspection warnings from pangoxft-fontmap pango/pangoxft-fontmap.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 6fc80c1c95000161fd00052927df081aa879fdaf Author: Alberto Ruiz @@ -1282,7 +1461,7 @@ Removing introspection warnings from pangocairo-fontmap pango/pangocairo-fontmap.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) + 1 file changed, 9 insertions(+), 9 deletions(-) commit 7e30d468e12d2447244d8c67dd01c215f7f7f2e4 Author: Alberto Ruiz @@ -1291,7 +1470,7 @@ Removing introspection warnings from pangocairo-context pango/pangocairo-context.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit adab8c169c04eea795d009f8097eb00235db386b Author: Alberto Ruiz @@ -1301,7 +1480,7 @@ in pango_glyph_item_apply_attr pango/pango-glyph-item.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 1a10aafb9acf4044ac6c9913837ce4a1c53c6e98 Author: Alberto Ruiz @@ -1311,7 +1490,7 @@ in pango_split_file_list pango/pango-utils.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit a502c5eff4d679ea5d623b698e3d6bcf5db023e9 Author: Alberto Ruiz @@ -1332,7 +1511,7 @@ for the return value in pango_itemize_with_base_dir pango/pango-context.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) + 1 file changed, 8 insertions(+), 4 deletions(-) commit c2009f6e323d15e6fb4268b1f45a5cb29ec908b3 Author: Alberto Ruiz @@ -1342,7 +1521,7 @@ for the return value in pango_itemize pango/pango-context.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f02381600e245c9c5721d6b4d5e98e3f067282d5 Author: Alberto Ruiz @@ -1352,7 +1531,7 @@ pango_layout_index_to_line_x pango/pango-layout.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 4c34b796e0977b7b95e1e86c76e365671b1a6e9d Author: Alberto Ruiz @@ -1362,7 +1541,7 @@ in pango_attr_list_filter pango/pango-attributes.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 133b534182bfbc9ff69fde54ce31d72af0308080 Author: Alberto Ruiz @@ -1372,7 +1551,7 @@ value in pango_attr_list_filter pango/pango-attributes.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 02fb7adc8ab51a04c5671c81d3fe2dcf4ed5258d Author: Alberto Ruiz @@ -1382,7 +1561,7 @@ in pango_layout_iter_get_run_readonly pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5f55ce69f8611fe53670f1001d5b8ecae94b2bd3 Author: Alberto Ruiz @@ -1392,7 +1571,7 @@ in pango_layout_iter_get_layout pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit c2d5d982840c08af3bf5cb0e2181919854e3a8f7 Author: Alberto Ruiz @@ -1402,7 +1581,7 @@ in pango_font_get_font_map pango/fonts.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit d129f5db7ab71e986e2c8dd8e08a8899ebda8ae2 Author: Alberto Ruiz @@ -1412,7 +1591,7 @@ in pango_fontset_get_font pango/pango-fontset.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 77fd2d97d3cb62ff4e2cebe19ad60e215a04fe13 Author: Alberto Ruiz @@ -1422,7 +1601,7 @@ value in pango_fontset_foreach pango/pango-fontset.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 776789e30d1227186c4efd7e38f1517c4daaab65 Author: Alberto Ruiz @@ -1432,7 +1611,7 @@ in pango_font_map_create_context pango/pango-fontmap.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit d709d1bd56a9233aba5e53f3718b158ff695b3e8 Author: Alberto Ruiz @@ -1442,7 +1621,7 @@ in pango_font_map_load_fontset pango/pango-fontmap.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 2ebd68ee8773fc5bd866b30068432bd81151b269 Author: Alberto Ruiz @@ -1451,7 +1630,7 @@ Fixed typos in the PangoContext gtk-doc pango/pango-context.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 22822d7700e87dbe8a8125072775e40bd8b53f99 Author: Alberto Ruiz @@ -1461,7 +1640,7 @@ in pango_font_map_load_font pango/pango-fontmap.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 1b4d351d114996e357912b5c1bfc979cfb39b294 Author: Alberto Ruiz @@ -1471,7 +1650,7 @@ in pango_context_get_font_map pango/pango-context.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 file changed, 5 insertions(+), 4 deletions(-) commit 52a495cef9d35c02d54ca010e24f1e8f44384193 Author: Alberto Ruiz @@ -1481,7 +1660,7 @@ in pango_context_load_font pango/pango-context.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 19e6c35b5c78efd6b22ec04af4a8624d3c0068e0 Author: Alberto Ruiz @@ -1491,7 +1670,7 @@ in pango_context_load_fontset pango/pango-context.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 4acacd27dd882c8aec4a7f49cc487724e69e2e14 Author: Alberto Ruiz @@ -1501,7 +1680,7 @@ in pango_layout_copy pango/pango-layout.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit b803f39784f2feb178ad64979a01aa03d0a2ab3d Author: Alberto Ruiz @@ -1511,7 +1690,7 @@ in pango_renderer_get_layout pango/pango-renderer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit db3ac6083dcd3fe6c9f31c70d314f8a572545057 Author: Alberto Ruiz @@ -1520,7 +1699,7 @@ Fixing array introspection annotation for pango_attr_iterator_get_font pango/pango-attributes.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5d0ee19f32e062240d2084bf037d0a9e31bce6df Author: Alberto Ruiz @@ -1530,7 +1709,7 @@ pango_layout_line_get_x_ranges pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit e8a88f1270431a74292a401ff195de1f72575932 Author: Alberto Ruiz @@ -1539,7 +1718,7 @@ Adding allow-none introspection metadata to pango_language_from_string pango/pango-language.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ba9b52e188c3ee903fbbb59d50132bbc9019b3a Author: Alberto Ruiz @@ -1548,7 +1727,7 @@ Adding allow-none introspection metadata to pango_itemize pango/pango-context.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) + 1 file changed, 3 insertions(+), 4 deletions(-) commit 025fe509acd3033e8fe4ffd1bea4584b286c527f Author: Alberto Ruiz @@ -1558,7 +1737,7 @@ pango_itemize_with_base_dir pango/pango-context.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 5ad1c470011e732913d26dcd63be4adcdcbf33a9 Author: Alberto Ruiz @@ -1567,7 +1746,7 @@ Adding (out) introspection metadata to pango_read_line pango/pango-utils.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2f52540631fe1d6868901f00e6de0018e021bdd9 Author: Alberto Ruiz @@ -1576,7 +1755,7 @@ Adding (inout) introspection metadata to pango_skip_space pango/pango-utils.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 8058e20ba19b728daa4c5b777676d99fe194366c Author: Alberto Ruiz @@ -1585,7 +1764,7 @@ Adding (inout)/(out) introspection metadata to pango_scan_word pango/pango-utils.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 17972485e6036d0e9f36f06d6e0c8b4d3060180c Author: Alberto Ruiz @@ -1594,7 +1773,7 @@ Adding (inout)/(out) introspection metadata to pango_scan_string pango/pango-utils.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 7a1057f6e1763533773d4ef41ff67cbb0ced1f52 Author: Alberto Ruiz @@ -1603,7 +1782,7 @@ Adding (inout) introspection metadata to pango_scan_int pango/pango-utils.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 918dd91598bba4916f98d9866e6715232e0db322 Author: Alberto Ruiz @@ -1612,7 +1791,7 @@ adding (out) introspection metadata to pango_parse_enum pango/pango-utils.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 50d7ad6f2073742c7b0423f578171b380b8196f5 Author: Alberto Ruiz @@ -1621,7 +1800,7 @@ adding allow-none introspection metadata to pango_parse_enum pango/pango-utils.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit d1c260d3d48ffa32aebe16e987fea187e635c370 Author: Alberto Ruiz @@ -1630,7 +1809,7 @@ Add out and array metadata annotations to pango_lookup_aliases pango/pango-utils.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit fe789d8e8d062e6f495e54bef585a74958bd671e Author: Alberto Ruiz @@ -1639,7 +1818,7 @@ adding (inout) introspection metadata to pango_quantize_line_geometry pango/pango-utils.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 2bcf1b9dbba5be761ddaa4db984ae74087c230f0 Author: Alberto Ruiz @@ -1648,7 +1827,7 @@ adding allow-none introspection metadata to pango_extents_to_pixels pango/pango-utils.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 22dde4fcb56755435fd44890a40afee6d3e5ceba Author: Alberto Ruiz @@ -1658,7 +1837,7 @@ pango_attr_shape_new_with_data pango/pango-attributes.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 file changed, 5 insertions(+), 5 deletions(-) commit c07ff4f3755f7d00f44f94b5731d1abe47f35cb6 Author: Alberto Ruiz @@ -1667,7 +1846,7 @@ adding (out) introspection metadata to pango_tab_array_get_tabs pango/pango-tabs.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 02fec2d8be12c44d16a569c70952b84ff8a98ce4 Author: Alberto Ruiz @@ -1676,7 +1855,7 @@ adding allow-none introspection metadata to pango_tab_array_get_tabs pango/pango-tabs.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 4ee2ce45c44f97e7e1232021447fd2fb710c8a75 Author: Alberto Ruiz @@ -1685,7 +1864,7 @@ adding (out) introspection metadata to pango_tab_array_get_tab pango/pango-tabs.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit cbd5942b82b6b7336accf3fc053366b67a002390 Author: Alberto Ruiz @@ -1694,7 +1873,7 @@ adding allow-none introspection metadata to pango_tab_array_get_tab pango/pango-tabs.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 1050fa307ebdd54f08eb3cf7dee56a769b09941e Author: Alberto Ruiz @@ -1703,7 +1882,7 @@ adding (out) introspection metadata to pango_script_iter_get_range pango/pango-script.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit c73479690963e11fa7f4d4a87475cb02c78ca0c1 Author: Alberto Ruiz @@ -1713,7 +1892,7 @@ pango_script_iter_get_range pango/pango-script.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit b96debcfa2c7a8cd8fae3e4cc9aa1d460ec7f33e Author: Alberto Ruiz @@ -1722,7 +1901,7 @@ adding allow-none introspection metadata to pango_renderer_set_matrix pango/pango-renderer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 139b37c44c297e009ece5a8efa040f36125e8acb Author: Alberto Ruiz @@ -1731,7 +1910,7 @@ adding allow-none introspection metadata to pango_renderer_set_color pango/pango-renderer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ec9fe8dee8425612c49193150d35ecb9e3300c1 Author: Alberto Ruiz @@ -1741,7 +1920,7 @@ pango_renderer_draw_glyph_item pango/pango-renderer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f811e4de18034dd8c6ef2bbd6895aa3e4d3deb3c Author: Alberto Ruiz @@ -1751,7 +1930,7 @@ pango_matrix_get_font_scale_factor pango/pango-matrix.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 877447d21c495622ac84de2ac85364b3f4df7891 Author: Alberto Ruiz @@ -1761,7 +1940,7 @@ pango_matrix_transform_distance pango/pango-matrix.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 0c3a5f2acf7c2fd74de7652d277b7851e216e3ec Author: Alberto Ruiz @@ -1770,7 +1949,7 @@ adding (inout) introspection metadata to pango_matrix_transform_point pango/pango-matrix.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 3132f0f62ff0485d33047e5390ada5feee5b7e8f Author: Alberto Ruiz @@ -1780,7 +1959,7 @@ pango_matrix_transform_rectangle pango/pango-matrix.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit b84e0bae01ff08b26a614f3c91b6e6d276ae95ed Author: Alberto Ruiz @@ -1790,7 +1969,7 @@ pango_matrix_transform_rectangle pango/pango-matrix.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 64fa9090b202a1d27b0baf96e75763239ef21dde Author: Alberto Ruiz @@ -1800,7 +1979,7 @@ pango_matrix_transform_pixel_rectangle pango/pango-matrix.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 646a51dfad73beee3ddb578f305d064cdf056b98 Author: Alberto Ruiz @@ -1810,7 +1989,7 @@ pango_matrix_transform_pixel_rectangle pango/pango-matrix.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit a04ac359f79d0d460bf164801ac9ef39bae276dc Author: Alberto Ruiz @@ -1820,7 +1999,7 @@ pango_layout_get_pixel_extents pango/pango-layout.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit a92ee9af8c9801edc484a680b2d2247f83c4a36f Author: Alberto Ruiz @@ -1830,7 +2009,7 @@ pango_layout_line_get_extents pango/pango-layout.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 136cdd90a78dc82ce66c519fba9e64fb3ada6a33 Author: Alberto Ruiz @@ -1840,7 +2019,7 @@ pango_layout_iter_get_run_textents pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 3c6029984d59c0c4ac4d393617fc7fa7e33e2216 Author: Alberto Ruiz @@ -1850,7 +2029,7 @@ pango_layout_iter_get_run_extents pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 863bf48c6a3d621a33f7d4d82def6f5a6bcc24b0 Author: Alberto Ruiz @@ -1859,7 +2038,7 @@ adding (out) introspection metadata to pango_layout_get_line_extents pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 519739bd0fefbb1e81c56a62992422952e6292e2 Author: Alberto Ruiz @@ -1869,7 +2048,7 @@ pango_layout_get_line_extents pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit ece5e47c80bdaab44b5b709d4486059abefd1191 Author: Alberto Ruiz @@ -1878,7 +2057,7 @@ adding (out) introspection metadata to pango_layout_get_layout_extents pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 05c192dfcde8783d6921e1abb2f39f2fba52db6d Author: Alberto Ruiz @@ -1888,7 +2067,7 @@ pango_layout_get_layout_extents pango/pango-layout.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 6ed0fec2a65ea767c717998f8b89038275e721f0 Author: Alberto Ruiz @@ -1898,7 +2077,7 @@ instropection annotation pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit de232401243a09abde2639aac34d4e4ff2f8e1e7 Author: Alberto Ruiz @@ -1908,7 +2087,7 @@ pango_layout_get_cluster_extents pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 44a4b7b352ef9a559584c85df1692a882edf9673 Author: Alberto Ruiz @@ -1918,7 +2097,7 @@ pango_layout_get_cluster_extents pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit cd00b2fefad50a6a2fe24b8539a4341632ae5217 Author: Alberto Ruiz @@ -1927,7 +2106,7 @@ adding allow-none introspection metadata to pango_layout_set_tabs pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ee5963ce9cf98bc5ab795d19d0f432d613c86708 Author: Alberto Ruiz @@ -1937,7 +2116,7 @@ pango_layout_set_markup_with_accel. Correct some documentation typos. pango/pango-layout.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + 1 file changed, 4 insertions(+), 3 deletions(-) commit 74661a3c1b6e01f504816cf8fd065dccffd40b66 Author: Alberto Ruiz @@ -1947,7 +2126,7 @@ pango_layout_set_font_description pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit d3e0539d3063badd1f2fcf9f564280cff2350a0a Author: Alberto Ruiz @@ -1957,7 +2136,7 @@ pango_layout_set_attributes pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 112227f7a2aa851417cd475f7a27f76d77fb2d51 Author: Alberto Ruiz @@ -1966,7 +2145,7 @@ adding allow-none introspection metadata to pango_layout_get_size pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 31257eceac3dbe9bc267775dc35b187b99f7ac7d Author: Alberto Ruiz @@ -1976,7 +2155,7 @@ pango_layout_get_pixel_size pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 357249f89307a9cafbcfb105f3796c52e322329b Author: Alberto Ruiz @@ -1986,7 +2165,7 @@ pango_layout_get_pixel_extents pango/pango-layout.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) + 1 file changed, 6 insertions(+), 5 deletions(-) commit 33a261862474aa9077f939fab428078883e99844 Author: Alberto Ruiz @@ -1995,7 +2174,7 @@ adding allow-none introspection metadata to pango_layout_get_extents pango/pango-layout.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) + 1 file changed, 6 insertions(+), 5 deletions(-) commit 6767b4b0a39d2faeb57829edaf87472ebce9983b Author: Alberto Ruiz @@ -2005,7 +2184,7 @@ pango_layout_get_cursor_pos pango/pango-layout.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 3ff035bde4665f5aa9ef12ebe516270b40c1f1d9 Author: Alberto Ruiz @@ -2015,7 +2194,7 @@ pango_language_get_scripts parameters pango/pango-language.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 031dd86aac9764e1762ca3028d3a4f5ad0fa47e3 Author: Alberto Ruiz @@ -2025,7 +2204,7 @@ pango_glypth_string_extents pango/glyphstring.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit aa08f45bfea5c5c91652fc98ac056579caabf369 Author: Alberto Ruiz @@ -2035,7 +2214,7 @@ parameters pango/pango-language.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 file changed, 3 insertions(+), 2 deletions(-) commit 030cb9e8d0e7615ab67d829a58b92d7a5d70466b Author: Alberto Ruiz @@ -2045,7 +2224,7 @@ parameters pango/glyphstring.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit ff493f9733fb4e3d700b8c880335ca273d22273a Author: Alberto Ruiz @@ -2055,7 +2234,7 @@ pango_font_description_merge parameters pango/fonts.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 44fbe23a64625b6e1e7521135f14a61a60ecb8f6 Author: Alberto Ruiz @@ -2065,7 +2244,7 @@ pango_font_description_better_match parameters pango/fonts.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ea31f7f4ca5ce352726e63518d7496a6caaed7c4 Author: Alberto Ruiz @@ -2075,7 +2254,7 @@ parameters pango/fonts.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + 1 file changed, 2 insertions(+), 3 deletions(-) commit cec9683199595651136e3fb0e4753e0b55215ab8 Author: Alberto Ruiz @@ -2084,7 +2263,7 @@ fixing metadata typo in pango_font_get_glypth_extents pango/fonts.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit e3afea7d120f2f2957185840d94aab70da3e2063 Author: Alberto Ruiz @@ -2094,7 +2273,7 @@ pango_font_get_glypth_extents pango/fonts.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 81474cb91d2c5b2d8226d54e1f87f49828195c01 Author: Alberto Ruiz @@ -2104,7 +2283,7 @@ pango_font_get_glypth_extents parameters pango/fonts.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 7502b164c84dc385e637305cdda3f8caeb87e23a Author: Alberto Ruiz @@ -2114,7 +2293,7 @@ pango_font_descriptions_free pango/fonts.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 79e5e6d9fe52797da4bea582177772d9b8b992ce Author: Alberto Ruiz @@ -2124,7 +2303,7 @@ pango_font_descriptions_free pango/fonts.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit b17a51d9d5b64215622ab33d12813037326dd3a6 Author: Alberto Ruiz @@ -2133,7 +2312,7 @@ adding allow-none to pango_font_descriptions_free parameters pango/fonts.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 54f16645d14ec475ac070e969e883051d2f53add Author: Alberto Ruiz @@ -2142,7 +2321,7 @@ adding allow-none to pango_context_set_matrix parameters pango/pango-context.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 9bea909f3eaff4ea3cd5d3065a9860ab0081db11 Author: Alberto Ruiz @@ -2151,7 +2330,7 @@ adding allow-none to pango_context_get_metrics parameters pango/pango-context.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + 1 file changed, 7 insertions(+), 7 deletions(-) commit d45ce5856f0e7be9402c425bcd967bacf9ffe060 Author: Alberto Ruiz @@ -2160,7 +2339,7 @@ adding allow-none to pango_attr_iterator_get_font parameters pango/pango-attributes.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit deda590f67fb2d62ea3bc090d35319774dfc69b7 Author: Alberto Ruiz @@ -2170,7 +2349,7 @@ as requested by walters in #647827 pango/fonts.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit b8fbe2ce364cc1f8cdaea125e97537b85e97daab Author: Alberto Ruiz @@ -2190,7 +2369,7 @@ Fix introspection for list families pango/pango-context.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit ad401ec2d5f7662b89804e5c269945fc26c0f232 Author: Kristian Rietveld @@ -2201,7 +2380,7 @@ Patch by Jerome Lambourg configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit cf1d6fdaaec524b5892200bdc7c2a4560e853719 Author: Kristian Rietveld @@ -2210,7 +2389,7 @@ Build fix after rebase pango/pangocairo-coretextfont.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 file changed, 5 insertions(+), 5 deletions(-) commit b8e8e9b8f5b377377037478506b789ee4c2f9b34 Author: Kristian Rietveld @@ -2219,7 +2398,7 @@ Add module-defs-coretext.c to MODULE_DEF_FILES pango/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 5e658c9e8942468666b72eed97adca595796817c Author: Kristian Rietveld @@ -2228,7 +2407,7 @@ Really get _pango_cairo_core_text_font_new right pango/pangocairo-coretextfont.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit ef900792d05308405f7ae98f28b007cdeea63499 Author: Kristian Rietveld @@ -2237,7 +2416,7 @@ Get _pango_cairo_core_text_font_new right pango/pangocairo-coretextfont.c | 27 +++++++++++---------------- - 1 files changed, 11 insertions(+), 16 deletions(-) + 1 file changed, 11 insertions(+), 16 deletions(-) commit a98b025b603fc1605c48f0fcebcdcefe5c99d6dc Author: Kristian Rietveld @@ -2246,7 +2425,7 @@ Properly propagate font size in pango_core_text_font_map_load_font pango/pangocoretext-fontmap.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + 1 file changed, 7 insertions(+), 1 deletion(-) commit 32fea7e2821f28c470048f5951d8de1b787104a5 Author: Kristian Rietveld @@ -2255,7 +2434,7 @@ Shape engine should return array in LTR order when expected modules/basic/basic-coretext.c | 35 ++++++++++++++++++++++++++--------- - 1 files changed, 26 insertions(+), 9 deletions(-) + 1 file changed, 26 insertions(+), 9 deletions(-) commit 6854053a1603a6dfe8421376d3455255800ce735 Author: Kristian Rietveld @@ -2264,7 +2443,7 @@ Remove pointless FIXME pango/pangocoretext.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit b5efdc928f392c2ec47c206af3cbeddb986553a0 Author: Kristian Rietveld @@ -2276,7 +2455,7 @@ family does not have an italic or oblique variant, then add synthetic italic variants that are handled by Pango. - pango/pangocairo-coretextfont.c | 14 ++++++- + pango/pangocairo-coretextfont.c | 14 ++++++-- pango/pangocoretext-fontmap.c | 71 ++++++++++++++++++++++++++++++++++++++- pango/pangocoretext-private.h | 1 + @@ -2290,7 +2469,7 @@ pango/pangocoretext-fontmap.c | 113 ++++++++++++++++++++++------------------- - 1 files changed, 61 insertions(+), 52 deletions(-) + 1 file changed, 61 insertions(+), 52 deletions(-) commit 87882adf1ccacfb49e8c119b1fcb6d13a0e4731f Author: Kristian Rietveld @@ -2312,7 +2491,7 @@ modules/basic/basic-coretext.c | 232 +++++++++ pango/Makefile.am | 21 + pango/modules.h | 1 + - pango/pangocairo-coretext.h | 55 ++ + pango/pangocairo-coretext.h | 55 +++ pango/pangocairo-coretextfont.c | 279 +++++++++++ pango/pangocairo-coretextfont.h | 37 ++ pango/pangocairo-coretextfontmap.c | 107 ++++ @@ -2334,7 +2513,7 @@ Fix the previous fix! modules/hangul/hangul-fc.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 file changed, 3 insertions(+), 2 deletions(-) commit 6b1910adacb133e229acde532a5a43d588d12faa Author: Behdad Esfahbod @@ -2344,7 +2523,7 @@ errors modules/hangul/hangul-fc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6b522430ad65fe047b077f9cc3990a97e8869e23 Author: Behdad Esfahbod @@ -2357,10 +2536,10 @@ by Karl Tomlinson pango/opentype/hb-buffer-private.h | 1 + - pango/opentype/hb-buffer.c | 70 + pango/opentype/hb-buffer.c | 66 +++++++++++++++++++++--------------- pango/opentype/hb-buffer.h | 2 +- - 3 files changed, 43 insertions(+), 30 deletions(-) + 3 files changed, 41 insertions(+), 28 deletions(-) commit ec69005aa8d865bc04e5a80258ee7a78bc0468ba Author: Víctor Manuel Jáquez Leal @@ -2371,7 +2550,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=644724 docs/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 729352cf1c328615b05e7368a5888a23f7382c4e Author: John (J5) Palmieri @@ -2382,8 +2561,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=642593 pango/pango-layout.c | 80 - ++++++++++++++++++++++++++----------------------- - 1 files changed, 42 insertions(+), 38 deletions(-) + ++++++++++++++++++++++++++------------------------ + 1 file changed, 42 insertions(+), 38 deletions(-) commit 4e6248d76f55c6184f28afe614d7d76b6fa3d455 Author: Behdad Esfahbod @@ -2392,7 +2571,7 @@ Bug 639882 - Heap corruption in font parsing with FreeType2 backend pango/pangoft2-render.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) + 1 file changed, 14 insertions(+), 2 deletions(-) commit 12de1ecf9ab9c925e7021288b10175af74007e94 Author: Laszlo Pandy @@ -2401,7 +2580,7 @@ [GI] Add (allow-none) annotations to pango_parse_markup(). pango/pango-markup.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit a7a0db3caa56c9924d823017a23dbc0e71f3ba60 Author: Laszlo Pandy @@ -2410,7 +2589,7 @@ [GI] Annotate out arguments of pango_parse_markup(). pango/pango-markup.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 34448ab65f41dfb0c098a3e0d112b084ef84f8d8 Author: Behdad Esfahbod @@ -2420,7 +2599,7 @@ cairo scale pango/pangocairo-font.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 4da05d60a8c9e7f22329c58264e0ca6c683dbf0c Author: Paolo Borelli @@ -2429,7 +2608,7 @@ Annotate pango_layout_get_context(). pango/pango-layout.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit d4a36df5f2e1a1487d7e9f7e966c16bb167a5b96 Author: Behdad Esfahbod @@ -2438,7 +2617,7 @@ [git.mk] Support Mallard docs git.mk | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + 1 file changed, 6 insertions(+), 2 deletions(-) commit 588847fe4b5ed905f3a035825567e08a3b4d516d Author: Sven Herzberg @@ -2450,7 +2629,7 @@ gnome-autogen.sh would have done autogen.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 807c776bf36667c697c0c9bd76d37160e9c1d8cc Author: Christian Persch @@ -2482,7 +2661,7 @@ Fixed https://bugzilla.gnome.org/show_bug.cgi?id=633208 autogen.sh | 38 +++++++++++++++++++++----------------- - 1 files changed, 21 insertions(+), 17 deletions(-) + 1 file changed, 21 insertions(+), 17 deletions(-) commit bcad3f2dfe3542d5d91e3172f883ca3d7943228e Author: Colin Walters @@ -2522,7 +2701,7 @@ configure.in: Add missing ; configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1f32ac0356cfc5c961570d7291d70603d85efa8b Author: Behdad Esfahbod @@ -2555,7 +2734,7 @@ which are all removed on mostlyclean by gsettings.m4. git.mk | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) + 1 file changed, 10 insertions(+), 1 deletion(-) commit ce7af5623349df44c4787a44296645db405c5e0c Author: Behdad Esfahbod @@ -2590,7 +2769,7 @@ docs/tmpl/win32-fonts.sgml | 9 +++++++++ docs/tmpl/x-fonts.sgml | 3 +++ docs/tmpl/xft-fonts.sgml | 3 +++ - 27 files changed, 104 insertions(+), 0 deletions(-) + 27 files changed, 104 insertions(+) commit 837f1bae095f90c662fdc51fd39a0eeb2bb8f850 Author: Behdad Esfahbod @@ -2603,7 +2782,7 @@ dependent libraries from the .la file... docs/Makefile.am | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + 1 file changed, 5 insertions(+), 3 deletions(-) commit 47ba8cfcb857d62f15f4df58d5d5c7bd5088a107 Author: Behdad Esfahbod @@ -2614,7 +2793,7 @@ Cleanup LINE_IS_VALID() usage. pango/pango-layout.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) + 1 file changed, 1 insertion(+), 8 deletions(-) commit 152e0aab5bb29d691e5e69e2f375b3b42e15e48e Author: Behdad Esfahbod @@ -2626,7 +2805,7 @@ pango/opentype/hb-open-type-private.hh | 2 +- pango/opentype/hb-ot-layout-gpos-private.hh | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) + 2 files changed, 2 insertions(+), 1 deletion(-) commit 254f42980e272f0560b28d466c2b65a1748b1132 Author: Behdad Esfahbod @@ -2635,7 +2814,7 @@ Bug 629632 - configure bug configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 4f5c9708455308eb2fb692817db6ef103505da72 Author: Tor Lillqvist @@ -2664,7 +2843,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627973 pango/Makefile.am | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 file changed, 5 insertions(+), 5 deletions(-) commit 7030230ac42811e44fb47d9af0149e425abacc79 Author: Behdad Esfahbod @@ -2673,7 +2852,7 @@ Bug 627978 - explicitly link with the math lib (-lm) for use of 'cos' examples/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit b13aea4f55a6db5518866af72cd079a5c002a8f1 Author: Behdad Esfahbod @@ -2682,7 +2861,7 @@ Bug 627902 - explicitely link dump-boundaries to GLib tests/Makefile.am | 19 +++++++++++-------- - 1 files changed, 11 insertions(+), 8 deletions(-) + 1 file changed, 11 insertions(+), 8 deletions(-) commit 2baffa4c47b64c4b6a0603eaeb951a6be6ba5b5e Author: Behdad Esfahbod @@ -2691,7 +2870,7 @@ Fix include pango/pango-engine-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit d3f2af76130687f72653c1866fb8af91b6500250 Author: Robert Ancell @@ -2713,7 +2892,7 @@ pango/pangofc-font.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 45 insertions(+), 3 deletions(-) + 1 file changed, 45 insertions(+), 3 deletions(-) commit 9b43da625483b68aa8702d217523bf9d8a8100d6 Author: Behdad Esfahbod @@ -2751,7 +2930,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=554524 pango/pango-utils.c | 26 +++++++++++++++++--------- - 1 files changed, 17 insertions(+), 9 deletions(-) + 1 file changed, 17 insertions(+), 9 deletions(-) commit 3743d1c82066ecd4f8d6d6fba993b15fcc8d9773 Author: Tor Lillqvist @@ -2762,7 +2941,7 @@ As such libpangowin32 is deprecated, I guess... pango/pangowin32.def | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3882c7dcaa00c0489c4bfdd582b3fefe5e3741b9 Author: Tor Lillqvist @@ -2776,9 +2955,9 @@ Patch by by David E. Hollingsworth and Fredrik Corneliusson, from bug modules/basic/basic-win32.c | 50 - ++++++++++++++++++++++++++++++++---------- - pango/pangowin32-private.h | 7 ++--- - pango/pangowin32.c | 29 +++++++++--------------- + ++++++++++++++++++++++++++++++++----------- + pango/pangowin32-private.h | 7 +++--- + pango/pangowin32.c | 29 ++++++++++--------------- pango/pangowin32.def | 1 + 4 files changed, 53 insertions(+), 34 deletions(-) @@ -2789,7 +2968,7 @@ Bump version to 1.29 configure.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit cf1022c02c89d50a64743b1cf8d989817e4e1fd1 Author: Behdad Esfahbod @@ -2812,7 +2991,7 @@ Bug 621612 - VPATH build fix pango-view/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit a30783a14c4dc69adc43922474e79721fec54829 Author: Matthias Clasen @@ -2824,7 +3003,7 @@ http://build.gnome.org/builders/pango-RHEL5/builds/310/steps/pango%20check/logs/stdio pango/pangoft2.def | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 8be1be82dbea3e81596366d1fa65d9b79d73850c Author: Behdad Esfahbod @@ -2833,7 +3012,7 @@ Cypriot is RTL pango/pango-gravity.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 495932623fb3390dd4249e08a3fd8593ebceaef4 Author: Behdad Esfahbod @@ -2844,7 +3023,7 @@ Bug 605870 - Incorrect shaping for Syriac pango/pango-ot-info.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 1caf2947f0941e2354dd4f43d56934e1ec706b6e Author: Behdad Esfahbod @@ -2866,14 +3045,14 @@ [cairo] Refactor common code in create_metrics_for_context() pango/pangocairo-atsuifont.c | 31 +++++-------------------- - pango/pangocairo-fcfont.c | 8 +++--- + pango/pangocairo-fcfont.c | 8 +++---- pango/pangocairo-font.c | 48 ++++++++++++++++++++++++++++++++++++++- - pango/pangocairo-private.h | 4 +- + pango/pangocairo-private.h | 4 ++-- pango/pangocairo-win32font.c | 31 +++++-------------------- pango/pangofc-font.c | 51 - ++--------------------------------------- - pango/pangofc-private.h | 4 +- + +++--------------------------------------- + pango/pangofc-private.h | 4 ++-- 7 files changed, 70 insertions(+), 107 deletions(-) commit fd31122c5a153c3a21ae015cdd1c72aef79671d0 @@ -2883,7 +3062,7 @@ [HB] Minor pango/opentype/hb-ot-layout-gpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 140cfe4b4a40f95a379c1b78881b1edf12f72145 Author: Behdad Esfahbod @@ -2892,7 +3071,7 @@ [HB] Improve comments pango/opentype/hb-open-type-private.hh | 22 ++++++++++++++-------- - 1 files changed, 14 insertions(+), 8 deletions(-) + 1 file changed, 14 insertions(+), 8 deletions(-) commit 4eca6bc0c98b573cc28005413e40790af8b10930 Author: Behdad Esfahbod @@ -2901,7 +3080,7 @@ [HB] Remove stale TODO item pango/opentype/hb-open-type-private.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit 9091e0f4d59b4f6dec4b0992f86ddcc141c0b919 Author: Behdad Esfahbod @@ -2910,7 +3089,7 @@ [HB] Use a function template instead of struct template for Null pango/opentype/hb-open-type-private.hh | 24 ++++++++++-------------- - 1 files changed, 10 insertions(+), 14 deletions(-) + 1 file changed, 10 insertions(+), 14 deletions(-) commit 39620ce42fa212d4e76f49ac257d2b2cf6da20fa Author: Behdad Esfahbod @@ -2940,7 +3119,7 @@ [HB] Fix Class operator return type pango/opentype/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 851f873072b26b32c514c459ba2ca141dd1b79e0 Author: Behdad Esfahbod @@ -2949,7 +3128,7 @@ [HB] Add couple consts to operators pango/opentype/hb-open-type-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit fc23518fc6fb391a0e7dc872c6a2e89a09cad018 Author: Behdad Esfahbod @@ -2970,7 +3149,7 @@ pango/opentype/hb-ot-layout-gpos-private.hh | 147 +++++++++++++++++++++------ - 1 files changed, 116 insertions(+), 31 deletions(-) + 1 file changed, 116 insertions(+), 31 deletions(-) commit 0d0cbf451613c301ae358cc4dbe54fb63ae5fc9e Author: Behdad Esfahbod @@ -3012,7 +3191,7 @@ pango-view/viewer-render.c | 41 ++++++++++++++++++++++++++++++++++------- - 1 files changed, 34 insertions(+), 7 deletions(-) + 1 file changed, 34 insertions(+), 7 deletions(-) commit 91d8773a88938aaa0a78de9bc6f768baf7021bc8 Author: Tor Lillqvist @@ -3024,7 +3203,7 @@ problem with make dist. pango/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 5f32f21772954f40d337a1e60299be47fc8be572 Author: Behdad Esfahbod @@ -3033,7 +3212,7 @@ [HB] Fix leak when duplicating blob pango/opentype/hb-blob.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit f4201009d192300442e76d25a83c0dab8022d0d6 Author: Kristian Rietveld @@ -3054,7 +3233,7 @@ pango/pangoatsui-fontmap.c | 8 ++++++- pango/pangocairo-atsuifont.c | 47 - ++++++++++++++++++++--------------------- + +++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 25 deletions(-) commit 7e2abeb19c4b0760d60ec8b388c9f98075700004 @@ -3066,7 +3245,7 @@ It has to be possible to run "make dist" also in an unpacked tarball. build/win32/vs9/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 9cac172f82dd492d068590434199989021be236e Author: Behdad Esfahbod @@ -3101,10 +3280,10 @@ pango/opentype/hb-open-file-private.hh | 4 ++- pango/opentype/hb-open-type-private.hh | 11 ++++--- - pango/opentype/hb-ot-layout-common-private.hh | 10 +++++- + pango/opentype/hb-ot-layout-common-private.hh | 10 ++++-- pango/opentype/hb-ot-layout-gpos-private.hh | 37 +++++++++++++---------- - pango/opentype/hb-ot-layout-gsubgpos-private.hh | 15 +++++---- + pango/opentype/hb-ot-layout-gsubgpos-private.hh | 15 ++++----- 5 files changed, 46 insertions(+), 31 deletions(-) commit 7ee9ab4b2519131a9753499175ec43871232c84d @@ -3114,7 +3293,7 @@ [HB] Cosmetic pango/opentype/hb-ot-layout-common-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit d9e254f3220337577b22f229839e036f344ce048 Author: Tor Lillqvist @@ -3170,8 +3349,8 @@ build/win32/Makefile.am | 1 + config.h.win32.in | 151 +++++++++++++++++++++++++++++++++++++++++++++++ - pango/pangocairo.rc.in | 30 +++++++++ - 4 files changed, 183 insertions(+), 0 deletions(-) + pango/pangocairo.rc.in | 30 ++++++++++ + 4 files changed, 183 insertions(+) commit b68d520e9ff526be4301f6db09c0faa077cd864a Author: Tor Lillqvist @@ -3207,7 +3386,7 @@ what the configure script provides. Makefile.am | 4 +- - README.win32 | 28 +---- + README.win32 | 28 ++---- build/win32/vs9/Makefile.am | 8 ++ build/win32/vs9/README.txt | 35 +++++++ build/win32/vs9/install.vcproj | 78 +++++++++++++++ @@ -3222,7 +3401,7 @@ +++++++++++++++++++++++++++++++ build/win32/vs9/stdint.h | 36 +++++++ build/win32/vs9/unistd.h | 1 + - configure.in | 9 ++- + configure.in | 9 +- modules/arabic/arabic-fc.c | 4 + modules/arabic/arabic-lang.c | 4 + modules/basic/basic-fc.c | 5 + @@ -3235,10 +3414,10 @@ modules/syriac/syriac-fc.c | 4 + modules/thai/thai-fc.c | 5 + modules/tibetan/tibetan-fc.c | 4 + - pango/Makefile.am | 55 +++++++++- + pango/Makefile.am | 55 +++++++++-- pango/mini-fribidi/Makefile.am | 10 ++ pango/module-defs-fc.c.win32 | 40 +++----- - pango/module-defs-lang.c.win32 | 11 ++ + pango/module-defs-lang.c.win32 | 11 +++ pango/module-defs-win32.c.win32 | 26 +---- pango/module-defs.h.win32 | 74 ++++++++++++++ pango/opentype/Makefile.am | 10 ++ @@ -3251,7 +3430,7 @@ [git.mk] Fix bug with parallel make and subdirs git.mk | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + 1 file changed, 5 insertions(+), 2 deletions(-) commit 238d7a23d619f842953ee41f9592bbf8c6c409c7 Author: Behdad Esfahbod @@ -3263,7 +3442,7 @@ Random character class changes... It's all Chinese to me. modules/indic/indic-ot-class-tables.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + 1 file changed, 6 insertions(+), 6 deletions(-) commit 45c5cb6acd497e159e68835cba78061793eaad98 Author: Behdad Esfahbod @@ -3273,7 +3452,7 @@ modules/indic/indic-lang.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 73 insertions(+), 0 deletions(-) + 1 file changed, 73 insertions(+) commit 8818723646aeb013dd39fca1c6e1162c7636b67f Author: Behdad Esfahbod @@ -3286,7 +3465,7 @@ != NULL. pango/pango-ot-info.c | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) + 1 file changed, 1 insertion(+), 7 deletions(-) commit 952847a6e2d53b33cea39d13255fd0f7c8075942 Author: Behdad Esfahbod @@ -3297,7 +3476,7 @@ Bug 604128 - Applications crash when displaying Hebrew characters pango/opentype/hb-blob.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + 1 file changed, 7 insertions(+), 7 deletions(-) commit 8c3bffeccbd0074e04adf894199393580de88e95 Author: Tor Lillqvist @@ -3311,7 +3490,7 @@ simple workaround. pango/pango-ot-info.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + 1 file changed, 7 insertions(+), 1 deletion(-) commit 77f99dd9e17c5051b2b2dcfe6e7746f924e9f71b Author: Kristian Rietveld @@ -3324,7 +3503,7 @@ was expected. modules/basic/basic-atsui.c | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) + 1 file changed, 9 insertions(+), 6 deletions(-) commit 2c858fe6b36801e731fe764c1085a2cbcbc04037 Author: Behdad Esfahbod @@ -3337,7 +3516,7 @@ docs/pango-docs.sgml | 3 +++ docs/pango-sections.txt | 1 + docs/tmpl/atsui-fonts.sgml | 9 +++++++++ - 3 files changed, 13 insertions(+), 0 deletions(-) + 3 files changed, 13 insertions(+) commit 728bec3cb2525b35b16cea772428a70350aba3fb Author: Behdad Esfahbod @@ -3358,7 +3537,7 @@ Bug 593240 - (pangoosx) Crash / infinite loop with Mac OS X pango/opentype/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit aae6aab95ce876f52c266bddb2b200344f8020bb Author: Behdad Esfahbod @@ -3367,7 +3546,7 @@ Enable introspection for dist again Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit b6a2d2b3fc0ad9e3506b0b530346d3c044488419 Author: Behdad Esfahbod @@ -3378,7 +3557,7 @@ Disable some __attribute__s with gcc 3. pango/opentype/hb-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit c7460fc1b71a491a1b33c19ba0d4cd3b8353c7cb Author: Behdad Esfahbod @@ -3389,7 +3568,7 @@ pango/opentype/hb-ot-layout.cc | 1 - pango/opentype/hb-ot-layout.h | 1 - pango/pango-ot-info.c | 3 +-- - 3 files changed, 1 insertions(+), 4 deletions(-) + 3 files changed, 1 insertion(+), 4 deletions(-) commit 797d46714d27f147277fdd5346648d838c68fb8c Author: Behdad Esfahbod @@ -3398,7 +3577,7 @@ [HB/GDEF] Fix bug in building synthetic GDEF table pango/opentype/hb-ot-layout.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) commit 558b96314f1184c5f031545ee238549ac3dd3868 Author: Behdad Esfahbod @@ -3419,7 +3598,7 @@ [configure] Remove stale code configure.in | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + 1 file changed, 3 deletions(-) commit 2b3154b4b7cd9ad1cd532f095c10bedfccfae190 Author: Behdad Esfahbod @@ -3428,7 +3607,7 @@ Bug 582697 - Add pango-view --pixels option pango-view/viewer-render.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + 1 file changed, 7 insertions(+), 1 deletion(-) commit 0f0b9f963db52024f348359ce61c66bff6ce0531 Author: Johan Dahlin @@ -3439,7 +3618,7 @@ Since it breaks when using a system install of gobject-introspection pango/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 5389aa2daacc6d41e1a2adeed24ca49f30d371ec Author: Behdad Esfahbod @@ -3448,7 +3627,7 @@ Simplify cluster analysis pango/pango-layout.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + 1 file changed, 2 insertions(+), 3 deletions(-) commit d52aa9ec30e74b593eee80082bf8f27bea08246f Author: Behdad Esfahbod @@ -3461,7 +3640,7 @@ essentially free these days, so do it always. pango/pango-layout.c | 10 ++-------- - 1 files changed, 2 insertions(+), 8 deletions(-) + 1 file changed, 2 insertions(+), 8 deletions(-) commit 2cd9c4b416cbe55dd68106003f360e861a6722be Author: Behdad Esfahbod @@ -3480,7 +3659,7 @@ Problem originally reported on gtk-list on 2009-12-22 by Ben Pfaff. pango/pango-layout.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 file changed, 10 insertions(+) commit dded011854cf721ca80587e3f7587d2af31a859d Author: Behdad Esfahbod @@ -3489,7 +3668,7 @@ Cosmetic pango/pango-layout.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit 0dbcc691b8e14879a72d275d188848064d8c7e40 Author: Behdad Esfahbod @@ -3498,7 +3677,7 @@ [modules] Don't warn multiple times pango/modules.c | 44 ++++++++++++++++++++++++++++++++------------ - 1 files changed, 32 insertions(+), 12 deletions(-) + 1 file changed, 32 insertions(+), 12 deletions(-) commit ce6ee34f226b5f7582ea944fe8123bb0a04269d0 Author: Kristian Rietveld @@ -3507,7 +3686,7 @@ Don't use devel version numbers in Since tags pango/pangoatsui.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 0f06d7758bc37a4942342d2c17a88944cbc88adb Author: Kristian Rietveld @@ -3556,7 +3735,7 @@ Fix FT_Face finalizer call pango/pango-ot-info.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit fd15a3a04c69af0f5c04cde8c659269d0b139c28 Author: Johan Dahlin @@ -3585,8 +3764,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604770 pango/Makefile.am | 145 - +++++++++++++++++++++------------------------------- - 1 files changed, 59 insertions(+), 86 deletions(-) + ++++++++++++++++++++++------------------------------- + 1 file changed, 59 insertions(+), 86 deletions(-) commit aad6150aa47601dcc1c3aa7766dec828197b5919 Author: Johan Dahlin @@ -3597,7 +3776,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604770 Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ee573c4e722c8ef7aff41c6cc98eaeab1ac57aec Author: Behdad Esfahbod @@ -3607,7 +3786,7 @@ NEWS | 9 +++++++++ configure.in | 2 +- - 2 files changed, 10 insertions(+), 1 deletions(-) + 2 files changed, 10 insertions(+), 1 deletion(-) commit 3230261dd6f856b77688cad7c40b7b83b63c17ed Author: Behdad Esfahbod @@ -3616,7 +3795,7 @@ Simplify make rules pango/Makefile.am | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + 1 file changed, 2 insertions(+), 4 deletions(-) commit 20889f065700ef005b1016729e9c26e078ef9e8a Author: Kristian Rietveld @@ -3631,7 +3810,7 @@ also broke support for Tiger and earlier -- we will fix that soonish. pango/pangocairo-atsuifont.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1a6d89b217fb259f91f8661351336cec651c55e3 Author: Behdad Esfahbod @@ -3640,7 +3819,7 @@ Bug 602823 - void function cannot return value pango/glyphstring.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit b685d25141ba069d2494b17fada2ecedd6dd0df5 Author: Behdad Esfahbod @@ -3655,7 +3834,7 @@ Cherry-picked from harfbuzz-ng repo. pango/opentype/hb-ot-layout-gsub-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 40bade07f999a0535e0cbc8c2afe45d44e92a663 Author: Behdad Esfahbod @@ -3684,7 +3863,7 @@ pango/opentype/hb-ot-layout-gpos-private.hh | 76 +++++++++-------------- pango/opentype/hb-ot-layout-gsub-private.hh | 44 +++++-------- - pango/opentype/hb-ot-layout-gsubgpos-private.hh | 47 +++++++-------- + pango/opentype/hb-ot-layout-gsubgpos-private.hh | 47 +++++++------- pango/opentype/hb-private.h | 5 ++ 8 files changed, 122 insertions(+), 137 deletions(-) @@ -3723,7 +3902,7 @@ NEWS | 12 ++++++++++++ configure.in | 2 +- - 2 files changed, 13 insertions(+), 1 deletions(-) + 2 files changed, 13 insertions(+), 1 deletion(-) commit df2d2ecbedfcc9fd470313c08f3d7edad148a0d1 Author: Behdad Esfahbod @@ -3732,7 +3911,7 @@ Fix pangocairo-fc fontsize weirdness pango/pangocairo-fcfont.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + 1 file changed, 2 insertions(+), 3 deletions(-) commit d9abcaf566e9cd7f702c98958f99f90fd53b4c0b Author: Behdad Esfahbod @@ -3744,9 +3923,9 @@ be redone for 1.28 (harfbuzz-ng) anyway. pango/pango-ot-buffer.c | 56 - +++++++++++++++++++++++++++++++++++++++++----- + ++++++++++++++++++++++++++++++++++++++++++----- pango/pangofc-font.c | 19 ++++++++++++++++ - pango/pangofc-private.h | 44 ++++++++++++++++++++++++++++++++++++ + pango/pangofc-private.h | 44 +++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 6 deletions(-) commit 4ccabeffc20f899163bf610356871afb197e9bf8 @@ -3778,7 +3957,7 @@ Fix typo in previous commit pango-view/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 28e179b4f24e11f2af3b739c6c5c3bd560d2de74 Author: Behdad Esfahbod @@ -3789,7 +3968,7 @@ Second try. pango-view/Makefile.am | 28 +++++++++++++--------------- - 1 files changed, 13 insertions(+), 15 deletions(-) + 1 file changed, 13 insertions(+), 15 deletions(-) commit 16c3f1d491a04eb8b12f209f97904c7862fbb9db Author: Behdad Esfahbod @@ -3800,7 +3979,7 @@ Try to fix parallel build.. pango-view/Makefile.am | 25 ++++++++++++++++--------- - 1 files changed, 16 insertions(+), 9 deletions(-) + 1 file changed, 16 insertions(+), 9 deletions(-) commit 5f3d21b78679694f76e788e9308062380a0d0c8e Author: Behdad Esfahbod @@ -3821,7 +4000,7 @@ Fix leak with non-mmapped fonts pango/pango-ot-info.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit bfbe9aea599bc98ffd4640268a66c90d6fa21736 Author: Behdad Esfahbod @@ -3830,7 +4009,7 @@ [HB] Add glyph_metrics typedef pango/opentype/hb-font.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 file changed, 9 insertions(+) commit cdb7383be41b4ace0e6d9f3a05ac3983e8d4eaf0 Author: Behdad Esfahbod @@ -3841,7 +4020,7 @@ Pointed out by Keith Stribley on HarfBuzz list. pango/opentype/hb-font.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 44164ee60f5ef2fc4f7a03846b60d72eb67ecb0e Author: Behdad Esfahbod @@ -3853,7 +4032,7 @@ pango/opentype/hb-ot-layout-common-private.hh | 1 + pango/opentype/hb-ot-layout.cc | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) + 2 files changed, 2 insertions(+), 1 deletion(-) commit 078b2d5b20c4c9e8b3f0a11d1d40e5510ef94cf6 Author: Behdad Esfahbod @@ -3865,7 +4044,7 @@ Add classification for new characters. Patch from Parag AN. modules/indic/indic-ot-class-tables.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 1038b7959944dd25d7c2a76a3c769eb26b5fd6a2 Author: Behdad Esfahbod @@ -3888,7 +4067,7 @@ Reported by mpsuzuki on gtk-i18n-list on 2009-10-16. configure.in | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + 1 file changed, 2 insertions(+), 4 deletions(-) commit 8598817414ab8bde6c218c6255faf378597394ea Author: Behdad Esfahbod @@ -3897,7 +4076,7 @@ Update from vte git.mk | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 6cf73f0034b6db8f10a5cdc096c7a5d1ac53af94 Author: Behdad Esfahbod @@ -3906,7 +4085,7 @@ Typo pango/pangocairo-font.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 8299e480df42f0c1c6481a87c83a6497e76856f0 Author: Behdad Esfahbod @@ -3915,7 +4094,7 @@ Bug 596837 - Typo in pango_cairo_show_layout documentation pango/pangocairo-render.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 18b4ad750528cf5018dc7aa53ba37d1a8af44e1f Author: Behdad Esfahbod @@ -3934,7 +4113,7 @@ [HB] Add comment pango/opentype/hb-ot-layout-gsubgpos-private.hh | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit d50615c838ef7b448021dacbe4daa49aa26ea388 Author: Behdad Esfahbod @@ -3947,7 +4126,7 @@ OpenType font pango/opentype/hb-ot-layout-gsubgpos-private.hh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit 73f94ec879476f52adac105570f4cebe5bd02c0c Author: Behdad Esfahbod @@ -3960,7 +4139,7 @@ OpenType font pango/opentype/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 730bed768e8eb4ed14d21bd390403d8bfed71742 Author: Behdad Esfahbod @@ -3985,7 +4164,7 @@ simply wrong. pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ce01a496c7dad90c672e673c0e7ba8c5de350137 Author: Behdad Esfahbod @@ -4010,7 +4189,7 @@ This reverts commit ea608c0bd7721d3019bed7ef2472289b1ea6fa53. modules/basic/basic-win32.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) + 1 file changed, 7 insertions(+), 6 deletions(-) commit 7f821fb6f714095c431f2195eb42ea2d288f84af Author: Behdad Esfahbod @@ -4019,7 +4198,7 @@ Only check doc coverage if building docs docs/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 03e20e37a11971de6717c88d392362ec9e858880 Author: Behdad Esfahbod @@ -4029,7 +4208,7 @@ NEWS | 7 +++++++ configure.in | 2 +- - 2 files changed, 8 insertions(+), 1 deletions(-) + 2 files changed, 8 insertions(+), 1 deletion(-) commit 29f4c73be091fa950269d5923923482905bcd14b Author: Behdad Esfahbod @@ -4038,7 +4217,7 @@ [HB] Add TODO item pango/opentype/TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit e10a17f28cbb8c6c4bd707b79af7e7d2b1370c16 Author: Behdad Esfahbod @@ -4049,12 +4228,12 @@ pango/opentype/hb-open-file-private.hh | 8 +- pango/opentype/hb-open-type-private.hh | 50 ++++++------ pango/opentype/hb-ot-layout-common-private.hh | 32 ++++---- - pango/opentype/hb-ot-layout-gdef-private.hh | 20 +++--- + pango/opentype/hb-ot-layout-gdef-private.hh | 20 ++--- pango/opentype/hb-ot-layout-gpos-private.hh | 92 - +++++++++++----------- + +++++++++++------------ pango/opentype/hb-ot-layout-gsub-private.hh | 72 +++++++++--------- pango/opentype/hb-ot-layout-gsubgpos-private.hh | 78 - ++++++++++---------- + +++++++++---------- 7 files changed, 176 insertions(+), 176 deletions(-) commit a6fbd0752ada8f1ae64b77b09b84202c969a3b9b @@ -4063,8 +4242,8 @@ [HB] Add GSUB/GPOS tracing - pango/opentype/hb-ot-layout-gpos-private.hh | 29 ++++++++++++- - pango/opentype/hb-ot-layout-gsub-private.hh | 28 ++++++++++++- + pango/opentype/hb-ot-layout-gpos-private.hh | 29 ++++++++++++-- + pango/opentype/hb-ot-layout-gsub-private.hh | 28 +++++++++++-- pango/opentype/hb-ot-layout-gsubgpos-private.hh | 49 ++++++++++++++++++++++- 3 files changed, 98 insertions(+), 8 deletions(-) @@ -4088,7 +4267,7 @@ Enable silent rules by default configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 735e2efc3369d4ad28a1ab73352232e39f768e27 Author: Behdad Esfahbod @@ -4097,7 +4276,7 @@ Fix stupid array growing bug pango/opentype/hb-ot-layout.cc | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 file changed, 4 insertions(+), 1 deletion(-) commit d82431ec05b92cef903d02d47d8069a9427e96b9 Author: Behdad Esfahbod @@ -4106,7 +4285,7 @@ [HB] Simplify counting pango/opentype/hb-ot-layout.cc | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 file changed, 5 insertions(+), 4 deletions(-) commit 98428c0680625be6737d89bca6104ff95cd7037b Author: Behdad Esfahbod @@ -4118,7 +4297,7 @@ things crash pango/pango-ot-info.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit ca180e1f0e2a453bd9ae16791b6bba1328cfffeb Author: Behdad Esfahbod @@ -4127,7 +4306,7 @@ [HB] Indent pango/opentype/hb-blob.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit b16c2664af5be02dfa987f3e8449dcb04d108c00 Author: Behdad Esfahbod @@ -4136,7 +4315,7 @@ [HB] Bug 593231 - < c99 compiler dislikes ValueRecord pango/opentype/hb-ot-layout-gpos-private.hh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) commit 364548d8014ba4e29b486a5d430f23415f27742e Author: Behdad Esfahbod @@ -4146,7 +4325,7 @@ NEWS | 7 +++++++ configure.in | 2 +- - 2 files changed, 8 insertions(+), 1 deletions(-) + 2 files changed, 8 insertions(+), 1 deletion(-) commit 3831dec6ed827fb7854743413b1936ab65b578b3 Author: Behdad Esfahbod @@ -4155,7 +4334,7 @@ Update git.mk git.mk | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 4c68b4bf575e6d02c658507374c9fb3cb0f958c6 Author: Behdad Esfahbod @@ -4166,7 +4345,7 @@ Fix off-by-one. pango/opentype/hb-ot-layout.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 48d7faba771a738504e0c431c29458cac305275f Author: Behdad Esfahbod @@ -4175,7 +4354,7 @@ [HB][glib] Make glib unicode funcs static pango/opentype/hb-glib.c | 36 +++++++++++++++++------------------- - 1 files changed, 17 insertions(+), 19 deletions(-) + 1 file changed, 17 insertions(+), 19 deletions(-) commit c18e50d95f6283031e9fe365d914bdcc85f339cc Author: Behdad Esfahbod @@ -4184,7 +4363,7 @@ [HB] Fix more casts pango/opentype/hb-open-type-private.hh | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 file changed, 5 insertions(+), 5 deletions(-) commit 6f73b497a2f4d22611a136ef360b68a78547074f Author: Behdad Esfahbod @@ -4195,7 +4374,7 @@ Hiss! pango/opentype/hb-private.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 392f1f1ddb24c0e7d1d64ee8d36c739ac6482b81 Author: Behdad Esfahbod @@ -4212,7 +4391,7 @@ Based on mailing list discussion with Carl Worth. pango/opentype/hb-blob.c | 51 - ++++++++++++++++++++++----------------------- + +++++++++++++++++++++++----------------------- pango/opentype/hb-blob.h | 1 - 2 files changed, 25 insertions(+), 27 deletions(-) @@ -4224,9 +4403,9 @@ pango/opentype/hb-blob.c | 38 ++++++++++++++++---------------- - pango/opentype/hb-blob.h | 10 ++++---- - pango/opentype/hb-open-type-private.hh | 6 ++-- - pango/pango-ot-info.c | 4 +- + pango/opentype/hb-blob.h | 10 ++++----- + pango/opentype/hb-open-type-private.hh | 6 ++--- + pango/pango-ot-info.c | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) commit 2bd2cd6ed88671df1d7db1ede9a8c02208cb8f48 @@ -4236,7 +4415,7 @@ [HB] Hide lig_id and component members of hb_glyph_info_t pango/opentype/hb-buffer.h | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + 1 file changed, 2 insertions(+), 3 deletions(-) commit 34810eedcd0fe0c5347a69e511a16b27ef0499d6 Author: Behdad Esfahbod @@ -4245,7 +4424,7 @@ [HB] Fix typo pango/opentype/hb-font.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 0a8034ea52c1297e330e75ce5cccb3a6bf602fff Author: Behdad Esfahbod @@ -4288,7 +4467,7 @@ [HB] Fix more wrong method signatures pango/opentype/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 602c83982359f98916967dc88da6b5731fc06798 Author: Behdad Esfahbod @@ -4297,7 +4476,7 @@ [HB] Fix wrong method signature pango/opentype/hb-ot-layout-common-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 8f6e589aaab62f384c6c8dbc4d0087147bc22237 Author: Behdad Esfahbod @@ -4309,7 +4488,7 @@ configure.in | 1 + pango/opentype/hb-blob.c | 94 - +++++++++++++++++++++++++++++---------------- + +++++++++++++++++++++++++++++----------------- 2 files changed, 61 insertions(+), 34 deletions(-) commit a90b692a43bc94a7d204ff36422e3b0b3c5ba27d @@ -4320,7 +4499,7 @@ NEWS | 13 +++++++++++++ configure.in | 2 +- - 2 files changed, 14 insertions(+), 1 deletions(-) + 2 files changed, 14 insertions(+), 1 deletion(-) commit cad422da3d653dae3f55eb9fc93d09b8a9530c9d Author: Behdad Esfahbod @@ -4329,7 +4508,7 @@ AM_V_GEN ChangeLog too Makefile.am | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit d4f8da3f4855db24484a8924d883df362561b7ce Author: Behdad Esfahbod @@ -4357,7 +4536,7 @@ For stable releases, no micro release adds new API. configure.in | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 file changed, 10 insertions(+) commit 5f256c2fd14b2cd18978a3963c8b49a2b68966f5 Author: Behdad Esfahbod @@ -4366,7 +4545,7 @@ [introspection] Don't this gir files, really pango/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 59fbdf8efd88d72c587dc55a22b6eabd7184284b Author: Behdad Esfahbod @@ -4375,7 +4554,7 @@ [Makefile] Remove GIR files from EXTRA_DIST pango/Makefile.am | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit 078300ef69ab0855a7cc39503880cbc8b2e23494 Author: Colin Walters @@ -4395,7 +4574,7 @@ configure.in | 2 +- pango/Makefile.am | 69 - ++++++++++++++++++++-------------------------------- + +++++++++++++++++++++-------------------------------- 2 files changed, 28 insertions(+), 43 deletions(-) commit f1d8d01c81b10a8c5ed47fef7a3fba10aa66140c @@ -4418,8 +4597,8 @@ [HB] Simplify loop pango/opentype/hb-ot-layout-gpos-private.hh | 31 - ++++++++++++-------------- - 1 files changed, 14 insertions(+), 17 deletions(-) + ++++++++++++--------------- + 1 file changed, 14 insertions(+), 17 deletions(-) commit 400a17544e80d46ef9d7aaca4d1c33a6e11f5f97 Author: Behdad Esfahbod @@ -4428,8 +4607,8 @@ [HB] Merge mark positionin code between three types of lookups pango/opentype/hb-ot-layout-gpos-private.hh | 95 - ++++++++------------------ - 1 files changed, 29 insertions(+), 66 deletions(-) + ++++++++------------------- + 1 file changed, 29 insertions(+), 66 deletions(-) commit ae76417677db1d7a8daf454bf043269479b7910d Author: Behdad Esfahbod @@ -4472,7 +4651,7 @@ pango/opentype/hb-ot-layout-gpos-private.hh | 127 ++++++++++----------------- - 1 files changed, 48 insertions(+), 79 deletions(-) + 1 file changed, 48 insertions(+), 79 deletions(-) commit 279a5bd1bbd085493a1ce882274481a80a443e46 Author: Behdad Esfahbod @@ -4481,8 +4660,8 @@ [HB] Simplify MarkMark pango/opentype/hb-ot-layout-gpos-private.hh | 29 - ++++++++++++++------------ - 1 files changed, 16 insertions(+), 13 deletions(-) + +++++++++++++++------------ + 1 file changed, 16 insertions(+), 13 deletions(-) commit 10bc378f81fb2fd21fd7ef5f8d6242ad18b88132 Author: Behdad Esfahbod @@ -4502,8 +4681,8 @@ [HB] Debug output for SANITIZE_MEM() pango/opentype/hb-open-type-private.hh | 34 - +++++++++++++++++++++---------- - 1 files changed, 23 insertions(+), 11 deletions(-) + +++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) commit 397196a3758a4f0e645df876937ccc88d529b865 Author: Behdad Esfahbod @@ -4512,8 +4691,8 @@ [HB] Use inline function for SANITIZE_MEM() pango/opentype/hb-open-type-private.hh | 33 - +++++++++++++++++++------------ - 1 files changed, 20 insertions(+), 13 deletions(-) + +++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) commit 6e5affe549e571c4bfa46be48963001bcc1b3d74 Author: Behdad Esfahbod @@ -4522,7 +4701,7 @@ [HB] Use SANITIZE_THIS() when applicable pango/opentype/hb-open-type-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 578e321d3b5a08b86e6f1576f09973a94924e448 Author: Behdad Esfahbod @@ -4532,7 +4711,7 @@ pango/opentype/TODO | 1 + pango/opentype/hb-ot-layout-gpos-private.hh | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) + 2 files changed, 2 insertions(+), 1 deletion(-) commit d683b37b8817aef334281aada550bf8974fde1a8 Author: Behdad Esfahbod @@ -4540,11 +4719,11 @@ [HB] Add empty hb_shape() API - pango/opentype/Makefile.am | 2 + + pango/opentype/Makefile.am | 2 ++ pango/opentype/hb-shape.c | 40 +++++++++++++++++++++++++++++++++ pango/opentype/hb-shape.h | 53 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 95 insertions(+), 0 deletions(-) + 3 files changed, 95 insertions(+) commit f4868084a55e3abd0b45ee2fb7b477e038a81d1a Author: Behdad Esfahbod @@ -4555,7 +4734,7 @@ Fix the second instance. pango/opentype/hb-buffer.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ea608c0bd7721d3019bed7ef2472289b1ea6fa53 Author: David E. Hollingsworth @@ -4578,7 +4757,7 @@ from 20s to .3s. modules/basic/basic-win32.c | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) + 1 file changed, 6 insertions(+), 7 deletions(-) commit b4f10583ea84d02ed0278fc2cb2846aaf075864d Author: Behdad Esfahbod @@ -4603,7 +4782,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=591511 pango/opentype/hb-buffer-private.h | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + 1 file changed, 7 insertions(+), 7 deletions(-) commit c4f35720bc1310c37b41af134dace628ff35a221 Author: Behdad Esfahbod @@ -4638,7 +4817,7 @@ configure.in | 3 ++- pango/opentype/hb-blob.c | 8 ++++++++ - 2 files changed, 10 insertions(+), 1 deletions(-) + 2 files changed, 10 insertions(+), 1 deletion(-) commit 2059465b5d9440126d99a78aae7f785d89572194 Author: Behdad Esfahbod @@ -4647,7 +4826,7 @@ [HB] Add comment pango/opentype/hb-buffer-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7b1b94b255d616759672b03b2cf4b88aa013271a Author: Behdad Esfahbod @@ -4656,12 +4835,12 @@ New public API: pango_glyph_item_get_logical_widths() docs/pango-sections.txt | 1 + - docs/tmpl/glyphs.sgml | 10 +++++++ - pango/glyphstring.c | 39 +++-------------------------- + docs/tmpl/glyphs.sgml | 10 ++++++++ + pango/glyphstring.c | 39 ++++-------------------------- pango/pango-glyph-item.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ - pango/pango-glyph-item.h | 3 ++ - pango/pango-layout.c | 5 +-- + pango/pango-glyph-item.h | 3 +++ + pango/pango-layout.c | 5 ++-- pango/pango.def | 1 + 7 files changed, 81 insertions(+), 38 deletions(-) @@ -4684,7 +4863,7 @@ Since the glyph widths can be adjusted directly. pango/pango-glyph.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 075e9925cc9d4675e5a6be65e599e4ee97f2d018 Author: Behdad Esfahbod @@ -4696,7 +4875,7 @@ In the mean time, IranNastaliq was hitting the 100 limit. pango/pango-ot-info.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 68b88d292b4be0bffe321c3da84891c4a7b3ba6f Author: Behdad Esfahbod @@ -4705,7 +4884,7 @@ [layout] clear state->log_widths after freeing pango/pango-layout.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 1e53d4d5904445c740a374ea8492935f95bf1654 Author: Behdad Esfahbod @@ -4714,7 +4893,7 @@ [HB] Always clear positions if dirty, before returning to user pango/opentype/hb-buffer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 141dfa186403bb22e1e3875fdc263d402b2abb1d Author: Behdad Esfahbod @@ -4728,7 +4907,7 @@ pango/opentype/hb-buffer-private.h | 1 + pango/opentype/hb-buffer.c | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) + 2 files changed, 13 insertions(+) commit 996eab4e5f35432692fc76939a2f586a1298c1da Author: Behdad Esfahbod @@ -4737,7 +4916,7 @@ [HB] Fixed signedness warnings pango/opentype/hb-open-type-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 4d5bd658c7b78392d24ad4cc82d800b6d0fc8434 Author: Behdad Esfahbod @@ -4746,7 +4925,7 @@ [HB] Ouch. Fix compilation. pango/opentype/hb-ot-layout-gpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit ebdcfbeb5aeb3e827326844f2f942570e503e26a Author: Behdad Esfahbod @@ -4770,7 +4949,7 @@ Initialize count variables. pango/pango-ot-info.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit c556ca970a90850b6c6a96033bb862e1ceb00866 Author: Behdad Esfahbod @@ -4779,7 +4958,7 @@ [doc] Update doc templates docs/tmpl/atsui-fonts.sgml | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 file changed, 9 insertions(+) commit c99c7784e5c65e9c67721ec7335bce57cbd59fe3 Author: Behdad Esfahbod @@ -4800,7 +4979,7 @@ Bug 562100 – docs check fails docs/pango-sections.txt | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 954319c6eb2eb3dc74a3e271ee5ae6f1ce12ee32 Author: Behdad Esfahbod @@ -4809,8 +4988,8 @@ Bug 591409 – crash in firefox. Handle non-mmapped FT_Face pango/pango-ot-info.c | 50 - +++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 40 insertions(+), 10 deletions(-) + +++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 40 insertions(+), 10 deletions(-) commit 620858ee966c7999b206dd3a883542a1057a8d41 Author: Behdad Esfahbod @@ -4830,7 +5009,7 @@ [HB] Add missing initializer pango/opentype/hb-font.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) commit 106c0db2c0d88d956a3e2184259c19948d9ea4b5 Author: Behdad Esfahbod @@ -4858,7 +5037,7 @@ +++++++++++++++++++++++++++++++++++ pango/opentype/hb-glib.h | 41 +++++++++++++++++++++++++ pango/opentype/hb-unicode-private.h | 2 +- - pango/opentype/hb-unicode.c | 10 +++--- + pango/opentype/hb-unicode.c | 10 +++---- pango/opentype/hb-unicode.h | 6 ++-- 6 files changed, 109 insertions(+), 10 deletions(-) @@ -4891,7 +5070,7 @@ [HB] Initialize unicode funcs to nil getters pango/opentype/hb-unicode.c | 29 +++++++++++++++++++---------- - 1 files changed, 19 insertions(+), 10 deletions(-) + 1 file changed, 19 insertions(+), 10 deletions(-) commit f2fab897d32061d9a0329384cd4b0fd71748ea97 Author: Behdad Esfahbod @@ -4902,7 +5081,7 @@ pango/opentype/hb-object-private.h | 2 +- pango/opentype/hb-unicode-private.h | 12 +++---- pango/opentype/hb-unicode.c | 67 - ++++++++++++++++++++++++++++++---- + ++++++++++++++++++++++++++++++----- pango/opentype/hb-unicode.h | 3 -- 4 files changed, 65 insertions(+), 19 deletions(-) @@ -4914,7 +5093,7 @@ pango/opentype/hb-buffer.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ - pango/opentype/hb-buffer.h | 12 ++-- + pango/opentype/hb-buffer.h | 12 ++--- 2 files changed, 116 insertions(+), 6 deletions(-) commit 640709e6008ffcd9dc969aec71fcd717acbb8797 @@ -4924,7 +5103,7 @@ [HB] Add buffer UTF-X API pango/opentype/hb-buffer.h | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) + 1 file changed, 21 insertions(+) commit dfa2cfce0dac5ba1d9f87aea5ff3ab3ed36be6ce Author: Behdad Esfahbod @@ -4955,7 +5134,7 @@ pango/opentype/Makefile.am | 3 + pango/opentype/hb-font-private.h | 29 +---- pango/opentype/hb-font.cc | 163 +++++++------------------- - pango/opentype/hb-font.h | 140 ++++++++--------------- + pango/opentype/hb-font.h | 140 ++++++++-------------- pango/opentype/hb-unicode-private.h | 54 +++++++++ pango/opentype/hb-unicode.c | 89 ++++++++++++++ pango/opentype/hb-unicode.h | 220 @@ -4987,7 +5166,7 @@ Add CXX check to configure configure.in | 11 +---------- - 1 files changed, 1 insertions(+), 10 deletions(-) + 1 file changed, 1 insertion(+), 10 deletions(-) commit b2ff4fa41d33af6c3f784d26667d5aa2ad81ebd3 Author: Behdad Esfahbod @@ -4998,7 +5177,7 @@ Just add couple of options to it (still assuming gcc) pango/opentype/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit e6e9681411d07bbbca4c2c00052896aab3459fef Author: Behdad Esfahbod @@ -5019,7 +5198,7 @@ Oops! pango/pangoft2.def | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + 1 file changed, 3 deletions(-) commit 7eea3552420ab23562c44777fceba91f5da5d883 Author: Behdad Esfahbod @@ -5032,7 +5211,7 @@ and hence breaks "distcheck". Need to look into it again. pango/Makefile.am | 31 ++++++++++++++++--------------- - 1 files changed, 16 insertions(+), 15 deletions(-) + 1 file changed, 16 insertions(+), 15 deletions(-) commit f5a10f5ce603cdd7dc70513c09975ca0535089b2 Author: Behdad Esfahbod @@ -5041,7 +5220,7 @@ [HB] Indent pango/opentype/hb-ot-layout.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit 7736059a852b4951ae2a14f02bb552262dd179fd Author: Behdad Esfahbod @@ -5050,7 +5229,7 @@ [HB] Remove unused code pango/opentype/hb-ot-layout-gdef-private.hh | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) + 1 file changed, 10 deletions(-) commit 845e7a7a35bd65af32a188b6cf89adb611ac35bc Author: Behdad Esfahbod @@ -5058,11 +5237,11 @@ [HB] Add a NEXT() macro - pango/opentype/hb-open-type-private.hh | 2 + - pango/opentype/hb-ot-layout-common-private.hh | 4 +- - pango/opentype/hb-ot-layout-gsub-private.hh | 8 +++--- + pango/opentype/hb-open-type-private.hh | 2 ++ + pango/opentype/hb-ot-layout-common-private.hh | 4 ++-- + pango/opentype/hb-ot-layout-gsub-private.hh | 8 ++++---- pango/opentype/hb-ot-layout-gsubgpos-private.hh | 24 - +++++++++++----------- + +++++++++++------------ 4 files changed, 20 insertions(+), 18 deletions(-) commit 4cd222b23494b2dd3511169be90f382922c5f210 @@ -5072,7 +5251,7 @@ [HB] Remove done TODO item pango/opentype/TODO | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit 88bfabba705331762f369364bbb38becf56d83ed Author: Behdad Esfahbod @@ -5081,7 +5260,7 @@ [HB] Print mark sets in main.cc pango/opentype/main.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 0956094754c054a9cafc7ead4bac24ca2c77439a Author: Behdad Esfahbod @@ -5095,7 +5274,7 @@ pango/opentype/hb-ot-layout.cc | 16 ---------------- pango/opentype/hb-ot-layout.h | 6 ------ - 2 files changed, 0 insertions(+), 22 deletions(-) + 2 files changed, 22 deletions(-) commit 3616d0b02412d86aa8d2370e67002c2ef5b31da3 Author: Behdad Esfahbod @@ -5104,16 +5283,16 @@ [HB] Rename hb_ot_layout_feature_mask_t to hb_mask_t pango/opentype/TODO | 1 - - pango/opentype/hb-buffer-private.h | 4 +- - pango/opentype/hb-buffer.c | 12 ++++---- - pango/opentype/hb-buffer.h | 4 +- + pango/opentype/hb-buffer-private.h | 4 ++-- + pango/opentype/hb-buffer.c | 12 +++++----- + pango/opentype/hb-buffer.h | 4 ++-- pango/opentype/hb-common.h | 1 + - pango/opentype/hb-ot-layout-gpos-private.hh | 12 ++++---- - pango/opentype/hb-ot-layout-gsub-private.hh | 14 +++++----- + pango/opentype/hb-ot-layout-gpos-private.hh | 12 +++++----- + pango/opentype/hb-ot-layout-gsub-private.hh | 14 +++++------ pango/opentype/hb-ot-layout.cc | 18 +++++++------- pango/opentype/hb-ot-layout.h | 34 - +++++++------------------- - pango/pango-ot-info.c | 4 +- + +++++++-------------------- + pango/pango-ot-info.c | 4 ++-- 10 files changed, 44 insertions(+), 60 deletions(-) commit 005058069f1638e207859c2898129fd1375458d7 @@ -5123,7 +5302,7 @@ [HB] Fix bug introduced recently pango/opentype/hb-open-type-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit c899bfddd1aaa0f0b4242910080f80a9889cb27c Author: Behdad Esfahbod @@ -5133,13 +5312,13 @@ pango/opentype/TODO | 2 - pango/opentype/hb-open-file-private.hh | 41 ++++++- - pango/opentype/hb-open-type-private.hh | 104 +---------------- + pango/opentype/hb-open-type-private.hh | 104 +--------------- pango/opentype/hb-ot-layout-common-private.hh | 103 ++++++++++++---- - pango/opentype/hb-ot-layout-gsubgpos-private.hh | 35 +++++- + pango/opentype/hb-ot-layout-gsubgpos-private.hh | 35 ++++-- pango/opentype/hb-ot-layout.cc | 146 ++++++++--------------- pango/opentype/hb-ot-layout.h | 101 +++++++--------- - pango/pango-ot-info.c | 96 ++++++---------- + pango/pango-ot-info.c | 96 ++++++--------- 8 files changed, 274 insertions(+), 354 deletions(-) commit ca89182f510d3627526b3f5e7379ce5a89440354 @@ -5159,7 +5338,7 @@ [HB] Remove unused var pango/opentype/hb-ot-layout-private.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit a5e0c175ef3b63b3db53ff861f8847ffe9cea03d Author: Behdad Esfahbod @@ -5168,7 +5347,7 @@ [HB] Remove another stale XXX pango/opentype/hb-ot-layout.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit 2b067b28aee93c2275644b0a1dc3b04ad751bda6 Author: Behdad Esfahbod @@ -5177,7 +5356,7 @@ [HB] Rebrand XXX as TODO pango/opentype/hb-open-file-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit bdf7aec5550061d8924673dbebda0221eec45dfd Author: Behdad Esfahbod @@ -5186,7 +5365,7 @@ [HB] Remove stale XXX pango/opentype/hb-blob.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit 374f30c9d62a0559d71bbd610b10249d049e7778 Author: Behdad Esfahbod @@ -5227,11 +5406,11 @@ [HB] Use glib again - pango/opentype/Makefile.am | 5 ++- - pango/opentype/hb-blob.c | 4 +- - pango/opentype/hb-object-private.h | 19 ++++---------- + pango/opentype/Makefile.am | 5 ++-- + pango/opentype/hb-blob.c | 4 ++-- + pango/opentype/hb-object-private.h | 19 +++++---------- pango/opentype/hb-private.h | 45 - ++++++++++++++++++++--------------- + +++++++++++++++++++++--------------- 4 files changed, 37 insertions(+), 36 deletions(-) commit d29e8fcd57cd62627c4fdbbaf4cbcf2e58c5df89 @@ -5241,7 +5420,7 @@ [OT] Remove SFNT special-casing. HB knows how to do that pango/pango-ot-info.c | 30 +++++++++++++----------------- - 1 files changed, 13 insertions(+), 17 deletions(-) + 1 file changed, 13 insertions(+), 17 deletions(-) commit 6ab6f0042aa081007af8a1ae7e8871c8a6f13ab2 Author: Behdad Esfahbod @@ -5250,7 +5429,7 @@ [OT] Fix crash with non-SFNT fonts pango/pango-ot-info.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7a1539df497997a4d97b9d27cfb082454e4ab694 Author: Behdad Esfahbod @@ -5259,7 +5438,7 @@ [OT] Make sure we own face generic data before using it pango/pango-ot-info.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 file changed, 4 insertions(+), 1 deletion(-) commit 20588ed32aadba157bb2fcf1c8b2447890854234 Author: Behdad Esfahbod @@ -5268,7 +5447,7 @@ [HB] Improve debug output pango/opentype/hb-open-type-private.hh | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + 1 file changed, 4 insertions(+), 3 deletions(-) commit 6caa02aee9d614077c9ae4b5dfe8fec0058f7356 Author: Behdad Esfahbod @@ -5277,7 +5456,7 @@ [HB] Minor pango/opentype/hb-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1761cd11cb12b033df73ae265900733c0d8f4231 Author: Behdad Esfahbod @@ -5286,7 +5465,7 @@ [HB] Add a few TODO items pango/opentype/TODO | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + 1 file changed, 5 insertions(+), 3 deletions(-) commit 895a98508dc408bd232dadb33bb5ac313b96ffbb Author: Behdad Esfahbod @@ -5295,7 +5474,7 @@ [HB] Improve debug output pango/opentype/hb-open-type-private.hh | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 file changed, 8 insertions(+) commit 1aab84b8b2ed0f35fcf5265e6b8432d8ecc07162 Author: Behdad Esfahbod @@ -5304,7 +5483,7 @@ [HB] Fix blob unlock pango/opentype/hb-blob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 77bde84243e5e03ffaf6940678ca920e00eea253 Author: Behdad Esfahbod @@ -5313,7 +5492,7 @@ [HB] Improve debug output and fix mprotect bug pango/opentype/hb-blob.c | 57 - +++++++++++++++++++++++++++---- + +++++++++++++++++++++++++++----- pango/opentype/hb-open-type-private.hh | 30 ++++++++--------- pango/opentype/hb-private.h | 3 +- 3 files changed, 65 insertions(+), 25 deletions(-) @@ -5325,7 +5504,7 @@ [HB] Minor pango/opentype/hb-private.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit c96b2a6a3b2b2bb106163254b034a8fdcc3081e5 Author: Behdad Esfahbod @@ -5344,7 +5523,7 @@ [HB] turn debugging off pango/opentype/hb-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f250cc489b961d77e5104c16d030ed495c1c4b46 Author: Behdad Esfahbod @@ -5354,7 +5533,7 @@ docs/tmpl/atsui-fonts.sgml | 9 --------- docs/tmpl/opentype.sgml | 2 +- - 2 files changed, 1 insertions(+), 10 deletions(-) + 2 files changed, 1 insertion(+), 10 deletions(-) commit 85c2e96bee9c19cec66f2b7fefabcab1bb1fe57f Author: Behdad Esfahbod @@ -5363,7 +5542,7 @@ [HB] Fix another sanitize() bug; hopefully it's the last one pango/opentype/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2e28925934eac99d59ba3a9257071e0e735d0819 Author: Behdad Esfahbod @@ -5382,8 +5561,8 @@ [HB] More debugging output pango/opentype/hb-open-type-private.hh | 45 - ++++++++++++++++++++++++++++--- - 1 files changed, 40 insertions(+), 5 deletions(-) + ++++++++++++++++++++++++++++---- + 1 file changed, 40 insertions(+), 5 deletions(-) commit a990ba0d2b8599ee3eab8bea6ac96aec99b1ee1d Author: Behdad Esfahbod @@ -5392,7 +5571,7 @@ [HB] Fix fatal Sanitizer bug pango/opentype/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7762880223a110e41cb1f1c256564f6809747fb8 Author: Behdad Esfahbod @@ -5401,7 +5580,7 @@ [HB] Add missing sanitize pango/opentype/hb-open-file-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit b4c1057497e2498a3391b2536aa1fbc7efe9723a Author: Behdad Esfahbod @@ -5409,14 +5588,14 @@ [HB] Add sanitize debugging facilities - pango/opentype/hb-open-file-private.hh | 4 ++ + pango/opentype/hb-open-file-private.hh | 4 +++ pango/opentype/hb-open-type-private.hh | 43 ++++++++++++++++++++--- pango/opentype/hb-ot-layout-common-private.hh | 17 +++++++++ - pango/opentype/hb-ot-layout-gdef-private.hh | 10 +++++ + pango/opentype/hb-ot-layout-gdef-private.hh | 10 ++++++ pango/opentype/hb-ot-layout-gpos-private.hh | 28 +++++++++++++++ - pango/opentype/hb-ot-layout-gsub-private.hh | 18 +++++++++ - pango/opentype/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++ + pango/opentype/hb-ot-layout-gsub-private.hh | 18 ++++++++++ + pango/opentype/hb-ot-layout-gsubgpos-private.hh | 16 +++++++++ pango/opentype/hb-private.h | 6 +++- 8 files changed, 136 insertions(+), 6 deletions(-) @@ -5442,7 +5621,7 @@ [HB] Save edit even if not writeable pango/opentype/hb-open-types-private.hh | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + 1 file changed, 2 insertions(+), 4 deletions(-) commit c63d3b1b1fbe7a796f2722b467830ce726b78619 Author: Behdad Esfahbod @@ -5473,7 +5652,7 @@ pango/opentype/hb-ot-layout-gpos-private.hh | 1 + pango/opentype/hb-ot-layout-gsub-private.hh | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) + 2 files changed, 2 insertions(+) commit 23663fe3b506d0f9b44168dcf0b0a80d102b0877 Author: Behdad Esfahbod @@ -5493,7 +5672,7 @@ [HB] Fix leak pango/opentype/hb-ot-layout.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit c04edb57948948bc2fcb24060bf12bdb6dfcebb9 Author: Behdad Esfahbod @@ -5503,7 +5682,7 @@ pango/opentype/hb-open-types-private.hh | 58 ++++++++++++++++++++++++++++--- - 1 files changed, 53 insertions(+), 5 deletions(-) + 1 file changed, 53 insertions(+), 5 deletions(-) commit 64563fcff29aeac442f152c4643328730184763a Author: Behdad Esfahbod @@ -5512,7 +5691,7 @@ [HB] Add XXX pango/opentype/hb-open-file-private.hh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 02c12b3802bfe4163d1b19a6a3a1daaf947f192d Author: Behdad Esfahbod @@ -5534,7 +5713,7 @@ pango/opentype/hb-open-types-private.hh | 127 ++++++++++++++++--------------- - 1 files changed, 65 insertions(+), 62 deletions(-) + 1 file changed, 65 insertions(+), 62 deletions(-) commit d327d7fed4068f0fd69673cbc73b22d57476baa2 Merge: 6a4933a 091be0f @@ -5551,7 +5730,7 @@ pango/opentype/hb-open-types-private.hh | 29 ++++++++++++++++++++++++++++- - 1 files changed, 28 insertions(+), 1 deletions(-) + 1 file changed, 28 insertions(+), 1 deletion(-) commit f92f7d301c7219cc1478759e2a5729cfba821529 Author: Behdad Esfahbod @@ -5605,7 +5784,7 @@ [HB] Remove stale TODO pango/opentype/hb-ot-layout.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit 7a0a97bc1b8ee09004140fdec8529d52f5702c18 Author: Behdad Esfahbod @@ -5614,7 +5793,7 @@ [HB] Hookup NEUTER() pango/opentype/hb-open-types-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit b2eb172416f9ad32a60bb33a26df6bf40ae69453 Author: Behdad Esfahbod @@ -5638,7 +5817,7 @@ [HB] GPOS sanitize() - pango/opentype/hb-open-types-private.hh | 22 +++- + pango/opentype/hb-open-types-private.hh | 22 ++- pango/opentype/hb-ot-layout-gpos-private.hh | 195 ++++++++++++++++++++++++++- pango/opentype/hb-ot-layout-gsub-private.hh | 2 - @@ -5662,7 +5841,7 @@ [HB] More casts pango/opentype/hb-ot-layout-gsub-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7d0dc6328b60b9a1244dca21d1bc2ffe7411f5d3 Author: Behdad Esfahbod @@ -5671,7 +5850,7 @@ [HB] Fix couple of bugs pango/opentype/hb-open-types-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 7c897c7a2452ec740ac434561d2334c72c1ffdd8 Author: Behdad Esfahbod @@ -5679,11 +5858,11 @@ [HB] More cast cleanup - pango/opentype/hb-open-types-private.hh | 23 +++++--- - pango/opentype/hb-ot-layout-common-private.hh | 7 +-- + pango/opentype/hb-open-types-private.hh | 23 ++++---- + pango/opentype/hb-ot-layout-common-private.hh | 7 ++- pango/opentype/hb-ot-layout-gsub-private.hh | 27 ++++------ pango/opentype/hb-ot-layout-gsubgpos-private.hh | 64 - ++++++++-------------- + ++++++++--------------- 4 files changed, 50 insertions(+), 71 deletions(-) commit 5e8a31e45cd4b837e1c5e2fa5fb6e78dda1d1df8 @@ -5692,13 +5871,13 @@ [Hb] Use reinterpret casts instead of direct casts to char * - pango/opentype/hb-open-file-private.hh | 4 +- - pango/opentype/hb-open-types-private.hh | 19 +++++++--- - pango/opentype/hb-ot-layout-common-private.hh | 8 ++-- - pango/opentype/hb-ot-layout-gpos-private.hh | 12 +++--- - pango/opentype/hb-ot-layout-gsub-private.hh | 20 +++++----- + pango/opentype/hb-open-file-private.hh | 4 +-- + pango/opentype/hb-open-types-private.hh | 19 ++++++---- + pango/opentype/hb-ot-layout-common-private.hh | 8 ++--- + pango/opentype/hb-ot-layout-gpos-private.hh | 12 +++---- + pango/opentype/hb-ot-layout-gsub-private.hh | 20 +++++------ pango/opentype/hb-ot-layout-gsubgpos-private.hh | 44 - +++++++++++----------- + +++++++++++------------ 6 files changed, 57 insertions(+), 50 deletions(-) commit c8c04266568d23e2efa12b7c073562ac7b5b0b2f @@ -5709,7 +5888,7 @@ pango/opentype/hb-open-types-private.hh | 167 ++++++++++--------------------- - 1 files changed, 55 insertions(+), 112 deletions(-) + 1 file changed, 55 insertions(+), 112 deletions(-) commit a501ac401398cc85d2c9695bb2fc41dc4f7efb39 Author: Behdad Esfahbod @@ -5729,7 +5908,7 @@ [HB] Finish GSUB sanitize() pango/opentype/hb-ot-layout-gsub-private.hh | 21 ++++++++++++++++++++- - 1 files changed, 20 insertions(+), 1 deletions(-) + 1 file changed, 20 insertions(+), 1 deletion(-) commit 8c48985195d3b1cafb7852f2d70b9d82a01d1d78 Author: Behdad Esfahbod @@ -5738,7 +5917,7 @@ [HB] Add comment pango/opentype/hb-ot-layout-common-private.hh | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 15e1f268f52a61ebdcdcf0d3c7cd643f897cdcde Author: Behdad Esfahbod @@ -5747,7 +5926,7 @@ [HB] Optimize sanitize() pango/opentype/hb-open-types-private.hh | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 file changed, 6 insertions(+), 1 deletion(-) commit f786c9d501099f3c989fb6e34469381f4be8681f Author: Behdad Esfahbod @@ -5796,7 +5975,7 @@ [HB] Make it all work again - pango/opentype/hb-font.cc | 23 ++++++++------ + pango/opentype/hb-font.cc | 23 ++++++++------- pango/opentype/hb-ot-layout-private.h | 9 ++++-- pango/opentype/hb-ot-layout.cc | 51 ++++++++++++++++----------------- @@ -5812,7 +5991,7 @@ pango/opentype/hb-font-private.h | 4 + pango/opentype/hb-font.cc | 74 ++++++-- pango/opentype/hb-font.h | 3 + - pango/opentype/hb-object-private.h | 36 +++-- + pango/opentype/hb-object-private.h | 36 ++-- pango/opentype/hb-ot-layout-gdef-private.hh | 2 + pango/opentype/hb-ot-layout-gpos-private.hh | 14 +- pango/opentype/hb-ot-layout-gsub-private.hh | 32 ++-- @@ -5829,8 +6008,8 @@ [HB] Simplify sub-blob support pango/opentype/hb-blob.c | 172 - +++++++++++++++++---------------------------- - pango/opentype/hb-blob.h | 14 +++-- + ++++++++++++++++++---------------------------- + pango/opentype/hb-blob.h | 14 ++-- 2 files changed, 74 insertions(+), 112 deletions(-) commit ab5a714897efa61da57d8a7fc060b57a6ff4991c @@ -5910,14 +6089,14 @@ pango/opentype/hb-common.h | 1 + pango/opentype/hb-font.c | 9 + pango/opentype/hb-font.h | 3 + - pango/opentype/hb-ot-layout-gdef-private.h | 32 ++-- + pango/opentype/hb-ot-layout-gdef-private.h | 32 +-- pango/opentype/hb-ot-layout-gpos-private.h | 106 ++++---- pango/opentype/hb-ot-layout-gsub-private.h | 50 ++-- pango/opentype/hb-ot-layout-gsubgpos-private.h | 12 +- pango/opentype/hb-ot-layout-private.h | 36 ++- pango/opentype/hb-ot-layout.cc | 342 +++++++++++++----------- - pango/opentype/hb-ot-layout.h | 207 +++++++-------- + pango/opentype/hb-ot-layout.h | 207 +++++++------- pango/pango-ot-buffer.c | 6 +- pango/pango-ot-info.c | 110 ++++---- pango/pango-ot-private.h | 6 +- @@ -5932,7 +6111,7 @@ pango/opentype/Makefile.am | 2 ++ pango/opentype/hb-ot.h | 34 ++++++++++++++++++++++++++++++++++ pango/opentype/hb.h | 35 +++++++++++++++++++++++++++++++++++ - 3 files changed, 71 insertions(+), 0 deletions(-) + 3 files changed, 71 insertions(+) commit fac416667fed565d3d61b25b6736e39b266e22f0 Author: Behdad Esfahbod @@ -5963,7 +6142,7 @@ [HB] Cleanup TODO pango/opentype/TODO | 10 +--------- - 1 files changed, 1 insertions(+), 9 deletions(-) + 1 file changed, 1 insertion(+), 9 deletions(-) commit 55b6ef4545bda8f12ae4c82aba3a61e8e7c47868 Author: Behdad Esfahbod @@ -5972,12 +6151,12 @@ [HB] Cleanup public buffer structs pango/opentype/hb-buffer-private.h | 46 - +++++++++++++++++++++---- + +++++++++++++++++++++----- pango/opentype/hb-buffer.c | 49 - ++++++++++++++------------- + ++++++++++++++-------------- pango/opentype/hb-buffer.h | 35 ++++++++++---------- - pango/opentype/hb-ot-layout-gpos-private.h | 8 ++-- - pango/opentype/hb-ot-layout-private.h | 5 ++- + pango/opentype/hb-ot-layout-gpos-private.h | 8 ++--- + pango/opentype/hb-ot-layout-private.h | 5 +-- pango/opentype/hb-ot-layout.cc | 20 ++++++------ 6 files changed, 97 insertions(+), 66 deletions(-) @@ -6001,9 +6180,9 @@ pango/opentype/hb-buffer-private.h | 24 +++++++++++-- pango/opentype/hb-buffer.c | 65 - +++++++++++++++++++++++++++-------- + +++++++++++++++++++++++++++--------- pango/opentype/hb-buffer.h | 53 ++++++++++++++++++----------- - pango/pango-ot-buffer.c | 33 +++++++++++------- + pango/pango-ot-buffer.c | 33 ++++++++++-------- pango/pango-ot-info.c | 10 +++--- 5 files changed, 129 insertions(+), 56 deletions(-) @@ -6029,7 +6208,7 @@ pango/opentype/hb-font.c | 24 ++++++++++++++++++++++++ pango/opentype/hb-font.h | 12 ++++++++++++ pango/opentype/hb-object-private.h | 7 +++++++ - 5 files changed, 52 insertions(+), 0 deletions(-) + 5 files changed, 52 insertions(+) commit fe17dd9e5df9a7f0b118b42efc6bc0978842216b Author: Behdad Esfahbod @@ -6038,7 +6217,7 @@ [Makefile] Fix MOSTLYCLEANFILES pango/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 0ae1b78e7694204cb973c633d665d1f3e3d20dc4 Author: Behdad Esfahbod @@ -6060,7 +6239,7 @@ pango/opentype/hb-ot-layout-open-private.h | 4 +- pango/opentype/hb-private.h | 88 - +++++++++++++++++++++------ + +++++++++++++++++++++------- 2 files changed, 70 insertions(+), 22 deletions(-) commit 308259613a34f54151c20d616cd5c940d69de980 @@ -6118,7 +6297,7 @@ [HB] Fix for dfont's with multiple faces pango/opentype/hb-ot-layout-open-private.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 86f7ff9415d71de495f6257edad2ba991692e042 Author: Behdad Esfahbod @@ -6136,14 +6315,14 @@ [HB] Remove hinting setting and use ppem==0 to mean "no hinting" - pango/opentype/hb-blob.h | 3 -- + pango/opentype/hb-blob.h | 3 --- pango/opentype/hb-common.h | 9 +++++++ pango/opentype/hb-ot-layout-gpos-private.h | 36 - ++++++++++++++++++--------- - pango/opentype/hb-ot-layout-private.h | 2 - - pango/opentype/hb-ot-layout.cc | 7 ----- - pango/opentype/hb-ot-layout.h | 4 --- - pango/pango-ot-info.c | 12 +++++---- + ++++++++++++++++++---------- + pango/opentype/hb-ot-layout-private.h | 2 -- + pango/opentype/hb-ot-layout.cc | 7 ------ + pango/opentype/hb-ot-layout.h | 4 ---- + pango/pango-ot-info.c | 12 ++++++---- 7 files changed, 40 insertions(+), 33 deletions(-) commit 112f0d741a24237e83922f8eee735b7f1ae74019 @@ -6158,7 +6337,7 @@ pango/opentype/hb-blob.h | 74 ++++++++++++++ pango/opentype/hb-private.h | 2 + pango/opentype/hb-refcount-private.h | 54 ++++++++++ - 5 files changed, 315 insertions(+), 1 deletions(-) + 5 files changed, 315 insertions(+), 1 deletion(-) commit 7444dad9ea3dde39b5276fef4f844237d1e661b1 Author: Behdad Esfahbod @@ -6184,7 +6363,7 @@ pango/opentype/hb-ot-layout-gsubgpos-private.h | 56 ++++++++++++------------ - 1 files changed, 28 insertions(+), 28 deletions(-) + 1 file changed, 28 insertions(+), 28 deletions(-) commit 11c229d522b9bda910805d571eb29a564b81e926 Author: Behdad Esfahbod @@ -6193,7 +6372,7 @@ [HB] Adapt to new buffer API pango/pango-ot-buffer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 603479e35c849285078238275510c0c89170ff9d Author: Behdad Esfahbod @@ -6202,7 +6381,7 @@ [HB] Fix buffer enlargement. Ouch pango/opentype/hb-buffer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 59f8868cf32691cce37060b30c3d16503a003df7 Author: Behdad Esfahbod @@ -6213,7 +6392,7 @@ pango/opentype/hb-buffer.c | 75 +++++++++++++++++++++------------------- pango/opentype/hb-buffer.h | 6 +++- - pango/opentype/hb-ot-layout.cc | 31 ++++++++++++++++ + pango/opentype/hb-ot-layout.cc | 31 +++++++++++++++++ pango/opentype/hb-ot-layout.h | 15 ++++++++ pango/opentype/hb-private.h | 2 +- 5 files changed, 91 insertions(+), 38 deletions(-) @@ -6225,7 +6404,7 @@ Bug 590042 – pango-view.1 manpage should not be gzipped pango-view/Makefile.am | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) + 1 file changed, 6 deletions(-) commit 01783de926a09dd8a3b11699bc8b1a6b6dce0556 Author: Behdad Esfahbod @@ -6254,14 +6433,14 @@ pango/opentype/hb-buffer.c | 9 -- pango/opentype/hb-buffer.h | 14 --- pango/opentype/hb-common.h | 3 - - pango/opentype/hb-ot-layout-gdef-private.h | 32 ++++---- + pango/opentype/hb-ot-layout-gdef-private.h | 32 +++---- pango/opentype/hb-ot-layout-gpos-private.h | 108 ++++++++++++------------ pango/opentype/hb-ot-layout-gsub-private.h | 46 +++++----- - pango/opentype/hb-ot-layout-gsubgpos-private.h | 68 ++++++++-------- - pango/opentype/hb-ot-layout-private.h | 28 +++---- + pango/opentype/hb-ot-layout-gsubgpos-private.h | 68 +++++++-------- + pango/opentype/hb-ot-layout-private.h | 28 +++--- pango/opentype/hb-ot-layout.cc | 30 +++++++ - pango/opentype/hb-ot-layout.h | 5 + + pango/opentype/hb-ot-layout.h | 5 ++ pango/opentype/hb-private.h | 16 ---- 12 files changed, 174 insertions(+), 187 deletions(-) @@ -6279,7 +6458,7 @@ [docs] Add index of symbols new in 1.24 and 1.26 docs/pango-docs.sgml | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) commit ac2ce962e9c257657eeceaf08d6aeeddd6faaa83 Author: Behdad Esfahbod @@ -6296,8 +6475,8 @@ pango_gravity_get_for_script_and_width() docs/pango-sections.txt | 1 + - docs/tmpl/vertical.sgml | 12 +++++++++ - pango/pango-context.c | 13 ++++------ + docs/tmpl/vertical.sgml | 12 ++++++++++ + pango/pango-context.c | 13 ++++------- pango/pango-gravity.c | 58 ++++++++++++++++++++++++++++++++++++++++++----- pango/pango-gravity.h | 5 ++++ @@ -6311,7 +6490,7 @@ Remove DOS newline pango/pangox.def | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit a9a416de60ce42fea78e8283253d07a018bf2778 Author: Behdad Esfahbod @@ -6354,7 +6533,7 @@ use the built-in aliases code. pango/pango-utils.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 8e348718e57d3f4ed04c9fdcb16a0019a6e13675 Author: Behdad Esfahbod @@ -6363,7 +6542,7 @@ Bump version to 1.25.0 configure.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 47ab634106a27b49085d26150999380e18bd3946 Merge: 1eadda9 a7d12be @@ -6389,7 +6568,7 @@ Bug 589133 – Firefox 3.5 complains about invalid weak references pango/pangofc-font.c | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) + 1 file changed, 11 insertions(+), 2 deletions(-) commit fe07285144de9146822bce5667aadcf1bc0d4111 Author: Behdad Esfahbod @@ -6399,7 +6578,7 @@ pango/pangofc-font.c | 3 --- pango/pangofc-fontmap.c | 5 ----- - 2 files changed, 0 insertions(+), 8 deletions(-) + 2 files changed, 8 deletions(-) commit 1eadda908f0f9262dcb4c301f487b5a190dc0e54 Author: Behdad Esfahbod @@ -6408,7 +6587,7 @@ Bug 589133 – Firefox 3.5 complains about invalid weak references pango/pangofc-font.c | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) + 1 file changed, 11 insertions(+), 2 deletions(-) commit 5a75ce1414f43a36a5e510cc5cfac085671bfdca Author: Behdad Esfahbod @@ -6418,7 +6597,7 @@ pango/pangofc-font.c | 3 --- pango/pangofc-fontmap.c | 5 ----- - 2 files changed, 0 insertions(+), 8 deletions(-) + 2 files changed, 8 deletions(-) commit 853f3ddd12ea2fbf3bed551ebfd542536e7f42e0 Author: Colin Walters @@ -6432,7 +6611,7 @@ This allows us to re-enable the introspection build. pango/Makefile.am | 31 +++++++++++++++---------------- - 1 files changed, 15 insertions(+), 16 deletions(-) + 1 file changed, 15 insertions(+), 16 deletions(-) commit efd34a719271d3c386d5fd4d852619829355fc88 Author: Behdad Esfahbod @@ -6441,7 +6620,7 @@ Fix typo pango/pango-layout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 67052645e6afcd7f72ef852c99ee88897d2022da Author: Behdad Esfahbod @@ -6488,7 +6667,7 @@ Followup patch from Morten. pango/pangofc-font.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 file changed, 5 insertions(+), 1 deletion(-) commit f868f085dd22f74ea43426d21b13165ebcd091b4 Author: Behdad Esfahbod @@ -6499,7 +6678,7 @@ Avoid modifying hashtable while walking it. pango/pangofc-fontmap.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) + 1 file changed, 9 insertions(+), 5 deletions(-) commit fd5f93fc6bdf5d8985826c3caa56e2081279cf0e Author: Behdad Esfahbod @@ -6523,7 +6702,7 @@ Remove duplicate entry for pango-ot.h. pango/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 0fd3bb3036fb2621c5a0f80e3a9d495b84b30449 Author: Behdad Esfahbod @@ -6534,7 +6713,7 @@ Fix pango-view manual installation. pango-view/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit c939f6aff405ca7b10b1f1538f46148bff719fcb Author: Behdad Esfahbod @@ -6546,14 +6725,14 @@ pango/opentype/hb-buffer.c | 9 ++ pango/opentype/hb-buffer.h | 14 +++ pango/opentype/hb-common.h | 3 + - pango/opentype/hb-ot-layout-gdef-private.h | 32 ++++---- + pango/opentype/hb-ot-layout-gdef-private.h | 32 +++---- pango/opentype/hb-ot-layout-gpos-private.h | 108 ++++++++++++------------ pango/opentype/hb-ot-layout-gsub-private.h | 46 +++++----- - pango/opentype/hb-ot-layout-gsubgpos-private.h | 68 ++++++++-------- - pango/opentype/hb-ot-layout-private.h | 28 ++++--- + pango/opentype/hb-ot-layout-gsubgpos-private.h | 68 +++++++-------- + pango/opentype/hb-ot-layout-private.h | 28 +++--- pango/opentype/hb-ot-layout.cc | 30 ------- - pango/opentype/hb-ot-layout.h | 5 - + pango/opentype/hb-ot-layout.h | 5 -- pango/opentype/hb-private.h | 16 ++++ 12 files changed, 187 insertions(+), 174 deletions(-) @@ -6566,7 +6745,7 @@ Fix pango-view manual installation. pango-view/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6209a6230cce6c9b1af3c699f0f18335e820e1ea Author: Behdad Esfahbod @@ -6577,7 +6756,7 @@ Remove Alef Maksura from sample text. pango/pango-language-sample-table.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f0e5e54917286dd18471d76ed099bccf0eb85053 Author: Behdad Esfahbod @@ -6592,7 +6771,7 @@ over all the fonts used by the sample str. pango/pango-context.c | 29 ++++++++++------------------- - 1 files changed, 10 insertions(+), 19 deletions(-) + 1 file changed, 10 insertions(+), 19 deletions(-) commit eae0fecefc4e294f0c182a7063348a817c111dce Author: Behdad Esfahbod @@ -6601,7 +6780,7 @@ [GPOS] Advance buffer cursor in SinglePos lookups. Ouch! pango/opentype/hb-ot-layout-gpos-private.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit 9fdfc9a06874820f94196c4802c96bc32d71ddc2 Author: Behdad Esfahbod @@ -6614,7 +6793,7 @@ pango/opentype/hb-buffer.c | 156 +++++++++++++++++++------------------------- - pango/opentype/hb-buffer.h | 9 +-- + pango/opentype/hb-buffer.h | 9 ++- 2 files changed, 72 insertions(+), 93 deletions(-) commit 3dbd37431ebcf8b24a5891a04e66a2f964178c1e @@ -6624,7 +6803,7 @@ [GPOS] Fix property checking pango/opentype/hb-ot-layout-gpos-private.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit 810f4214af6438076da5014888d60d4bfe77ebd6 Author: Behdad Esfahbod @@ -6633,7 +6812,7 @@ [GPOS] Add vertical TODO pango/opentype/hb-ot-layout-gpos-private.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 157af6ba32a32c941cd5be9b0b0034bf8b7327cb Author: Behdad Esfahbod @@ -6642,7 +6821,7 @@ [HB] Remove useless include pango/opentype/hb-ot-layout-private.h | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + 1 file changed, 3 deletions(-) commit 4921800a3ff9edc8b564cd49ae6e976767a16a0f Author: Behdad Esfahbod @@ -6651,7 +6830,7 @@ [GPOS] Remove unused variables pango/opentype/hb-ot-layout-gpos-private.h | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit 07c0e3b1d239ab041e243b0543640c9001e04931 Author: Behdad Esfahbod @@ -6660,7 +6839,7 @@ Fall back to TT kerning if no GPOS pango/pango-ot-info.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 6f9bd9a0e876bc49d25fb8e892b17adfa5b12b8c Author: Behdad Esfahbod @@ -6680,7 +6859,7 @@ [GPOS] Fix PairPos signedness pango/opentype/hb-ot-layout-gpos-private.h | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) + 1 file changed, 4 insertions(+), 7 deletions(-) commit 74d8c52f6ac1787efb8d87b72f47c6933abaf4ae Author: Behdad Esfahbod @@ -6689,8 +6868,8 @@ [GPOS] Fix mark matching pango/opentype/hb-ot-layout-gpos-private.h | 44 - ++++++++++++--------------- - 1 files changed, 20 insertions(+), 24 deletions(-) + +++++++++++++--------------- + 1 file changed, 20 insertions(+), 24 deletions(-) commit fe789092d83e6d4da43126640af0150b6bb2555c Author: Behdad Esfahbod @@ -6700,11 +6879,11 @@ pango/opentype/TODO | 1 - pango/opentype/hb-ot-layout-gpos-private.h | 13 +---- - pango/opentype/hb-ot-layout-gsub-private.h | 38 ++++++-------- - pango/opentype/hb-ot-layout-gsubgpos-private.h | 14 +++--- - pango/opentype/hb-ot-layout-private.h | 6 ++ + pango/opentype/hb-ot-layout-gsub-private.h | 38 ++++++------- + pango/opentype/hb-ot-layout-gsubgpos-private.h | 14 ++--- + pango/opentype/hb-ot-layout-private.h | 6 +++ pango/opentype/hb-ot-layout.cc | 69 - +++++++++++++++-------- + +++++++++++++++--------- 6 files changed, 76 insertions(+), 65 deletions(-) commit 746860bb7b54c16898264b248eb93a56e8af333b @@ -6714,8 +6893,8 @@ [GDEF] Support MarkFilteringSets pango/opentype/hb-ot-layout.cc | 59 - ++++++++++++++------------------------- - 1 files changed, 21 insertions(+), 38 deletions(-) + ++++++++++++++-------------------------- + 1 file changed, 21 insertions(+), 38 deletions(-) commit 95c3fffa8a2b102a3d5f88f3940e7f93e2368fec Author: Behdad Esfahbod @@ -6737,7 +6916,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 55 ++++++++++++++++++++++++---- pango/opentype/hb-ot-layout-gpos-private.h | 1 + - pango/opentype/hb-ot-layout.cc | 6 ++-- + pango/opentype/hb-ot-layout.cc | 6 +-- 3 files changed, 51 insertions(+), 11 deletions(-) commit d877d91e5c0617a82620a6a47406cd196e16e5d6 @@ -6748,7 +6927,7 @@ pango/opentype/hb-ot-layout-gsubgpos-private.h | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) + 1 file changed, 12 insertions(+), 12 deletions(-) commit 3b1a840d2726772fb3a6ec0daedaf698fce29c52 Author: Behdad Esfahbod @@ -6758,7 +6937,7 @@ pango/opentype/hb-ot-layout-common-private.h | 24 +++++++++++++++++++----- - 1 files changed, 19 insertions(+), 5 deletions(-) + 1 file changed, 19 insertions(+), 5 deletions(-) commit fb8da04aac1fe1b11b8a617342f1532e12c595db Author: Behdad Esfahbod @@ -6768,7 +6947,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 57 ++++++++++++++++++++++------ - pango/opentype/hb-ot-layout.cc | 17 ++++++-- + pango/opentype/hb-ot-layout.cc | 17 +++++++-- pango/opentype/hb-ot-layout.h | 8 +++- pango/opentype/main.cc | 9 +---- 4 files changed, 66 insertions(+), 25 deletions(-) @@ -6782,12 +6961,12 @@ pango/opentype/Makefile.am | 2 +- pango/opentype/hb-ot-layout-gdef-private.h | 35 ++++++++++++++++++++-------- - pango/opentype/hb-ot-layout-gpos-private.h | 28 +++++---------------- - pango/opentype/hb-ot-layout-gsub-private.h | 28 +++++---------------- - pango/opentype/hb-ot-layout-open-private.h | 12 ++------- + pango/opentype/hb-ot-layout-gpos-private.h | 28 ++++++---------------- + pango/opentype/hb-ot-layout-gsub-private.h | 28 ++++++---------------- + pango/opentype/hb-ot-layout-open-private.h | 12 +++------- pango/opentype/hb-ot-layout.cc | 9 +++++++ - pango/opentype/hb-ot-layout.h | 6 ++++ - pango/opentype/main.cc | 8 +++--- + pango/opentype/hb-ot-layout.h | 6 +++++ + pango/opentype/main.cc | 8 +++---- 8 files changed, 62 insertions(+), 66 deletions(-) commit 298dadbd395a594176ed4cda4b9cf7004b724b66 @@ -6797,7 +6976,7 @@ [HB] Remove more macros pango/opentype/hb-ot-layout-gdef-private.h | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) + 1 file changed, 9 insertions(+), 9 deletions(-) commit 7b3f038ada310ac1f113d898a637df188177f8bb Author: Behdad Esfahbod @@ -6809,11 +6988,11 @@ pango/opentype/hb-buffer.c | 138 ++++++++++++------------ pango/opentype/hb-buffer.h | 22 ++-- - pango/opentype/hb-ot-layout-gpos-private.h | 29 +++--- + pango/opentype/hb-ot-layout-gpos-private.h | 29 ++--- pango/opentype/hb-ot-layout-gsub-private.h | 10 +- pango/opentype/hb-ot-layout-gsubgpos-private.h | 8 +- pango/opentype/hb-ot-layout-private.h | 13 +-- - pango/opentype/hb-ot-layout.cc | 16 ++-- + pango/opentype/hb-ot-layout.cc | 16 +-- pango/opentype/hb-private.h | 29 ----- pango/pango-ot-buffer.c | 18 ++-- pango/pango-ot-info.c | 3 +- @@ -6897,7 +7076,7 @@ pango/opentype/hb-ot-layout-open-private.h | 46 +++++++++++----------------- - 1 files changed, 18 insertions(+), 28 deletions(-) + 1 file changed, 18 insertions(+), 28 deletions(-) commit c53ed30cddcf3ed56ffb2756f2d8650ad012ff44 Author: Behdad Esfahbod @@ -6907,7 +7086,7 @@ pango/opentype/hb-ot-layout-open-private.h | 31 +++++++++------------------- - 1 files changed, 10 insertions(+), 21 deletions(-) + 1 file changed, 10 insertions(+), 21 deletions(-) commit d63d5c6cfc6e1584ca426e469e3a35c46aa4605f Author: Behdad Esfahbod @@ -6950,7 +7129,7 @@ [HB] Remove stale makefile.msc too pango/opentype/makefile.msc | 19 ------------------- - 1 files changed, 0 insertions(+), 19 deletions(-) + 1 file changed, 19 deletions(-) commit a7a715480db66148b1f487528887508a7991dcd0 Author: Behdad Esfahbod @@ -6983,7 +7162,7 @@ pango/opentype/harfbuzz-stream.c | 257 -- pango/opentype/harfbuzz.c | 31 - pango/opentype/harfbuzz.h | 35 - - 22 files changed, 0 insertions(+), 16691 deletions(-) + 22 files changed, 16691 deletions(-) commit 4b90aa823cf91c586d0fd8a5d6154f46516a87ce Author: Behdad Esfahbod @@ -6992,7 +7171,7 @@ [HB] Remove stale TODO mark pango/opentype/hb-ot-layout-open-private.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit d11f8e6d41213d38b2b3ea2ec4843e2b6f34697b Author: Behdad Esfahbod @@ -7001,7 +7180,7 @@ [HB] Add FixedVersion cast to int pango/opentype/hb-ot-layout-open-private.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) commit 8ff827848f63ac61446735c8516a452177c16336 Author: Behdad Esfahbod @@ -7010,7 +7189,7 @@ [HB] Simplify tag pango/opentype/hb-ot-layout-open-private.h | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 file changed, 5 insertions(+), 5 deletions(-) commit f89367b83225a5c0a2804ec122d66290a8feb8d5 Author: Behdad Esfahbod @@ -7021,7 +7200,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 2 +- pango/opentype/hb-ot-layout-gsubgpos-private.h | 2 +- pango/opentype/hb-ot-layout-open-private.h | 54 - ++--------------------- + +++--------------------- 3 files changed, 7 insertions(+), 51 deletions(-) commit 8259e8735babe30eaf3c017e022368bf796b411e @@ -7064,7 +7243,7 @@ [HB] Add TODO items pango/opentype/TODO | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) commit d2b11bb9bf3cfa3e1cdcf79a473626ec4ed51846 Author: Behdad Esfahbod @@ -7074,7 +7253,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 36 ++++++++++++++-------------- - 1 files changed, 18 insertions(+), 18 deletions(-) + 1 file changed, 18 insertions(+), 18 deletions(-) commit 191cfb73b04955d9af757d47dc85b1ae0ab6c6c5 Author: Behdad Esfahbod @@ -7086,7 +7265,7 @@ pango/opentype/hb-ot-layout-gpos-private.h | 128 ++++++++++++++++++++-------- - 1 files changed, 92 insertions(+), 36 deletions(-) + 1 file changed, 92 insertions(+), 36 deletions(-) commit 31f627d786003824d189c786db532600d8701114 Author: Behdad Esfahbod @@ -7095,9 +7274,9 @@ [HB] Remove apply_subtables() again pango/opentype/hb-ot-layout-gpos-private.h | 31 - +++++++++----------------- + ++++++++++---------------- pango/opentype/hb-ot-layout-gsub-private.h | 33 - ++++++++++----------------- + ++++++++++------------------ 2 files changed, 23 insertions(+), 41 deletions(-) commit fb963a1a1e8f7c337af6b7fee4718c3f65bc8c51 @@ -7106,7 +7285,7 @@ [HB] Share Extension lookup code between GSUB and GPOS - pango/opentype/hb-ot-layout-gpos-private.h | 64 +++--------------- + pango/opentype/hb-ot-layout-gpos-private.h | 64 ++++-------------- pango/opentype/hb-ot-layout-gsub-private.h | 83 ++++-------------------- pango/opentype/hb-ot-layout-gsubgpos-private.h | 52 +++++++++++++++ @@ -7121,7 +7300,7 @@ The "bug" was in the font. pango/opentype/hb-ot-layout-gpos-private.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit 541e8ad0c666f895649fbe1df2393ef0f04f2655 Author: Behdad Esfahbod @@ -7132,7 +7311,7 @@ pango/opentype/hb-common.h | 53 +++++++++++++++++ pango/opentype/hb-private.h | 132 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 185 insertions(+), 0 deletions(-) + 2 files changed, 185 insertions(+) commit 6e1a2662b3f9d5514c99a82f70e037749d95dc3c Author: Behdad Esfahbod @@ -7155,7 +7334,7 @@ pango/opentype/TODO | 1 + pango/opentype/hb-ot-layout-gpos-private.h | 62 - +++++++++++++++++++++++++-- + +++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 5 deletions(-) commit 180781efd0691964cc5b823c6b9274f208fd083c @@ -7165,7 +7344,7 @@ [GPOS] Implement MarkArray interface pango/opentype/hb-ot-layout-gpos-private.h | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 file changed, 3 insertions(+), 2 deletions(-) commit 164137a18e4b10c240c8d63bf676872cfdc934c3 Author: Behdad Esfahbod @@ -7174,7 +7353,7 @@ [GPOS] Implement Device support in AnchorFormat3 pango/opentype/hb-ot-layout-gpos-private.h | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) + 1 file changed, 8 insertions(+), 3 deletions(-) commit 361cdf36b00a7e4632de45a8ad9697d3cb1b8670 Author: Behdad Esfahbod @@ -7184,7 +7363,7 @@ pango/opentype/hb-ot-layout-gpos-private.h | 75 +++++++++++++--------------- - 1 files changed, 34 insertions(+), 41 deletions(-) + 1 file changed, 34 insertions(+), 41 deletions(-) commit 93e5da2de8070410b5e8978dfa3a261e6d7f00a4 Author: Behdad Esfahbod @@ -7194,7 +7373,7 @@ pango/opentype/TODO | 1 + pango/opentype/hb-ot-layout-gpos-private.h | 38 - ++++++++++++--------------- + +++++++++++++--------------- 2 files changed, 18 insertions(+), 21 deletions(-) commit 25494c523822e837716bc1000b1d94ff06ca476f @@ -7205,7 +7384,7 @@ pango/opentype/hb-ot-layout-gpos-private.h | 1 + pango/opentype/hb-ot-layout-gsub-private.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) + 2 files changed, 2 insertions(+) commit 6fb8dab583378de48a39b1b25459e24b0162e5d4 Author: Behdad Esfahbod @@ -7214,7 +7393,7 @@ [HB] Add TODO item pango/opentype/TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 5687dd7511fbf8503dcb6d7c215455e1f999cf03 Author: Behdad Esfahbod @@ -7224,10 +7403,10 @@ pango/opentype/hb-buffer-private.h | 88 ++++++++++++++-------------- - pango/opentype/hb-buffer.c | 47 +++++++-------- - pango/opentype/hb-ot-layout-gpos-private.h | 11 +-- + pango/opentype/hb-buffer.c | 47 ++++++++------- + pango/opentype/hb-ot-layout-gpos-private.h | 11 ++-- pango/opentype/hb-ot-layout-gsub-private.h | 12 ++-- - pango/opentype/hb-ot-layout.cc | 16 +++--- + pango/opentype/hb-ot-layout.cc | 16 ++--- 5 files changed, 85 insertions(+), 89 deletions(-) commit c141180297254ef341e3e557c26b51eb7e964706 @@ -7259,14 +7438,14 @@ pango/opentype/Makefile.am | 76 +++++----------- pango/opentype/harfbuzz-buffer.c | 154 - +++++++++++++------------------- - pango/opentype/harfbuzz-buffer.h | 80 +++++++++--------- + ++++++++++++++------------------- + pango/opentype/harfbuzz-buffer.h | 80 ++++++++--------- pango/opentype/hb-ot-layout-private.h | 6 +- - pango/opentype/hb-ot-layout.cc | 17 ++--- + pango/opentype/hb-ot-layout.cc | 17 ++-- pango/opentype/hb-ot-layout.h | 1 + - pango/pango-ot-buffer.c | 14 ++-- - pango/pango-ot-info.c | 14 ++-- - pango/pango-ot-private.h | 10 +- + pango/pango-ot-buffer.c | 14 +-- + pango/pango-ot-info.c | 14 +-- + pango/pango-ot-private.h | 10 +-- 9 files changed, 156 insertions(+), 216 deletions(-) commit 15a0220c336113a2df8de91ec0513b1bdde35a89 @@ -7291,9 +7470,9 @@ pango/opentype/Makefile.am | 2 +- pango/opentype/hb-ot-layout-gpos-private.h | 37 +++++++++++++++------------- - pango/opentype/hb-ot-layout.cc | 7 +++++ + pango/opentype/hb-ot-layout.cc | 7 ++++++ pango/opentype/hb-ot-layout.h | 5 ++++ - pango/pango-ot-info.c | 2 + + pango/pango-ot-info.c | 2 ++ 5 files changed, 35 insertions(+), 18 deletions(-) commit b77c4990efcd6f6ef77dc6e956bb3f1df9bf6bff @@ -7304,7 +7483,7 @@ pango/pango-ot-info.c | 51 ++++++++++++++++++++++++------------------------- - 1 files changed, 25 insertions(+), 26 deletions(-) + 1 file changed, 25 insertions(+), 26 deletions(-) commit 25db8f6de85f6f8ee11adbf423edb22e6259c543 Author: Behdad Esfahbod @@ -7314,7 +7493,7 @@ pango/opentype/hb-ot-layout-gpos-private.h | 66 ++++++++++++++-------------- - pango/opentype/hb-ot-layout-gsub-private.h | 44 +++++++++--------- + pango/opentype/hb-ot-layout-gsub-private.h | 44 +++++++++---------- 2 files changed, 55 insertions(+), 55 deletions(-) commit e97278164b1939d4b76128ff8bf520ca02b1debb @@ -7324,7 +7503,7 @@ [GDEF] Simplify Device access pango/opentype/hb-ot-layout-gdef-private.h | 12 +++--------- - 1 files changed, 3 insertions(+), 9 deletions(-) + 1 file changed, 3 insertions(+), 9 deletions(-) commit 0b092ed02b6cda94c1a4df87c25f88142f967f4f Author: Behdad Esfahbod @@ -7334,7 +7513,7 @@ pango/opentype/hb-ot-layout-common-private.h | 170 ++++++++++++------------ - pango/opentype/hb-ot-layout-gdef-private.h | 65 +++++---- + pango/opentype/hb-ot-layout-gdef-private.h | 65 ++++----- pango/opentype/hb-ot-layout-gsubgpos-private.h | 150 ++++++++++++--------- pango/opentype/hb-ot-layout-open-private.h | 159 @@ -7349,7 +7528,7 @@ [HB] Remove unused methods pango/opentype/hb-ot-layout-common-private.h | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) + 1 file changed, 6 deletions(-) commit 066d6ab77a5a95187f5865dd409c8b1ee0b79f7b Author: Behdad Esfahbod @@ -7381,8 +7560,8 @@ [GSUB] PairPosFormat2 pango/opentype/hb-ot-layout-gpos-private.h | 43 - ++++++++++++++++++++++++--- - 1 files changed, 38 insertions(+), 5 deletions(-) + ++++++++++++++++++++++++---- + 1 file changed, 38 insertions(+), 5 deletions(-) commit 10ddad5aa5c15d589b3dd9330d75562abc21c03a Author: Behdad Esfahbod @@ -7392,7 +7571,7 @@ pango/opentype/hb-ot-layout-gpos-private.h | 91 ++++++++++++++++++++++------ - 1 files changed, 73 insertions(+), 18 deletions(-) + 1 file changed, 73 insertions(+), 18 deletions(-) commit 9c25dfbd235bd155ad62f3a8d03e27af9a17b810 Author: Behdad Esfahbod @@ -7402,10 +7581,10 @@ pango/opentype/harfbuzz-buffer-private.h | 1 + pango/opentype/harfbuzz-buffer.c | 3 - - pango/opentype/hb-ot-layout-common-private.h | 35 +++++--- - pango/opentype/hb-ot-layout-gpos-private.h | 125 + pango/opentype/hb-ot-layout-common-private.h | 35 ++++--- + pango/opentype/hb-ot-layout-gpos-private.h | 127 +++++++++++++++++++------- - 4 files changed, 115 insertions(+), 49 deletions(-) + 4 files changed, 116 insertions(+), 50 deletions(-) commit 51d81548dd52fbb6c90775eb3bc83289c0329ddf Author: Behdad Esfahbod @@ -7424,7 +7603,7 @@ [HB] More reference cast simplification - pango/opentype/hb-ot-layout-gsub-private.h | 8 +++--- + pango/opentype/hb-ot-layout-gsub-private.h | 8 +++---- pango/opentype/hb-ot-layout-gsubgpos-private.h | 28 ++++++++++++------------ pango/opentype/hb-ot-layout-open-private.h | 2 +- @@ -7437,7 +7616,7 @@ [HB] Rename LOOKUP_ARGS to APPLY_ARGS pango/opentype/hb-ot-layout-gpos-private.h | 88 - ++++++++++++------------ + +++++++++++------------ pango/opentype/hb-ot-layout-gsub-private.h | 84 +++++++++++----------- pango/opentype/hb-ot-layout-gsubgpos-private.h | 90 @@ -7474,13 +7653,13 @@ Switch Pango to new, defunt, GPOS - pango/opentype/hb-ot-layout-gpos-private.h | 22 ++++-- + pango/opentype/hb-ot-layout-gpos-private.h | 22 +++++-- pango/opentype/hb-ot-layout.cc | 13 ++++ pango/opentype/hb-ot-layout.h | 5 ++ pango/pango-ot-info.c | 97 ++++++++++++++++++---------- pango/pango-ot-private.h | 5 +- - pango/pango-ot-ruleset.c | 32 +-------- + pango/pango-ot-ruleset.c | 32 ++------- 6 files changed, 102 insertions(+), 72 deletions(-) commit 68f88f1ca8e7057c8830c1c60a369e588745ebdc @@ -7504,7 +7683,7 @@ [GSUB] Minor pango/opentype/hb-ot-layout-gsub-private.h | 16 ++++++---------- - 1 files changed, 6 insertions(+), 10 deletions(-) + 1 file changed, 6 insertions(+), 10 deletions(-) commit 014a7567c6152b73218fe21a54e34ddc6ef1447d Author: Behdad Esfahbod @@ -7513,7 +7692,7 @@ [HB] Minor pango/opentype/hb-ot-layout-gsub-private.h | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) + 1 file changed, 11 insertions(+), 11 deletions(-) commit cda2b36b75bd7be71d830bee78b2ab5845e90831 Author: Behdad Esfahbod @@ -7522,7 +7701,7 @@ [GSUB] Protect against mismatching Extension subtable types pango/opentype/hb-ot-layout-gsub-private.h | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) + 1 file changed, 6 insertions(+), 3 deletions(-) commit bba893b810b14c4e6bfc8cfded697fbe28282d35 Author: Behdad Esfahbod @@ -7534,7 +7713,7 @@ pango/opentype/hb-ot-layout-gsub-private.h | 55 ++++++++++++++++++------ - pango/opentype/hb-ot-layout-gsubgpos-private.h | 43 ++++++------------- + pango/opentype/hb-ot-layout-gsubgpos-private.h | 43 ++++++------------ 2 files changed, 54 insertions(+), 44 deletions(-) commit 1927fb2efcecf445aadc3e2be51290f250554576 @@ -7556,7 +7735,7 @@ [GSUB] Oops, fix Extension check pango/opentype/hb-ot-layout-gsub-private.h | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 2 deletions(-) commit 29f0ff90f687a82a630ca0212bbbac1aa3412f59 Author: Behdad Esfahbod @@ -7597,7 +7776,7 @@ [HB] Minor cleanup pango/opentype/hb-ot-layout-gsubgpos-private.h | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) + 1 file changed, 4 insertions(+), 6 deletions(-) commit 55fdb2a9d8b9520d62bc1168709188baaf42790c Author: Behdad Esfahbod @@ -7606,7 +7785,7 @@ [HB] Correctly skip glyphs when applying (Chain)Context lookups pango/opentype/hb-ot-layout-gsubgpos-private.h | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) + 1 file changed, 11 insertions(+), 3 deletions(-) commit 16fb96b68b109d7f06db80e0174dba3f5e643964 Author: Behdad Esfahbod @@ -7628,8 +7807,8 @@ IranNastaliq renders perfectly again! pango/opentype/hb-ot-layout-gsubgpos-private.h | 63 - +++++++++++++++++------ - 1 files changed, 46 insertions(+), 17 deletions(-) + +++++++++++++++++------- + 1 file changed, 46 insertions(+), 17 deletions(-) commit b20970dc224472076c18e5a28ab40e38fc7ea605 Author: Behdad Esfahbod @@ -7638,8 +7817,8 @@ [HB] Implement backtrack matching pango/opentype/hb-ot-layout-gsubgpos-private.h | 61 - +++++++++++++++++------ - 1 files changed, 45 insertions(+), 16 deletions(-) + +++++++++++++++++------- + 1 file changed, 45 insertions(+), 16 deletions(-) commit e1b4d68c0d4a6cf656288ba5d88419ce4b914228 Author: Behdad Esfahbod @@ -7649,7 +7828,7 @@ pango/opentype/hb-ot-layout-gsubgpos-private.h | 107 ++++++++++++++---------- - 1 files changed, 61 insertions(+), 46 deletions(-) + 1 file changed, 61 insertions(+), 46 deletions(-) commit 21be5dfef4033ecd5e7c0f69fc2ca0038e2a8ea1 Author: Behdad Esfahbod @@ -7659,7 +7838,7 @@ pango/opentype/hb-ot-layout-gsubgpos-private.h | 92 ++++++++++++++++-------- - 1 files changed, 63 insertions(+), 29 deletions(-) + 1 file changed, 63 insertions(+), 29 deletions(-) commit d9acee5295e6dde5f672c9ce0456520543f5df66 Author: Behdad Esfahbod @@ -7668,8 +7847,8 @@ [HB] A step closer to working ChainContext pango/opentype/hb-ot-layout-gsubgpos-private.h | 36 - +++++++++++++++++------ - 1 files changed, 26 insertions(+), 10 deletions(-) + +++++++++++++++++------- + 1 file changed, 26 insertions(+), 10 deletions(-) commit ac227e24dd98e77da9d548d81ac9efa3afa4d816 Author: Behdad Esfahbod @@ -7689,8 +7868,8 @@ [HB] More template goodness pango/opentype/hb-ot-layout-gsubgpos-private.h | 37 - +++++++++-------------- - 1 files changed, 15 insertions(+), 22 deletions(-) + ++++++++++-------------- + 1 file changed, 15 insertions(+), 22 deletions(-) commit f445e05b822699356536d138a0d5f02bdc8372ac Author: Behdad Esfahbod @@ -7699,7 +7878,7 @@ [HB] More churning towards ChainContext lookups pango/opentype/hb-ot-layout-common-private.h | 6 +- - pango/opentype/hb-ot-layout-gsub-private.h | 15 ++- + pango/opentype/hb-ot-layout-gsub-private.h | 15 +- pango/opentype/hb-ot-layout-gsubgpos-private.h | 174 +++++++++++++++--------- 3 files changed, 125 insertions(+), 70 deletions(-) @@ -7712,7 +7891,7 @@ pango/opentype/hb-ot-layout-gsubgpos-private.h | 220 +++++++++++------------- - 1 files changed, 99 insertions(+), 121 deletions(-) + 1 file changed, 99 insertions(+), 121 deletions(-) commit d32b9ea104a606a92ad5a27999da7bce2090d675 Author: Behdad Esfahbod @@ -7721,7 +7900,7 @@ [HB] Add check to avoid infinite recursion pango/opentype/hb-ot-layout-gsub-private.h | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) + 1 file changed, 8 insertions(+), 4 deletions(-) commit 55fe0e4ea68c70815558a29d09fb139316cecc4d Author: Behdad Esfahbod @@ -7730,7 +7909,7 @@ [HB] Cosmetic pango/opentype/hb-ot-layout-gsub-private.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit eea8dd6ee176dc275c23f84e5d42366f9bba8acf Author: Behdad Esfahbod @@ -7740,8 +7919,7 @@ pango/opentype/hb-ot-layout-gsub-private.h | 269 +++++------------------- - pango/opentype/hb-ot-layout-gsubgpos-private.h | 214 - +++++++++++++++++++- + pango/opentype/hb-ot-layout-gsubgpos-private.h | 214 ++++++++++++++++++- 2 files changed, 268 insertions(+), 215 deletions(-) commit 0c11bc365caaef22a125a1f315e5233df3f665cb @@ -7751,7 +7929,7 @@ [HB] Remove stale TODO pango/opentype/hb-ot-layout-private.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit fe01531dc12be28aaef610a0cd94c21dc476e9a6 Author: Behdad Esfahbod @@ -7786,10 +7964,10 @@ [HB] Cleanup format unions - pango/opentype/hb-ot-layout-gdef-private.h | 18 +++--- + pango/opentype/hb-ot-layout-gdef-private.h | 18 ++--- pango/opentype/hb-ot-layout-gsub-private.h | 87 - ++++++++++++----------- - pango/opentype/hb-ot-layout-gsubgpos-private.h | 16 ++-- + ++++++++++++------------ + pango/opentype/hb-ot-layout-gsubgpos-private.h | 16 ++--- pango/opentype/hb-ot-layout-open-private.h | 41 ++++------- 4 files changed, 77 insertions(+), 85 deletions(-) @@ -7800,7 +7978,7 @@ [HB] Use four bytes for Null Tag, not 5 pango/opentype/hb-ot-layout-open-private.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) commit aec04a301f2e181626f7a3067d69e003ba915b32 Author: Behdad Esfahbod @@ -7822,7 +8000,7 @@ This slightly grows code size. pango/opentype/hb-ot-layout-gsub-private.h | 100 - ++++++++++++----------- + ++++++++++++------------ pango/opentype/hb-ot-layout-gsubgpos-private.h | 7 +- 2 files changed, 56 insertions(+), 51 deletions(-) @@ -7833,8 +8011,8 @@ [GSUB] Further optimize the main switch pango/opentype/hb-ot-layout-gsub-private.h | 31 - +++++++++++++++------------ - 1 files changed, 17 insertions(+), 14 deletions(-) + +++++++++++++++------------- + 1 file changed, 17 insertions(+), 14 deletions(-) commit 5bdc1ff677d37af311e887ef2717daa8fae008ce Author: Behdad Esfahbod @@ -7843,7 +8021,7 @@ [HB] Unify first glyph property checking pango/opentype/hb-ot-layout-gsub-private.h | 81 - ++++++++++------------- + ++++++++++-------------- pango/opentype/hb-ot-layout-gsubgpos-private.h | 12 ---- 2 files changed, 35 insertions(+), 58 deletions(-) @@ -7855,7 +8033,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 2 - pango/opentype/hb-ot-layout-gsub-private.h | 331 - +---------------------- + +--------------------- pango/opentype/hb-ot-layout-gsubgpos-private.h | 347 ++++++++++++++++++++++++ 3 files changed, 352 insertions(+), 328 deletions(-) @@ -7867,8 +8045,8 @@ [GSUB] Unify ContextSubst matching pango/opentype/hb-ot-layout-gsub-private.h | 378 - +++++++++++---------------- - 1 files changed, 154 insertions(+), 224 deletions(-) + ++++++++++++---------------- + 1 file changed, 154 insertions(+), 224 deletions(-) commit 264a07cd621fce810914c43bb43885519b819aab Author: Behdad Esfahbod @@ -7878,7 +8056,7 @@ pango/opentype/hb-ot-layout-gsub-private.h | 122 ++++++++++++++-------------- - 1 files changed, 61 insertions(+), 61 deletions(-) + 1 file changed, 61 insertions(+), 61 deletions(-) commit 92c65d29132105784b18b60ba938a3ec86dfcb76 Author: Behdad Esfahbod @@ -7886,11 +8064,11 @@ [HB] Simplify buffer - pango/opentype/harfbuzz-buffer-private.h | 14 ++++------ + pango/opentype/harfbuzz-buffer-private.h | 14 +++++------ pango/opentype/harfbuzz-buffer.c | 35 - ++++++++++++--------------- - pango/opentype/harfbuzz-gsub.c | 6 ++-- - pango/opentype/hb-ot-layout-gsub-private.h | 12 ++++---- + +++++++++++++--------------- + pango/opentype/harfbuzz-gsub.c | 6 ++--- + pango/opentype/hb-ot-layout-gsub-private.h | 12 +++++----- 4 files changed, 31 insertions(+), 36 deletions(-) commit f1e6c0487f5c1bc72061f49a0faa3b134736b06a @@ -7901,7 +8079,7 @@ pango/opentype/TODO | 1 + pango/opentype/harfbuzz-buffer.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) + 2 files changed, 2 insertions(+), 1 deletion(-) commit a44105aa2196e782c730dc102aaf77e2c4247ed5 Author: Behdad Esfahbod @@ -7946,7 +8124,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 62 +++++----------------- pango/opentype/hb-ot-layout-open-private.h | 77 - ++++++++++++++++++++------- + ++++++++++++++++++++-------- 2 files changed, 71 insertions(+), 68 deletions(-) commit 2cb82da2cf865cdc05e23745ea07bff773eedc0b @@ -7958,7 +8136,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 1 + pango/opentype/hb-ot-layout-gsub-private.h | 55 +++++++++++----------------- - pango/opentype/hb-ot-layout-open-private.h | 10 +----- + pango/opentype/hb-ot-layout-open-private.h | 10 +---- 3 files changed, 23 insertions(+), 43 deletions(-) commit fe6de1703567ddd2e3f5bf8f604d6f8961938340 @@ -7991,7 +8169,7 @@ [HB] Automate int-type size assertion pango/opentype/hb-ot-layout-open-private.h | 13 +++---------- - 1 files changed, 3 insertions(+), 10 deletions(-) + 1 file changed, 3 insertions(+), 10 deletions(-) commit d34fc6f5b7efc8d04a9dec527856a370b939dfc2 Author: Behdad Esfahbod @@ -8001,7 +8179,7 @@ Also use a common pool for all nul-content ones. - pango/opentype/hb-ot-layout-gdef-private.h | 12 +- + pango/opentype/hb-ot-layout-gdef-private.h | 12 +-- pango/opentype/hb-ot-layout-gsub-private.h | 28 +++--- pango/opentype/hb-ot-layout-open-private.h | 142 ++++++++++++++++------------ @@ -8015,7 +8193,7 @@ [HB] Remove obsolete comment pango/opentype/hb-ot-layout-gdef-private.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit b05941e12b2891d9064c4a7717a155d8b622aa6c Author: Behdad Esfahbod @@ -8024,8 +8202,8 @@ [GSUB] Start ChainContextSubst pango/opentype/hb-ot-layout-gsub-private.h | 50 - +++++++++++++++++++++------ - 1 files changed, 39 insertions(+), 11 deletions(-) + ++++++++++++++++++++++------ + 1 file changed, 39 insertions(+), 11 deletions(-) commit 241fbceffc58deff47323280915dfd67a6d23329 Author: Behdad Esfahbod @@ -8035,7 +8213,7 @@ pango/opentype/hb-ot-layout-gsub-private.h | 62 +++++++++++++++++++++++++++- - 1 files changed, 61 insertions(+), 1 deletions(-) + 1 file changed, 61 insertions(+), 1 deletion(-) commit e9622c8c8c1dd88f63e1ba01df5295fc59eafde8 Author: Behdad Esfahbod @@ -8044,8 +8222,8 @@ [GSUB] Implement ContextSubstFormat2 pango/opentype/hb-ot-layout-gsub-private.h | 105 - +++++++++++++++++++++++++-- - 1 files changed, 97 insertions(+), 8 deletions(-) + +++++++++++++++++++++++++--- + 1 file changed, 97 insertions(+), 8 deletions(-) commit 75778ef4af51ce974fc9af25063f7bb239563b5a Author: Behdad Esfahbod @@ -8064,7 +8242,7 @@ [GSUB] Finish ContextSubstFormat1 pango/opentype/hb-ot-layout-gsub-private.h | 77 - +++++++++++++++++++++------ + ++++++++++++++++++++++------ pango/opentype/hb-ot-layout-private.h | 14 +++++ pango/opentype/hb-ot-layout.cc | 13 ----- 3 files changed, 74 insertions(+), 30 deletions(-) @@ -8076,7 +8254,7 @@ [HB] Fix typo pango/opentype/hb-ot-layout-open-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 35f3896cfc703b6b06fad76778f357a0c9fdde38 Author: Behdad Esfahbod @@ -8085,7 +8263,7 @@ [HB] Add TODO item pango/opentype/TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 9042dae8a1a4f4727a49b220f13487d50bc2e6fb Author: Behdad Esfahbod @@ -8096,7 +8274,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 2 -- pango/opentype/hb-ot-layout-gsub-private.h | 3 --- pango/opentype/hb-ot-layout-open-private.h | 18 +----------------- - 3 files changed, 1 insertions(+), 22 deletions(-) + 3 files changed, 1 insertion(+), 22 deletions(-) commit 384c824418c8510d77f47ea10adeaa234612500b Author: Behdad Esfahbod @@ -8107,7 +8285,7 @@ pango/opentype/hb-ot-layout-gdef-private.h | 9 ---- pango/opentype/hb-ot-layout-gsub-private.h | 63 ---------------------------- - pango/opentype/hb-ot-layout-open-private.h | 42 +----------------- + pango/opentype/hb-ot-layout-open-private.h | 42 ++----------------- 3 files changed, 3 insertions(+), 111 deletions(-) commit 9ca1c677b6f9e4329bbf9efc826621845b12b879 @@ -8118,7 +8296,7 @@ pango/opentype/hb-ot-layout-gsub-private.h | 52 ++++++++++++++++++++++++---- - 1 files changed, 45 insertions(+), 7 deletions(-) + 1 file changed, 45 insertions(+), 7 deletions(-) commit dc7f2949972981ad3253df73c9562c1ac2032ef9 Author: Behdad Esfahbod @@ -8128,7 +8306,7 @@ pango/opentype/hb-ot-layout-gsub-private.h | 170 ++++++++++++++-------------- - 1 files changed, 86 insertions(+), 84 deletions(-) + 1 file changed, 86 insertions(+), 84 deletions(-) commit 21d6ce8759a582bfdf475e0f7f149338909b7c04 Author: Behdad Esfahbod @@ -8137,7 +8315,7 @@ [HarfBuzz] Start a TODO file pango/opentype/TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 24eb2f6e5bbde72b27f33a816d22cced57b9bbc2 Author: Behdad Esfahbod @@ -8146,7 +8324,7 @@ [GSUB] minor pango/opentype/hb-ot-layout-open-private.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 5e2e37cbbb7612f595b9c8af72fe4709b2386857 Author: Behdad Esfahbod @@ -8156,7 +8334,7 @@ pango/opentype/hb-ot-layout-gsub-private.h | 137 ++++++++++++++++++++++------ - 1 files changed, 108 insertions(+), 29 deletions(-) + 1 file changed, 108 insertions(+), 29 deletions(-) commit e3d3752ed67492358212ecff6f2e3ea71537b4b8 Author: Behdad Esfahbod @@ -8165,8 +8343,8 @@ [GSUB] Minor refactoring pango/opentype/hb-ot-layout-gsub-private.h | 42 - +++++++++++++++------------ - 1 files changed, 23 insertions(+), 19 deletions(-) + +++++++++++++++------------- + 1 file changed, 23 insertions(+), 19 deletions(-) commit 8afbf62147bca4db12e78426ea9c41b5e801c7ed Author: Behdad Esfahbod @@ -8185,11 +8363,11 @@ [GSUB] Hook new GSUB up in Pango - pango/opentype/hb-ot-layout-gsub-private.h | 15 ++++-- + pango/opentype/hb-ot-layout-gsub-private.h | 15 ++++--- pango/pango-ot-info.c | 65 ++++++++++++++++------------ pango/pango-ot-private.h | 14 +++++- - pango/pango-ot-ruleset.c | 37 +-------------- + pango/pango-ot-ruleset.c | 37 ++-------------- 4 files changed, 62 insertions(+), 69 deletions(-) commit 644d9208ce6f916d702d41f35c3bd3f87552fa7b @@ -8210,7 +8388,7 @@ [GSUB] Implement Alternate subtables pango/opentype/hb-ot-layout-gsub-private.h | 104 - +++++++++++++++++++++++++-- + +++++++++++++++++++++++++--- pango/opentype/hb-ot-layout-open-private.h | 2 +- 2 files changed, 97 insertions(+), 9 deletions(-) @@ -8222,7 +8400,7 @@ pango/opentype/hb-ot-layout-gsub-private.h | 169 ++++++++++++++++++---------- - 1 files changed, 108 insertions(+), 61 deletions(-) + 1 file changed, 108 insertions(+), 61 deletions(-) commit 3be923835e89c9697d7c0ab24013a353fbafa9ab Author: Behdad Esfahbod @@ -8231,7 +8409,7 @@ [GSUB] Fix reverse lookup loop like we did in the old code before pango/opentype/hb-ot-layout-gsub-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 25f2af64013f6d88289d526315d2d0c91b77e3a1 Author: Behdad Esfahbod @@ -8244,7 +8422,7 @@ pango/opentype/harfbuzz.c | 1 - pango/opentype/hb-ot-layout-gdef-private.h | 4 +- pango/opentype/hb-ot-layout-gsub-private.h | 383 - ++++++++++++++++++++------- + ++++++++++++++++++++-------- pango/opentype/hb-ot-layout-open-private.h | 31 ++- pango/opentype/hb-ot-layout-private.h | 6 +- pango/opentype/hb-ot-layout.cc | 94 +++++-- @@ -8257,20 +8435,20 @@ Implement the first substitute() - pango/opentype/harfbuzz-buffer-private.h | 8 +- + pango/opentype/harfbuzz-buffer-private.h | 8 +-- pango/opentype/harfbuzz-buffer.c | 4 +- pango/opentype/harfbuzz-buffer.h | 2 +- pango/opentype/harfbuzz-gdef-private.h | 4 +- pango/opentype/harfbuzz-gdef.c | 6 +- pango/opentype/harfbuzz-gdef.h | 2 +- - pango/opentype/harfbuzz-gpos.c | 8 +- + pango/opentype/harfbuzz-gpos.c | 8 +-- pango/opentype/harfbuzz-gpos.h | 2 +- pango/opentype/harfbuzz-gsub.h | 2 +- pango/opentype/hb-ot-layout-gsub-private.h | 88 +++++++++++++++++++++++++--- pango/opentype/hb-ot-layout-open-private.h | 2 +- - pango/opentype/hb-ot-layout-private.h | 23 ++++--- - pango/opentype/hb-ot-layout.cc | 54 ++++++++++++----- + pango/opentype/hb-ot-layout-private.h | 23 ++++---- + pango/opentype/hb-ot-layout.cc | 54 +++++++++++------ pango/opentype/hb-ot-layout.h | 2 +- 14 files changed, 151 insertions(+), 56 deletions(-) @@ -8285,7 +8463,7 @@ pango/opentype/harfbuzz-global.h | 3 + pango/opentype/harfbuzz-gpos.c | 121 ++-- pango/opentype/harfbuzz-gpos.h | 6 +- - pango/opentype/harfbuzz-gsub.c | 145 ++--- + pango/opentype/harfbuzz-gsub.c | 145 ++-- pango/opentype/harfbuzz-gsub.h | 4 +- pango/opentype/harfbuzz-impl.h | 11 +- pango/opentype/harfbuzz-open.c | 9 - @@ -8299,7 +8477,7 @@ pango/opentype/hb-ot-layout.h | 229 +++++++ pango/opentype/main.cc | 174 +++++ pango/pango-ot-buffer.c | 12 +- - pango/pango-ot-info.c | 397 +++--------- + pango/pango-ot-info.c | 397 +++-------- pango/pango-ot-private.h | 4 +- 20 files changed, 3127 insertions(+), 494 deletions(-) @@ -8320,7 +8498,7 @@ [git.mk] Better deal with non-automake directories git.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2dbd066cbab8b9bfcf967e9147415db4f5627ab5 Author: Behdad Esfahbod @@ -8329,8 +8507,8 @@ [git.mk] Update git.mk | 157 - ++++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 80 insertions(+), 77 deletions(-) + +++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 80 insertions(+), 77 deletions(-) commit 967e4eb92e3b7ce2bd92f18a84ecdc3f8bb39ed3 Author: Behdad Esfahbod @@ -8339,7 +8517,7 @@ [git.mk] Fix DEST_SUBDIR recursion git.mk | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) + 1 file changed, 8 insertions(+), 7 deletions(-) commit f7c76896afc0f34db01a039933ee64ddc23bc3ab Author: Behdad Esfahbod @@ -8348,7 +8526,7 @@ [git.mk] Recurse in DIST_SUBDIRS too git.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2c9979d6a01b5fb4951f1413ad8468ed10415c64 Author: Behdad Esfahbod @@ -8359,7 +8537,7 @@ Be pedantic about broken cluster setup, avoid div-by-zero. pango/glyphstring.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) commit 150573e610c0b14c34aba6fe17b1a6e36d282767 Author: Behdad Esfahbod @@ -8368,7 +8546,7 @@ [doap] Add mailto: pango.doap | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit c91e757da1835900b73dcde3128ea4f5a5290c59 Author: Behdad Esfahbod @@ -8380,7 +8558,7 @@ [doc] Remove misleading sentence about points and Pango units pango/fonts.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) commit ff7dc9ae5d9b1cc340c6859bd5f3aa3054b19bea Author: Behdad Esfahbod @@ -8389,7 +8567,7 @@ [git.mk] Also ignore other vim buffer files git.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 131f9b20f0d8748baf7e9bf27166c91ec8bad88f Author: Behdad Esfahbod @@ -8398,7 +8576,7 @@ Fix maintainer-clean git.mk | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit abb1367e9942509a0e5e30df5451a5cfe07a415e Author: Behdad Esfahbod @@ -8409,7 +8587,7 @@ Apparently "stat" was aliased by me locally. git.mk | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 37baf42b1b74884156162c317a6604951e4f2d19 Author: Behdad Esfahbod @@ -8420,7 +8598,7 @@ Fix build on Cygwin. pango-view/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 049634718ff06752eb2722449a358a8248bcdea9 Author: Behdad Esfahbod @@ -8429,7 +8607,7 @@ [DOAP] Add category pango.doap | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) commit 4ad7bc1ece28204a528561fa383ffc4664c5c578 Author: Behdad Esfahbod @@ -8438,7 +8616,7 @@ [git.mk] Support out-of-tree builds git.mk | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) + 1 file changed, 9 insertions(+), 5 deletions(-) commit d0830820f84eb28a27502306b6acbf0f2b57fc7d Author: Behdad Esfahbod @@ -8447,7 +8625,7 @@ [git.mk] Remove copyright claim git.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit f88ab902430d3c01a83b980bf723058507c08d1f Author: Behdad Esfahbod @@ -8456,7 +8634,7 @@ [Makefile.am] Minor cleanup Makefile.am | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 file changed, 4 insertions(+), 1 deletion(-) commit 0564202a417e3d8eb6aad2c93c6d5e716f967549 Author: Behdad Esfahbod @@ -8476,7 +8654,7 @@ git.mk | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 87 insertions(+), 20 deletions(-) + 1 file changed, 87 insertions(+), 20 deletions(-) commit 133839d1d7ae77cfc80638a3a29187794f87dddf Author: Behdad Esfahbod @@ -8495,7 +8673,7 @@ [docs] Fix Makefile.am to not delete .gitignore on dist docs/Makefile.am | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 file changed, 4 insertions(+), 1 deletion(-) commit 137f858f17f680e2487bf4614a33c411c69469c7 Author: Behdad Esfahbod @@ -8504,7 +8682,7 @@ [doc] Update templates docs/tmpl/pangofc-font.sgml | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) commit 1140637cc765e449d381ae2d3a2ef6e3c9a98334 Author: Behdad Esfahbod @@ -8531,7 +8709,7 @@ pango/opentype/Makefile.am | 2 ++ tests/Makefile.am | 2 ++ tools/Makefile.am | 2 ++ - 19 files changed, 38 insertions(+), 0 deletions(-) + 19 files changed, 38 insertions(+) commit 5016f4caab5ecaa3c6faf46746c19801a72e9f08 Author: Behdad Esfahbod @@ -8541,7 +8719,7 @@ git.mk | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 72 insertions(+), 0 deletions(-) + 1 file changed, 72 insertions(+) commit b712138ad9d1f0eebb5f1ecc48d89ead7abf4a9f Author: Behdad Esfahbod @@ -8551,7 +8729,7 @@ Makefile.am | 3 ++- pango.doap | 33 +++++++++++++++++++++++++++++++++ - 2 files changed, 35 insertions(+), 1 deletions(-) + 2 files changed, 35 insertions(+), 1 deletion(-) commit f1bda36443d1759e02a4168563de21f08b39c566 Author: Behdad Esfahbod @@ -8563,7 +8741,7 @@ docs/Makefile.am | 1 + docs/tmpl/scripts.sgml | 7 ------- - 2 files changed, 1 insertions(+), 7 deletions(-) + 2 files changed, 1 insertion(+), 7 deletions(-) commit 8197b4d1721d905f1cda3207494df525be112f5d Author: Behdad Esfahbod @@ -8590,7 +8768,7 @@ of checking for "face->num_faces >1". pango/opentype/harfbuzz-stream.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) + 1 file changed, 9 insertions(+), 2 deletions(-) commit c5921ca904f3ab25f975e4c719c7334a31d84434 Author: Behdad Esfahbod @@ -8619,7 +8797,7 @@ pango/pangofc-font.c | 2 +- pango/pangofc-fontmap.c | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletions(-) + 2 files changed, 6 insertions(+), 1 deletion(-) commit 7a654f4999cdedf71d2c39cfa6ccf6fe2a7a8477 Author: Peter Clifton @@ -8644,7 +8822,7 @@ wrapped and ellipsized. pango/pango-layout.c | 16 +++++++--------- - 1 files changed, 7 insertions(+), 9 deletions(-) + 1 file changed, 7 insertions(+), 9 deletions(-) commit b6b9a22500c3e760f7c05d6c1fd62ff1529dee1b Author: Behdad Esfahbod @@ -8660,7 +8838,7 @@ set with no size. pango/pango-layout.c | 23 ++++++++++++++--------- - 1 files changed, 14 insertions(+), 9 deletions(-) + 1 file changed, 14 insertions(+), 9 deletions(-) commit 5ea040faf98de83101d50d1dfa141cdaf0cc5c2f Author: Behdad Esfahbod @@ -8670,7 +8848,7 @@ ellipsized pango/pango-layout.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) + 1 file changed, 7 insertions(+), 2 deletions(-) commit caabe183c7747d7486695071ab592e677bbdce25 Author: Behdad Esfahbod @@ -8705,7 +8883,7 @@ Allow desc_to_merge=NULL in pango_font_description_merge() pango/fonts.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + 1 file changed, 6 insertions(+), 2 deletions(-) commit 3948365307f6b70863d89af7da832b84af72c263 Author: Behdad Esfahbod @@ -8724,7 +8902,7 @@ [cairotwisted] Plug couple other leaks examples/cairotwisted.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 434011df553c8d40c1e6508c9bdea4884e591f97 Author: Behdad Esfahbod @@ -8733,7 +8911,7 @@ [cairotwisted] Plug leak examples/cairotwisted.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 file changed, 5 insertions(+), 1 deletion(-) commit 17ea2edc6defca2862bd45680d80e525998ea738 Author: Behdad Esfahbod @@ -8742,7 +8920,7 @@ [indic] Fix build modules/indic/indic-ot-class-tables.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit cf13cde8a80c9a1a9d4c9e343c634350da59991a Author: Behdad Esfahbod @@ -8754,7 +8932,7 @@ Patch from Rahul Bhalerao. modules/indic/indic-ot-class-tables.c | 20 +++++++++++--------- - 1 files changed, 11 insertions(+), 9 deletions(-) + 1 file changed, 11 insertions(+), 9 deletions(-) commit 477747bc1ef1078b06c4e1c615a1a912e6ada299 Author: Sebastian Dröge @@ -8765,7 +8943,7 @@ pango-view/pango-view.c | 2 +- pango-view/viewer-cairo.c | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletions(-) + 2 files changed, 5 insertions(+), 1 deletion(-) commit 698203ab28bc679c2e62a2452a79d5785fd46ca7 Author: Chris Wilson @@ -8781,8 +8959,8 @@ allocations associated with the iterator. pango/Makefile.am | 1 + - pango/break.c | 13 ++++--- - pango/pango-context.c | 13 ++++--- + pango/break.c | 13 ++++---- + pango/pango-context.c | 13 ++++---- pango/pango-script-private.h | 56 +++++++++++++++++++++++++++++++++ pango/pango-script.c | 70 ++++++++++++++++++------------------------ @@ -8795,7 +8973,7 @@ [pango-context] Fix assertion with enable_fallback=FALSE and no fonts pango/pango-context.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 file changed, 3 insertions(+) commit 7c025dc9d4ef396d991c823ed015c34aaf0eb3ae Author: Behdad Esfahbod @@ -8826,7 +9004,7 @@ [Makefile.am] Generage ChangeLog from git-log Makefile.am | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) + 1 file changed, 17 insertions(+) commit c82e8ad9dda142b1acfbcb86054750e082600893 Author: Behdad Esfahbod @@ -8864,10 +9042,10 @@ [pango-view] Add an extra level of mild annotation to cairo backend pango-view/viewer-main.c | 2 +- - pango-view/viewer-pangocairo.c | 133 - ++++++++++++++++++++------------------- + pango-view/viewer-pangocairo.c | 129 + ++++++++++++++++++++-------------------- pango-view/viewer-x.c | 15 ++--- - 3 files changed, 74 insertions(+), 76 deletions(-) + 3 files changed, 72 insertions(+), 74 deletions(-) commit c4f9a30634779bc985a470df2bc9f7e4fa0e6ad0 Author: Behdad Esfahbod @@ -8877,7 +9055,7 @@ pango-view/viewer-cairo.c | 90 ++++++++++++++++++++++++++---------------- - pango-view/viewer-pangoxft.c | 21 ++++------ + pango-view/viewer-pangoxft.c | 21 +++++----- pango-view/viewer-x.c | 8 ---- 3 files changed, 65 insertions(+), 54 deletions(-) @@ -8888,13 +9066,13 @@ Bug 502805 – pango-view option for foreground/background color pango-view/viewer-cairo.c | 58 +++++++++++++++++------- - pango-view/viewer-cairo.h | 3 + + pango-view/viewer-cairo.h | 3 ++ pango-view/viewer-pangocairo.c | 13 +++++- - pango-view/viewer-pangoxft.c | 26 +++++++---- + pango-view/viewer-pangoxft.c | 26 ++++++----- pango-view/viewer-render.c | 97 +++++++++++++++++++++++++++++++++++++++- - pango-view/viewer-render.h | 7 +++- - pango-view/viewer-x.c | 8 +++ + pango-view/viewer-render.h | 7 ++- + pango-view/viewer-x.c | 8 ++++ 7 files changed, 182 insertions(+), 30 deletions(-) commit 2599e265eba6fd27b3f7684c484f3160f9a67595 @@ -8904,7 +9082,7 @@ [configure.in] Look for pango.pc.in instead of ChangeLog configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 4eb4cf81312691516c2129f04f245401b5566235 Author: Behdad Esfahbod @@ -8935,7 +9113,7 @@ [pango-view] Make the cairo backend save png natively pango-view/viewer-pangocairo.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) commit a08cd2843ea38b142d375a15a08520c8758cd4ba Author: Behdad Esfahbod @@ -8944,7 +9122,7 @@ [Makefile.am] Cleanup pango-view/Makefile.am | 18 +++++------------- - 1 files changed, 5 insertions(+), 13 deletions(-) + 1 file changed, 5 insertions(+), 13 deletions(-) commit 9644e56231280151803e0bdbee7141507a6b899f Author: Behdad Esfahbod @@ -8955,7 +9133,7 @@ Don't crash when no fonts installed. pango/pangofc-fontmap.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit df05d117a5c168fb90138d7d6bae760c1b2851af Author: Behdad Esfahbod @@ -8981,7 +9159,7 @@ [pango-view] Don't set metrics-hinting, fallback to surface default pango-view/viewer-pangocairo.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) commit 5ca1d5b3373e6a2c2c69829a9ffd2a515d64e860 Author: Behdad Esfahbod @@ -8991,11 +9169,11 @@ pango-view/Makefile.am | 97 ------------------------------------------ - pango-view/pangocairo-view.c | 8 --- - pango-view/pangoft2-view.c | 8 --- - pango-view/pangox-view.c | 8 --- - pango-view/pangoxft-view.c | 8 --- - 5 files changed, 0 insertions(+), 129 deletions(-) + pango-view/pangocairo-view.c | 8 ---- + pango-view/pangoft2-view.c | 8 ---- + pango-view/pangox-view.c | 8 ---- + pango-view/pangoxft-view.c | 8 ---- + 5 files changed, 129 deletions(-) commit f4508bc989919842e8df3ff5b9aeeffece29571c Author: Behdad Esfahbod @@ -9005,7 +9183,7 @@ pango/pango-script-lang-table.h | 434 ++++++++++++++++++++++----------------- - 1 files changed, 241 insertions(+), 193 deletions(-) + 1 file changed, 241 insertions(+), 193 deletions(-) commit 46c65d090998b27a25ee89d36d444d645640934e Author: Behdad Esfahbod @@ -9014,7 +9192,7 @@ [Makefile.am] Fix build of gen-script-for-lang tools/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 04138218a9b515244f02202c5b18103e84e33d9e Author: Behdad Esfahbod @@ -9024,7 +9202,7 @@ pango/pangofc-fontmap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) + 1 file changed, 54 insertions(+) commit 03a13541fbf3f49c21d73490570ca217f559acbb Author: Behdad Esfahbod @@ -9033,9 +9211,9 @@ [pangofc] Share cmap cache between PangoFcFont's of the same face (#567160) - pango/pangofc-font.c | 41 ++++-------- + pango/pangofc-font.c | 41 ++++------- pango/pangofc-fontmap.c | 172 - ++++++++++++++++++++++++++++++++-------------- + ++++++++++++++++++++++++++++++++--------------- pango/pangofc-private.h | 26 +++++++ 3 files changed, 158 insertions(+), 81 deletions(-) @@ -9046,7 +9224,7 @@ [pangofc] Reuse filename from pattern in coverage key pango/pangofc-fontmap.c | 28 ++++++++++++++++++++-------- - 1 files changed, 20 insertions(+), 8 deletions(-) + 1 file changed, 20 insertions(+), 8 deletions(-) commit 9305b9a9995e84ace3818a90346820ef8c47a3ce Author: Behdad Esfahbod @@ -9083,7 +9261,7 @@ [pango-coverage] Fix optimization bug in pango_coverage_to_bytes() pango/pango-coverage.c | 19 +++++++++++-------- - 1 files changed, 11 insertions(+), 8 deletions(-) + 1 file changed, 11 insertions(+), 8 deletions(-) commit fa908f4cb6db943b555a51d1ce4bf01112b1a710 Author: Behdad Esfahbod @@ -9092,7 +9270,7 @@ [pango-coverage] Use gslice for data arrays pango/pango-coverage.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) commit b22da261e98702b95db83cd96175d0d655dc0df4 Author: Behdad Esfahbod @@ -9101,7 +9279,7 @@ [pango-coverage] Remove unused struct member pango/pango-coverage.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) commit e3cff8e0bb2926b2db1687182fab587ade7b64ee Author: Behdad Esfahbod @@ -9113,7 +9291,7 @@ cache size. pango/pangofc-fontmap.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5861e2609ded6495ebfd4110c4fc8f07ba32ebca Author: Behdad Esfahbod @@ -9122,7 +9300,7 @@ [pangofc-fontmap] Don't unref NULL object (RH bug# 487593) pango/pangofc-fontmap.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 file changed, 5 insertions(+), 1 deletion(-) commit a45933e695a6a60ebae63b30b5a021859cb85305 Author: Tor Lillqvist @@ -9139,7 +9317,7 @@ pango/pangowin32-fontmap.c | 100 +------------------------------------------- - 1 files changed, 2 insertions(+), 98 deletions(-) + 1 file changed, 2 insertions(+), 98 deletions(-) commit fab7a104d5c6f3182fe9bdc84bfcba5807f87f8a Author: Behdad Esfahbod @@ -9168,7 +9346,7 @@ [glyphstring] Handle overflow with very long glyphstrings pango/glyphstring.c | 26 ++++++++++++++++++++------ - 1 files changed, 20 insertions(+), 6 deletions(-) + 1 file changed, 20 insertions(+), 6 deletions(-) commit 1c9433bfe43890b102c8cead8ab3ee34b44c5c37 Author: Behdad Esfahbod @@ -9179,7 +9357,7 @@ Reported by Tommi Rantala. pango/pango-language.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) commit 7245e427818d88358f2c9fcfdbe777701d7b0ab9 Author: Behdad Esfahbod @@ -9192,7 +9370,7 @@ pango-view/Makefile.am | 1 - pango-view/viewer-win32.c | 748 --------------------------------------------- - 2 files changed, 0 insertions(+), 749 deletions(-) + 2 files changed, 749 deletions(-) commit e2f1e870a164dfe855542520c38b5d0b5758d433 Author: Behdad Esfahbod @@ -9214,7 +9392,7 @@ Fix Bug 572529 – Poor -I ordering can break build pango/opentype/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) commit 44c9dd3d4c17776240a2bd7bdee93b5455ab76d5 Author: Behdad Esfahbod @@ -9223,7 +9401,7 @@ Fix warnings tests/gen-all-unicode.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) commit d17a99734b13e3ea4886177c704d54fbb634a0f7 Author: Behdad Esfahbod @@ -9234,7 +9412,7 @@ svn path=/trunk/; revision=2829 pango/pangoft2.def | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) commit 400b54870729c2afe49d1aec2b43b2678e0d0844 Author: Behdad Esfahbod @@ -9254,4 +9432,4 @@ ChangeLog | 8 ++++++++ NEWS | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 62 insertions(+), 0 deletions(-) + 2 files changed, 62 insertions(+) diff -Nru pango1.0-1.29.5/config.guess pango1.0-1.30.0/config.guess --- pango1.0-1.29.5/config.guess 2011-11-22 19:07:56.000000000 +0000 +++ pango1.0-1.30.0/config.guess 2012-03-27 01:38:50.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -144,7 +145,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +181,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +224,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +270,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +299,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -394,23 +398,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +484,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +498,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +555,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +598,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +734,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +773,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,13 +792,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -803,15 +806,18 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -866,7 +872,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -878,20 +884,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -933,7 +948,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -959,7 +974,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -967,14 +982,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1001,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1037,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1065,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1106,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1150,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1179,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1230,6 +1248,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1275,13 +1296,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1321,11 +1342,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru pango1.0-1.29.5/config.h.win32 pango1.0-1.30.0/config.h.win32 --- pango1.0-1.29.5/config.h.win32 2011-11-22 20:24:15.000000000 +0000 +++ pango1.0-1.30.0/config.h.win32 2012-03-27 01:38:57.000000000 +0000 @@ -28,6 +28,9 @@ /* Whether Cairo has Xlib support */ /* #undef HAVE_CAIRO_XLIB */ +/* Whether CoreText is available on the system */ +/* #undef HAVE_CORE_TEXT */ + /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_DIRENT_H */ @@ -121,16 +124,16 @@ #define PACKAGE_NAME "pango" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pango 1.29.5" +#define PACKAGE_STRING "pango 1.30.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pango" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.29.5" +#define PACKAGE_VERSION "1.30.0" /* PANGO binary age */ -#define PANGO_BINARY_AGE 2905 +#define PANGO_BINARY_AGE 3000 /* PANGO interface age */ #define PANGO_INTERFACE_AGE 0 @@ -139,10 +142,10 @@ #define PANGO_VERSION_MAJOR 1 /* PANGO micro version */ -#define PANGO_VERSION_MICRO 5 +#define PANGO_VERSION_MICRO 0 /* PANGO minor version */ -#define PANGO_VERSION_MINOR 29 +#define PANGO_VERSION_MINOR 30 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -151,7 +154,7 @@ /* #undef USE_LA_MODULES */ /* Version number of package */ -#define VERSION "1.29.5" +#define VERSION "1.30.0" /* Define to 1 if the X Window System is missing or not being used. */ #define X_DISPLAY_MISSING 1 diff -Nru pango1.0-1.29.5/config.h.win32.in pango1.0-1.30.0/config.h.win32.in --- pango1.0-1.29.5/config.h.win32.in 2011-08-16 01:11:08.000000000 +0000 +++ pango1.0-1.30.0/config.h.win32.in 2012-01-10 19:11:46.000000000 +0000 @@ -28,6 +28,9 @@ /* Whether Cairo has Xlib support */ /* #undef HAVE_CAIRO_XLIB */ +/* Whether CoreText is available on the system */ +/* #undef HAVE_CORE_TEXT */ + /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_DIRENT_H */ diff -Nru pango1.0-1.29.5/config.sub pango1.0-1.30.0/config.sub --- pango1.0-1.29.5/config.sub 2011-11-22 19:07:56.000000000 +0000 +++ pango1.0-1.30.0/config.sub 2012-03-27 01:38:50.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-01-01' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,8 +124,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -156,8 +158,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +175,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -249,13 +251,17 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -281,29 +287,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +329,18 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -332,16 +360,19 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -367,25 +398,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +445,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +515,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +560,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +718,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,7 +775,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -771,10 +814,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +890,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +978,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1017,6 +1075,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1134,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1205,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1305,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1293,8 +1345,9 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1394,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1443,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1435,6 +1488,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1512,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1527,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1557,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1588,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru pango1.0-1.29.5/configure pango1.0-1.30.0/configure --- pango1.0-1.29.5/configure 2011-11-22 19:07:55.000000000 +0000 +++ pango1.0-1.30.0/configure 2012-03-27 01:38:49.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for pango 1.29.5. +# Generated by GNU Autoconf 2.68 for pango 1.30.0. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='pango' PACKAGE_TARNAME='pango' -PACKAGE_VERSION='1.29.5' -PACKAGE_STRING='pango 1.29.5' +PACKAGE_VERSION='1.30.0' +PACKAGE_STRING='pango 1.30.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pango' PACKAGE_URL='' @@ -818,12 +818,13 @@ am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE -ac_ct_CXX CXXFLAGS +ac_ct_CXX CXX am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -859,6 +860,8 @@ PANGO_VERSION_MAJOR AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -1520,7 +1523,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pango 1.29.5 to adapt to many kinds of systems. +\`configure' configures pango 1.30.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1594,7 +1597,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pango 1.29.5:";; + short | recursive ) echo "Configuration of pango 1.30.0:";; esac cat <<\_ACEOF @@ -1612,7 +1615,7 @@ optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-debug=[no/minimum/yes] - turn on debugging [default=yes] + turn on debugging [default=minimum] --disable-rebuilds disable all source autogeneration rules --enable-introspection=[no/auto/yes] Enable introspection for this build @@ -1629,7 +1632,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1751,7 +1754,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pango configure 1.29.5 +pango configure 1.30.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2241,7 +2244,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pango $as_me 1.29.5, which was +It was created by pango $as_me 1.30.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3059,7 +3062,7 @@ # Define the identity of the package. PACKAGE='pango' - VERSION='1.29.5' + VERSION='1.30.0' cat >>confdefs.h <<_ACEOF @@ -3089,11 +3092,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3109,6 +3112,33 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' ac_config_headers="$ac_config_headers config.h" @@ -3116,12 +3146,12 @@ PANGO_VERSION_MAJOR=1 -PANGO_VERSION_MINOR=29 -PANGO_VERSION_MICRO=5 -PANGO_VERSION=1.29.5 +PANGO_VERSION_MINOR=30 +PANGO_VERSION_MICRO=0 +PANGO_VERSION=1.30.0 PANGO_API_VERSION=1.0 PANGO_INTERFACE_AGE=0 -PANGO_BINARY_AGE=2905 +PANGO_BINARY_AGE=3000 PANGO_MODULE_VERSION=1.6.0 @@ -3137,7 +3167,7 @@ $as_echo "#define MODULE_VERSION \"1.6.0\"" >>confdefs.h -$as_echo "#define PANGO_BINARY_AGE 2905" >>confdefs.h +$as_echo "#define PANGO_BINARY_AGE 3000" >>confdefs.h $as_echo "#define PANGO_INTERFACE_AGE 0" >>confdefs.h @@ -3146,16 +3176,16 @@ $as_echo "#define PANGO_VERSION_MAJOR 1" >>confdefs.h -$as_echo "#define PANGO_VERSION_MINOR 29" >>confdefs.h +$as_echo "#define PANGO_VERSION_MINOR 30" >>confdefs.h -$as_echo "#define PANGO_VERSION_MICRO 5" >>confdefs.h +$as_echo "#define PANGO_VERSION_MICRO 0" >>confdefs.h -VERSION_INFO="2905:0:2905" +VERSION_INFO="3000:0:3000" PANGO_CURRENT_MINUS_AGE=0 @@ -4106,6 +4136,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -4130,6 +4161,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4189,7 +4221,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4245,10 +4277,11 @@ -for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_CXX+:} false; then : @@ -4264,7 +4297,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_prog" + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4284,9 +4317,65 @@ fi - test -n "$CXX" && break + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -test -n "$CXX" || CXX="gcc" + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="gcc" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi ac_ext=cpp @@ -4565,6 +4654,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4624,7 +4714,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4986,6 +5076,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5045,7 +5136,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -5888,8 +5979,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -6533,6 +6624,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -6572,7 +6668,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -6998,7 +7094,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -7635,13 +7731,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -7788,6 +7884,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -8176,7 +8273,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -8187,7 +8284,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -8827,7 +8937,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8838,6 +8954,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -8870,6 +8987,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -8891,7 +9009,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -9007,7 +9127,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -9085,6 +9220,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -9540,7 +9679,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -9631,18 +9772,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -10004,7 +10160,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -10254,8 +10409,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -10634,6 +10788,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -10679,6 +10834,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -10707,10 +10863,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10723,7 +10875,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10762,7 +10914,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -11386,11 +11537,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -11480,7 +11626,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -11489,7 +11635,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -11554,7 +11700,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11693,7 +11839,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -11701,10 +11847,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11712,7 +11854,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11730,7 +11872,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11750,17 +11892,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -11821,7 +11964,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11837,7 +11980,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11874,9 +12017,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11962,7 +12105,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -12031,7 +12174,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12056,7 +12199,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12080,7 +12223,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -12111,7 +12254,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12121,7 +12264,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -13046,7 +13189,6 @@ hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -13630,6 +13772,7 @@ hardcode_shlibpath_var_CXX=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec_CXX='' fi @@ -13674,7 +13817,7 @@ esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -14350,6 +14493,7 @@ case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -15139,7 +15283,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' @@ -15292,8 +15438,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -15319,7 +15463,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -15328,7 +15472,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -15393,7 +15537,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -15530,7 +15674,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -15538,10 +15682,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -15549,7 +15689,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -15567,7 +15707,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -15587,17 +15727,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -15658,7 +15799,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -15674,7 +15815,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -15711,9 +15852,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15799,7 +15940,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -15868,7 +16009,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15893,7 +16034,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15917,7 +16058,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -15948,7 +16089,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15958,7 +16099,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -16097,6 +16238,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -16523,10 +16666,10 @@ Report bugs to ." lt_cl_version="\ -pango config.lt 1.29.5 +pango config.lt 1.30.0 configured by $0, generated by GNU Autoconf 2.68. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -16577,6 +16720,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -16657,7 +16801,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -16729,7 +16872,6 @@ allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -16771,6 +16913,7 @@ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -16819,7 +16962,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -16853,7 +16995,6 @@ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ @@ -16962,8 +17103,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -17026,6 +17167,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -17321,10 +17465,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -17667,10 +17807,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX @@ -17942,7 +18078,7 @@ if test "${enable_debug+set}" = set; then : enableval=$enable_debug; else - enable_debug=yes + enable_debug=minimum fi @@ -21763,7 +21899,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pango $as_me 1.29.5, which was +This file was extended by pango $as_me 1.30.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21829,7 +21965,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pango config.status 1.29.5 +pango config.status 1.30.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -21969,6 +22105,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -22049,7 +22186,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -22121,7 +22257,6 @@ allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -22163,6 +22298,7 @@ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -22211,7 +22347,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -22245,7 +22380,6 @@ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ @@ -23113,8 +23247,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -23177,6 +23311,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -23472,10 +23609,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -23818,10 +23951,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX diff -Nru pango1.0-1.29.5/configure.in pango1.0-1.30.0/configure.in --- pango1.0-1.29.5/configure.in 2011-11-22 19:07:34.000000000 +0000 +++ pango1.0-1.30.0/configure.in 2012-03-27 01:28:50.000000000 +0000 @@ -21,8 +21,8 @@ dnl The triplet m4_define([pango_version_major], [1]) -m4_define([pango_version_minor], [29]) -m4_define([pango_version_micro], [5]) +m4_define([pango_version_minor], [30]) +m4_define([pango_version_micro], [0]) m4_define([pango_version], [pango_version_major.pango_version_minor.pango_version_micro]) @@ -52,7 +52,7 @@ dnl -Wno-portability tells automake to stop complaining about the dnl usage of GNU Make specific features. -AM_INIT_AUTOMAKE(1.9 gnits dist-bzip2 no-dist-gzip -Wno-portability) +AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AM_CONFIG_HEADER([config.h]) @@ -124,7 +124,7 @@ dnl Check for a working C++ compiler, but do not bail out, if none is found. dnl We use this for an automated test for C++ header correctness. dnl -AC_CHECK_PROGS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc) +AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc) AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) diff -Nru pango1.0-1.29.5/debian/changelog pango1.0-1.30.0/debian/changelog --- pango1.0-1.29.5/debian/changelog 2012-02-08 07:42:58.000000000 +0000 +++ pango1.0-1.30.0/debian/changelog 2012-03-29 00:34:08.000000000 +0000 @@ -1,3 +1,15 @@ +pango1.0 (1.30.0-0ubuntu1) precise-proposed; urgency=low + + * New upstream release: + - Fix cross-compiling bug in configure.in + - Zero-width spaces cause missing characters + - CoreText backend: implement font fallbacks + - CoreText backend: make more robust against broken fonts + - CoreText backend: make shaping engine more robust + - CoreText backend: Guard against glyph count of zero + + -- Robert Ancell Thu, 29 Mar 2012 10:54:21 +1100 + pango1.0 (1.29.5-0ubuntu1) precise; urgency=low * New upstream bug fix release. diff -Nru pango1.0-1.29.5/debian/patches/10_scan-module-files-in-dirs.patch pango1.0-1.30.0/debian/patches/10_scan-module-files-in-dirs.patch --- pango1.0-1.29.5/debian/patches/10_scan-module-files-in-dirs.patch 2011-10-15 11:58:19.000000000 +0000 +++ pango1.0-1.30.0/debian/patches/10_scan-module-files-in-dirs.patch 2012-03-29 00:25:23.000000000 +0000 @@ -1,7 +1,7 @@ -Index: pango1.0-1.28.1/pango/modules.c +Index: pango1.0-1.30.0/pango/modules.c =================================================================== ---- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:21.255815917 +0200 -+++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:31.287811515 +0200 +--- pango1.0-1.30.0.orig/pango/modules.c 2012-03-29 11:20:58.054438454 +1100 ++++ pango1.0-1.30.0/pango/modules.c 2012-03-29 11:25:20.402429369 +1100 @@ -40,6 +40,9 @@ #define PANGO_MODULE(module) (G_TYPE_CHECK_INSTANCE_CAST ((module), PANGO_TYPE_MODULE, PangoModule)) #define PANGO_IS_MODULE(module) (G_TYPE_CHECK_INSTANCE_TYPE ((module), PANGO_TYPE_MODULE)) @@ -12,7 +12,7 @@ typedef struct _PangoMapInfo PangoMapInfo; typedef struct _PangoEnginePair PangoEnginePair; typedef struct _PangoSubmap PangoSubmap; -@@ -540,11 +543,36 @@ +@@ -545,13 +548,40 @@ while (n-- > 0) { @@ -32,7 +32,9 @@ + module_file = g_fopen (pathname, "r"); + if (module_file) + { -+ process_module_file(module_file); ++ const gchar *module_file_dir = g_path_get_dirname (files[n]); ++ process_module_file(module_file, module_file_dir); ++ g_free ((gpointer) module_file_dir); + fclose(module_file); + } + g_free (pathname); @@ -42,12 +44,16 @@ + } + else { -- process_module_file(module_file); +- const gchar *module_file_dir = g_path_get_dirname (files[n]); +- process_module_file(module_file, module_file_dir); +- g_free ((gpointer) module_file_dir); - fclose(module_file); + module_file = g_fopen (files[n], "r"); + if (module_file) + { -+ process_module_file(module_file); ++ const gchar *module_file_dir = g_path_get_dirname (files[n]); ++ process_module_file(module_file, module_file_dir); ++ g_free ((gpointer) module_file_dir); + fclose(module_file); + } } diff -Nru pango1.0-1.29.5/debian/patches/11_module-files-append-module-files-d.patch pango1.0-1.30.0/debian/patches/11_module-files-append-module-files-d.patch --- pango1.0-1.29.5/debian/patches/11_module-files-append-module-files-d.patch 2011-10-15 11:58:19.000000000 +0000 +++ pango1.0-1.30.0/debian/patches/11_module-files-append-module-files-d.patch 2012-03-29 00:25:25.000000000 +0000 @@ -1,8 +1,8 @@ -Index: pango1.0-1.28.1/pango/modules.c +Index: pango1.0-1.30.0/pango/modules.c =================================================================== ---- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:31.287811515 +0200 -+++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:36.626808929 +0200 -@@ -525,6 +525,11 @@ +--- pango1.0-1.30.0.orig/pango/modules.c 2012-03-29 11:25:20.402429369 +1100 ++++ pango1.0-1.30.0/pango/modules.c 2012-03-29 11:25:24.030429242 +1100 +@@ -530,6 +530,11 @@ FILE *module_file; char *file_str = pango_config_key_get ("Pango/ModuleFiles"); @@ -14,7 +14,7 @@ char **files; int n; -@@ -535,7 +540,12 @@ +@@ -540,7 +545,12 @@ "pango.modules", NULL); @@ -28,7 +28,7 @@ n = 0; while (files[n]) -@@ -577,6 +587,8 @@ +@@ -586,6 +596,8 @@ } g_strfreev (files); diff -Nru pango1.0-1.29.5/debian/patches/12_module-files-append-compat-module-files-d.patch pango1.0-1.30.0/debian/patches/12_module-files-append-compat-module-files-d.patch --- pango1.0-1.29.5/debian/patches/12_module-files-append-compat-module-files-d.patch 2011-10-15 11:58:19.000000000 +0000 +++ pango1.0-1.30.0/debian/patches/12_module-files-append-compat-module-files-d.patch 2012-03-29 00:25:26.000000000 +0000 @@ -1,7 +1,7 @@ -Index: pango1.0-1.28.1/pango/modules.c +Index: pango1.0-1.30.0/pango/modules.c =================================================================== ---- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:36.626808929 +0200 -+++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:38.606801290 +0200 +--- pango1.0-1.30.0.orig/pango/modules.c 2012-03-29 11:25:24.030429242 +1100 ++++ pango1.0-1.30.0/pango/modules.c 2012-03-29 11:25:25.570429190 +1100 @@ -24,6 +24,7 @@ #include #include @@ -10,7 +10,7 @@ #include #include -@@ -529,6 +530,18 @@ +@@ -534,6 +535,18 @@ MODULE_VERSION, "module-files.d", NULL); @@ -29,7 +29,7 @@ char *list_str; char **files; int n; -@@ -540,6 +553,17 @@ +@@ -545,6 +558,17 @@ "pango.modules", NULL); @@ -47,7 +47,7 @@ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, file_str, module_files_d_str, -@@ -589,6 +613,9 @@ +@@ -598,6 +622,9 @@ g_strfreev (files); g_free (list_str); g_free (module_files_d_str); diff -Nru pango1.0-1.29.5/depcomp pango1.0-1.30.0/depcomp --- pango1.0-1.29.5/depcomp 2011-11-22 19:07:59.000000000 +0000 +++ pango1.0-1.30.0/depcomp 2012-03-27 01:38:51.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,10 +90,18 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -158,10 +166,12 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/ \1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/ / + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -503,7 +559,9 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru pango1.0-1.29.5/docs/html/index.html pango1.0-1.30.0/docs/html/index.html --- pango1.0-1.29.5/docs/html/index.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/index.html 2012-03-27 01:41:19.000000000 +0000 @@ -14,7 +14,7 @@
-

for Pango 1.29.5 +

for Pango 1.30.0


diff -Nru pango1.0-1.29.5/docs/html/pango-ATSUI-Fonts.html pango1.0-1.30.0/docs/html/pango-ATSUI-Fonts.html --- pango1.0-1.29.5/docs/html/pango-ATSUI-Fonts.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-ATSUI-Fonts.html 2012-03-27 01:41:19.000000000 +0000 @@ -57,7 +57,7 @@

A string constant identifying the ATSUI renderer. The associated quark (see -g_quark_from_string()) is used to identify the renderer in pango_find_map(). +g_quark_from_string()) is used to identify the renderer in pango_find_map().


diff -Nru pango1.0-1.29.5/docs/html/pango-Bidirectional-Text.html pango1.0-1.30.0/docs/html/pango-Bidirectional-Text.html --- pango1.0-1.29.5/docs/html/pango-Bidirectional-Text.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Bidirectional-Text.html 2012-03-27 01:41:19.000000000 +0000 @@ -40,13 +40,13 @@

Synopsis

enum                PangoDirection;
-PangoDirection      pango_unichar_direction             (gunichar ch);
-PangoDirection      pango_find_base_dir                 (const gchar *text,
-                                                         gint length);
-gboolean            pango_get_mirror_char               (gunichar ch,
-                                                         gunichar *mirrored_ch);
+PangoDirection      pango_unichar_direction             (gunichar ch);
+PangoDirection      pango_find_base_dir                 (const gchar *text,
+                                                         gint length);
+gboolean            pango_get_mirror_char               (gunichar ch,
+                                                         gunichar *mirrored_ch);
 enum                PangoBidiType;
-PangoBidiType       pango_bidi_type_for_unichar         (gunichar ch);
+PangoBidiType       pango_bidi_type_for_unichar         (gunichar ch);
 
@@ -153,7 +153,7 @@

pango_unichar_direction ()

-
PangoDirection      pango_unichar_direction             (gunichar ch);
+
PangoDirection      pango_unichar_direction             (gunichar ch);

Determines the inherent direction of a character; either PANGO_DIRECTION_LTR, PANGO_DIRECTION_RTL, or @@ -182,8 +182,8 @@


pango_find_base_dir ()

-
PangoDirection      pango_find_base_dir                 (const gchar *text,
-                                                         gint length);
+
PangoDirection      pango_find_base_dir                 (const gchar *text,
+                                                         gint length);

Searches a string the first character that has a strong direction, according to the Unicode bidirectional algorithm. @@ -211,8 +211,8 @@


pango_get_mirror_char ()

-
gboolean            pango_get_mirror_char               (gunichar ch,
-                                                         gunichar *mirrored_ch);
+
gboolean            pango_get_mirror_char               (gunichar ch,
+                                                         gunichar *mirrored_ch);

Warning

pango_get_mirror_char is deprecated and should not be used in newly-written code.

@@ -223,7 +223,7 @@ glyph, puts that character in the address pointed to by mirrored_ch.

-Use g_unichar_get_mirror_char() instead; the docs for that function +Use g_unichar_get_mirror_char() instead; the docs for that function provide full details.

@@ -240,8 +240,8 @@ +TRUE if ch has a mirrored character and mirrored_ch is +filled in, FALSE otherwise

Returns :

-TRUE if ch has a mirrored character and mirrored_ch is -filled in, FALSE otherwise
@@ -386,7 +386,7 @@

pango_bidi_type_for_unichar ()

-
PangoBidiType       pango_bidi_type_for_unichar         (gunichar ch);
+
PangoBidiType       pango_bidi_type_for_unichar         (gunichar ch);

Determines the normative bidirectional character type of a character, as specified in the Unicode Character Database. diff -Nru pango1.0-1.29.5/docs/html/pango-Cairo-Rendering.html pango1.0-1.30.0/docs/html/pango-Cairo-Rendering.html --- pango1.0-1.29.5/docs/html/pango-Cairo-Rendering.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Cairo-Rendering.html 2012-03-27 01:41:19.000000000 +0000 @@ -64,16 +64,16 @@ (PangoContext *context); void (*PangoCairoShapeRendererFunc) (cairo_t *cr, PangoAttrShape *attr, - gboolean do_path, - gpointer data); + gboolean do_path, + gpointer data); void pango_cairo_context_set_shape_renderer (PangoContext *context, PangoCairoShapeRendererFunc func, - gpointer data, - GDestroyNotify dnotify); + gpointer data, + GDestroyNotify dnotify); PangoCairoShapeRendererFunc pango_cairo_context_get_shape_renderer (PangoContext *context, - gpointer *data); + gpointer *data); PangoContext * pango_cairo_create_context (cairo_t *cr); void pango_cairo_update_context (cairo_t *cr, PangoContext *context); @@ -265,9 +265,9 @@ double red; cairo_save (cr); /* Gradient from red at angle == 60 to blue at angle == 240 */ - red = (1 + cos ((angle - 60) * G_PI / 180.)) / 2; + red = (1 + cos ((angle - 60) * G_PI / 180.)) / 2; cairo_set_source_rgb (cr, red, 0, 1.0 - red); - cairo_rotate (cr, angle * G_PI / 180.); + cairo_rotate (cr, angle * G_PI / 180.); /* Inform Pango to re-layout the text with the new transformation */ pango_cairo_update_layout (cr, layout); pango_layout_get_size (layout, &width, &height); @@ -276,7 +276,7 @@ cairo_restore (cr); } /* free the layout object */ - g_object_unref (layout); + g_object_unref (layout); } int main (int argc, char **argv) { @@ -286,7 +286,7 @@ cairo_surface_t *surface; if (argc != 2) { - g_printerr ("Usage: cairosimple OUTPUT_FILENAME\n"); + g_printerr ("Usage: cairosimple OUTPUT_FILENAME\n"); return 1; } filename = argv[1]; @@ -301,7 +301,7 @@ cairo_surface_destroy (surface); if (status != CAIRO_STATUS_SUCCESS) { - g_printerr ("Could not save png to '%s'\n", filename); + g_printerr ("Could not save png to '%s'\n", filename); return 1; } return 0; @@ -384,7 +384,7 @@ is unreffed and the new font map referenced.

-A value of NULL for fontmap will cause the current default +A value of NULL for fontmap will cause the current default font map to be released and a new default font map to be created on demand, using pango_cairo_font_map_new().

@@ -392,7 +392,7 @@

fontmap :

-The new default font map, or NULL +The new default font map, or NULL
@@ -420,7 +420,7 @@

Returns :

the newly allocated PangoFontMap, -which should be freed with g_object_unref(). [transfer full] +which should be freed with g_object_unref(). [transfer full]
@@ -452,7 +452,7 @@

Returns :

(transfer full) : the newly allocated PangoFontMap of suitable type which should be freed with -g_object_unref(), or NULL if the requested cairo +g_object_unref(), or NULL if the requested cairo font backend is not supported / compiled in. @@ -554,7 +554,7 @@

Returns :

-the newly created context; free with g_object_unref(). +the newly created context; free with g_object_unref().
@@ -580,7 +580,7 @@

Returns :

the cairo_scaled_font_t used by font, -or NULL if font is NULL. +or NULL if font is NULL.
@@ -657,7 +657,7 @@

options :

-a cairo_font_options_t, or NULL to unset any previously set +a cairo_font_options_t, or NULL to unset any previously set options. A copy is made. @@ -683,7 +683,7 @@

Returns :

-the font options previously set on the context, or NULL +the font options previously set on the context, or NULL if no options have been set. This value is owned by the context and must not be modified or freed. @@ -696,8 +696,8 @@

PangoCairoShapeRendererFunc ()

void                (*PangoCairoShapeRendererFunc)      (cairo_t *cr,
                                                          PangoAttrShape *attr,
-                                                         gboolean do_path,
-                                                         gpointer data);
+ gboolean do_path, + gpointer data);

Function type for rendering attributes of type PANGO_ATTR_SHAPE with Pango's Cairo renderer. @@ -718,7 +718,7 @@

do_path :

whether only the shape path should be appended to current path of cr and no filling/stroking done. This will be set -to TRUE when called from pango_cairo_layout_path() and +to TRUE when called from pango_cairo_layout_path() and pango_cairo_layout_line_path() rendering functions. @@ -735,8 +735,8 @@
void                pango_cairo_context_set_shape_renderer
                                                         (PangoContext *context,
                                                          PangoCairoShapeRendererFunc func,
-                                                         gpointer data,
-                                                         GDestroyNotify dnotify);
+ gpointer data, + GDestroyNotify dnotify);

Sets callback function for context to use for rendering attributes of type PANGO_ATTR_SHAPE. See PangoCairoShapeRendererFunc for @@ -752,7 +752,7 @@

func :

Callback function for rendering attributes of type -PANGO_ATTR_SHAPE, or NULL to disable shape rendering. +PANGO_ATTR_SHAPE, or NULL to disable shape rendering.

data :

@@ -761,7 +761,7 @@

dnotify :

Callback that will be called when the -context is freed to release data, or NULL. +context is freed to release data, or NULL.
@@ -772,7 +772,7 @@

pango_cairo_context_get_shape_renderer ()

PangoCairoShapeRendererFunc pango_cairo_context_get_shape_renderer
                                                         (PangoContext *context,
-                                                         gpointer *data);
+ gpointer *data);

Sets callback function for context to use for rendering attributes of type PANGO_ATTR_SHAPE. See PangoCairoShapeRendererFunc for @@ -792,11 +792,11 @@

data :

-Pointer to gpointer to return user data +Pointer to gpointer to return user data

Returns :

-the shape rendering callback previously set on the context, or NULL +the shape rendering callback previously set on the context, or NULL if no shape rendering callback have been set. @@ -828,7 +828,7 @@

Returns :

the newly created PangoContext. Free with -g_object_unref(). [transfer full] +g_object_unref(). [transfer full] @@ -890,7 +890,7 @@

Returns :

the newly created PangoLayout. Free with -g_object_unref(). [transfer full] +g_object_unref(). [transfer full] diff -Nru pango1.0-1.29.5/docs/html/pango-CoreText-Fonts.html pango1.0-1.30.0/docs/html/pango-CoreText-Fonts.html --- pango1.0-1.29.5/docs/html/pango-CoreText-Fonts.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-CoreText-Fonts.html 2012-03-27 01:41:19.000000000 +0000 @@ -56,7 +56,7 @@

A string constant identifying the CoreText renderer. The associated quark (see -g_quark_from_string()) is used to identify the renderer in pango_find_map(). +g_quark_from_string()) is used to identify the renderer in pango_find_map().


diff -Nru pango1.0-1.29.5/docs/html/pango-Coverage-Maps.html pango1.0-1.30.0/docs/html/pango-Coverage-Maps.html --- pango1.0-1.29.5/docs/html/pango-Coverage-Maps.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Coverage-Maps.html 2012-03-27 01:41:19.000000000 +0000 @@ -55,9 +55,9 @@ int index_, PangoCoverageLevel level); void pango_coverage_to_bytes (PangoCoverage *coverage, - guchar **bytes, + guchar **bytes, int *n_bytes); -PangoCoverage * pango_coverage_from_bytes (guchar *bytes, +PangoCoverage * pango_coverage_from_bytes (guchar *bytes, int n_bytes);
@@ -130,7 +130,7 @@
#define PANGO_TYPE_COVERAGE_LEVEL (pango_coverage_level_get_type())
 

-The GObject type for PangoCoverageLevel. +The GObject type for PangoCoverageLevel.


@@ -310,7 +310,7 @@

pango_coverage_to_bytes ()

void                pango_coverage_to_bytes             (PangoCoverage *coverage,
-                                                         guchar **bytes,
+                                                         guchar **bytes,
                                                          int *n_bytes);

Convert a PangoCoverage structure into a flat binary format @@ -325,7 +325,7 @@

bytes :

-location to store result (must be freed with g_free()) +location to store result (must be freed with g_free())

n_bytes :

@@ -337,7 +337,7 @@

pango_coverage_from_bytes ()

-
PangoCoverage *     pango_coverage_from_bytes           (guchar *bytes,
+
PangoCoverage *     pango_coverage_from_bytes           (guchar *bytes,
                                                          int n_bytes);

Convert data generated from pango_converage_to_bytes() back @@ -357,7 +357,7 @@

Returns :

-a newly allocated PangoCoverage, or NULL if +a newly allocated PangoCoverage, or NULL if the data was invalid. diff -Nru pango1.0-1.29.5/docs/html/PangoEngineLang.html pango1.0-1.30.0/docs/html/PangoEngineLang.html --- pango1.0-1.29.5/docs/html/PangoEngineLang.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/PangoEngineLang.html 2012-03-27 01:41:19.000000000 +0000 @@ -55,7 +55,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoEngine
          +----PangoEngineLang
 
@@ -102,7 +102,7 @@

script_break ()

Provides a custom implementation of pango_break(). -If NULL, pango_default_break() is used instead. If not NULL, for +If NULL, pango_default_break() is used instead. If not NULL, for Pango versions before 1.16 (module interface version before 1.6.0), this was called instead of pango_default_break(), but in newer versions, pango_default_break() is always called and this is called after that to @@ -151,7 +151,7 @@
1
-
PangoEngine *engine = g_object_new (<em class="replaceable"><code>prefix</code></em>_type, NULL);
+
PangoEngine *engine = g_object_new (<em class="replaceable"><code>prefix</code></em>_type, NULL);
@@ -174,12 +174,12 @@

class_init :

-Class initialization function for the new type, or NULL +Class initialization function for the new type, or NULL

instance_init :

-Instance initialization function for the new type, or NULL +Instance initialization function for the new type, or NULL diff -Nru pango1.0-1.29.5/docs/html/PangoEngineShape.html pango1.0-1.30.0/docs/html/PangoEngineShape.html --- pango1.0-1.29.5/docs/html/PangoEngineShape.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/PangoEngineShape.html 2012-03-27 01:41:19.000000000 +0000 @@ -55,7 +55,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoEngine
          +----PangoEngineShape
 
@@ -176,7 +176,7 @@
1
-
PangoEngine *engine = g_object_new (<em class="replaceable"><code>prefix</code></em>_type, NULL);
+
PangoEngine *engine = g_object_new (<em class="replaceable"><code>prefix</code></em>_type, NULL);
@@ -199,12 +199,12 @@

class_init :

-Class initialization function for the new type, or NULL +Class initialization function for the new type, or NULL

instance_init :

-Instance initialization function for the new type, or NULL +Instance initialization function for the new type, or NULL diff -Nru pango1.0-1.29.5/docs/html/pango-Engines.html pango1.0-1.30.0/docs/html/pango-Engines.html --- pango1.0-1.29.5/docs/html/pango-Engines.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Engines.html 2012-03-27 01:41:19.000000000 +0000 @@ -46,7 +46,7 @@ #define PANGO_RENDER_TYPE_NONE void script_engine_list (PangoEngineInfo **engines, int *n_engines); -void script_engine_init (GTypeModule *module); +void script_engine_init (GTypeModule *module); void script_engine_exit (void); PangoEngine * script_engine_create (const char *id);
@@ -54,7 +54,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoEngine
          +----PangoEngineLang
          +----PangoEngineShape
@@ -100,15 +100,15 @@
 
 
 
-

const gchar *id;

+

const gchar *id;

a unique string ID for the engine. -

const gchar *engine_type;

+

const gchar *engine_type;

a string identifying the engine type. -

const gchar *render_type;

+

const gchar *render_type;

a string identifying the render type. @@ -116,7 +116,7 @@ array of scripts this engine supports. -

gint n_scripts;

+

gint n_scripts;

number of items in scripts. @@ -144,7 +144,7 @@ the special meaning here of "all scripts" -

const gchar *langs;

+

const gchar *langs;

a semicolon separated list of languages that this engine handles for this script. This may be empty, in which case the engine is saying that it is a @@ -220,7 +220,7 @@

script_engine_init ()

-
void                script_engine_init                  (GTypeModule *module);
+
void                script_engine_init                  (GTypeModule *module);

Function to be provided by a module to register any GObject types in the module. @@ -229,7 +229,7 @@

module :

-a GTypeModule structure used to associate any +a GTypeModule structure used to associate any GObject types created in this module with the module.
@@ -261,8 +261,8 @@

Returns :

a newly created PangoEngine of the specified -type, or NULL if an error occurred. (In normal operation, -a module should not return NULL. A NULL return is only +type, or NULL if an error occurred. (In normal operation, +a module should not return NULL. A NULL return is only acceptable in the case where system misconfiguration or bugs in the driver routine are encountered.) diff -Nru pango1.0-1.29.5/docs/html/PangoFcDecoder.html pango1.0-1.30.0/docs/html/PangoFcDecoder.html --- pango1.0-1.29.5/docs/html/PangoFcDecoder.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/PangoFcDecoder.html 2012-03-27 01:41:19.000000000 +0000 @@ -45,13 +45,13 @@ PangoFcFont *fcfont); PangoGlyph pango_fc_decoder_get_glyph (PangoFcDecoder *decoder, PangoFcFont *fcfont, - guint32 wc); + guint32 wc);

Object Hierarchy

-  GObject
+  GObject
    +----PangoFcDecoder
 
@@ -152,7 +152,7 @@

pango_fc_decoder_get_glyph ()

PangoGlyph          pango_fc_decoder_get_glyph          (PangoFcDecoder *decoder,
                                                          PangoFcFont *fcfont,
-                                                         guint32 wc);
+ guint32 wc);

Generates a PangoGlyph for the given Unicode point using the custom decoder. For complex scripts where there can be multiple diff -Nru pango1.0-1.29.5/docs/html/PangoFcFont.html pango1.0-1.30.0/docs/html/PangoFcFont.html --- pango1.0-1.29.5/docs/html/PangoFcFont.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/PangoFcFont.html 2012-03-27 01:41:19.000000000 +0000 @@ -46,12 +46,12 @@ #define PANGO_RENDER_TYPE_FC FT_Face pango_fc_font_lock_face (PangoFcFont *font); void pango_fc_font_unlock_face (PangoFcFont *font); -gboolean pango_fc_font_has_char (PangoFcFont *font, - gunichar wc); -guint pango_fc_font_get_glyph (PangoFcFont *font, - gunichar wc); +gboolean pango_fc_font_has_char (PangoFcFont *font, + gunichar wc); +guint pango_fc_font_get_glyph (PangoFcFont *font, + gunichar wc); PangoGlyph pango_fc_font_get_unknown_glyph (PangoFcFont *font, - gunichar wc); + gunichar wc); void pango_fc_font_kern_glyphs (PangoFcFont *font, PangoGlyphString *glyphs); @@ -59,7 +59,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoFont
          +----PangoFcFont
                +----PangoXftFont
@@ -69,7 +69,7 @@
 

Properties

   "fontmap"                  PangoFcFontMap*       : Read / Write
-  "pattern"                  gpointer              : Read / Write / Construct Only
+  "pattern"                  gpointer              : Read / Write / Construct Only
 
@@ -134,7 +134,7 @@

has_char ()

-Return TRUE if the the font contains a glyph +Return TRUE if the the font contains a glyph corresponding to the specified character. @@ -147,13 +147,13 @@ Gets the glyph that should be used to display an unknown-glyph indication for the specified Unicode character. -May be NULL. +May be NULL.

shutdown ()

Performs any font-specific shutdown code that needs to be done when pango_fc_font_map_shutdown is called. -May be NULL. +May be NULL.
@@ -213,8 +213,8 @@

pango_fc_font_has_char ()

-
gboolean            pango_fc_font_has_char              (PangoFcFont *font,
-                                                         gunichar wc);
+
gboolean            pango_fc_font_has_char              (PangoFcFont *font,
+                                                         gunichar wc);

Determines whether font has a glyph for the codepoint wc.

@@ -233,7 +233,7 @@

Returns :

-TRUE if font has the requested codepoint. +TRUE if font has the requested codepoint.
@@ -242,8 +242,8 @@

pango_fc_font_get_glyph ()

-
guint               pango_fc_font_get_glyph             (PangoFcFont *font,
-                                                         gunichar wc);
+
guint               pango_fc_font_get_glyph             (PangoFcFont *font,
+                                                         gunichar wc);

Gets the glyph index for a given Unicode character for font. If you only want to determine @@ -274,7 +274,7 @@

pango_fc_font_get_unknown_glyph ()

PangoGlyph          pango_fc_font_get_unknown_glyph     (PangoFcFont *font,
-                                                         gunichar wc);
+ gunichar wc);

Warning

pango_fc_font_get_unknown_glyph is deprecated and should not be used in newly-written code.

@@ -343,7 +343,7 @@

The "pattern" property

-
  "pattern"                  gpointer              : Read / Write / Construct Only
+
  "pattern"                  gpointer              : Read / Write / Construct Only

The fontconfig pattern for this font.

diff -Nru pango1.0-1.29.5/docs/html/PangoFcFontMap.html pango1.0-1.30.0/docs/html/PangoFcFontMap.html --- pango1.0-1.29.5/docs/html/PangoFcFontMap.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/PangoFcFontMap.html 2012-03-27 01:41:19.000000000 +0000 @@ -43,26 +43,26 @@ struct PangoFcFontMapClass; PangoContext * pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap); PangoFcDecoder * (*PangoFcDecoderFindFunc) (FcPattern *pattern, - gpointer user_data); + gpointer user_data); void pango_fc_font_map_add_decoder_find_func (PangoFcFontMap *fcfontmap, PangoFcDecoderFindFunc findfunc, - gpointer user_data, - GDestroyNotify dnotify); + gpointer user_data, + GDestroyNotify dnotify); PangoFcDecoder * pango_fc_font_map_find_decoder (PangoFcFontMap *fcfontmap, FcPattern *pattern); void pango_fc_font_map_cache_clear (PangoFcFontMap *fcfontmap); void pango_fc_font_map_shutdown (PangoFcFontMap *fcfontmap); PangoFontDescription * pango_fc_font_description_from_pattern (FcPattern *pattern, - gboolean include_size); + gboolean include_size); #define PANGO_FC_GRAVITY #define PANGO_FC_VERSION #define PANGO_FC_PRGNAME PangoFcFontsetKey; -gpointer pango_fc_fontset_key_get_context_key +gpointer pango_fc_fontset_key_get_context_key (const PangoFcFontsetKey *key); const PangoFontDescription * pango_fc_fontset_key_get_description (const PangoFcFontsetKey *key); @@ -72,7 +72,7 @@ (const PangoFcFontsetKey *key); double pango_fc_fontset_key_get_resolution (const PangoFcFontsetKey *key); PangoFcFontKey; -gpointer pango_fc_font_key_get_context_key (const PangoFcFontKey *key); +gpointer pango_fc_font_key_get_context_key (const PangoFcFontKey *key); const PangoMatrix * pango_fc_font_key_get_matrix (const PangoFcFontKey *key); const FcPattern * pango_fc_font_key_get_pattern (const PangoFcFontKey *key); @@ -80,7 +80,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoFontMap
          +----PangoFcFontMap
                +----PangoFT2FontMap
@@ -156,7 +156,7 @@
 

default_substitute ()

Substitutes in default values for unspecified fields in a FcPattern. This will be called -prior to creating a font for the pattern. May be NULL. +prior to creating a font for the pattern. May be NULL. Deprecated in favor of font_key_substitute(). @@ -164,7 +164,7 @@ Creates a new PangoFcFont for the specified pattern of the appropriate type for this font map. The pattern argument must be passed to the "pattern" property -of PangoFcFont when you call g_object_new(). Deprecated +of PangoFcFont when you call g_object_new(). Deprecated in favor of create_font(). @@ -206,7 +206,7 @@

fontset_key_substitute ()

Substitutes in default values for unspecified fields in a FcPattern. This will be called -prior to creating a font for the pattern. May be NULL. +prior to creating a font for the pattern. May be NULL. (Since: 1.24) @@ -217,7 +217,7 @@ pattern member of font_key can be retrieved using pango_fc_font_key_get_pattern() and must be passed to the "pattern" property of PangoFcFont when you call -g_object_new(). If NULL, new_font() is used. +g_object_new(). If NULL, new_font() is used. (Since: 1.24) @@ -259,7 +259,7 @@

PangoFcDecoderFindFunc ()

PangoFcDecoder *    (*PangoFcDecoderFindFunc)           (FcPattern *pattern,
-                                                         gpointer user_data);
+ gpointer user_data);

Callback function passed to pango_fc_font_map_add_decoder_find_func().

@@ -278,7 +278,7 @@

Returns :

a new reference to a custom decoder for this pattern, -or NULL if the default decoder handling should be used. +or NULL if the default decoder handling should be used.
@@ -289,8 +289,8 @@
void                pango_fc_font_map_add_decoder_find_func
                                                         (PangoFcFontMap *fcfontmap,
                                                          PangoFcDecoderFindFunc findfunc,
-                                                         gpointer user_data,
-                                                         GDestroyNotify dnotify);
+ gpointer user_data, + GDestroyNotify dnotify);

This function saves a callback method in the PangoFcFontMap that will be called whenever new fonts are created. If the @@ -316,7 +316,7 @@

dnotify :

-A GDestroyNotify callback that will be called when the +A GDestroyNotify callback that will be called when the fontmap is finalized and the decoder is released. @@ -345,7 +345,7 @@

Returns :

-a newly created PangoFcDecoder object or NULL if +a newly created PangoFcDecoder object or NULL if no decoder is set for pattern. @@ -400,7 +400,7 @@

pango_fc_font_description_from_pattern ()

PangoFontDescription * pango_fc_font_description_from_pattern
                                                         (FcPattern *pattern,
-                                                         gboolean include_size);
+ gboolean include_size);

Creates a PangoFontDescription that matches the specified Fontconfig pattern as closely as possible. Many possible Fontconfig @@ -417,7 +417,7 @@

include_size :

-if TRUE, the pattern will include the size from +if TRUE, the pattern will include the size from the pattern; otherwise the resulting pattern will be unsized. (only FC_SIZE is examined, not FC_PIXEL_SIZE) @@ -476,7 +476,7 @@

The property will have a string equal to what -g_get_prgname() returns. +g_get_prgname() returns. This can be used to write fontconfig configuration rules that only affect certain applications.

@@ -495,7 +495,7 @@

pango_fc_fontset_key_get_context_key ()

-
gpointer            pango_fc_fontset_key_get_context_key
+
gpointer            pango_fc_fontset_key_get_context_key
                                                         (const PangoFcFontsetKey *key);

Gets the context key member of key. @@ -642,7 +642,7 @@


pango_fc_font_key_get_context_key ()

-
gpointer            pango_fc_font_key_get_context_key   (const PangoFcFontKey *key);
+
gpointer            pango_fc_font_key_get_context_key   (const PangoFcFontKey *key);

Gets the context key member of key.

diff -Nru pango1.0-1.29.5/docs/html/pango-Fonts.html pango1.0-1.30.0/docs/html/pango-Fonts.html --- pango1.0-1.29.5/docs/html/pango-Fonts.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Fonts.html 2012-03-27 01:41:19.000000000 +0000 @@ -57,8 +57,8 @@ PangoFontDescription * pango_font_description_copy (const PangoFontDescription *desc); PangoFontDescription * pango_font_description_copy_static (const PangoFontDescription *desc); -guint pango_font_description_hash (const PangoFontDescription *desc); -gboolean pango_font_description_equal (const PangoFontDescription *desc1, +guint pango_font_description_hash (const PangoFontDescription *desc); +gboolean pango_font_description_equal (const PangoFontDescription *desc1, const PangoFontDescription *desc2); void pango_font_description_free (PangoFontDescription *desc); void pango_font_descriptions_free (PangoFontDescription **descs, @@ -82,12 +82,12 @@ PangoStretch stretch); PangoStretch pango_font_description_get_stretch (const PangoFontDescription *desc); void pango_font_description_set_size (PangoFontDescription *desc, - gint size); -gint pango_font_description_get_size (const PangoFontDescription *desc); + gint size); +gint pango_font_description_get_size (const PangoFontDescription *desc); void pango_font_description_set_absolute_size (PangoFontDescription *desc, double size); -gboolean pango_font_description_get_size_is_absolute +gboolean pango_font_description_get_size_is_absolute (const PangoFontDescription *desc); void pango_font_description_set_gravity (PangoFontDescription *desc, PangoGravity gravity); @@ -98,11 +98,11 @@ PangoFontMask to_unset); void pango_font_description_merge (PangoFontDescription *desc, const PangoFontDescription *desc_to_merge, - gboolean replace_existing); + gboolean replace_existing); void pango_font_description_merge_static (PangoFontDescription *desc, const PangoFontDescription *desc_to_merge, - gboolean replace_existing); -gboolean pango_font_description_better_match (const PangoFontDescription *desc, + gboolean replace_existing); +gboolean pango_font_description_better_match (const PangoFontDescription *desc, const PangoFontDescription *old_match, const PangoFontDescription *new_match); PangoFontDescription * pango_font_description_from_string @@ -135,7 +135,7 @@ #define PANGO_IS_FONT (object) PangoEngineShape * pango_font_find_shaper (PangoFont *font, PangoLanguage *language, - guint32 ch); + guint32 ch); PangoFontDescription * pango_font_describe (PangoFont *font); PangoFontDescription * pango_font_describe_with_absolute_size (PangoFont *font); @@ -154,7 +154,7 @@ #define PANGO_FONT_FAMILY (object) #define PANGO_IS_FONT_FAMILY (object) const char * pango_font_family_get_name (PangoFontFamily *family); -gboolean pango_font_family_is_monospace (PangoFontFamily *family); +gboolean pango_font_family_is_monospace (PangoFontFamily *family); void pango_font_family_list_faces (PangoFontFamily *family, PangoFontFace ***faces, int *n_faces); @@ -168,7 +168,7 @@ int **sizes, int *n_sizes); PangoFontDescription * pango_font_face_describe (PangoFontFace *face); -gboolean pango_font_face_is_synthesized (PangoFontFace *face); +gboolean pango_font_face_is_synthesized (PangoFontFace *face); PangoFontMap; #define PANGO_TYPE_FONT_MAP @@ -196,14 +196,14 @@ #define PANGO_TYPE_FONTSET struct PangoFontsetClass; PangoFont * pango_fontset_get_font (PangoFontset *fontset, - guint wc); + guint wc); PangoFontMetrics * pango_fontset_get_metrics (PangoFontset *fontset); -gboolean (*PangoFontsetForeachFunc) (PangoFontset *fontset, +gboolean (*PangoFontsetForeachFunc) (PangoFontset *fontset, PangoFont *font, - gpointer data); + gpointer data); void pango_fontset_foreach (PangoFontset *fontset, PangoFontsetForeachFunc func, - gpointer data); + gpointer data); PangoFontsetSimple; #define PANGO_TYPE_FONTSET_SIMPLE PangoFontsetSimple * pango_fontset_simple_new (PangoLanguage *language); @@ -243,30 +243,30 @@ +----PangoFontMetrics
-  GObject
+  GObject
    +----PangoFont
          +----PangoFcFont
 
-  GObject
+  GObject
    +----PangoFontFamily
 
-  GObject
+  GObject
    +----PangoFontFace
 
-  GObject
+  GObject
    +----PangoFontMap
          +----PangoFcFontMap
 
-  GObject
+  GObject
    +----PangoFontset
          +----PangoFontsetSimple
 
-  GObject
+  GObject
    +----PangoFontset
          +----PangoFontsetSimple
 
@@ -309,7 +309,7 @@
#define PANGO_TYPE_FONT_DESCRIPTION (pango_font_description_get_type ())
 

-The GObject type for PangoFontDescription. +The GObject type for PangoFontDescription.


@@ -351,7 +351,7 @@
#define PANGO_TYPE_STYLE (pango_style_get_type())
 

-The GObject type for PangoStyle. +The GObject type for PangoStyle.


@@ -442,7 +442,7 @@
#define PANGO_TYPE_WEIGHT (pango_weight_get_type())
 

-The GObject type for PangoWeight. +The GObject type for PangoWeight.


@@ -479,7 +479,7 @@
#define PANGO_TYPE_VARIANT (pango_variant_get_type())
 

-The GObject type for PangoVariant. +The GObject type for PangoVariant.


@@ -558,7 +558,7 @@
#define PANGO_TYPE_STRETCH (pango_stretch_get_type())
 

-The GObject type for PangoStretch. +The GObject type for PangoStretch.


@@ -625,7 +625,7 @@
#define PANGO_TYPE_FONT_MASK (pango_font_mask_get_type())
 

-The GObject type for PangoFontMask. +The GObject type for PangoFontMask.


@@ -656,14 +656,14 @@

desc :

-a PangoFontDescription, may be NULL +a PangoFontDescription, may be NULL

Returns :

the newly allocated PangoFontDescription, which should -be freed with pango_font_description_free(), or NULL -if desc was NULL. +be freed with pango_font_description_free(), or NULL +if desc was NULL. @@ -684,14 +684,14 @@

desc :

-a PangoFontDescription, may be NULL +a PangoFontDescription, may be NULL

Returns :

the newly allocated PangoFontDescription, which should -be freed with pango_font_description_free(), or NULL -if desc was NULL. +be freed with pango_font_description_free(), or NULL +if desc was NULL. @@ -699,10 +699,10 @@

pango_font_description_hash ()

-
guint               pango_font_description_hash         (const PangoFontDescription *desc);
+
guint               pango_font_description_hash         (const PangoFontDescription *desc);

Computes a hash of a PangoFontDescription structure suitable -to be used, for example, as an argument to g_hash_table_new(). +to be used, for example, as an argument to g_hash_table_new(). The hash value is independent of desc->mask.

@@ -723,14 +723,14 @@

pango_font_description_equal ()

-
gboolean            pango_font_description_equal        (const PangoFontDescription *desc1,
+
gboolean            pango_font_description_equal        (const PangoFontDescription *desc1,
                                                          const PangoFontDescription *desc2);

Compares two font descriptions for equality. Two font descriptions are considered equal if the fonts they describe are provably identical. This means that their masks do not have to match, as long as other fields are all the same. (Two font descriptions may result in identical fonts -being loaded, but still compare FALSE.) +being loaded, but still compare FALSE.)

@@ -748,8 +748,8 @@ +TRUE if the two font descriptions are identical, +FALSE otherwise.

Returns :

-TRUE if the two font descriptions are identical, -FALSE otherwise.
@@ -765,7 +765,7 @@

desc :

-a PangoFontDescription, may be NULL +a PangoFontDescription, may be NULL
@@ -784,7 +784,7 @@

descs :

a pointer -to an array of PangoFontDescription, may be NULL. [allow-none][array length=n_descs][transfer full] +to an array of PangoFontDescription, may be NULL. [allow-none][array length=n_descs][transfer full] @@ -868,7 +868,7 @@

Returns :

the family name field for the font description, or -NULL if not previously set. This has the same life-time +NULL if not previously set. This has the same life-time as the font description itself and should not be freed. @@ -1080,7 +1080,7 @@

pango_font_description_set_size ()

void                pango_font_description_set_size     (PangoFontDescription *desc,
-                                                         gint size);
+ gint size);

Sets the size field of a font description in fractional points. This is mutually exclusive with pango_font_description_set_absolute_size(). @@ -1109,7 +1109,7 @@


pango_font_description_get_size ()

-
gint                pango_font_description_get_size     (const PangoFontDescription *desc);
+
gint                pango_font_description_get_size     (const PangoFontDescription *desc);

Gets the size field of a font description. See pango_font_description_set_size(). @@ -1166,7 +1166,7 @@


pango_font_description_get_size_is_absolute ()

-
gboolean            pango_font_description_get_size_is_absolute
+
gboolean            pango_font_description_get_size_is_absolute
                                                         (const PangoFontDescription *desc);

Determines whether the size of the font is in points (not absolute) or device units (absolute). @@ -1300,15 +1300,15 @@

pango_font_description_merge ()

void                pango_font_description_merge        (PangoFontDescription *desc,
                                                          const PangoFontDescription *desc_to_merge,
-                                                         gboolean replace_existing);
+ gboolean replace_existing);

Merges the fields that are set in desc_to_merge into the fields in -desc. If replace_existing is FALSE, only fields in desc that -are not already set are affected. If TRUE, then fields that are +desc. If replace_existing is FALSE, only fields in desc that +are not already set are affected. If TRUE, then fields that are already set will be replaced as well.

-If desc_to_merge is NULL, this function performs nothing. +If desc_to_merge is NULL, this function performs nothing.

@@ -1320,12 +1320,12 @@ - - @@ -1337,7 +1337,7 @@

pango_font_description_merge_static ()

void                pango_font_description_merge_static (PangoFontDescription *desc,
                                                          const PangoFontDescription *desc_to_merge,
-                                                         gboolean replace_existing);
+ gboolean replace_existing);

Like pango_font_description_merge(), but only a shallow copy is made of the family name and other allocated fields. desc can only be @@ -1358,7 +1358,7 @@

- @@ -1368,12 +1368,12 @@

pango_font_description_better_match ()

-
gboolean            pango_font_description_better_match (const PangoFontDescription *desc,
+
gboolean            pango_font_description_better_match (const PangoFontDescription *desc,
                                                          const PangoFontDescription *old_match,
                                                          const PangoFontDescription *new_match);

Determines if the style attributes of new_match are a closer match -for desc than those of old_match are, or if old_match is NULL, +for desc than those of old_match are, or if old_match is NULL, determines if new_match is a match at all. Approximate matching is done for weight and style; other style attributes must match exactly. @@ -1395,7 +1395,7 @@

- @@ -1406,7 +1406,7 @@ +TRUE if new_match is a better match

desc_to_merge :

the PangoFontDescription to merge from, or NULL. [allow-none] +the PangoFontDescription to merge from, or NULL. [allow-none]

replace_existing :

if TRUE, replace fields in desc with the +if TRUE, replace fields in desc with the corresponding values from desc_to_merge, even if they are already exist.

replace_existing :

if TRUE, replace fields in desc with the +if TRUE, replace fields in desc with the corresponding values from desc_to_merge, even if they are already exist.

old_match :

a PangoFontDescription, or NULL. [allow-none] +a PangoFontDescription, or NULL. [allow-none]

Returns :

-TRUE if new_match is a better match
@@ -1425,7 +1425,7 @@ is a decimal number (size in points) or optionally followed by the unit modifier "px" for absolute size. Any one of the options may be absent. If FAMILY-LIST is absent, then the family_name field of -the resulting font description will be initialized to NULL. If +the resulting font description will be initialized to NULL. If STYLE-OPTIONS is missing, then all style options will be set to the default values. If SIZE is missing, the size in the resulting font description will be set to 0. @@ -1465,7 +1465,7 @@

Returns :

-a new string that must be freed with g_free(). +a new string that must be freed with g_free().
@@ -1490,7 +1490,7 @@

Returns :

-a new string that must be freed with g_free(). +a new string that must be freed with g_free().
@@ -1525,7 +1525,7 @@
#define PANGO_TYPE_FONT_METRICS  (pango_font_metrics_get_type ())
 

-The GObject type for PangoFontMetrics. +The GObject type for PangoFontMetrics.


@@ -1540,7 +1540,7 @@

metrics :

-a PangoFontMetrics structure, may be NULL +a PangoFontMetrics structure, may be NULL @@ -1563,7 +1563,7 @@

metrics :

-a PangoFontMetrics structure, may be NULL +a PangoFontMetrics structure, may be NULL @@ -1794,7 +1794,7 @@
#define PANGO_TYPE_FONT              (pango_font_get_type ())
 

-The GObject type for PangoFont. +The GObject type for PangoFont.


@@ -1803,13 +1803,13 @@
#define PANGO_FONT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT, PangoFont))
 

-Casts a GObject to a PangoFont. +Casts a GObject to a PangoFont.

- +

object :

a GObject.a GObject.
@@ -1819,13 +1819,13 @@
#define PANGO_IS_FONT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT))
 

-Returns TRUE if object is a PangoFont. +Returns TRUE if object is a PangoFont.

- +

object :

a GObject.a GObject.
@@ -1834,7 +1834,7 @@

pango_font_find_shaper ()

PangoEngineShape *  pango_font_find_shaper              (PangoFont *font,
                                                          PangoLanguage *language,
-                                                         guint32 ch);
+ guint32 ch);

Finds the best matching shaper for a font for a particular language tag and character point. @@ -1956,7 +1956,7 @@ of the rectangles are in 1/PANGO_SCALE of a device unit.

-If font is NULL, this function gracefully sets some sane values in the +If font is NULL, this function gracefully sets some sane values in the output variables and returns.

@@ -1974,13 +1974,13 @@ @@ -1998,7 +1998,7 @@ correspond to the script(s) used by that language.

-If font is NULL, this function gracefully sets some sane values in the +If font is NULL, this function gracefully sets some sane values in the output variables and returns.

ink_rect :

rectangle used to store the extents of the glyph -as drawn or NULL to indicate that the result is not needed. [out][allow-none] +as drawn or NULL to indicate that the result is not needed. [out][allow-none]

logical_rect :

rectangle used to store the logical extents of -the glyph or NULL to indicate that the result is not needed. [out][allow-none] +the glyph or NULL to indicate that the result is not needed. [out][allow-none]
@@ -2012,7 +2012,7 @@ @@ -2034,7 +2034,7 @@ Note that the font maintains a weak reference to the font map, so if all references to font map are dropped, the font map will be finalized even if there are fonts created with the font -map that are still alive. In that case this function will return NULL. +map that are still alive. In that case this function will return NULL. It is the responsibility of the user to ensure that the font map is kept alive. In most uses this is not an issue as a PangoContext holds a reference to the font map. @@ -2044,13 +2044,13 @@ - - @@ -2073,7 +2073,7 @@
#define PANGO_TYPE_FONT_FAMILY              (pango_font_family_get_type ())
 

-The GObject type for PangoFontFamily. +The GObject type for PangoFontFamily.


@@ -2082,13 +2082,13 @@
#define PANGO_FONT_FAMILY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_FAMILY, PangoFontFamily))
 

-Casts a GObject to a PangoFontFamily. +Casts a GObject to a PangoFontFamily.

language :

language tag used to determine which script to get the metrics -for, or NULL to indicate to get the metrics for the entire font. [allow-none] +for, or NULL to indicate to get the metrics for the entire font. [allow-none]

font :

a PangoFont, or NULL +a PangoFont, or NULL

Returns :

the PangoFontMap for the font, or NULL -if font is NULL. [transfer none] +the PangoFontMap for the font, or NULL +if font is NULL. [transfer none]
- +

object :

a GObject.a GObject.
@@ -2098,13 +2098,13 @@
#define PANGO_IS_FONT_FAMILY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_FAMILY))
 

-Returns TRUE if object is a PangoFontFamily. +Returns TRUE if object is a PangoFontFamily.

- +

object :

a GObject.a GObject.
@@ -2136,14 +2136,14 @@

pango_font_family_is_monospace ()

-
gboolean            pango_font_family_is_monospace      (PangoFontFamily *family);
+
gboolean            pango_font_family_is_monospace      (PangoFontFamily *family);

A monospace font is a font designed for text display where the the characters form a regular grid. For Western languages this would mean that the advance width of all characters are the same, but this categorization also includes Asian fonts which include double-width characters: characters that occupy two grid cells. -g_unichar_iswide() returns a result that indicates whether a +g_unichar_iswide() returns a result that indicates whether a character is typically double-width in a monospace font.

@@ -2163,7 +2163,7 @@

Returns :

-TRUE if the family is monospace. +TRUE if the family is monospace.
@@ -2191,7 +2191,7 @@

faces :

location to store an array of pointers to PangoFontFace -objects, or NULL. This array should be freed with g_free() +objects, or NULL. This array should be freed with g_free() when it is no longer needed. [out][allow-none][array length=n_faces] @@ -2218,7 +2218,7 @@
#define PANGO_TYPE_FONT_FACE              (pango_font_face_get_type ())
 

-The GObject type for PangoFontFace. +The GObject type for PangoFontFace.


@@ -2227,13 +2227,13 @@
#define PANGO_FONT_FACE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_FACE, PangoFontFace))
 

-Casts a GObject to a PangoFontFace. +Casts a GObject to a PangoFontFace.

- +

object :

a GObject.a GObject.
@@ -2243,13 +2243,13 @@
#define PANGO_IS_FONT_FACE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_FACE))
 

-Returns TRUE if object is a PangoFontFace. +Returns TRUE if object is a PangoFontFace.

- +

object :

a GObject.a GObject.
@@ -2286,7 +2286,7 @@ int *n_sizes);

List the available sizes for a font. This is only applicable to bitmap -fonts. For scalable fonts, stores NULL at the location pointed to by +fonts. For scalable fonts, stores NULL at the location pointed to by sizes and 0 at the location pointed to by n_sizes. The sizes returned are in Pango units and are sorted in ascending order.

@@ -2300,7 +2300,7 @@

sizes :

location to store a pointer to an array of int. This array -should be freed with g_free(). +should be freed with g_free().

n_sizes :

@@ -2340,7 +2340,7 @@

pango_font_face_is_synthesized ()

-
gboolean            pango_font_face_is_synthesized      (PangoFontFace *face);
+
gboolean            pango_font_face_is_synthesized      (PangoFontFace *face);

Returns whether a PangoFontFace is synthesized by the underlying font rendering engine from another face, perhaps by shearing, emboldening, @@ -2387,7 +2387,7 @@

#define PANGO_TYPE_FONT_MAP              (pango_font_map_get_type ())
 

-The GObject type for PangoFontMap. +The GObject type for PangoFontMap.


@@ -2396,13 +2396,13 @@
#define PANGO_FONT_MAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONT_MAP, PangoFontMap))
 

-Casts a GObject to a PangoFontMap. +Casts a GObject to a PangoFontMap.

- +

object :

a GObject.a GObject.
@@ -2412,13 +2412,13 @@
#define PANGO_IS_FONT_MAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONT_MAP))
 

-Returns TRUE if object is a PangoFontMap. +Returns TRUE if object is a PangoFontMap.

- +

object :

a GObject.a GObject.
@@ -2451,8 +2451,8 @@ -

GObjectClass parent_class;

-parent GObjectClass. +

GObjectClass parent_class;

+parent GObjectClass.

load_font ()

@@ -2484,13 +2484,13 @@
#define PANGO_FONT_MAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_MAP, PangoFontMapClass))
 

-Casts a GObject to a PangoFontMapClass. +Casts a GObject to a PangoFontMapClass.

- +

klass :

a GObject.a GObject.
@@ -2500,13 +2500,13 @@
#define PANGO_IS_FONT_MAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_MAP))
 

-Returns TRUE if klass is a subtype of PangoFontMapClass. +Returns TRUE if klass is a subtype of PangoFontMapClass.

- +

klass :

a GObject.a GObject.
@@ -2552,7 +2552,7 @@

Returns :

the newly allocated PangoContext, -which should be freed with g_object_unref(). [transfer full] +which should be freed with g_object_unref(). [transfer full] @@ -2587,7 +2587,7 @@

Returns :

the newly allocated PangoFont loaded, -or NULL if no font matched. [transfer full] +or NULL if no font matched. [transfer full] @@ -2627,7 +2627,7 @@

Returns :

the newly allocated PangoFontset -loaded, or NULL if no font matched. [transfer full] +loaded, or NULL if no font matched. [transfer full] @@ -2653,7 +2653,7 @@

families :

location to store a pointer to an array of PangoFontFamily *. -This array should be freed with g_free(). [out][array length=n_families] +This array should be freed with g_free(). [out][array length=n_families] @@ -2711,7 +2711,7 @@
#define PANGO_TYPE_FONTSET              (pango_fontset_get_type ())
 

-The GObject type for PangoFontset. +The GObject type for PangoFontset.


@@ -2739,8 +2739,8 @@ -

GObjectClass parent_class;

-parent GObjectClass. +

GObjectClass parent_class;

+parent GObjectClass.

get_font ()

@@ -2768,7 +2768,7 @@

pango_fontset_get_font ()

PangoFont *         pango_fontset_get_font              (PangoFontset *fontset,
-                                                         guint wc);
+ guint wc);

Returns the font in the fontset that contains the best glyph for the Unicode character wc. @@ -2820,9 +2820,9 @@


PangoFontsetForeachFunc ()

-
gboolean            (*PangoFontsetForeachFunc)          (PangoFontset *fontset,
+
gboolean            (*PangoFontsetForeachFunc)          (PangoFontset *fontset,
                                                          PangoFont *font,
-                                                         gpointer data);
+ gpointer data);

A callback function used by pango_fontset_foreach() when enumerating the fonts in a fontset. @@ -2846,7 +2846,7 @@

Returns :

-if TRUE, stop iteration and return immediately. +if TRUE, stop iteration and return immediately.
@@ -2857,10 +2857,10 @@

pango_fontset_foreach ()

void                pango_fontset_foreach               (PangoFontset *fontset,
                                                          PangoFontsetForeachFunc func,
-                                                         gpointer data);
+ gpointer data);

Iterates through all the fonts in a fontset, calling func for -each one. If func returns TRUE, that stops the iteration. +each one. If func returns TRUE, that stops the iteration.

@@ -2901,7 +2901,7 @@
#define PANGO_TYPE_FONTSET_SIMPLE       (pango_fontset_simple_get_type ())
 

-The GObject type for PangoFontsetSimple. +The GObject type for PangoFontsetSimple.


@@ -2921,7 +2921,7 @@ +be freed with g_object_unref().

Returns :

the newly allocated PangoFontsetSimple, which should -be freed with g_object_unref().
diff -Nru pango1.0-1.29.5/docs/html/pango-FreeType-Fonts-and-Rendering.html pango1.0-1.30.0/docs/html/pango-FreeType-Fonts-and-Rendering.html --- pango1.0-1.29.5/docs/html/pango-FreeType-Fonts-and-Rendering.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-FreeType-Fonts-and-Rendering.html 2012-03-27 01:41:19.000000000 +0000 @@ -47,12 +47,12 @@ double dpi_y); PangoContext * pango_ft2_font_map_create_context (PangoFT2FontMap *fontmap); void (*PangoFT2SubstituteFunc) (FcPattern *pattern, - gpointer data); + gpointer data); void pango_ft2_font_map_set_default_substitute (PangoFT2FontMap *fontmap, PangoFT2SubstituteFunc func, - gpointer data, - GDestroyNotify notify); + gpointer data, + GDestroyNotify notify); void pango_ft2_font_map_substitute_changed (PangoFT2FontMap *fontmap); PangoContext * pango_ft2_get_context (double dpi_x, @@ -60,8 +60,8 @@ void pango_ft2_render (FT_Bitmap *bitmap, PangoFont *font, PangoGlyphString *glyphs, - gint x, - gint y); + gint x, + gint y); void pango_ft2_render_transformed (FT_Bitmap *bitmap, const PangoMatrix *matrix, PangoFont *font, @@ -99,7 +99,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoFontMap
          +----PangoFcFontMap
                +----PangoFT2FontMap
@@ -151,7 +151,7 @@
 
 

Returns :

the newly created fontmap object. Unref -with g_object_unref() when you are finished with it. +with g_object_unref() when you are finished with it.

Since 1.2

@@ -206,7 +206,7 @@

Returns :

-the newly created context; free with g_object_unref(). +the newly created context; free with g_object_unref().
@@ -216,7 +216,7 @@

PangoFT2SubstituteFunc ()

void                (*PangoFT2SubstituteFunc)           (FcPattern *pattern,
-                                                         gpointer data);
+ gpointer data);

Function type for doing final config tweaking on prepared FcPatterns.

@@ -240,8 +240,8 @@
void                pango_ft2_font_map_set_default_substitute
                                                         (PangoFT2FontMap *fontmap,
                                                          PangoFT2SubstituteFunc func,
-                                                         gpointer data,
-                                                         GDestroyNotify notify);
+ gpointer data, + GDestroyNotify notify);

Sets a function that will be called to do final configuration substitution on a FcPattern before it is used to load @@ -335,8 +335,8 @@

void                pango_ft2_render                    (FT_Bitmap *bitmap,
                                                          PangoFont *font,
                                                          PangoGlyphString *glyphs,
-                                                         gint x,
-                                                         gint y);
+ gint x, + gint y);

Renders a PangoGlyphString onto a FreeType2 bitmap.

@@ -392,7 +392,7 @@

matrix :

-a PangoMatrix, or NULL to use an identity transformation +a PangoMatrix, or NULL to use an identity transformation

font :

@@ -662,7 +662,7 @@

Returns :

a pointer to a FT_Face structure, with the size set correctly, -or NULL if font is NULL. +or NULL if font is NULL.
diff -Nru pango1.0-1.29.5/docs/html/pango-Glyph-Storage.html pango1.0-1.30.0/docs/html/pango-Glyph-Storage.html --- pango1.0-1.29.5/docs/html/pango-Glyph-Storage.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Glyph-Storage.html 2012-03-27 01:41:19.000000000 +0000 @@ -96,7 +96,7 @@ PangoGlyphString * pango_glyph_string_new (void); PangoGlyphString * pango_glyph_string_copy (PangoGlyphString *string); void pango_glyph_string_set_size (PangoGlyphString *string, - gint new_len); + gint new_len); void pango_glyph_string_free (PangoGlyphString *string); void pango_glyph_string_extents (PangoGlyphString *glyphs, PangoFont *font, @@ -114,7 +114,7 @@ int length, PangoAnalysis *analysis, int index_, - gboolean trailing, + gboolean trailing, int *x_pos); void pango_glyph_string_x_to_index (PangoGlyphString *glyphs, char *text, @@ -135,7 +135,7 @@ PangoGlyphItem * pango_glyph_item_split (PangoGlyphItem *orig, const char *text, int split_index); -GSList * pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item, +GSList * pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item, const char *text, PangoAttrList *list); void pango_glyph_item_letter_space (PangoGlyphItem *glyph_item, @@ -148,14 +148,14 @@ #define PANGO_TYPE_GLYPH_ITEM_ITER PangoGlyphItemIter * pango_glyph_item_iter_copy (PangoGlyphItemIter *orig); void pango_glyph_item_iter_free (PangoGlyphItemIter *iter); -gboolean pango_glyph_item_iter_init_start (PangoGlyphItemIter *iter, +gboolean pango_glyph_item_iter_init_start (PangoGlyphItemIter *iter, PangoGlyphItem *glyph_item, const char *text); -gboolean pango_glyph_item_iter_init_end (PangoGlyphItemIter *iter, +gboolean pango_glyph_item_iter_init_end (PangoGlyphItemIter *iter, PangoGlyphItem *glyph_item, const char *text); -gboolean pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter); -gboolean pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter); +gboolean pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter); +gboolean pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter);
@@ -490,12 +490,12 @@

inclusive :

-rectangle to round to pixels inclusively, or NULL. [allow-none] +rectangle to round to pixels inclusively, or NULL. [allow-none]

nearest :

-rectangle to round to nearest pixels, or NULL. [allow-none] +rectangle to round to nearest pixels, or NULL. [allow-none] @@ -607,14 +607,14 @@

matrix :

-a PangoMatrix, may be NULL +a PangoMatrix, may be NULL

Returns :

the newly allocated PangoMatrix, which should -be freed with pango_matrix_free(), or NULL if -matrix was NULL. +be freed with pango_matrix_free(), or NULL if +matrix was NULL.
@@ -631,7 +631,7 @@

matrix :

-a PangoMatrix, may be NULL +a PangoMatrix, may be NULL @@ -767,7 +767,7 @@

matrix :

-a PangoMatrix, or NULL +a PangoMatrix, or NULL @@ -815,7 +815,7 @@

matrix :

-a PangoMatrix, or NULL +a PangoMatrix, or NULL @@ -865,12 +865,12 @@

matrix :

-a PangoMatrix, or NULL +a PangoMatrix, or NULL

rect :

-in/out bounding box in Pango units, or NULL. [inout][allow-none] +in/out bounding box in Pango units, or NULL. [inout][allow-none] @@ -903,12 +903,12 @@

matrix :

-a PangoMatrix, or NULL +a PangoMatrix, or NULL

rect :

-in/out bounding box in device units, or NULL. [inout][allow-none] +in/out bounding box in device units, or NULL. [inout][allow-none] @@ -929,13 +929,13 @@

matrix :

-a PangoMatrix, may be NULL. [allow-none] +a PangoMatrix, may be NULL. [allow-none]

Returns :

the scale factor of matrix on the height of the font, -or 1.0 if matrix is NULL. +or 1.0 if matrix is NULL. @@ -984,8 +984,8 @@

The PANGO_GLYPH_UNKNOWN_FLAG macro is a flag value that can be added to -a gunichar value of a valid Unicode character, to produce a PangoGlyph -value, representing an unknown-character glyph for the respective gunichar. +a gunichar value of a valid Unicode character, to produce a PangoGlyph +value, representing an unknown-character glyph for the respective gunichar.


@@ -1100,7 +1100,7 @@
- + - +or NULL if string was NULL.

guint is_cluster_start : 1;

guint is_cluster_start : 1;

set for the first logical glyph in each cluster. (Clusters are stored in visual order, within the cluster, glyphs are always ordered in logical order, since visual @@ -1209,7 +1209,7 @@
#define PANGO_TYPE_GLYPH_STRING (pango_glyph_string_get_type ())
 

-The GObject type for PangoGlyphString. +The GObject type for PangoGlyphString.


@@ -1240,14 +1240,14 @@

string :

a PangoGlyphString, may be NULL +a PangoGlyphString, may be NULL

Returns :

the newly allocated PangoGlyphString, which should be freed with pango_glyph_string_free(), -or NULL if string was NULL.
@@ -1256,7 +1256,7 @@

pango_glyph_string_set_size ()

void                pango_glyph_string_set_size         (PangoGlyphString *string,
-                                                         gint new_len);
+ gint new_len);

Resize a glyph string to the given length.

@@ -1285,7 +1285,7 @@

string :

-a PangoGlyphString, may be NULL +a PangoGlyphString, may be NULL
@@ -1318,13 +1318,13 @@

ink_rect :

rectangle used to store the extents of the glyph string -as drawn or NULL to indicate that the result is not needed. [out][allow-none] +as drawn or NULL to indicate that the result is not needed. [out][allow-none]

logical_rect :

rectangle used to store the logical extents of the -glyph string or NULL to indicate that the result is not needed. [out][allow-none] +glyph string or NULL to indicate that the result is not needed. [out][allow-none] @@ -1370,12 +1370,12 @@

ink_rect :

rectangle used to store the extents of the glyph string range as drawn -or NULL to indicate that the result is not needed. +or NULL to indicate that the result is not needed.

logical_rect :

rectangle used to store the logical extents of the glyph string range -or NULL to indicate that the result is not needed. +or NULL to indicate that the result is not needed. @@ -1414,7 +1414,7 @@ int length, PangoAnalysis *analysis, int index_, - gboolean trailing, + gboolean trailing, int *x_pos);

Converts from character position to x position. (X position @@ -1449,8 +1449,8 @@

trailing :

-whether we should compute the result for the beginning (FALSE) -or end (TRUE) of the character. +whether we should compute the result for the beginning (FALSE) +or end (TRUE) of the character.

x_pos :

@@ -1570,7 +1570,7 @@
#define PANGO_TYPE_GLYPH_ITEM (pango_glyph_item_get_type ())
 

-The GObject type for PangoGlyphItem. +The GObject type for PangoGlyphItem.

Since 1.20

@@ -1586,14 +1586,14 @@

orig :

-a PangoGlyphItem, may be NULL +a PangoGlyphItem, may be NULL

Returns :

the newly allocated PangoGlyphItem, which should -be freed with pango_glyph_item_free(), or NULL -if orig was NULL. +be freed with pango_glyph_item_free(), or NULL +if orig was NULL. @@ -1610,7 +1610,7 @@

glyph_item :

-a PangoGlyphItem, may be NULL +a PangoGlyphItem, may be NULL @@ -1664,7 +1664,7 @@

pango_glyph_item_apply_attrs ()

-
GSList *            pango_glyph_item_apply_attrs        (PangoGlyphItem *glyph_item,
+
GSList *            pango_glyph_item_apply_attrs        (PangoGlyphItem *glyph_item,
                                                          const char *text,
                                                          PangoAttrList *list);

@@ -1707,7 +1707,7 @@

Returns :

a list of glyph items resulting from splitting glyph_item. Free the elements using -pango_glyph_item_free(), the list using g_slist_free(). [transfer full] +pango_glyph_item_free(), the list using g_slist_free(). [transfer full] @@ -1800,7 +1800,7 @@
#define PANGO_TYPE_GLYPH_ITEM_ITER (pango_glyph_item_iter_get_type ())
 

-The GObject type for PangoGlyphItemIter. +The GObject type for PangoGlyphItemIter.

Since 1.22

@@ -1816,14 +1816,14 @@

orig :

-a PangoGlyphItemIter, may be NULL +a PangoGlyphItemIter, may be NULL

Returns :

the newly allocated PangoGlyphItemIter, which should -be freed with pango_glyph_item_iter_free(), or NULL -if orig was NULL. +be freed with pango_glyph_item_iter_free(), or NULL +if orig was NULL. @@ -1840,7 +1840,7 @@

iter :

-a PangoGlyphItemIter, may be NULL +a PangoGlyphItemIter, may be NULL @@ -1849,7 +1849,7 @@

pango_glyph_item_iter_init_start ()

-
gboolean            pango_glyph_item_iter_init_start    (PangoGlyphItemIter *iter,
+
gboolean            pango_glyph_item_iter_init_start    (PangoGlyphItemIter *iter,
                                                          PangoGlyphItem *glyph_item,
                                                          const char *text);

@@ -1876,7 +1876,7 @@

Returns :

-FALSE if there are no clusters in the glyph item +FALSE if there are no clusters in the glyph item
@@ -1885,7 +1885,7 @@

pango_glyph_item_iter_init_end ()

-
gboolean            pango_glyph_item_iter_init_end      (PangoGlyphItemIter *iter,
+
gboolean            pango_glyph_item_iter_init_end      (PangoGlyphItemIter *iter,
                                                          PangoGlyphItem *glyph_item,
                                                          const char *text);

@@ -1912,7 +1912,7 @@

Returns :

-FALSE if there are no clusters in the glyph item +FALSE if there are no clusters in the glyph item
@@ -1921,7 +1921,7 @@

pango_glyph_item_iter_next_cluster ()

-
gboolean            pango_glyph_item_iter_next_cluster  (PangoGlyphItemIter *iter);
+
gboolean            pango_glyph_item_iter_next_cluster  (PangoGlyphItemIter *iter);

Advances the iterator to the next cluster in the glyph item. See PangoGlyphItemIter for details of cluster orders. @@ -1937,7 +1937,7 @@

Returns :

-TRUE if the iterator was advanced, FALSE if we were already on the +TRUE if the iterator was advanced, FALSE if we were already on the last cluster. @@ -1947,7 +1947,7 @@

pango_glyph_item_iter_prev_cluster ()

-
gboolean            pango_glyph_item_iter_prev_cluster  (PangoGlyphItemIter *iter);
+
gboolean            pango_glyph_item_iter_prev_cluster  (PangoGlyphItemIter *iter);

Moves the iterator to the preceding cluster in the glyph item. See PangoGlyphItemIter for details of cluster orders. @@ -1963,7 +1963,7 @@

Returns :

-TRUE if the iterator was moved, FALSE if we were already on the +TRUE if the iterator was moved, FALSE if we were already on the first cluster. diff -Nru pango1.0-1.29.5/docs/html/pango-hierarchy.html pango1.0-1.30.0/docs/html/pango-hierarchy.html --- pango1.0-1.29.5/docs/html/pango-hierarchy.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-hierarchy.html 2012-03-27 01:41:19.000000000 +0000 @@ -23,7 +23,7 @@

Object Hierarchy

-    GObject
+    GObject
         PangoFontMap
             PangoFcFontMap
                 PangoFT2FontMap
diff -Nru pango1.0-1.29.5/docs/html/pango-Layout-Objects.html pango1.0-1.30.0/docs/html/pango-Layout-Objects.html
--- pango1.0-1.29.5/docs/html/pango-Layout-Objects.html	2011-11-22 20:29:45.000000000 +0000
+++ pango1.0-1.30.0/docs/html/pango-Layout-Objects.html	2012-03-27 01:41:19.000000000 +0000
@@ -49,15 +49,15 @@
                                                          const char *text,
                                                          int length);
 const char *        pango_layout_get_text               (PangoLayout *layout);
-gint                pango_layout_get_character_count    (PangoLayout *layout);
+gint                pango_layout_get_character_count    (PangoLayout *layout);
 void                pango_layout_set_markup             (PangoLayout *layout,
                                                          const char *markup,
                                                          int length);
 void                pango_layout_set_markup_with_accel  (PangoLayout *layout,
                                                          const char *markup,
                                                          int length,
-                                                         gunichar accel_marker,
-                                                         gunichar *accel_char);
+                                                         gunichar accel_marker,
+                                                         gunichar *accel_char);
 void                pango_layout_set_attributes         (PangoLayout *layout,
                                                          PangoAttrList *attrs);
 PangoAttrList *     pango_layout_get_attributes         (PangoLayout *layout);
@@ -74,13 +74,13 @@
 void                pango_layout_set_wrap               (PangoLayout *layout,
                                                          PangoWrapMode wrap);
 PangoWrapMode       pango_layout_get_wrap               (PangoLayout *layout);
-gboolean            pango_layout_is_wrapped             (PangoLayout *layout);
+gboolean            pango_layout_is_wrapped             (PangoLayout *layout);
 enum                PangoWrapMode;
 #define             PANGO_TYPE_WRAP_MODE
 void                pango_layout_set_ellipsize          (PangoLayout *layout,
                                                          PangoEllipsizeMode ellipsize);
 PangoEllipsizeMode  pango_layout_get_ellipsize          (PangoLayout *layout);
-gboolean            pango_layout_is_ellipsized          (PangoLayout *layout);
+gboolean            pango_layout_is_ellipsized          (PangoLayout *layout);
 enum                PangoEllipsizeMode;
 #define             PANGO_TYPE_ELLIPSIZE_MODE
 void                pango_layout_set_indent             (PangoLayout *layout,
@@ -90,11 +90,11 @@
 void                pango_layout_set_spacing            (PangoLayout *layout,
                                                          int spacing);
 void                pango_layout_set_justify            (PangoLayout *layout,
-                                                         gboolean justify);
-gboolean            pango_layout_get_justify            (PangoLayout *layout);
+                                                         gboolean justify);
+gboolean            pango_layout_get_justify            (PangoLayout *layout);
 void                pango_layout_set_auto_dir           (PangoLayout *layout,
-                                                         gboolean auto_dir);
-gboolean            pango_layout_get_auto_dir           (PangoLayout *layout);
+                                                         gboolean auto_dir);
+gboolean            pango_layout_get_auto_dir           (PangoLayout *layout);
 void                pango_layout_set_alignment          (PangoLayout *layout,
                                                          PangoAlignment alignment);
 PangoAlignment      pango_layout_get_alignment          (PangoLayout *layout);
@@ -103,8 +103,8 @@
 PangoTabArray *     pango_layout_get_tabs               (PangoLayout *layout);
 void                pango_layout_set_single_paragraph_mode
                                                         (PangoLayout *layout,
-                                                         gboolean setting);
-gboolean            pango_layout_get_single_paragraph_mode
+                                                         gboolean setting);
+gboolean            pango_layout_get_single_paragraph_mode
                                                         (PangoLayout *layout);
 enum                PangoAlignment;
 #define             PANGO_TYPE_ALIGNMENT
@@ -112,19 +112,19 @@
                                                         (PangoLayout *layout);
 void                pango_layout_get_log_attrs          (PangoLayout *layout,
                                                          PangoLogAttr **attrs,
-                                                         gint *n_attrs);
+                                                         gint *n_attrs);
 const PangoLogAttr * pango_layout_get_log_attrs_readonly
                                                         (PangoLayout *layout,
-                                                         gint *n_attrs);
+                                                         gint *n_attrs);
 void                pango_layout_index_to_pos           (PangoLayout *layout,
                                                          int index_,
                                                          PangoRectangle *pos);
 void                pango_layout_index_to_line_x        (PangoLayout *layout,
                                                          int index_,
-                                                         gboolean trailing,
+                                                         gboolean trailing,
                                                          int *line,
                                                          int *x_pos);
-gboolean            pango_layout_xy_to_index            (PangoLayout *layout,
+gboolean            pango_layout_xy_to_index            (PangoLayout *layout,
                                                          int x,
                                                          int y,
                                                          int *index_,
@@ -134,7 +134,7 @@
                                                          PangoRectangle *strong_pos,
                                                          PangoRectangle *weak_pos);
 void                pango_layout_move_cursor_visually   (PangoLayout *layout,
-                                                         gboolean strong,
+                                                         gboolean strong,
                                                          int old_index,
                                                          int old_trailing,
                                                          int direction,
@@ -158,16 +158,16 @@
                                                          int line);
 PangoLayoutLine *   pango_layout_get_line_readonly      (PangoLayout *layout,
                                                          int line);
-GSList *            pango_layout_get_lines              (PangoLayout *layout);
-GSList *            pango_layout_get_lines_readonly     (PangoLayout *layout);
+GSList *            pango_layout_get_lines              (PangoLayout *layout);
+GSList *            pango_layout_get_lines_readonly     (PangoLayout *layout);
 PangoLayoutIter *   pango_layout_get_iter               (PangoLayout *layout);
 PangoLayoutIter *   pango_layout_iter_copy              (PangoLayoutIter *iter);
 void                pango_layout_iter_free              (PangoLayoutIter *iter);
-gboolean            pango_layout_iter_next_run          (PangoLayoutIter *iter);
-gboolean            pango_layout_iter_next_char         (PangoLayoutIter *iter);
-gboolean            pango_layout_iter_next_cluster      (PangoLayoutIter *iter);
-gboolean            pango_layout_iter_next_line         (PangoLayoutIter *iter);
-gboolean            pango_layout_iter_at_last_line      (PangoLayoutIter *iter);
+gboolean            pango_layout_iter_next_run          (PangoLayoutIter *iter);
+gboolean            pango_layout_iter_next_char         (PangoLayoutIter *iter);
+gboolean            pango_layout_iter_next_cluster      (PangoLayoutIter *iter);
+gboolean            pango_layout_iter_next_line         (PangoLayoutIter *iter);
+gboolean            pango_layout_iter_at_last_line      (PangoLayoutIter *iter);
 int                 pango_layout_iter_get_index         (PangoLayoutIter *iter);
 int                 pango_layout_iter_get_baseline      (PangoLayoutIter *iter);
 PangoLayoutRun *    pango_layout_iter_get_run           (PangoLayoutIter *iter);
@@ -207,9 +207,9 @@
                                                          PangoRectangle *logical_rect);
 void                pango_layout_line_index_to_x        (PangoLayoutLine *line,
                                                          int index_,
-                                                         gboolean trailing,
+                                                         gboolean trailing,
                                                          int *x_pos);
-gboolean            pango_layout_line_x_to_index        (PangoLayoutLine *line,
+gboolean            pango_layout_line_x_to_index        (PangoLayoutLine *line,
                                                          int x_pos,
                                                          int *index_,
                                                          int *trailing);
@@ -223,7 +223,7 @@
 

Object Hierarchy

-  GObject
+  GObject
    +----PangoLayout
 
@@ -320,7 +320,7 @@
 

Returns :

the newly allocated PangoLayout, with a reference count of one, which should be freed with -g_object_unref(). +g_object_unref().
@@ -346,7 +346,7 @@

Returns :

the newly allocated PangoLayout, with a reference count of one, which should be freed -with g_object_unref(). [transfer full] +with g_object_unref(). [transfer full] @@ -461,7 +461,7 @@

pango_layout_get_character_count ()

-
gint                pango_layout_get_character_count    (PangoLayout *layout);
+
gint                pango_layout_get_character_count    (PangoLayout *layout);

Returns the number of Unicode characters in the the text of layout. @@ -520,8 +520,8 @@

void                pango_layout_set_markup_with_accel  (PangoLayout *layout,
                                                          const char *markup,
                                                          int length,
-                                                         gunichar accel_marker,
-                                                         gunichar *accel_char);
+ gunichar accel_marker, + gunichar *accel_char);

Sets the layout text and attribute list from marked-up text (see markup format). Replaces @@ -561,7 +561,7 @@

accel_char :

return location -for first located accelerator, or NULL. [out caller-allocates][allow-none] +for first located accelerator, or NULL. [out caller-allocates][allow-none] @@ -586,7 +586,7 @@

attrs :

-a PangoAttrList, can be NULL. [allow-none][transfer full] +a PangoAttrList, can be NULL. [allow-none][transfer full] @@ -634,7 +634,7 @@

desc :

-the new PangoFontDescription, or NULL to unset the +the new PangoFontDescription, or NULL to unset the current font description. [allow-none] @@ -660,7 +660,7 @@

Returns :

a pointer to the layout's font description, -or NULL if the font description from the layout's +or NULL if the font description from the layout's context is inherited. This value is owned by the layout and must not be modified or freed. @@ -842,12 +842,12 @@

pango_layout_is_wrapped ()

-
gboolean            pango_layout_is_wrapped             (PangoLayout *layout);
+
gboolean            pango_layout_is_wrapped             (PangoLayout *layout);

Queries whether the layout had to wrap any paragraphs.

-This returns TRUE if a positive width is set on layout, +This returns TRUE if a positive width is set on layout, ellipsization mode of layout is set to PANGO_ELLIPSIZE_NONE, and there are paragraphs exceeding the layout width that have to be wrapped. @@ -863,7 +863,7 @@

Returns :

-TRUE if any paragraphs had to be wrapped, FALSE +TRUE if any paragraphs had to be wrapped, FALSE otherwise. @@ -910,7 +910,7 @@
#define PANGO_TYPE_WRAP_MODE (pango_wrap_mode_get_type())
 

-The GObject type for PangoWrapMode. +The GObject type for PangoWrapMode.


@@ -978,12 +978,12 @@

pango_layout_is_ellipsized ()

-
gboolean            pango_layout_is_ellipsized          (PangoLayout *layout);
+
gboolean            pango_layout_is_ellipsized          (PangoLayout *layout);

Queries whether the layout had to ellipsize any paragraphs.

-This returns TRUE if the ellipsization mode for layout +This returns TRUE if the ellipsization mode for layout is not PANGO_ELLIPSIZE_NONE, a positive width is set on layout, and there are paragraphs exceeding that width that have to be ellipsized. @@ -999,7 +999,7 @@

Returns :

-TRUE if any paragraphs had to be ellipsized, FALSE +TRUE if any paragraphs had to be ellipsized, FALSE otherwise. @@ -1055,7 +1055,7 @@
#define PANGO_TYPE_ELLIPSIZE_MODE (pango_ellipsize_mode_get_type())
 

-The GObject type for PangoEllipsizeMode. +The GObject type for PangoEllipsizeMode.


@@ -1159,7 +1159,7 @@

pango_layout_set_justify ()

void                pango_layout_set_justify            (PangoLayout *layout,
-                                                         gboolean justify);
+ gboolean justify);

Sets whether each complete line should be stretched to fill the entire width of the layout. This stretching is typically @@ -1189,7 +1189,7 @@


pango_layout_get_justify ()

-
gboolean            pango_layout_get_justify            (PangoLayout *layout);
+
gboolean            pango_layout_get_justify            (PangoLayout *layout);

Gets whether each complete line should be stretched to fill the entire width of the layout. @@ -1213,7 +1213,7 @@

pango_layout_set_auto_dir ()

void                pango_layout_set_auto_dir           (PangoLayout *layout,
-                                                         gboolean auto_dir);
+ gboolean auto_dir);

Sets whether to calculate the bidirectional base direction for the layout according to the contents of the layout; @@ -1225,7 +1225,7 @@ characters get their direction from the surrounding paragraphs.

-When FALSE, the choice between left-to-right and +When FALSE, the choice between left-to-right and right-to-left layout is done according to the base direction of the layout's PangoContext. (See pango_context_set_base_dir()).

@@ -1244,7 +1244,7 @@

auto_dir :

-if TRUE, compute the bidirectional base direction +if TRUE, compute the bidirectional base direction from the layout's contents. @@ -1254,7 +1254,7 @@

pango_layout_get_auto_dir ()

-
gboolean            pango_layout_get_auto_dir           (PangoLayout *layout);
+
gboolean            pango_layout_get_auto_dir           (PangoLayout *layout);

Gets whether to calculate the bidirectional base direction for the layout according to the contents of the layout. @@ -1271,8 +1271,8 @@

Returns :

-TRUE if the bidirectional base direction -is computed from the layout's contents, FALSE otherwise. +TRUE if the bidirectional base direction +is computed from the layout's contents, FALSE otherwise.
@@ -1332,7 +1332,7 @@ PangoTabArray *tabs);

Sets the tabs to use for layout, overriding the default tabs -(by default, tabs are every 8 spaces). If tabs is NULL, the default +(by default, tabs are every 8 spaces). If tabs is NULL, the default tabs are reinstated. tabs is copied into the layout; you must free your copy of tabs yourself.

@@ -1346,7 +1346,7 @@

tabs :

-a PangoTabArray, or NULL. [allow-none] +a PangoTabArray, or NULL. [allow-none] @@ -1359,7 +1359,7 @@

Gets the current PangoTabArray used by this layout. If no PangoTabArray has been set, then the default tabs are in use -and NULL is returned. Default tabs are every 8 spaces. +and NULL is returned. Default tabs are every 8 spaces. The return value should be freed with pango_tab_array_free().

@@ -1372,7 +1372,7 @@ - +

Returns :

a copy of the tabs for this layout, or NULL.a copy of the tabs for this layout, or NULL.
@@ -1382,9 +1382,9 @@

pango_layout_set_single_paragraph_mode ()

void                pango_layout_set_single_paragraph_mode
                                                         (PangoLayout *layout,
-                                                         gboolean setting);
+ gboolean setting);

-If setting is TRUE, do not treat newlines and similar characters +If setting is TRUE, do not treat newlines and similar characters as paragraph separators; instead, keep all text in a single paragraph, and display a glyph for paragraph separator characters. Used when you want to allow editing of newlines on a single text line. @@ -1407,7 +1407,7 @@


pango_layout_get_single_paragraph_mode ()

-
gboolean            pango_layout_get_single_paragraph_mode
+
gboolean            pango_layout_get_single_paragraph_mode
                                                         (PangoLayout *layout);

Obtains the value set by pango_layout_set_single_paragraph_mode(). @@ -1423,8 +1423,8 @@

Returns :

-TRUE if the layout does not break paragraphs at -paragraph separator characters, FALSE otherwise. +TRUE if the layout does not break paragraphs at +paragraph separator characters, FALSE otherwise.
@@ -1470,7 +1470,7 @@
#define PANGO_TYPE_ALIGNMENT (pango_alignment_get_type())
 

-The GObject type for PangoAlignment. +The GObject type for PangoAlignment.


@@ -1510,7 +1510,7 @@

pango_layout_get_log_attrs ()

void                pango_layout_get_log_attrs          (PangoLayout *layout,
                                                          PangoLogAttr **attrs,
-                                                         gint *n_attrs);
+ gint *n_attrs);

Retrieves an array of logical attributes for each character in the layout. @@ -1526,7 +1526,7 @@

attrs :

location to store a pointer to an array of logical attributes -This value must be freed with g_free(). [out][array length=n_attrs][transfer container] +This value must be freed with g_free(). [out][array length=n_attrs][transfer container] @@ -1545,7 +1545,7 @@

pango_layout_get_log_attrs_readonly ()

const PangoLogAttr * pango_layout_get_log_attrs_readonly
                                                         (PangoLayout *layout,
-                                                         gint *n_attrs);
+ gint *n_attrs);

Retrieves an array of logical attributes for each character in the layout. @@ -1621,7 +1621,7 @@

pango_layout_index_to_line_x ()

void                pango_layout_index_to_line_x        (PangoLayout *layout,
                                                          int index_,
-                                                         gboolean trailing,
+                                                         gboolean trailing,
                                                          int *line,
                                                          int *x_pos);

@@ -1649,13 +1649,13 @@

line :

location to store resulting line index. (which will -between 0 and pango_layout_get_line_count(layout) - 1), or NULL. [out][allow-none] +between 0 and pango_layout_get_line_count(layout) - 1), or NULL. [out][allow-none]

x_pos :

location to store resulting position within line -(PANGO_SCALE units per device unit), or NULL. [out][allow-none] +(PANGO_SCALE units per device unit), or NULL. [out][allow-none] @@ -1664,7 +1664,7 @@

pango_layout_xy_to_index ()

-
gboolean            pango_layout_xy_to_index            (PangoLayout *layout,
+
gboolean            pango_layout_xy_to_index            (PangoLayout *layout,
                                                          int x,
                                                          int y,
                                                          int *index_,
@@ -1677,7 +1677,7 @@
 X position is not within the layout, then the start or the
 end of the line is chosen as  described for pango_layout_x_to_index().
 If either the X or Y positions were not inside the layout, then the
-function returns FALSE; on an exact hit, it returns TRUE.
+function returns FALSE; on an exact hit, it returns TRUE.
 

@@ -1713,7 +1713,7 @@ +TRUE if the coordinates were inside text, FALSE otherwise.

Returns :

-TRUE if the coordinates were inside text, FALSE otherwise.
@@ -1750,12 +1750,12 @@

strong_pos :

location to store the strong cursor position -(may be NULL). [out][allow-none] +(may be NULL). [out][allow-none]

weak_pos :

-location to store the weak cursor position (may be NULL). [out][allow-none] +location to store the weak cursor position (may be NULL). [out][allow-none] @@ -1765,7 +1765,7 @@

pango_layout_move_cursor_visually ()

void                pango_layout_move_cursor_visually   (PangoLayout *layout,
-                                                         gboolean strong,
+                                                         gboolean strong,
                                                          int old_index,
                                                          int old_trailing,
                                                          int direction,
@@ -1823,7 +1823,7 @@
 

new_index :

location to store the new cursor byte index. A value of -1 indicates that the cursor has been moved off the beginning -of the layout. A value of G_MAXINT indicates that +of the layout. A value of G_MAXINT indicates that the cursor has been moved off the end of the layout. [out] @@ -1868,14 +1868,14 @@

ink_rect :

rectangle used to store the extents of the -layout as drawn or NULL to indicate that the result is +layout as drawn or NULL to indicate that the result is not needed. [out][allow-none]

logical_rect :

rectangle used to store the logical -extents of the layout or NULL to indicate that the +extents of the layout or NULL to indicate that the result is not needed. [out][allow-none] @@ -1906,14 +1906,14 @@

ink_rect :

rectangle used to store the extents of the -layout as drawn or NULL to indicate that the result is +layout as drawn or NULL to indicate that the result is not needed. [out][allow-none]

logical_rect :

rectangle used to store the logical -extents of the layout or NULL to indicate that the +extents of the layout or NULL to indicate that the result is not needed. [out][allow-none] @@ -1941,12 +1941,12 @@

width :

-location to store the logical width, or NULL. [out caller-allocates][allow-none] +location to store the logical width, or NULL. [out caller-allocates][allow-none]

height :

-location to store the logical height, or NULL. [out caller-allocates][allow-none] +location to store the logical height, or NULL. [out caller-allocates][allow-none] @@ -1975,12 +1975,12 @@

width :

-location to store the logical width, or NULL. [out][allow-none] +location to store the logical width, or NULL. [out][allow-none]

height :

-location to store the logical height, or NULL. [out][allow-none] +location to store the logical height, or NULL. [out][allow-none] @@ -2057,7 +2057,7 @@

Returns :

-the requested PangoLayoutLine, or NULL if the +the requested PangoLayoutLine, or NULL if the index is out of range. This layout line can be ref'ed and retained, but will become invalid if changes are made to the PangoLayout. [transfer none] @@ -2094,7 +2094,7 @@

Returns :

-the requested PangoLayoutLine, or NULL if the +the requested PangoLayoutLine, or NULL if the index is out of range. This layout line can be ref'ed and retained, but will become invalid if changes are made to the PangoLayout. @@ -2108,7 +2108,7 @@

pango_layout_get_lines ()

-
GSList *            pango_layout_get_lines              (PangoLayout *layout);
+
GSList *            pango_layout_get_lines              (PangoLayout *layout);

Returns the lines of the layout as a list.

@@ -2126,7 +2126,7 @@

Returns :

-a GSList containing +a GSList containing the lines in the layout. This points to internal data of the PangoLayout and must be used with care. It will become invalid on any change to the layout's text or properties. [element-type Pango.LayoutLine][transfer none] @@ -2138,7 +2138,7 @@

pango_layout_get_lines_readonly ()

-
GSList *            pango_layout_get_lines_readonly     (PangoLayout *layout);
+
GSList *            pango_layout_get_lines_readonly     (PangoLayout *layout);

Returns the lines of the layout as a list.

@@ -2157,7 +2157,7 @@

Returns :

-a GSList containing +a GSList containing the lines in the layout. This points to internal data of the PangoLayout and must be used with care. It will become invalid on any change to the layout's text or properties. No changes should be made to the lines. [element-type Pango.LayoutLine][transfer none] @@ -2202,14 +2202,14 @@

iter :

-a PangoLayoutIter, may be NULL +a PangoLayoutIter, may be NULL

Returns :

the newly allocated PangoLayoutIter, which should -be freed with pango_layout_iter_free(), or NULL if -iter was NULL. +be freed with pango_layout_iter_free(), or NULL if +iter was NULL.
@@ -2226,7 +2226,7 @@

iter :

-a PangoLayoutIter, may be NULL +a PangoLayoutIter, may be NULL
@@ -2234,10 +2234,10 @@

pango_layout_iter_next_run ()

-
gboolean            pango_layout_iter_next_run          (PangoLayoutIter *iter);
+
gboolean            pango_layout_iter_next_run          (PangoLayoutIter *iter);

Moves iter forward to the next run in visual order. If iter was -already at the end of the layout, returns FALSE. +already at the end of the layout, returns FALSE.

@@ -2257,10 +2257,10 @@

pango_layout_iter_next_char ()

-
gboolean            pango_layout_iter_next_char         (PangoLayoutIter *iter);
+
gboolean            pango_layout_iter_next_char         (PangoLayoutIter *iter);

Moves iter forward to the next character in visual order. If iter was already at -the end of the layout, returns FALSE. +the end of the layout, returns FALSE.

@@ -2280,10 +2280,10 @@

pango_layout_iter_next_cluster ()

-
gboolean            pango_layout_iter_next_cluster      (PangoLayoutIter *iter);
+
gboolean            pango_layout_iter_next_cluster      (PangoLayoutIter *iter);

Moves iter forward to the next cluster in visual order. If iter -was already at the end of the layout, returns FALSE. +was already at the end of the layout, returns FALSE.

@@ -2303,10 +2303,10 @@

pango_layout_iter_next_line ()

-
gboolean            pango_layout_iter_next_line         (PangoLayoutIter *iter);
+
gboolean            pango_layout_iter_next_line         (PangoLayoutIter *iter);

Moves iter forward to the start of the next line. If iter is -already on the last line, returns FALSE. +already on the last line, returns FALSE.

@@ -2326,7 +2326,7 @@

pango_layout_iter_at_last_line ()

-
gboolean            pango_layout_iter_at_last_line      (PangoLayoutIter *iter);
+
gboolean            pango_layout_iter_at_last_line      (PangoLayoutIter *iter);

Determines whether iter is on the last line of the layout.

@@ -2341,7 +2341,7 @@
+TRUE if iter is on the last line.

Returns :

-TRUE if iter is on the last line.
@@ -2354,7 +2354,7 @@ Gets the current byte index. Note that iterating forward by char moves in visual order, not logical order, so indexes may not be sequential. Also, the index may be equal to the length of the text -in the layout, if on the NULL run (see pango_layout_iter_get_run()). +in the layout, if on the NULL run (see pango_layout_iter_get_run()).

@@ -2400,8 +2400,8 @@
PangoLayoutRun *    pango_layout_iter_get_run           (PangoLayoutIter *iter);

Gets the current run. When iterating by run, at the end of each -line, there's a position with a NULL run, so this function can return -NULL. The NULL run at the end of each line ensures that all lines have +line, there's a position with a NULL run, so this function can return +NULL. The NULL run at the end of each line ensures that all lines have at least one run, even lines consisting of only a newline.

@@ -2430,8 +2430,8 @@

PangoLayoutRun *    pango_layout_iter_get_run_readonly  (PangoLayoutIter *iter);

Gets the current run. When iterating by run, at the end of each -line, there's a position with a NULL run, so this function can return -NULL. The NULL run at the end of each line ensures that all lines have +line, there's a position with a NULL run, so this function can return +NULL. The NULL run at the end of each line ensures that all lines have at least one run, even lines consisting of only a newline.

@@ -2581,12 +2581,12 @@

- - @@ -2612,12 +2612,12 @@ - - @@ -2648,12 +2648,12 @@ - - @@ -2667,7 +2667,7 @@ PangoRectangle *logical_rect);

Obtains the extents of the current line. ink_rect or logical_rect -can be NULL if you aren't interested in them. Extents are in layout +can be NULL if you aren't interested in them. Extents are in layout coordinates (origin is the top-left corner of the entire PangoLayout). Thus the extents returned by this function will be the same width/height but not at the same x/y as the extents @@ -2683,12 +2683,12 @@

- - @@ -2703,7 +2703,7 @@ PangoRectangle *logical_rect);

Obtains the extents of the PangoLayout being iterated -over. ink_rect or logical_rect can be NULL if you +over. ink_rect or logical_rect can be NULL if you aren't interested in them.

ink_rect :

rectangle to fill with ink extents, or NULL. [out][allow-none] +rectangle to fill with ink extents, or NULL. [out][allow-none]

logical_rect :

rectangle to fill with logical extents, or NULL. [out][allow-none] +rectangle to fill with logical extents, or NULL. [out][allow-none]

ink_rect :

rectangle to fill with ink extents, or NULL. [out][allow-none] +rectangle to fill with ink extents, or NULL. [out][allow-none]

logical_rect :

rectangle to fill with logical extents, or NULL. [out][allow-none] +rectangle to fill with logical extents, or NULL. [out][allow-none]

y0_ :

start of line, or NULL. [out][allow-none] +start of line, or NULL. [out][allow-none]

y1_ :

end of line, or NULL. [out][allow-none] +end of line, or NULL. [out][allow-none]

ink_rect :

rectangle to fill with ink extents, or NULL. [out][allow-none] +rectangle to fill with ink extents, or NULL. [out][allow-none]

logical_rect :

rectangle to fill with logical extents, or NULL. [out][allow-none] +rectangle to fill with logical extents, or NULL. [out][allow-none]
@@ -2717,13 +2717,13 @@ @@ -2777,7 +2777,7 @@ - @@ -2828,13 +2828,13 @@ @@ -2864,13 +2864,13 @@ @@ -2881,7 +2881,7 @@

pango_layout_line_index_to_x ()

void                pango_layout_line_index_to_x        (PangoLayoutLine *line,
                                                          int index_,
-                                                         gboolean trailing,
+                                                         gboolean trailing,
                                                          int *x_pos);

Converts an index within a line to a X position. @@ -2915,7 +2915,7 @@


pango_layout_line_x_to_index ()

-
gboolean            pango_layout_line_x_to_index        (PangoLayoutLine *line,
+
gboolean            pango_layout_line_x_to_index        (PangoLayoutLine *line,
                                                          int x_pos,
                                                          int *index_,
                                                          int *trailing);
@@ -2961,7 +2961,7 @@
+FALSE if x_pos was outside the line, TRUE if inside

ink_rect :

rectangle to fill with ink extents, -or NULL. [out][allow-none] +or NULL. [out][allow-none]

logical_rect :

rectangle to fill with logical -extents, or NULL. [out][allow-none] +extents, or NULL. [out][allow-none]

line :

a PangoLayoutLine, may be NULL +a PangoLayoutLine, may be NULL

ink_rect :

rectangle used to store the extents of -the glyph string as drawn, or NULL. [out][allow-none] +the glyph string as drawn, or NULL. [out][allow-none]

logical_rect :

rectangle used to store the logical -extents of the glyph string, or NULL. [out][allow-none] +extents of the glyph string, or NULL. [out][allow-none]

ink_rect :

rectangle used to store the extents of -the glyph string as drawn, or NULL. [out][allow-none] +the glyph string as drawn, or NULL. [out][allow-none]

logical_rect :

rectangle used to store the logical -extents of the glyph string, or NULL. [out][allow-none] +extents of the glyph string, or NULL. [out][allow-none]

Returns :

-FALSE if x_pos was outside the line, TRUE if inside
@@ -3011,7 +3011,7 @@ The array will be of length 2*n_ranges, with each range starting at (*ranges)[2*n] and of width (*ranges)[2*n + 1] - (*ranges)[2*n]. -This array must be freed with g_free(). The coordinates are relative +This array must be freed with g_free(). The coordinates are relative to the layout and are in Pango units. [out][array length=n_ranges][transfer full] diff -Nru pango1.0-1.29.5/docs/html/pango-Miscellaneous-Utilities.html pango1.0-1.30.0/docs/html/pango-Miscellaneous-Utilities.html --- pango1.0-1.29.5/docs/html/pango-Miscellaneous-Utilities.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Miscellaneous-Utilities.html 2012-03-27 01:41:19.000000000 +0000 @@ -39,42 +39,42 @@

Synopsis

char **             pango_split_file_list               (const char *str);
 char *              pango_trim_string                   (const char *str);
-gint                pango_read_line                     (FILE *stream,
-                                                         GString *str);
-gboolean            pango_skip_space                    (const char **pos);
-gboolean            pango_scan_word                     (const char **pos,
-                                                         GString *out);
-gboolean            pango_scan_string                   (const char **pos,
-                                                         GString *out);
-gboolean            pango_scan_int                      (const char **pos,
+gint                pango_read_line                     (FILE *stream,
+                                                         GString *str);
+gboolean            pango_skip_space                    (const char **pos);
+gboolean            pango_scan_word                     (const char **pos,
+                                                         GString *out);
+gboolean            pango_scan_string                   (const char **pos,
+                                                         GString *out);
+gboolean            pango_scan_int                      (const char **pos,
                                                          int *out);
 char *              pango_config_key_get                (const char *key);
 void                pango_lookup_aliases                (const char *fontname,
                                                          char ***families,
                                                          int *n_families);
-gboolean            pango_parse_enum                    (GType type,
+gboolean            pango_parse_enum                    (GType type,
                                                          const char *str,
                                                          int *value,
-                                                         gboolean warn,
+                                                         gboolean warn,
                                                          char **possible_values);
-gboolean            pango_parse_style                   (const char *str,
+gboolean            pango_parse_style                   (const char *str,
                                                          PangoStyle *style,
-                                                         gboolean warn);
-gboolean            pango_parse_variant                 (const char *str,
+                                                         gboolean warn);
+gboolean            pango_parse_variant                 (const char *str,
                                                          PangoVariant *variant,
-                                                         gboolean warn);
-gboolean            pango_parse_weight                  (const char *str,
+                                                         gboolean warn);
+gboolean            pango_parse_weight                  (const char *str,
                                                          PangoWeight *weight,
-                                                         gboolean warn);
-gboolean            pango_parse_stretch                 (const char *str,
+                                                         gboolean warn);
+gboolean            pango_parse_stretch                 (const char *str,
                                                          PangoStretch *stretch,
-                                                         gboolean warn);
+                                                         gboolean warn);
 const char *        pango_get_sysconf_subdirectory      (void);
 const char *        pango_get_lib_subdirectory          (void);
-guint8 *            pango_log2vis_get_embedding_levels  (const gchar *text,
+guint8 *            pango_log2vis_get_embedding_levels  (const gchar *text,
                                                          int length,
                                                          PangoDirection *pbase_dir);
-gboolean            pango_is_zero_width                 (gunichar ch);
+gboolean            pango_is_zero_width                 (gunichar ch);
 void                pango_quantize_line_geometry        (int *thickness,
                                                          int *position);
 
@@ -92,7 +92,7 @@

pango_split_file_list ()

char **             pango_split_file_list               (const char *str);

-Splits a G_SEARCHPATH_SEPARATOR-separated list of files, stripping +Splits a G_SEARCHPATH_SEPARATOR-separated list of files, stripping white space and substituting ~/ with $HOME/.

@@ -100,12 +100,12 @@ - + @@ -127,7 +127,7 @@ - @@ -136,8 +136,8 @@

pango_read_line ()

-
gint                pango_read_line                     (FILE *stream,
-                                                         GString *str);
+
gint                pango_read_line                     (FILE *stream,
+                                                         GString *str);

Reads an entire line from a file into a buffer. Lines may be delimited with '\n', '\r', '\n\r', or '\r\n'. The delimiter @@ -157,7 +157,7 @@

@@ -172,7 +172,7 @@

pango_skip_space ()

-
gboolean            pango_skip_space                    (const char **pos);
+
gboolean            pango_skip_space                    (const char **pos);

Skips 0 or more characters of white space.

@@ -187,7 +187,7 @@
@@ -196,10 +196,10 @@

pango_scan_word ()

-
gboolean            pango_scan_word                     (const char **pos,
-                                                         GString *out);
+
gboolean            pango_scan_word                     (const char **pos,
+                                                         GString *out);

-Scans a word into a GString buffer. A word consists +Scans a word into a GString buffer. A word consists of [A-Za-z_] followed by zero or more [A-Za-z_0-9] Leading white space is skipped.

@@ -213,13 +213,13 @@
- +FALSE if a parse error occurred.

str :

a G_SEARCHPATH_SEPARATOR separated list of filenamesa G_SEARCHPATH_SEPARATOR separated list of filenames

Returns :

a list of -strings to be freed with g_strfreev(). [transfer full][array zero-terminated=1] +strings to be freed with g_strfreev(). [transfer full][array zero-terminated=1]

Returns :

A newly-allocated string that must be freed with g_free() +A newly-allocated string that must be freed with g_free()

str :

-GString buffer into which to write the result. [out] +GString buffer into which to write the result. [out]

Returns :

-FALSE if skipping the white space leaves +FALSE if skipping the white space leaves the position at a '\0' character.

out :

a GString into which to write the result. [out] +a GString into which to write the result. [out]

Returns :

-FALSE if a parse error occurred.
@@ -227,10 +227,10 @@

pango_scan_string ()

-
gboolean            pango_scan_string                   (const char **pos,
-                                                         GString *out);
+
gboolean            pango_scan_string                   (const char **pos,
+                                                         GString *out);

-Scans a string into a GString buffer. The string may either +Scans a string into a GString buffer. The string may either be a sequence of non-white-space characters, or a quoted string with '"'. Instead a quoted string, '\"' represents a literal quote. Leading white space outside of quotes is skipped. @@ -245,13 +245,13 @@

out :

-a GString into which to write the result. [out] +a GString into which to write the result. [out]

Returns :

-FALSE if a parse error occurred. +FALSE if a parse error occurred.
@@ -259,7 +259,7 @@

pango_scan_int ()

-
gboolean            pango_scan_int                      (const char **pos,
+
gboolean            pango_scan_int                      (const char **pos,
                                                          int *out);

Scans an integer. @@ -281,7 +281,7 @@

Returns :

-FALSE if a parse error occurred. +FALSE if a parse error occurred.
@@ -304,8 +304,8 @@

Returns :

-the value, if found, otherwise NULL. The value is a -newly-allocated string and must be freed with g_free(). +the value, if found, otherwise NULL. The value is a +newly-allocated string and must be freed with g_free().
@@ -345,22 +345,22 @@

pango_parse_enum ()

-
gboolean            pango_parse_enum                    (GType type,
+
gboolean            pango_parse_enum                    (GType type,
                                                          const char *str,
                                                          int *value,
-                                                         gboolean warn,
+                                                         gboolean warn,
                                                          char **possible_values);

Parses an enum type and stores the result in value.

If str does not match the nick name of any of the possible values for the -enum and is not an integer, FALSE is returned, a warning is issued -if warn is TRUE, and a +enum and is not an integer, FALSE is returned, a warning is issued +if warn is TRUE, and a string representing the list of possible values is stored in possible_values. The list is slash-separated, eg. -"none/start/middle/end". If failed and possible_values is not NULL, -returned string should be freed using g_free(). +"none/start/middle/end". If failed and possible_values is not NULL, +returned string should be freed using g_free().

@@ -371,27 +371,27 @@ - - - + - +TRUE if str was successfully parsed.

str :

string to parse. May be NULL. [allow-none] +string to parse. May be NULL. [allow-none]

value :

integer to store the result in, or NULL. [out][allow-none] +integer to store the result in, or NULL. [out][allow-none]

warn :

if TRUE, issue a g_warning() on bad input.if TRUE, issue a g_warning() on bad input.

possible_values :

place to store list of possible values on failure, or NULL. [out][allow-none] +place to store list of possible values on failure, or NULL. [out][allow-none]

Returns :

-TRUE if str was successfully parsed.
@@ -400,9 +400,9 @@

pango_parse_style ()

-
gboolean            pango_parse_style                   (const char *str,
+
gboolean            pango_parse_style                   (const char *str,
                                                          PangoStyle *style,
-                                                         gboolean warn);
+ gboolean warn);

Parses a font style. The allowed values are "normal", "italic" and "oblique", case variations being @@ -421,12 +421,12 @@

warn :

-if TRUE, issue a g_warning() on bad input. +if TRUE, issue a g_warning() on bad input.

Returns :

-TRUE if str was successfully parsed. +TRUE if str was successfully parsed.
@@ -434,9 +434,9 @@

pango_parse_variant ()

-
gboolean            pango_parse_variant                 (const char *str,
+
gboolean            pango_parse_variant                 (const char *str,
                                                          PangoVariant *variant,
-                                                         gboolean warn);
+ gboolean warn);

Parses a font variant. The allowed values are "normal" and "smallcaps" or "small_caps", case variations being @@ -455,12 +455,12 @@

warn :

-if TRUE, issue a g_warning() on bad input. +if TRUE, issue a g_warning() on bad input.

Returns :

-TRUE if str was successfully parsed. +TRUE if str was successfully parsed.
@@ -468,9 +468,9 @@

pango_parse_weight ()

-
gboolean            pango_parse_weight                  (const char *str,
+
gboolean            pango_parse_weight                  (const char *str,
                                                          PangoWeight *weight,
-                                                         gboolean warn);
+ gboolean warn);

Parses a font weight. The allowed values are "heavy", "ultrabold", "bold", "normal", "light", "ultraleight" @@ -489,12 +489,12 @@

warn :

-if TRUE, issue a g_warning() on bad input. +if TRUE, issue a g_warning() on bad input.

Returns :

-TRUE if str was successfully parsed. +TRUE if str was successfully parsed.
@@ -502,9 +502,9 @@

pango_parse_stretch ()

-
gboolean            pango_parse_stretch                 (const char *str,
+
gboolean            pango_parse_stretch                 (const char *str,
                                                          PangoStretch *stretch,
-                                                         gboolean warn);
+ gboolean warn);

Parses a font stretch. The allowed values are "ultra_condensed", "extra_condensed", "condensed", @@ -525,12 +525,12 @@

warn :

-if TRUE, issue a g_warning() on bad input. +if TRUE, issue a g_warning() on bad input.

Returns :

-TRUE if str was successfully parsed. +TRUE if str was successfully parsed.
@@ -576,7 +576,7 @@

pango_log2vis_get_embedding_levels ()

-
guint8 *            pango_log2vis_get_embedding_levels  (const gchar *text,
+
guint8 *            pango_log2vis_get_embedding_levels  (const gchar *text,
                                                          int length,
                                                          PangoDirection *pbase_dir);

@@ -618,12 +618,12 @@


pango_is_zero_width ()

-
gboolean            pango_is_zero_width                 (gunichar ch);
+
gboolean            pango_is_zero_width                 (gunichar ch);

Checks ch to see if it is a character that should not be normally rendered on the screen. This includes all Unicode characters with "ZERO WIDTH" in their name, as well as bidi formatting characters, and -a few other ones. This is totally different from g_unichar_iszerowidth() +a few other ones. This is totally different from g_unichar_iszerowidth() and is at best misnamed.

@@ -636,7 +636,7 @@ +TRUE if ch is a zero-width character, FALSE otherwise

Returns :

-TRUE if ch is a zero-width character, FALSE otherwise
diff -Nru pango1.0-1.29.5/docs/html/pango-Modules.html pango1.0-1.30.0/docs/html/pango-Modules.html --- pango1.0-1.29.5/docs/html/pango-Modules.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Modules.html 2012-03-27 01:41:19.000000000 +0000 @@ -41,14 +41,14 @@ PangoMap; PangoMapEntry; PangoMap * pango_find_map (PangoLanguage *language, - guint engine_type_id, - guint render_type_id); + guint engine_type_id, + guint render_type_id); PangoEngine * pango_map_get_engine (PangoMap *map, PangoScript script); void pango_map_get_engines (PangoMap *map, PangoScript script, - GSList **exact_engines, - GSList **fallback_engines); + GSList **exact_engines, + GSList **fallback_engines); void pango_module_register (PangoIncludedModule *module);
@@ -121,8 +121,8 @@

pango_find_map ()

PangoMap *          pango_find_map                      (PangoLanguage *language,
-                                                         guint engine_type_id,
-                                                         guint render_type_id);
+ guint engine_type_id, + guint render_type_id);

Locate a PangoMap for a particular engine type and render type. The resulting map can be used to determine the engine @@ -174,7 +174,7 @@

Returns :

the best engine, if one is listed for the script, -or NULL. The lookup may cause the engine to be loaded; +or NULL. The lookup may cause the engine to be loaded; once an engine is loaded, it won't be unloaded. If multiple engines are exact for the script, the choice of which is returned is arbitrary. @@ -187,8 +187,8 @@

pango_map_get_engines ()

void                pango_map_get_engines               (PangoMap *map,
                                                          PangoScript script,
-                                                         GSList **exact_engines,
-                                                         GSList **fallback_engines);
+ GSList **exact_engines, + GSList **fallback_engines);

Finds engines in the map that handle the given script. The returned lists should be freed with g_slist_free, but the engines in the diff -Nru pango1.0-1.29.5/docs/html/pango-OpenType-Font-Handling.html pango1.0-1.30.0/docs/html/pango-OpenType-Font-Handling.html --- pango1.0-1.29.5/docs/html/pango-OpenType-Font-Handling.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-OpenType-Font-Handling.html 2012-03-27 01:41:19.000000000 +0000 @@ -63,45 +63,45 @@ #define PANGO_OT_TAG_DEFAULT_LANGUAGE #define PANGO_OT_TAG_DEFAULT_SCRIPT PangoOTInfo * pango_ot_info_get (FT_Face face); -gboolean pango_ot_info_find_script (PangoOTInfo *info, +gboolean pango_ot_info_find_script (PangoOTInfo *info, PangoOTTableType table_type, PangoOTTag script_tag, - guint *script_index); -gboolean pango_ot_info_find_language (PangoOTInfo *info, + guint *script_index); +gboolean pango_ot_info_find_language (PangoOTInfo *info, PangoOTTableType table_type, - guint script_index, + guint script_index, PangoOTTag language_tag, - guint *language_index, - guint *required_feature_index); -gboolean pango_ot_info_find_feature (PangoOTInfo *info, + guint *language_index, + guint *required_feature_index); +gboolean pango_ot_info_find_feature (PangoOTInfo *info, PangoOTTableType table_type, PangoOTTag feature_tag, - guint script_index, - guint language_index, - guint *feature_index); + guint script_index, + guint language_index, + guint *feature_index); PangoOTTag * pango_ot_info_list_scripts (PangoOTInfo *info, PangoOTTableType table_type); PangoOTTag * pango_ot_info_list_languages (PangoOTInfo *info, PangoOTTableType table_type, - guint script_index, + guint script_index, PangoOTTag language_tag); PangoOTTag * pango_ot_info_list_features (PangoOTInfo *info, PangoOTTableType table_type, PangoOTTag tag, - guint script_index, - guint language_index); + guint script_index, + guint language_index); PangoOTBuffer * pango_ot_buffer_new (PangoFcFont *font); void pango_ot_buffer_destroy (PangoOTBuffer *buffer); void pango_ot_buffer_clear (PangoOTBuffer *buffer); void pango_ot_buffer_add_glyph (PangoOTBuffer *buffer, - guint glyph, - guint properties, - guint cluster); + guint glyph, + guint properties, + guint cluster); void pango_ot_buffer_set_rtl (PangoOTBuffer *buffer, - gboolean rtl); + gboolean rtl); void pango_ot_buffer_set_zero_width_marks (PangoOTBuffer *buffer, - gboolean zero_width_marks); + gboolean zero_width_marks); void pango_ot_buffer_get_glyphs (const PangoOTBuffer *buffer, PangoOTGlyph **glyphs, int *n_glyphs); @@ -119,29 +119,29 @@ const PangoOTRulesetDescription *desc); void pango_ot_ruleset_add_feature (PangoOTRuleset *ruleset, PangoOTTableType table_type, - guint feature_index, - gulong property_bit); -gboolean pango_ot_ruleset_maybe_add_feature (PangoOTRuleset *ruleset, + guint feature_index, + gulong property_bit); +gboolean pango_ot_ruleset_maybe_add_feature (PangoOTRuleset *ruleset, PangoOTTableType table_type, PangoOTTag feature_tag, - gulong property_bit); -guint pango_ot_ruleset_maybe_add_features (PangoOTRuleset *ruleset, + gulong property_bit); +guint pango_ot_ruleset_maybe_add_features (PangoOTRuleset *ruleset, PangoOTTableType table_type, const PangoOTFeatureMap *features, - guint n_features); -guint pango_ot_ruleset_get_feature_count (const PangoOTRuleset *ruleset, - guint *n_gsub_features, - guint *n_gpos_features); + guint n_features); +guint pango_ot_ruleset_get_feature_count (const PangoOTRuleset *ruleset, + guint *n_gsub_features, + guint *n_gpos_features); void pango_ot_ruleset_substitute (const PangoOTRuleset *ruleset, PangoOTBuffer *buffer); void pango_ot_ruleset_position (const PangoOTRuleset *ruleset, PangoOTBuffer *buffer); PangoOTRulesetDescription * pango_ot_ruleset_description_copy (const PangoOTRulesetDescription *desc); -gboolean pango_ot_ruleset_description_equal (const PangoOTRulesetDescription *desc1, +gboolean pango_ot_ruleset_description_equal (const PangoOTRulesetDescription *desc1, const PangoOTRulesetDescription *desc2); void pango_ot_ruleset_description_free (PangoOTRulesetDescription *desc); -guint pango_ot_ruleset_description_hash (const PangoOTRulesetDescription *desc); +guint pango_ot_ruleset_description_hash (const PangoOTRulesetDescription *desc); PangoOTTag pango_ot_tag_from_language (PangoLanguage *language); PangoOTTag pango_ot_tag_from_script (PangoScript script); PangoLanguage * pango_ot_tag_to_language (PangoOTTag language_tag); @@ -151,11 +151,11 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoOTInfo
 
-  GObject
+  GObject
    +----PangoOTRuleset
 
@@ -225,28 +225,28 @@ -

guint32 glyph;

+

guint32 glyph;

the glyph itself. -

guint properties;

+

guint properties;

the properties value, identifying which features should be applied on this glyph. See pango_ruleset_add_feature(). -

guint cluster;

+

guint cluster;

the cluster that this glyph belongs to. -

gushort component;

+

gushort component;

a component value, set by the OpenType layout engine. -

gushort ligID;

+

gushort ligID;

a ligature index value, set by the OpenType layout engine. -

guint internal;

+

guint internal;

for Pango internal use @@ -302,28 +302,28 @@

const PangoOTFeatureMap *static_gsub_features;

-static map of GSUB features, or NULL. +static map of GSUB features, or NULL. -

guint n_static_gsub_features;

+

guint n_static_gsub_features;

length of static_gsub_features, or 0.

const PangoOTFeatureMap *static_gpos_features;

-static map of GPOS features, or NULL. +static map of GPOS features, or NULL. -

guint n_static_gpos_features;

+

guint n_static_gpos_features;

length of static_gpos_features, or 0.

const PangoOTFeatureMap *other_features;

-map of extra features to add to both GSUB and GPOS, or NULL. +map of extra features to add to both GSUB and GPOS, or NULL. Unlike the static maps, this pointer need not live beyond the life of function calls taking this struct. -

guint n_other_features;

+

guint n_other_features;

length of other_features, or 0. @@ -380,7 +380,7 @@ feature tag in represented as four-letter ASCII string. -

gulong property_bit;

+

gulong property_bit;

the property bit to use for this feature. See pango_ot_ruleset_add_feature() for details. @@ -548,10 +548,10 @@

pango_ot_info_find_script ()

-
gboolean            pango_ot_info_find_script           (PangoOTInfo *info,
+
gboolean            pango_ot_info_find_script           (PangoOTInfo *info,
                                                          PangoOTTableType table_type,
                                                          PangoOTTag script_tag,
-                                                         guint *script_index);
+ guint *script_index);

Finds the index of a script. If not found, tries to find the 'DFLT' and then 'dflt' scripts and return the index of that in script_index. @@ -581,12 +581,12 @@

script_index :

-location to store the index of the script, or NULL. +location to store the index of the script, or NULL.

Returns :

-TRUE if the script was found. +TRUE if the script was found.
@@ -594,12 +594,12 @@

pango_ot_info_find_language ()

-
gboolean            pango_ot_info_find_language         (PangoOTInfo *info,
+
gboolean            pango_ot_info_find_language         (PangoOTInfo *info,
                                                          PangoOTTableType table_type,
-                                                         guint script_index,
+                                                         guint script_index,
                                                          PangoOTTag language_tag,
-                                                         guint *language_index,
-                                                         guint *required_feature_index);
+ guint *language_index, + guint *required_feature_index);

Finds the index of a language and its required feature index. If the language is not found, sets language_index to @@ -631,17 +631,17 @@

language_index :

-location to store the index of the language, or NULL. +location to store the index of the language, or NULL.

required_feature_index :

location to store the required feature index of -the language, or NULL. +the language, or NULL.

Returns :

-TRUE if the language was found. +TRUE if the language was found.
@@ -649,12 +649,12 @@

pango_ot_info_find_feature ()

-
gboolean            pango_ot_info_find_feature          (PangoOTInfo *info,
+
gboolean            pango_ot_info_find_feature          (PangoOTInfo *info,
                                                          PangoOTTableType table_type,
                                                          PangoOTTag feature_tag,
-                                                         guint script_index,
-                                                         guint language_index,
-                                                         guint *feature_index);
+ guint script_index, + guint language_index, + guint *feature_index);

Finds the index of a feature. If the feature is not found, sets feature_index to PANGO_OT_NO_FEATURE, which is safe to pass to @@ -664,7 +664,7 @@ In the future, this may set feature_index to an special value that if used in pango_ot_ruleset_add_feature() will ask Pango to synthesize the requested feature based on Unicode properties and data. However, this -function will still return FALSE in those cases. So, users may want to +function will still return FALSE in those cases. So, users may want to ignore the return value of this function in certain cases.

@@ -693,12 +693,12 @@ - + +TRUE if the feature was found.

feature_index :

location to store the index of the feature, or NULL.location to store the index of the feature, or NULL.

Returns :

-TRUE if the feature was found.
@@ -725,7 +725,7 @@

Returns :

a newly-allocated zero-terminated array containing the tags of the -available scripts. Should be freed using g_free(). +available scripts. Should be freed using g_free().
@@ -735,7 +735,7 @@

pango_ot_info_list_languages ()

PangoOTTag *        pango_ot_info_list_languages        (PangoOTInfo *info,
                                                          PangoOTTableType table_type,
-                                                         guint script_index,
+                                                         guint script_index,
                                                          PangoOTTag language_tag);

Obtains the list of available languages for a given script. @@ -762,7 +762,7 @@

Returns :

a newly-allocated zero-terminated array containing the tags of the -available languages. Should be freed using g_free(). +available languages. Should be freed using g_free().
@@ -773,8 +773,8 @@
PangoOTTag *        pango_ot_info_list_features         (PangoOTInfo *info,
                                                          PangoOTTableType table_type,
                                                          PangoOTTag tag,
-                                                         guint script_index,
-                                                         guint language_index);
+ guint script_index, + guint language_index);

Obtains the list of features for the given language of the given script.

@@ -806,7 +806,7 @@

Returns :

a newly-allocated zero-terminated array containing the tags of the -available features. Should be freed using g_free(). +available features. Should be freed using g_free().
@@ -873,9 +873,9 @@

pango_ot_buffer_add_glyph ()

void                pango_ot_buffer_add_glyph           (PangoOTBuffer *buffer,
-                                                         guint glyph,
-                                                         guint properties,
-                                                         guint cluster);
+ guint glyph, + guint properties, + guint cluster);

Appends a glyph to a PangoOTBuffer, with properties identifying which features should be applied on this glyph. See pango_ruleset_add_feature(). @@ -909,7 +909,7 @@

pango_ot_buffer_set_rtl ()

void                pango_ot_buffer_set_rtl             (PangoOTBuffer *buffer,
-                                                         gboolean rtl);
+ gboolean rtl);

Sets whether glyphs will be rendered right-to-left. This setting is needed for proper horizontal positioning of right-to-left scripts. @@ -925,7 +925,7 @@

rtl :

-TRUE for right-to-left text +TRUE for right-to-left text
@@ -936,7 +936,7 @@

pango_ot_buffer_set_zero_width_marks ()

void                pango_ot_buffer_set_zero_width_marks
                                                         (PangoOTBuffer *buffer,
-                                                         gboolean zero_width_marks);
+ gboolean zero_width_marks);

Sets whether characters with a mark class should be forced to zero width. This setting is needed for proper positioning of Arabic accents, @@ -954,7 +954,7 @@

zero_width_marks :

-TRUE if characters with a mark class should +TRUE if characters with a mark class should be forced to zero width. @@ -982,12 +982,12 @@

glyphs :

-location to store the array of glyphs, or NULL +location to store the array of glyphs, or NULL

n_glyphs :

-location to store the number of glyphs, or NULL +location to store the number of glyphs, or NULL @@ -1074,7 +1074,7 @@

Returns :

the newly allocated PangoOTRuleset, which -should be freed with g_object_unref(). +should be freed with g_object_unref().
@@ -1148,7 +1148,7 @@

Returns :

the newly allocated PangoOTRuleset, which -should be freed with g_object_unref(). +should be freed with g_object_unref().
@@ -1187,7 +1187,7 @@

Returns :

the newly allocated PangoOTRuleset, which -should be freed with g_object_unref(). +should be freed with g_object_unref().
@@ -1198,8 +1198,8 @@

pango_ot_ruleset_add_feature ()

void                pango_ot_ruleset_add_feature        (PangoOTRuleset *ruleset,
                                                          PangoOTTableType table_type,
-                                                         guint feature_index,
-                                                         gulong property_bit);
+ guint feature_index, + gulong property_bit);

Adds a feature to the ruleset.

@@ -1230,10 +1230,10 @@

pango_ot_ruleset_maybe_add_feature ()

-
gboolean            pango_ot_ruleset_maybe_add_feature  (PangoOTRuleset *ruleset,
+
gboolean            pango_ot_ruleset_maybe_add_feature  (PangoOTRuleset *ruleset,
                                                          PangoOTTableType table_type,
                                                          PangoOTTag feature_tag,
-                                                         gulong property_bit);
+ gulong property_bit);

This is a convenience function that first tries to find the feature using pango_ot_info_find_feature() and the ruleset script and language @@ -1268,8 +1268,8 @@

Returns :

-TRUE if the feature was found and added to ruleset, -FALSE otherwise. +TRUE if the feature was found and added to ruleset, +FALSE otherwise.
@@ -1278,10 +1278,10 @@

pango_ot_ruleset_maybe_add_features ()

-
guint               pango_ot_ruleset_maybe_add_features (PangoOTRuleset *ruleset,
+
guint               pango_ot_ruleset_maybe_add_features (PangoOTRuleset *ruleset,
                                                          PangoOTTableType table_type,
                                                          const PangoOTFeatureMap *features,
-                                                         guint n_features);
+ guint n_features);

This is a convenience function that for each feature in the feature map array features @@ -1319,9 +1319,9 @@


pango_ot_ruleset_get_feature_count ()

-
guint               pango_ot_ruleset_get_feature_count  (const PangoOTRuleset *ruleset,
-                                                         guint *n_gsub_features,
-                                                         guint *n_gpos_features);
+
guint               pango_ot_ruleset_get_feature_count  (const PangoOTRuleset *ruleset,
+                                                         guint *n_gsub_features,
+                                                         guint *n_gpos_features);

Gets the number of GSUB and GPOS features in the ruleset.

@@ -1334,11 +1334,11 @@

n_gsub_features :

-location to store number of GSUB features, or NULL. +location to store number of GSUB features, or NULL.

n_gpos_features :

-location to store number of GPOS features, or NULL. +location to store number of GPOS features, or NULL.

Returns :

@@ -1426,7 +1426,7 @@

pango_ot_ruleset_description_equal ()

-
gboolean            pango_ot_ruleset_description_equal  (const PangoOTRulesetDescription *desc1,
+
gboolean            pango_ot_ruleset_description_equal  (const PangoOTRulesetDescription *desc1,
                                                          const PangoOTRulesetDescription *desc2);

Compares two ruleset descriptions for equality. @@ -1436,7 +1436,7 @@ sets, the array addresses are compared directly, while for other features, the list of features is compared one by one. (Two ruleset descriptions may result in identical rulesets -being created, but still compare FALSE.) +being created, but still compare FALSE.)

@@ -1452,8 +1452,8 @@ +TRUE if two ruleset descriptions are identical, +FALSE otherwise.

Returns :

-TRUE if two ruleset descriptions are identical, -FALSE otherwise.
@@ -1480,10 +1480,10 @@

pango_ot_ruleset_description_hash ()

-
guint               pango_ot_ruleset_description_hash   (const PangoOTRulesetDescription *desc);
+
guint               pango_ot_ruleset_description_hash   (const PangoOTRulesetDescription *desc);

Computes a hash of a PangoOTRulesetDescription structure suitable -to be used, for example, as an argument to g_hash_table_new(). +to be used, for example, as an argument to g_hash_table_new().

@@ -1512,7 +1512,7 @@ - @@ -1520,7 +1520,7 @@ +is NULL.

language :

A PangoLanguage, or NULL +A PangoLanguage, or NULL
PangoOTTag best matching language or PANGO_OT_TAG_DEFAULT_LANGUAGE if none found or if language -is NULL.
diff -Nru pango1.0-1.29.5/docs/html/pango-pango-renderer.html pango1.0-1.30.0/docs/html/pango-pango-renderer.html --- pango1.0-1.29.5/docs/html/pango-pango-renderer.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-pango-renderer.html 2012-03-27 01:41:19.000000000 +0000 @@ -104,7 +104,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoRenderer
          +----PangoXftRenderer
 
@@ -141,7 +141,7 @@

PangoMatrix *matrix;

the current transformation matrix for the Renderer; may -be NULL, which should be treated the same as the identity matrix. +be NULL, which should be treated the same as the identity matrix.

Since 1.8

@@ -193,7 +193,7 @@
#define PANGO_TYPE_RENDER_PART (pango_render_part_get_type())
 

-The GObject type for PangoRenderPart. +The GObject type for PangoRenderPart.


@@ -464,7 +464,7 @@ indexed by glyph_item->item->offset.

-If text is NULL, this simply calls pango_renderer_draw_glyphs(). +If text is NULL, this simply calls pango_renderer_draw_glyphs().

The default implementation of this method simply falls back to @@ -480,7 +480,7 @@

text :

-the UTF-8 text that glyph_item refers to, or NULL. [allow-none] +the UTF-8 text that glyph_item refers to, or NULL. [allow-none] @@ -805,7 +805,7 @@

color :

-the new color or NULL to unset the current color. [allow-none] +the new color or NULL to unset the current color. [allow-none] @@ -834,7 +834,7 @@

Returns :

-the color for the specified part, or NULL +the color for the specified part, or NULL if it hasn't been set and should be inherited from the environment. @@ -860,7 +860,7 @@

matrix :

-a PangoMatrix, or NULL to unset any existing matrix. +a PangoMatrix, or NULL to unset any existing matrix. (No matrix set is the same as setting the identity matrix.). [allow-none] @@ -886,7 +886,7 @@

Returns :

-the matrix, or NULL if no matrix has been set +the matrix, or NULL if no matrix has been set (which is the same as the identity matrix). The returned matrix is owned by Pango and must not be modified or freed. @@ -918,7 +918,7 @@

Returns :

-the layout, or NULL if no layout is being +the layout, or NULL if no layout is being rendered using renderer at this time. [transfer none] @@ -949,7 +949,7 @@

Returns :

-the layout line, or NULL if no layout line is being +the layout line, or NULL if no layout line is being rendered using renderer at this time. diff -Nru pango1.0-1.29.5/docs/html/pango-Scripts-and-Languages.html pango1.0-1.30.0/docs/html/pango-Scripts-and-Languages.html --- pango1.0-1.29.5/docs/html/pango-Scripts-and-Languages.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Scripts-and-Languages.html 2012-03-27 01:41:19.000000000 +0000 @@ -42,7 +42,7 @@
enum                PangoScript;
 #define             PANGO_TYPE_SCRIPT
                     PangoScriptIter;
-PangoScript         pango_script_for_unichar            (gunichar ch);
+PangoScript         pango_script_for_unichar            (gunichar ch);
 PangoLanguage *     pango_script_get_sample_language    (PangoScript script);
 PangoScriptIter *   pango_script_iter_new               (const char *text,
                                                          int length);
@@ -50,15 +50,15 @@
                                                          const char **start,
                                                          const char **end,
                                                          PangoScript *script);
-gboolean            pango_script_iter_next              (PangoScriptIter *iter);
+gboolean            pango_script_iter_next              (PangoScriptIter *iter);
 void                pango_script_iter_free              (PangoScriptIter *iter);
                     PangoLanguage;
 #define             PANGO_TYPE_LANGUAGE
 PangoLanguage *     pango_language_from_string          (const char *language);
 const char *        pango_language_to_string            (PangoLanguage *language);
-gboolean            pango_language_matches              (PangoLanguage *language,
+gboolean            pango_language_matches              (PangoLanguage *language,
                                                          const char *range_list);
-gboolean            pango_language_includes_script      (PangoLanguage *language,
+gboolean            pango_language_includes_script      (PangoLanguage *language,
                                                          PangoScript script);
 const PangoScript * pango_language_get_scripts          (PangoLanguage *language,
                                                          int *num_scripts);
@@ -186,7 +186,7 @@
 Unicode standard.
 Note that new types may be added in the future. Applications should be ready
 to handle unknown values.  This enumeration is interchangeable with
-GUnicodeScript.  See Unicode Standard Annex
+GUnicodeScript.  See Unicode Standard Annex
 #24: Script names.
 

@@ -597,7 +597,7 @@
#define PANGO_TYPE_SCRIPT (pango_script_get_type())
 

-The GObject type for PangoScript +The GObject type for PangoScript


@@ -612,7 +612,7 @@

pango_script_for_unichar ()

-
PangoScript         pango_script_for_unichar            (gunichar ch);
+
PangoScript         pango_script_for_unichar            (gunichar ch);

Looks up the PangoScript for a particular character (as defined by Unicode Standard Annex 24). No check is made for ch being a @@ -621,7 +621,7 @@

As of Pango 1.18, this function simply returns the return value of -g_unichar_get_script(). +g_unichar_get_script().

@@ -687,7 +687,7 @@ +of the script, or NULL if no such language exists.

Returns :

a PangoLanguage that is representative -of the script, or NULL if no such language exists.
@@ -748,17 +748,17 @@

start :

-location to store start position of the range, or NULL. [out][allow-none] +location to store start position of the range, or NULL. [out][allow-none]

end :

-location to store end position of the range, or NULL. [out][allow-none] +location to store end position of the range, or NULL. [out][allow-none]

script :

-location to store script for range, or NULL. [out][allow-none] +location to store script for range, or NULL. [out][allow-none] @@ -768,10 +768,10 @@

pango_script_iter_next ()

-
gboolean            pango_script_iter_next              (PangoScriptIter *iter);
+
gboolean            pango_script_iter_next              (PangoScriptIter *iter);

Advances a PangoScriptIter to the next range. If iter -is already at the end, it is left unchanged and FALSE +is already at the end, it is left unchanged and FALSE is returned.

@@ -785,7 +785,7 @@ +TRUE if iter was successfully advanced.

Returns :

-TRUE if iter was successfully advanced.
@@ -827,7 +827,7 @@
#define PANGO_TYPE_LANGUAGE (pango_language_get_type ())
 

-The GObject type for PangoLanguage. +The GObject type for PangoLanguage.


@@ -854,13 +854,13 @@

language :

-a string representing a language tag, or NULL. [allow-none] +a string representing a language tag, or NULL. [allow-none]

Returns :

-an opaque pointer to a PangoLanguage structure, or NULL -if language was NULL. The returned pointer will be valid +an opaque pointer to a PangoLanguage structure, or NULL +if language was NULL. The returned pointer will be valid forever after, and should not be freed. @@ -891,7 +891,7 @@

pango_language_matches ()

-
gboolean            pango_language_matches              (PangoLanguage *language,
+
gboolean            pango_language_matches              (PangoLanguage *language,
                                                          const char *range_list);

Checks if a language tag matches one of the elements in a list of @@ -906,7 +906,7 @@

language :

a language tag (see pango_language_from_string()), -NULL is allowed and matches nothing but '*' +NULL is allowed and matches nothing but '*'

range_list :

@@ -919,7 +919,7 @@

Returns :

-TRUE if a match was found. +TRUE if a match was found.
@@ -927,13 +927,13 @@

pango_language_includes_script ()

-
gboolean            pango_language_includes_script      (PangoLanguage *language,
+
gboolean            pango_language_includes_script      (PangoLanguage *language,
                                                          PangoScript script);

Determines if script is one of the scripts used to write language. The returned value is conservative; if nothing is known about the language tag language, -TRUE will be returned, since, as far as Pango knows, +TRUE will be returned, since, as far as Pango knows, script might be used to write language.

@@ -950,7 +950,7 @@

language :

-a PangoLanguage, or NULL +a PangoLanguage, or NULL @@ -961,10 +961,10 @@

Returns :

-TRUE if script is one of the scripts used +TRUE if script is one of the scripts used to write language or if nothing is known about language -(including the case that language is NULL), -FALSE otherwise. +(including the case that language is NULL), +FALSE otherwise.
@@ -978,13 +978,13 @@

Determines the scripts used to to write language. If nothing is known about the language tag language, -or if language is NULL, then NULL is returned. +or if language is NULL, then NULL is returned. The list of scripts returned starts with the script that the language uses most and continues to the one it uses least.

The value num_script points at will be set to the number -of scripts in the returned array (or zero if NULL is returned). +of scripts in the returned array (or zero if NULL is returned).

Most languages use only one script for writing, but there are @@ -992,7 +992,7 @@ use three (Japanese for example). Applications should not make any assumptions on the maximum number of scripts returned though, except that it is positive if the return value is not -NULL, and it is a small number. +NULL, and it is a small number.

The pango_language_includes_script() function uses this function @@ -1003,21 +1003,21 @@

language :

-a PangoLanguage, or NULL. [allow-none] +a PangoLanguage, or NULL. [allow-none]

num_scripts :

location to return number of scripts, -or NULL. [out caller-allocates][allow-none] +or NULL. [out caller-allocates][allow-none]

Returns :

An array of PangoScript values, with the number of entries in the array stored in num_scripts, or -NULL if Pango does not have any information about this -particular language tag (also the case if language is NULL). +NULL if Pango does not have any information about this +particular language tag (also the case if language is NULL). The returned array is owned by Pango and should not be modified or freed. @@ -1047,7 +1047,7 @@ On Windows, the C library does not use any such environment variables, and setting them won't affect the behavior of functions like ctime(). The user sets the locale through the Regional Options -in the Control Panel. The C library (in the setlocale() function) +in the Control Panel. The C library (in the setlocale() function) does not use country and language codes, but country and language names spelled out in English. However, this function does check the above environment @@ -1085,7 +1085,7 @@ as sample text in a font selection dialog.

-If language is NULL, the default language as found by +If language is NULL, the default language as found by pango_language_get_default() is used.

@@ -1112,7 +1112,7 @@

language :

-a PangoLanguage, or NULL +a PangoLanguage, or NULL diff -Nru pango1.0-1.29.5/docs/html/pango-Tab-Stops.html pango1.0-1.30.0/docs/html/pango-Tab-Stops.html --- pango1.0-1.29.5/docs/html/pango-Tab-Stops.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Tab-Stops.html 2012-03-27 01:41:19.000000000 +0000 @@ -43,30 +43,30 @@ #define PANGO_TYPE_TAB_ARRAY enum PangoTabAlign; #define PANGO_TYPE_TAB_ALIGN -PangoTabArray * pango_tab_array_new (gint initial_size, - gboolean positions_in_pixels); -PangoTabArray * pango_tab_array_new_with_positions (gint size, - gboolean positions_in_pixels, +PangoTabArray * pango_tab_array_new (gint initial_size, + gboolean positions_in_pixels); +PangoTabArray * pango_tab_array_new_with_positions (gint size, + gboolean positions_in_pixels, PangoTabAlign first_alignment, - gint first_position, + gint first_position, ...); PangoTabArray * pango_tab_array_copy (PangoTabArray *src); void pango_tab_array_free (PangoTabArray *tab_array); -gint pango_tab_array_get_size (PangoTabArray *tab_array); +gint pango_tab_array_get_size (PangoTabArray *tab_array); void pango_tab_array_resize (PangoTabArray *tab_array, - gint new_size); + gint new_size); void pango_tab_array_set_tab (PangoTabArray *tab_array, - gint tab_index, + gint tab_index, PangoTabAlign alignment, - gint location); + gint location); void pango_tab_array_get_tab (PangoTabArray *tab_array, - gint tab_index, + gint tab_index, PangoTabAlign *alignment, - gint *location); + gint *location); void pango_tab_array_get_tabs (PangoTabArray *tab_array, PangoTabAlign **alignments, - gint **locations); -gboolean pango_tab_array_get_positions_in_pixels + gint **locations); +gboolean pango_tab_array_get_positions_in_pixels (PangoTabArray *tab_array);
@@ -104,7 +104,7 @@
#define PANGO_TYPE_TAB_ARRAY (pango_tab_array_get_type ())
 

-The GObject type for PangoTabArray. +The GObject type for PangoTabArray.


@@ -140,17 +140,17 @@
#define PANGO_TYPE_TAB_ALIGN (pango_tab_align_get_type())
 

-The GObject type for PangoTabAlign. +The GObject type for PangoTabAlign.


pango_tab_array_new ()

-
PangoTabArray *     pango_tab_array_new                 (gint initial_size,
-                                                         gboolean positions_in_pixels);
+
PangoTabArray *     pango_tab_array_new                 (gint initial_size,
+                                                         gboolean positions_in_pixels);

Creates an array of initial_size tab stops. Tab stops are specified in -pixel units if positions_in_pixels is TRUE, otherwise in Pango +pixel units if positions_in_pixels is TRUE, otherwise in Pango units. All stops are initially at position 0.

@@ -175,10 +175,10 @@

pango_tab_array_new_with_positions ()

-
PangoTabArray *     pango_tab_array_new_with_positions  (gint size,
-                                                         gboolean positions_in_pixels,
+
PangoTabArray *     pango_tab_array_new_with_positions  (gint size,
+                                                         gboolean positions_in_pixels,
                                                          PangoTabAlign first_alignment,
-                                                         gint first_position,
+                                                         gint first_position,
                                                          ...);

This is a convenience function that creates a PangoTabArray @@ -259,7 +259,7 @@


pango_tab_array_get_size ()

-
gint                pango_tab_array_get_size            (PangoTabArray *tab_array);
+
gint                pango_tab_array_get_size            (PangoTabArray *tab_array);

Gets the number of tab stops in tab_array.

@@ -282,7 +282,7 @@

pango_tab_array_resize ()

void                pango_tab_array_resize              (PangoTabArray *tab_array,
-                                                         gint new_size);
+ gint new_size);

Resizes a tab array. You must subsequently initialize any tabs that were added as a result of growing the array. @@ -306,9 +306,9 @@

pango_tab_array_set_tab ()

void                pango_tab_array_set_tab             (PangoTabArray *tab_array,
-                                                         gint tab_index,
+                                                         gint tab_index,
                                                          PangoTabAlign alignment,
-                                                         gint location);
+ gint location);

Sets the alignment and location of a tab stop. alignment must always be PANGO_TAB_LEFT in the current @@ -341,9 +341,9 @@

pango_tab_array_get_tab ()

void                pango_tab_array_get_tab             (PangoTabArray *tab_array,
-                                                         gint tab_index,
+                                                         gint tab_index,
                                                          PangoTabAlign *alignment,
-                                                         gint *location);
+ gint *location);

Gets the alignment and position of a tab stop.

@@ -361,12 +361,12 @@
- - @@ -377,9 +377,9 @@

pango_tab_array_get_tabs ()

void                pango_tab_array_get_tabs            (PangoTabArray *tab_array,
                                                          PangoTabAlign **alignments,
-                                                         gint **locations);
+ gint **locations);

-If non-NULL, alignments and locations are filled with allocated +If non-NULL, alignments and locations are filled with allocated arrays of length pango_tab_array_get_size(). You must free the returned array.

@@ -394,13 +394,13 @@ @@ -409,10 +409,10 @@

pango_tab_array_get_positions_in_pixels ()

-
gboolean            pango_tab_array_get_positions_in_pixels
+
gboolean            pango_tab_array_get_positions_in_pixels
                                                         (PangoTabArray *tab_array);

-Returns TRUE if the tab positions are in pixels, FALSE if they are +Returns TRUE if the tab positions are in pixels, FALSE if they are in Pango units.

alignment :

location to store alignment, or NULL. [out][allow-none] +location to store alignment, or NULL. [out][allow-none]

location :

location to store tab position, or NULL. [out][allow-none] +location to store tab position, or NULL. [out][allow-none]

alignments :

location to store an array of tab stop -alignments, or NULL. [out][allow-none] +alignments, or NULL. [out][allow-none]

locations :

location to store an array of tab positions, -or NULL. [out][allow-none] +or NULL. [out][allow-none]
diff -Nru pango1.0-1.29.5/docs/html/pango-Text-Attributes.html pango1.0-1.30.0/docs/html/pango-Text-Attributes.html --- pango1.0-1.29.5/docs/html/pango-Text-Attributes.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Text-Attributes.html 2012-03-27 01:41:19.000000000 +0000 @@ -53,19 +53,19 @@ struct PangoAttrFontDesc; struct PangoAttrShape; struct PangoAttrSize; -gbooleanpango_parse_markup (const char *markup_text, +gbooleanpango_parse_markup (const char *markup_text, int length, - gunichar accel_marker, + gunichar accel_marker, PangoAttrList **attr_list, char **text, - gunichar *accel_char, - GError **error); -PangoAttrTypepango_attr_type_register (const gchar *name); + gunichar *accel_char, + GError **error); +PangoAttrTypepango_attr_type_register (const gchar *name); const char * pango_attr_type_get_name (PangoAttrType type); voidpango_attribute_init (PangoAttribute *attr, const PangoAttrClass *klass); PangoAttribute * pango_attribute_copy (const PangoAttribute *attr); -gbooleanpango_attribute_equal (const PangoAttribute *attr1, +gbooleanpango_attribute_equal (const PangoAttribute *attr1, const PangoAttribute *attr2); voidpango_attribute_destroy (PangoAttribute *attr); @@ -78,30 +78,30 @@ PangoAttribute * pango_attr_size_new (int size); PangoAttribute * pango_attr_size_new_absolute (int size); PangoAttribute * pango_attr_font_desc_new (const PangoFontDescription *desc); -PangoAttribute * pango_attr_foreground_new (guint16 red, - guint16 green, - guint16 blue); -PangoAttribute * pango_attr_background_new (guint16 red, - guint16 green, - guint16 blue); -PangoAttribute * pango_attr_strikethrough_new (gboolean strikethrough); -PangoAttribute * pango_attr_strikethrough_color_new (guint16 red, - guint16 green, - guint16 blue); +PangoAttribute * pango_attr_foreground_new (guint16 red, + guint16 green, + guint16 blue); +PangoAttribute * pango_attr_background_new (guint16 red, + guint16 green, + guint16 blue); +PangoAttribute * pango_attr_strikethrough_new (gboolean strikethrough); +PangoAttribute * pango_attr_strikethrough_color_new (guint16 red, + guint16 green, + guint16 blue); PangoAttribute * pango_attr_underline_new (PangoUnderline underline); -PangoAttribute * pango_attr_underline_color_new (guint16 red, - guint16 green, - guint16 blue); +PangoAttribute * pango_attr_underline_color_new (guint16 red, + guint16 green, + guint16 blue); enum PangoUnderline; #define PANGO_TYPE_UNDERLINEPangoAttribute * pango_attr_shape_new (const PangoRectangle *ink_rect, const PangoRectangle *logical_rect); PangoAttribute * pango_attr_shape_new_with_data (const PangoRectangle *ink_rect, const PangoRectangle *logical_rect, - gpointer data, + gpointer data, PangoAttrDataCopyFunc copy_func, - GDestroyNotify destroy_func); -gpointer (*PangoAttrDataCopyFunc) (gconstpointer data); + GDestroyNotify destroy_func); +gpointer (*PangoAttrDataCopyFunc) (gconstpointer data); PangoAttribute * pango_attr_scale_new (double scale_factor); #define PANGO_SCALE_XX_SMALL #define PANGO_SCALE_X_SMALL @@ -112,16 +112,16 @@ #define PANGO_SCALE_XX_LARGEPangoAttribute * pango_attr_rise_new (int rise); PangoAttribute * pango_attr_letter_spacing_new (int letter_spacing); -PangoAttribute * pango_attr_fallback_new (gboolean enable_fallback); +PangoAttribute * pango_attr_fallback_new (gboolean enable_fallback); PangoAttribute * pango_attr_gravity_new (PangoGravity gravity); PangoAttribute * pango_attr_gravity_hint_new (PangoGravityHint hint); struct PangoColor; #define PANGO_TYPE_COLOR -gbooleanpango_color_parse (PangoColor *color, +gbooleanpango_color_parse (PangoColor *color, const char *spec); PangoColor * pango_color_copy (const PangoColor *src); voidpango_color_free (PangoColor *color); -gchar * pango_color_to_string (const PangoColor *color); +gchar * pango_color_to_string (const PangoColor *color); PangoAttrList; #define PANGO_TYPE_ATTR_LIST @@ -137,27 +137,27 @@ PangoAttribute *attr); voidpango_attr_list_splice (PangoAttrList *list, PangoAttrList *other, - gint pos, - gint len); + gint pos, + gint len); PangoAttrList * pango_attr_list_filter (PangoAttrList *list, PangoAttrFilterFunc func, - gpointer data); -gboolean (*PangoAttrFilterFunc) (PangoAttribute *attribute, - gpointer data); + gpointer data); +gboolean (*PangoAttrFilterFunc) (PangoAttribute *attribute, + gpointer data); PangoAttrIterator * pango_attr_list_get_iterator (PangoAttrList *list); PangoAttrIterator; PangoAttrIterator * pango_attr_iterator_copy (PangoAttrIterator *iterator); -gbooleanpango_attr_iterator_next (PangoAttrIterator *iterator); +gbooleanpango_attr_iterator_next (PangoAttrIterator *iterator); voidpango_attr_iterator_range (PangoAttrIterator *iterator, - gint *start, - gint *end); + gint *start, + gint *end); PangoAttribute * pango_attr_iterator_get (PangoAttrIterator *iterator, PangoAttrType type); voidpango_attr_iterator_get_font (PangoAttrIterator *iterator, PangoFontDescription *desc, PangoLanguage **language, - GSList **extra_attrs); -GSList * pango_attr_iterator_get_attrs (PangoAttrIterator *iterator); + GSList **extra_attrs); +GSList * pango_attr_iterator_get_attrs (PangoAttrIterator *iterator); voidpango_attr_iterator_destroy (PangoAttrIterator *iterator); @@ -355,7 +355,7 @@
#define PANGO_TYPE_ATTR_TYPE (pango_attr_type_get_type())
 

-The GObject type for PangoAttrType. +The GObject type for PangoAttrType.


@@ -411,7 +411,7 @@ as their initial portion. The common portion of the attribute holds the range to which the value in the type-specific part of the attribute applies and should be initialized using pango_attribute_init(). -By default an attribute will have an all-inclusive range of [0,G_MAXUINT]. +By default an attribute will have an all-inclusive range of [0,G_MAXUINT].

@@ -421,11 +421,11 @@ - + - + @@ -641,7 +641,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -681,11 +681,11 @@ PANGO_ATTR_SIZE) or of a device uni (for PANGO_ATTR_ABSOLUTE_SIZE) - + +be FALSE for PANGO_ATTR_SIZE and TRUE for PANGO_ATTR_ABSOLUTE_SIZE.
the class structure holding information about the type of the attribute

guint start_index;

guint start_index;

the start index of the range (in bytes).

guint end_index;

guint end_index;

end index of the range (in bytes). The character at this index is not included in the range.
the logical rectangle to restrict to

gpointer data;

gpointer data;

user data set (see pango_attr_shape_new_with_data())
copy function for the user data

GDestroyNotify destroy_func;

GDestroyNotify destroy_func;

destroy function for the user data

guint absolute : 1;

guint absolute : 1;

whether the font size is in device units or points. This field is only present for compatibility with Pango-1.8.0 (PANGO_ATTR_ABSOLUTE_SIZE was added in 1.8.1); and always will -be FALSE for PANGO_ATTR_SIZE and TRUE for PANGO_ATTR_ABSOLUTE_SIZE.
@@ -693,13 +693,13 @@

pango_parse_markup ()

-
gboolean            pango_parse_markup                  (const char *markup_text,
+
gboolean            pango_parse_markup                  (const char *markup_text,
                                                          int length,
-                                                         gunichar accel_marker,
+                                                         gunichar accel_marker,
                                                          PangoAttrList **attr_list,
                                                          char **text,
-                                                         gunichar *accel_char,
-                                                         GError **error);
+ gunichar *accel_char, + GError **error);

Parses marked-up text (see markup format) to create @@ -735,28 +735,28 @@

attr_list :

-address of return location for a PangoAttrList, or NULL. [out][allow-none] +address of return location for a PangoAttrList, or NULL. [out][allow-none]

text :

-address of return location for text with tags stripped, or NULL. [out][allow-none] +address of return location for text with tags stripped, or NULL. [out][allow-none]

accel_char :

-address of return location for accelerator char, or NULL. [out][allow-none] +address of return location for accelerator char, or NULL. [out][allow-none]

error :

-address of return location for errors, or NULL +address of return location for errors, or NULL

Returns :

-FALSE if error is set, otherwise TRUE +FALSE if error is set, otherwise TRUE @@ -765,7 +765,7 @@

pango_attr_type_register ()

-
PangoAttrType       pango_attr_type_register            (const gchar *name);
+
PangoAttrType       pango_attr_type_register            (const gchar *name);

Allocate a new attribute type ID. The attribute type name can be accessed later by using pango_attr_type_get_name(). @@ -793,7 +793,7 @@ pango_attr_type_register().

-The returned value is an interned string (see g_intern_string() for what +The returned value is an interned string (see g_intern_string() for what that means) that should not be modified or freed.

@@ -805,7 +805,7 @@ - @@ -867,7 +867,7 @@

pango_attribute_equal ()

-
gboolean            pango_attribute_equal               (const PangoAttribute *attr1,
+
gboolean            pango_attribute_equal               (const PangoAttribute *attr1,
                                                          const PangoAttribute *attr2);

Compare two attributes for equality. This compares only the @@ -890,7 +890,7 @@

+TRUE if the two attributes have the same value.

Returns :

the type ID name (which may be NULL), or NULL if type is +the type ID name (which may be NULL), or NULL if type is a built-in Pango attribute type or invalid.

Returns :

-TRUE if the two attributes have the same value.
@@ -1114,9 +1114,9 @@

pango_attr_foreground_new ()

-
PangoAttribute *    pango_attr_foreground_new           (guint16 red,
-                                                         guint16 green,
-                                                         guint16 blue);
+
PangoAttribute *    pango_attr_foreground_new           (guint16 red,
+                                                         guint16 green,
+                                                         guint16 blue);

Create a new foreground color attribute.

@@ -1146,9 +1146,9 @@

pango_attr_background_new ()

-
PangoAttribute *    pango_attr_background_new           (guint16 red,
-                                                         guint16 green,
-                                                         guint16 blue);
+
PangoAttribute *    pango_attr_background_new           (guint16 red,
+                                                         guint16 green,
+                                                         guint16 blue);

Create a new background color attribute.

@@ -1178,7 +1178,7 @@

pango_attr_strikethrough_new ()

-
PangoAttribute *    pango_attr_strikethrough_new        (gboolean strikethrough);
+
PangoAttribute *    pango_attr_strikethrough_new        (gboolean strikethrough);

Create a new strike-through attribute.

@@ -1188,7 +1188,7 @@

strikethrough :

-TRUE if the text should be struck-through. +TRUE if the text should be struck-through.

Returns :

@@ -1201,9 +1201,9 @@

pango_attr_strikethrough_color_new ()

-
PangoAttribute *    pango_attr_strikethrough_color_new  (guint16 red,
-                                                         guint16 green,
-                                                         guint16 blue);
+
PangoAttribute *    pango_attr_strikethrough_color_new  (guint16 red,
+                                                         guint16 green,
+                                                         guint16 blue);

Create a new strikethrough color attribute. This attribute modifies the color of strikethrough lines. If not set, strikethrough @@ -1258,9 +1258,9 @@


pango_attr_underline_color_new ()

-
PangoAttribute *    pango_attr_underline_color_new      (guint16 red,
-                                                         guint16 green,
-                                                         guint16 blue);
+
PangoAttribute *    pango_attr_underline_color_new      (guint16 red,
+                                                         guint16 green,
+                                                         guint16 blue);

Create a new underline color attribute. This attribute modifies the color of underlines. If not set, underlines @@ -1353,7 +1353,7 @@

#define PANGO_TYPE_UNDERLINE (pango_underline_get_type())
 

-The GObject type for PangoUnderline. +The GObject type for PangoUnderline.


@@ -1391,9 +1391,9 @@

pango_attr_shape_new_with_data ()

PangoAttribute *    pango_attr_shape_new_with_data      (const PangoRectangle *ink_rect,
                                                          const PangoRectangle *logical_rect,
-                                                         gpointer data,
+                                                         gpointer data,
                                                          PangoAttrDataCopyFunc copy_func,
-                                                         GDestroyNotify destroy_func);
+ GDestroyNotify destroy_func);

Like pango_attr_shape_new(), but a user data pointer is also provided; this pointer can be accessed when later @@ -1417,14 +1417,14 @@

copy_func :

function to copy data when the -attribute is copied. If NULL, data is simply +attribute is copied. If NULL, data is simply copied as a pointer. [allow-none]

destroy_func :

function to free data when the -attribute is freed, or NULL. [allow-none] +attribute is freed, or NULL. [allow-none] @@ -1439,7 +1439,7 @@

PangoAttrDataCopyFunc ()

-
gpointer            (*PangoAttrDataCopyFunc)            (gconstpointer data);
+
gpointer            (*PangoAttrDataCopyFunc)            (gconstpointer data);

A copy function passed to attribute new functions that take user data. @@ -1594,7 +1594,7 @@


pango_attr_fallback_new ()

-
PangoAttribute *    pango_attr_fallback_new             (gboolean enable_fallback);
+
PangoAttribute *    pango_attr_fallback_new             (gboolean enable_fallback);

Create a new font fallback attribute.

@@ -1610,7 +1610,7 @@

enable_fallback :

-TRUE if we should fall back on other fonts +TRUE if we should fall back on other fonts for characters the active font is missing. @@ -1688,13 +1688,13 @@
#define PANGO_TYPE_COLOR pango_color_get_type ()
 

-The GObject type for PangoColor. +The GObject type for PangoColor.


pango_color_parse ()

-
gboolean            pango_color_parse                   (PangoColor *color,
+
gboolean            pango_color_parse                   (PangoColor *color,
                                                          const char *spec);

Fill in the fields of a color from a string specification. The @@ -1710,7 +1710,7 @@

color :

-a PangoColor structure in which to store the result, or NULL +a PangoColor structure in which to store the result, or NULL @@ -1720,7 +1720,7 @@

Returns :

-TRUE if parsing of the specifier succeeded, +TRUE if parsing of the specifier succeeded, otherwise false. @@ -1741,14 +1741,14 @@

src :

-color to copy, may be NULL +color to copy, may be NULL

Returns :

the newly allocated PangoColor, which should -be freed with pango_color_free(), or NULL -if src was NULL. +be freed with pango_color_free(), or NULL +if src was NULL.
@@ -1764,7 +1764,7 @@

color :

-an allocated PangoColor, may be NULL +an allocated PangoColor, may be NULL
@@ -1772,7 +1772,7 @@

pango_color_to_string ()

-
gchar *             pango_color_to_string               (const PangoColor *color);
+
gchar *             pango_color_to_string               (const PangoColor *color);

Returns a textual specification of color in the hexadecimal form #rrrrggggbbbb, where r, @@ -1789,7 +1789,7 @@

Returns :

-a newly-allocated text string that must be freed with g_free(). +a newly-allocated text string that must be freed with g_free().
@@ -1819,7 +1819,7 @@
#define PANGO_TYPE_ATTR_LIST pango_attr_list_get_type ()
 

-The GObject type for PangoAttrList. +The GObject type for PangoAttrList.


@@ -1850,7 +1850,7 @@

list :

-a PangoAttrList, may be NULL +a PangoAttrList, may be NULL @@ -1874,7 +1874,7 @@

list :

-a PangoAttrList, may be NULL +a PangoAttrList, may be NULL
@@ -1891,7 +1891,7 @@

list :

-a PangoAttrList, may be NULL +a PangoAttrList, may be NULL @@ -1899,7 +1899,7 @@ the newly allocated PangoAttrList, with a reference count of one, which should be freed with pango_attr_list_unref(). -Returns NULL if list was NULL. +Returns NULL if list was NULL.
@@ -1994,8 +1994,8 @@

pango_attr_list_splice ()

void                pango_attr_list_splice              (PangoAttrList *list,
                                                          PangoAttrList *other,
-                                                         gint pos,
-                                                         gint len);
+ gint pos, + gint len);

This function opens up a hole in list, fills it in with attributes from the left, and then merges other on top of the hole. @@ -2042,10 +2042,10 @@

pango_attr_list_filter ()

PangoAttrList *     pango_attr_list_filter              (PangoAttrList *list,
                                                          PangoAttrFilterFunc func,
-                                                         gpointer data);
+ gpointer data);

Given a PangoAttrList and callback function, removes any elements -of list for which func returns TRUE and inserts them into +of list for which func returns TRUE and inserts them into a new list.

@@ -2058,7 +2058,7 @@ - @@ -2069,7 +2069,7 @@ - @@ -2080,8 +2080,8 @@

PangoAttrFilterFunc ()

-
gboolean            (*PangoAttrFilterFunc)              (PangoAttribute *attribute,
-                                                         gpointer data);
+
gboolean            (*PangoAttrFilterFunc)              (PangoAttribute *attribute,
+                                                         gpointer data);

A predicate function used by pango_attr_list_filter() to filter out a subset of attributes for a list. @@ -2102,7 +2102,7 @@

+TRUE if the attribute should be filtered out

func :

callback function; returns TRUE +callback function; returns TRUE if an attribute should be filtered out. [scope call][closure data]

Returns :

the new PangoAttrList or NULL if +the new PangoAttrList or NULL if no attributes of the given types were found. [transfer full]

Returns :

-TRUE if the attribute should be filtered out
@@ -2170,7 +2170,7 @@

pango_attr_iterator_next ()

-
gboolean            pango_attr_iterator_next            (PangoAttrIterator *iterator);
+
gboolean            pango_attr_iterator_next            (PangoAttrIterator *iterator);

Advance the iterator until the next change of style.

@@ -2185,7 +2185,7 @@

Returns :

-FALSE if the iterator is at the end of the list, otherwise TRUE +FALSE if the iterator is at the end of the list, otherwise TRUE @@ -2195,14 +2195,14 @@

pango_attr_iterator_range ()

void                pango_attr_iterator_range           (PangoAttrIterator *iterator,
-                                                         gint *start,
-                                                         gint *end);
+ gint *start, + gint *end);

Get the range of the current segment. Note that the stored return values are signed, not unsigned like the values in PangoAttribute. To deal with this API oversight, stored return values that wouldn't fit into -a signed integer are clamped to G_MAXINT. +a signed integer are clamped to G_MAXINT.

@@ -2248,7 +2248,7 @@ - @@ -2261,7 +2261,7 @@
void                pango_attr_iterator_get_font        (PangoAttrIterator *iterator,
                                                          PangoFontDescription *desc,
                                                          PangoLanguage **language,
-                                                         GSList **extra_attrs);
+ GSList **extra_attrs);

Get the font and other attributes at the current iterator position.

@@ -2284,13 +2284,13 @@ - - diff -Nru pango1.0-1.29.5/docs/html/pango-Text-Processing.html pango1.0-1.30.0/docs/html/pango-Text-Processing.html --- pango1.0-1.29.5/docs/html/pango-Text-Processing.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Text-Processing.html 2012-03-27 01:41:19.000000000 +0000 @@ -45,13 +45,13 @@ #define PANGO_ANALYSIS_FLAG_CENTERED_BASELINE #define PANGO_TYPE_DIRECTION -GList * pango_itemize (PangoContext *context, +GList * pango_itemize (PangoContext *context, const char *text, int start_index, int length, PangoAttrList *attrs, PangoAttrIterator *cached_iter); -GList * pango_itemize_with_base_dir (PangoContext *context, +GList * pango_itemize_with_base_dir (PangoContext *context, PangoDirection base_dir, const char *text, int start_index, @@ -64,7 +64,7 @@ PangoItem * pango_item_split (PangoItem *orig, int split_index, int split_offset); -GList * pango_reorder_items (GList *logical_items); +GList * pango_reorder_items (GList *logical_items); PangoContext * pango_context_new (void); voidpango_context_set_font_map (PangoContext *context, @@ -103,7 +103,7 @@ int *n_families); -voidpango_break (const gchar *text, +voidpango_break (const gchar *text, int length, PangoAnalysis *analysis, PangoLogAttr *attrs, @@ -114,19 +114,19 @@ PangoLanguage *language, PangoLogAttr *log_attrs, int attrs_len); -voidpango_find_paragraph_boundary (const gchar *text, - gint length, - gint *paragraph_delimiter_index, - gint *next_paragraph_start); -voidpango_default_break (const gchar *text, +voidpango_find_paragraph_boundary (const gchar *text, + gint length, + gint *paragraph_delimiter_index, + gint *next_paragraph_start); +voidpango_default_break (const gchar *text, int length, PangoAnalysis *analysis, PangoLogAttr *attrs, int attrs_len); PangoLogAttr; -voidpango_shape (const gchar *text, - gint length, +voidpango_shape (const gchar *text, + gint length, const PangoAnalysis *analysis, PangoGlyphString *glyphs); @@ -134,7 +134,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoContext
 
@@ -215,19 +215,19 @@
 
- + - + - + - + @@ -235,7 +235,7 @@ - + @@ -258,13 +258,13 @@
#define PANGO_TYPE_DIRECTION (pango_direction_get_type())
 

-The GObject type for PangoDirection. +The GObject type for PangoDirection.


pango_itemize ()

-
GList *             pango_itemize                       (PangoContext *context,
+
GList *             pango_itemize                       (PangoContext *context,
                                                          const char *text,
                                                          int start_index,
                                                          int length,
@@ -311,15 +311,15 @@
 
 
- - @@ -328,7 +328,7 @@

pango_itemize_with_base_dir ()

-
GList *             pango_itemize_with_base_dir         (PangoContext *context,
+
GList *             pango_itemize_with_base_dir         (PangoContext *context,
                                                          PangoDirection base_dir,
                                                          const char *text,
                                                          int start_index,
@@ -371,15 +371,15 @@
 
 
- - @@ -397,7 +397,7 @@ -

Returns :

the current attribute of the given type, or NULL +the current attribute of the given type, or NULL if no attribute of that type applies to the current location.

language :

if non-NULL, location to store language tag for item, or NULL +if non-NULL, location to store language tag for item, or NULL if none is found. [allow-none]

extra_attrs :

if non-NULL, +if non-NULL, location in which to store a list of non-font attributes at the the current position; only the highest priority value of each attribute will be added to this list. In order @@ -2304,7 +2304,7 @@

pango_attr_iterator_get_attrs ()

-
GSList *            pango_attr_iterator_get_attrs       (PangoAttrIterator *iterator);
+
GSList *            pango_attr_iterator_get_attrs       (PangoAttrIterator *iterator);

Gets a list of all attributes at the current position of the iterator. @@ -2322,7 +2322,7 @@

a list of all attributes for the current range. To free this value, call pango_attribute_destroy() on -each value and g_slist_free() on the list. [element-type Pango.Attribute][transfer full] +each value and g_slist_free() on the list. [element-type Pango.Attribute][transfer full]
the font for this segment.

guint8 level;

guint8 level;

the bidirectional level for this segment.

guint8 gravity;

guint8 gravity;

the glyph orientation for this segment (A PangoGravity).

guint8 flags;

guint8 flags;

boolean flags for this segment (currently only one) (Since: 1.16).

guint8 script;

guint8 script;

the detected script for this segment (A PangoScript) (Since: 1.18).
the detected language for this segment.

GSList *extra_attrs;

GSList *extra_attrs;

extra attributes for this segment.

cached_iter :

Cached attribute iterator, or NULL. [allow-none] +Cached attribute iterator, or NULL. [allow-none]

Returns :

a GList of PangoItem +a GList of PangoItem structures. The items should be freed using pango_item_free() -probably in combination with g_list_foreach(), and the list itself -using g_list_free(). [transfer full][element-type Pango.Item] +probably in combination with g_list_foreach(), and the list itself +using g_list_free(). [transfer full][element-type Pango.Item]

cached_iter :

Cached attribute iterator, or NULL. [allow-none] +Cached attribute iterator, or NULL. [allow-none]

Returns :

a GList of +a GList of PangoItem structures. The items should be freed using pango_item_free() probably in combination with -g_list_foreach(), and the list itself using g_list_free(). [transfer full][element-type Pango.Item] +g_list_foreach(), and the list itself using g_list_free(). [transfer full][element-type Pango.Item]

item :

a PangoItem, may be NULL +a PangoItem, may be NULL
@@ -414,13 +414,13 @@

item :

-a PangoItem, may be NULL +a PangoItem, may be NULL

Returns :

the newly allocated PangoItem, which should -be freed with pango_item_free(), or NULL if +be freed with pango_item_free(), or NULL if item was NULL. @@ -488,7 +488,7 @@

pango_reorder_items ()

-
GList *             pango_reorder_items                 (GList *logical_items);
+
GList *             pango_reorder_items                 (GList *logical_items);

From a list of items in logical order and the associated directional levels, produce a list in visual order. @@ -499,11 +499,11 @@

logical_items :

-a GList of PangoItem in logical order. +a GList of PangoItem in logical order.

Returns :

-a GList +a GList of PangoItem structures in visual order. (Please open a bug if you use this function. It is not a particularly convenient interface, and the code @@ -538,7 +538,7 @@

Returns :

the newly allocated PangoContext, which should -be freed with g_object_unref(). +be freed with g_object_unref().
@@ -889,7 +889,7 @@

Returns :

-the matrix, or NULL if no matrix has been set +the matrix, or NULL if no matrix has been set (which is the same as the identity matrix). The returned matrix is owned by Pango and must not be modified or freed. @@ -921,7 +921,7 @@

matrix :

-a PangoMatrix, or NULL to unset any existing +a PangoMatrix, or NULL to unset any existing matrix. (No matrix set is the same as setting the identity matrix.). [allow-none] @@ -953,7 +953,7 @@

Returns :

the newly allocated PangoFont that -was loaded, or NULL if no font matched. [transfer full] +was loaded, or NULL if no font matched. [transfer full] @@ -988,7 +988,7 @@

Returns :

the newly allocated PangoFontset loaded, -or NULL if no font matched. [transfer full] +or NULL if no font matched. [transfer full] @@ -1025,14 +1025,14 @@

desc :

-a PangoFontDescription structure. NULL means that the +a PangoFontDescription structure. NULL means that the font description from the context will be used. [allow-none]

language :

language tag used to determine which script to get -the metrics for. NULL means that the language tag from the context +the metrics for. NULL means that the language tag from the context will be used. If no language tag is set on the context, metrics for the default language (as determined by pango_language_get_default()) will be returned. [allow-none] @@ -1067,7 +1067,7 @@

families :

location to store a pointer to an array of PangoFontFamily *. This array should be freed -with g_free(). [out][array length=n_families] +with g_free(). [out][array length=n_families] @@ -1081,7 +1081,7 @@

pango_break ()

-
void                pango_break                         (const gchar *text,
+
void                pango_break                         (const gchar *text,
                                                          int length,
                                                          PangoAnalysis *analysis,
                                                          PangoLogAttr *attrs,
@@ -1172,10 +1172,10 @@
 

pango_find_paragraph_boundary ()

-
void                pango_find_paragraph_boundary       (const gchar *text,
-                                                         gint length,
-                                                         gint *paragraph_delimiter_index,
-                                                         gint *next_paragraph_start);
+
void                pango_find_paragraph_boundary       (const gchar *text,
+                                                         gint length,
+                                                         gint *paragraph_delimiter_index,
+                                                         gint *next_paragraph_start);

Locates a paragraph boundary in text. A boundary is caused by delimiter characters, such as a newline, carriage return, carriage @@ -1214,7 +1214,7 @@


pango_default_break ()

-
void                pango_default_break                 (const gchar *text,
+
void                pango_default_break                 (const gchar *text,
                                                          int length,
                                                          PangoAnalysis *analysis,
                                                          PangoLogAttr *attrs,
@@ -1223,7 +1223,7 @@
 This is the default break algorithm, used if no language
 engine overrides it. Normally you should use pango_break()
 instead. Unlike pango_break(),
-analysis can be NULL, but only do that if you know what
+analysis can be NULL, but only do that if you know what
 you're doing. If you need an analysis to pass to pango_break(),
 you need to pango_itemize().  In most cases however you should
 simply use pango_get_log_attrs().
@@ -1315,23 +1315,23 @@
 
 
 
-

guint is_line_break : 1;

+

guint is_line_break : 1;

if set, can break line in front of character -

guint is_mandatory_break : 1;

+

guint is_mandatory_break : 1;

if set, must break line in front of character -

guint is_char_break : 1;

+

guint is_char_break : 1;

if set, can break here when doing character wrapping -

guint is_white : 1;

+

guint is_white : 1;

is whitespace character -

guint is_cursor_position : 1;

+

guint is_cursor_position : 1;

if set, cursor can appear in front of character. i.e. this is a grapheme boundary, or the first character in the text. @@ -1340,17 +1340,17 @@ Cluster Boundaries semantics. -

guint is_word_start : 1;

+

guint is_word_start : 1;

is first character in a word -

guint is_word_end : 1;

+

guint is_word_end : 1;

is first non-word char after a word Note that in degenerate cases, you could have both is_word_start and is_word_end set for some character. -

guint is_sentence_boundary : 1;

+

guint is_sentence_boundary : 1;

is a sentence boundary. There are two ways to divide sentences. The first assigns all inter-sentence whitespace/control/format chars to some sentence, @@ -1361,18 +1361,18 @@ of those sentences. -

guint is_sentence_start : 1;

+

guint is_sentence_start : 1;

is first character in a sentence -

guint is_sentence_end : 1;

+

guint is_sentence_end : 1;

is first char after a sentence. Note that in degenerate cases, you could have both is_sentence_start and is_sentence_end set for some character. (e.g. no space after a period, so the next sentence starts right away) -

guint backspace_deletes_character : 1;

+

guint backspace_deletes_character : 1;

if set, backspace deletes one character rather than the entire grapheme cluster. This field is only meaningful on grapheme @@ -1387,12 +1387,12 @@ characters. -

guint is_expandable_space : 1;

+

guint is_expandable_space : 1;

is a whitespace character that can possibly be expanded for justification purposes. (Since: 1.18) -

guint is_word_boundary : 1;

+

guint is_word_boundary : 1;

is a word boundary. More specifically, means that this is not a position in the middle of a word. For example, both sides of a punctuation mark are @@ -1409,8 +1409,8 @@

pango_shape ()

-
void                pango_shape                         (const gchar *text,
-                                                         gint length,
+
void                pango_shape                         (const gchar *text,
+                                                         gint length,
                                                          const PangoAnalysis *analysis,
                                                          PangoGlyphString *glyphs);

diff -Nru pango1.0-1.29.5/docs/html/pango-Version-Checking.html pango1.0-1.30.0/docs/html/pango-Version-Checking.html --- pango1.0-1.29.5/docs/html/pango-Version-Checking.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Version-Checking.html 2012-03-27 01:41:19.000000000 +0000 @@ -114,7 +114,7 @@


PANGO_VERSION_MINOR

-
#define PANGO_VERSION_MINOR 29
+
#define PANGO_VERSION_MINOR 30
 

The minor component of the version of Pango available at compile-time. @@ -123,7 +123,7 @@


PANGO_VERSION_MICRO

-
#define PANGO_VERSION_MICRO 5
+
#define PANGO_VERSION_MICRO 0
 

The micro component of the version of Pango available at compile-time. @@ -132,7 +132,7 @@


PANGO_VERSION_STRING

-
#define PANGO_VERSION_STRING "1.29.5"
+
#define PANGO_VERSION_STRING "1.30.0"
 

A string literal containing the version of Pango available at compile-time. @@ -251,7 +251,7 @@

Returns :

-NULL if the Pango library is compatible with the +NULL if the Pango library is compatible with the given version, or a string describing the version mismatch. The returned string is owned by Pango and should not be modified or freed. diff -Nru pango1.0-1.29.5/docs/html/pango-Vertical-Text.html pango1.0-1.30.0/docs/html/pango-Vertical-Text.html --- pango1.0-1.29.5/docs/html/pango-Vertical-Text.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Vertical-Text.html 2012-03-27 01:41:19.000000000 +0000 @@ -48,7 +48,7 @@ PangoGravityHint hint); PangoGravity pango_gravity_get_for_script_and_width (PangoScript script, - gboolean wide, + gboolean wide, PangoGravity base_gravity, PangoGravityHint hint); double pango_gravity_to_rotation (PangoGravity gravity); @@ -237,8 +237,8 @@

Returns :

-TRUE if gravity is PANGO_GRAVITY_EAST or PANGO_GRAVITY_WEST, -FALSE otherwise. +TRUE if gravity is PANGO_GRAVITY_EAST or PANGO_GRAVITY_WEST, +FALSE otherwise.
@@ -263,7 +263,7 @@

Returns :

the gravity of matrix, which will never be -PANGO_GRAVITY_AUTO, or PANGO_GRAVITY_SOUTH if matrix is NULL +PANGO_GRAVITY_AUTO, or PANGO_GRAVITY_SOUTH if matrix is NULL @@ -315,7 +315,7 @@

pango_gravity_get_for_script_and_width ()

PangoGravity        pango_gravity_get_for_script_and_width
                                                         (PangoScript script,
-                                                         gboolean wide,
+                                                         gboolean wide,
                                                          PangoGravity base_gravity,
                                                          PangoGravityHint hint);

@@ -346,7 +346,7 @@

wide :

-TRUE for wide characters as returned by g_unichar_iswide() +TRUE for wide characters as returned by g_unichar_iswide() diff -Nru pango1.0-1.29.5/docs/html/pango-Win32-Fonts-and-Rendering.html pango1.0-1.30.0/docs/html/pango-Win32-Fonts-and-Rendering.html --- pango1.0-1.29.5/docs/html/pango-Win32-Fonts-and-Rendering.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Win32-Fonts-and-Rendering.html 2012-03-27 01:41:19.000000000 +0000 @@ -42,8 +42,8 @@ void pango_win32_render (HDC hdc, PangoFont *font, PangoGlyphString *glyphs, - gint x, - gint y); + gint x, + gint y); void pango_win32_render_transformed (HDC hdc, const PangoMatrix *matrix, PangoFont *font, @@ -59,14 +59,14 @@ int x, int y); PangoGlyph pango_win32_get_unknown_glyph (PangoFont *font, - gunichar wc); -gint pango_win32_font_get_glyph_index (PangoFont *font, - gunichar wc); -gboolean pango_win32_font_select_font (PangoFont *font, + gunichar wc); +gint pango_win32_font_get_glyph_index (PangoFont *font, + gunichar wc); +gboolean pango_win32_font_select_font (PangoFont *font, HDC hdc); void pango_win32_font_done_font (PangoFont *font); double pango_win32_font_get_metrics_factor (PangoFont *font); -gboolean pango_win32_get_debug_flag (void); +gboolean pango_win32_get_debug_flag (void); HDC pango_win32_get_dc (void); PangoWin32FontCache; PangoWin32FontCache * pango_win32_font_cache_new (void); @@ -104,7 +104,7 @@

A string constant identifying the Win32 renderer. The associated quark (see -g_quark_from_string()) is used to identify the renderer in pango_find_map(). +g_quark_from_string()) is used to identify the renderer in pango_find_map().


@@ -134,8 +134,8 @@
void                pango_win32_render                  (HDC hdc,
                                                          PangoFont *font,
                                                          PangoGlyphString *glyphs,
-                                                         gint x,
-                                                         gint y);
+ gint x, + gint y);

Render a PangoGlyphString onto a Windows DC

@@ -191,7 +191,7 @@

matrix :

-a PangoMatrix, or NULL to use an identity transformation +a PangoMatrix, or NULL to use an identity transformation

font :

@@ -286,7 +286,7 @@

pango_win32_get_unknown_glyph ()

PangoGlyph          pango_win32_get_unknown_glyph       (PangoFont *font,
-                                                         gunichar wc);
+ gunichar wc);

Warning

pango_win32_get_unknown_glyph is deprecated and should not be used in newly-written code.

@@ -321,8 +321,8 @@

pango_win32_font_get_glyph_index ()

-
gint                pango_win32_font_get_glyph_index    (PangoFont *font,
-                                                         gunichar wc);
+
gint                pango_win32_font_get_glyph_index    (PangoFont *font,
+                                                         gunichar wc);

Obtains the index of the glyph for wc in font, or 0, if not covered. @@ -348,7 +348,7 @@


pango_win32_font_select_font ()

-
gboolean            pango_win32_font_select_font        (PangoFont *font,
+
gboolean            pango_win32_font_select_font        (PangoFont *font,
                                                          HDC hdc);

Selects the font into the specified DC and changes the mapping mode @@ -376,7 +376,7 @@

Returns :

-TRUE if the operation succeeded. +TRUE if the operation succeeded.
@@ -423,7 +423,7 @@

pango_win32_get_debug_flag ()

-
gboolean            pango_win32_get_debug_flag          (void);
+
gboolean            pango_win32_get_debug_flag          (void);

Returns whether debugging is turned on.

@@ -432,7 +432,7 @@

Returns :

-TRUE if debugging is turned on. +TRUE if debugging is turned on.

Since 1.2

@@ -518,7 +518,7 @@

Returns :

-The font structure, or NULL if the font could +The font structure, or NULL if the font could not be loaded. In order to free this structure, you must call pango_win32_font_cache_unload(). @@ -549,7 +549,7 @@

Returns :

-The font structure, or NULL if the font could +The font structure, or NULL if the font could not be loaded. In order to free this structure, you must call pango_win32_font_cache_unload(). @@ -650,7 +650,7 @@

Returns :

A newly allocated LOGFONTA struct. It must be -freed with g_free(). +freed with g_free().
@@ -672,7 +672,7 @@

Returns :

A newly allocated LOGFONTW struct. It must be -freed with g_free(). +freed with g_free().
diff -Nru pango1.0-1.29.5/docs/html/pango-X-Fonts-and-Rendering.html pango1.0-1.30.0/docs/html/pango-X-Fonts-and-Rendering.html --- pango1.0-1.29.5/docs/html/pango-X-Fonts-and-Rendering.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-X-Fonts-and-Rendering.html 2012-03-27 01:41:19.000000000 +0000 @@ -52,8 +52,8 @@ GC gc, PangoFont *font, PangoGlyphString *glyphs, - gint x, - gint y); + gint x, + gint y); void pango_x_render_layout_line (Display *display, Drawable drawable, GC gc, @@ -72,9 +72,9 @@ #define PANGO_X_GLYPH_SUBFONT (glyph) #define PANGO_X_GLYPH_INDEX (glyph) PangoFont * pango_x_load_font (Display *display, - const gchar *spec); + const gchar *spec); PangoGlyph pango_x_get_unknown_glyph (PangoFont *font); -gboolean pango_x_has_glyph (PangoFont *font, +gboolean pango_x_has_glyph (PangoFont *font, PangoGlyph glyph); int pango_x_list_subfonts (PangoFont *font, char **charsets, @@ -86,15 +86,15 @@ PangoXFontCache * pango_x_font_map_get_font_cache (PangoFontMap *font_map); char * pango_x_font_subfont_xlfd (PangoFont *font, PangoXSubfont subfont_id); -gboolean pango_x_find_first_subfont (PangoFont *font, +gboolean pango_x_find_first_subfont (PangoFont *font, char **charsets, int n_charsets, PangoXSubfont *rfont); PangoGlyph pango_x_font_get_unknown_glyph (PangoFont *font, - gunichar wc); -gboolean pango_x_apply_ligatures (PangoFont *font, + gunichar wc); +gboolean pango_x_apply_ligatures (PangoFont *font, PangoXSubfont subfont, - gunichar **glyphs, + gunichar **glyphs, int *n_glyphs, int **clusters); void pango_x_fallback_shape (PangoFont *font, @@ -132,7 +132,7 @@

A string constant identifying the X renderer. The associated quark (see -g_quark_from_string()) is used to identify the renderer in pango_find_map(). +g_quark_from_string()) is used to identify the renderer in pango_find_map().


@@ -265,8 +265,8 @@ GC gc, PangoFont *font, PangoGlyphString *glyphs, - gint x, - gint y);
+ gint x, + gint y);

Warning

pango_x_render is deprecated and should not be used in newly-written code.

@@ -488,7 +488,7 @@

pango_x_load_font ()

PangoFont *         pango_x_load_font                   (Display *display,
-                                                         const gchar *spec);
+ const gchar *spec);

Warning

pango_x_load_font is deprecated and should not be used in newly-written code.

@@ -550,7 +550,7 @@

pango_x_has_glyph ()

-
gboolean            pango_x_has_glyph                   (PangoFont *font,
+
gboolean            pango_x_has_glyph                   (PangoFont *font,
                                                          PangoGlyph glyph);

Warning

@@ -574,7 +574,7 @@

Returns :

-TRUE if the glyph is present. +TRUE if the glyph is present.
@@ -613,12 +613,12 @@

subfont_ids :

location to store a pointer to an array of subfont IDs for each found subfont; -the result must be freed using g_free(). +the result must be freed using g_free().

subfont_charsets :

location to store a pointer to an array of subfont IDs for each found subfont; -the result must be freed using g_free(). +the result must be freed using g_free().

Returns :

@@ -727,7 +727,7 @@

Returns :

A newly-allocated string containing the XLFD for the -subfont. This string must be freed with g_free(). +subfont. This string must be freed with g_free().
@@ -735,7 +735,7 @@

pango_x_find_first_subfont ()

-
gboolean            pango_x_find_first_subfont          (PangoFont *font,
+
gboolean            pango_x_find_first_subfont          (PangoFont *font,
                                                          char **charsets,
                                                          int n_charsets,
                                                          PangoXSubfont *rfont);
@@ -769,7 +769,7 @@

Returns :

-TRUE if *rfont now contains a font. +TRUE if *rfont now contains a font.
@@ -778,7 +778,7 @@

pango_x_font_get_unknown_glyph ()

PangoGlyph          pango_x_font_get_unknown_glyph      (PangoFont *font,
-                                                         gunichar wc);
+ gunichar wc);

Warning

pango_x_font_get_unknown_glyph is deprecated and should not be used in newly-written code.

@@ -811,9 +811,9 @@

pango_x_apply_ligatures ()

-
gboolean            pango_x_apply_ligatures             (PangoFont *font,
+
gboolean            pango_x_apply_ligatures             (PangoFont *font,
                                                          PangoXSubfont subfont,
-                                                         gunichar **glyphs,
+                                                         gunichar **glyphs,
                                                          int *n_glyphs,
                                                          int **clusters);
@@ -849,7 +849,7 @@

Returns :

-FALSE, always. +FALSE, always.
@@ -980,7 +980,7 @@

Returns :

-The font structure, or NULL if the font could +The font structure, or NULL if the font could not be loaded. In order to free this structure, you must call pango_x_font_cache_unload(). diff -Nru pango1.0-1.29.5/docs/html/pango-Xft-Fonts-and-Rendering.html pango1.0-1.30.0/docs/html/pango-Xft-Fonts-and-Rendering.html --- pango1.0-1.29.5/docs/html/pango-Xft-Fonts-and-Rendering.html 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/html/pango-Xft-Fonts-and-Rendering.html 2012-03-27 01:41:19.000000000 +0000 @@ -51,24 +51,24 @@ void pango_xft_set_default_substitute (Display *display, int screen, PangoXftSubstituteFunc func, - gpointer data, - GDestroyNotify notify); + gpointer data, + GDestroyNotify notify); void (*PangoXftSubstituteFunc) (FcPattern *pattern, - gpointer data); + gpointer data); void pango_xft_substitute_changed (Display *display, int screen); void pango_xft_shutdown_display (Display *display, int screen); XftFont * pango_xft_font_get_font (PangoFont *font); Display * pango_xft_font_get_display (PangoFont *font); -gboolean pango_xft_font_has_char (PangoFont *font, - gunichar wc); +gboolean pango_xft_font_has_char (PangoFont *font, + gunichar wc); FT_Face pango_xft_font_lock_face (PangoFont *font); void pango_xft_font_unlock_face (PangoFont *font); -guint pango_xft_font_get_glyph (PangoFont *font, - gunichar wc); +guint pango_xft_font_get_glyph (PangoFont *font, + gunichar wc); PangoGlyph pango_xft_font_get_unknown_glyph (PangoFont *font, - gunichar wc); + gunichar wc); struct PangoXftRenderer; struct PangoXftRendererClass; PangoRenderer * pango_xft_renderer_new (Display *display, @@ -82,15 +82,15 @@ XftColor *color, PangoFont *font, PangoGlyphString *glyphs, - gint x, - gint y); + gint x, + gint y); void pango_xft_picture_render (Display *display, Picture src_picture, Picture dest_picture, PangoFont *font, PangoGlyphString *glyphs, - gint x, - gint y); + gint x, + gint y); void pango_xft_render_transformed (XftDraw *draw, XftColor *color, PangoMatrix *matrix, @@ -113,19 +113,19 @@

Object Hierarchy

-  GObject
+  GObject
    +----PangoFont
          +----PangoFcFont
                +----PangoXftFont
 
-  GObject
+  GObject
    +----PangoFontMap
          +----PangoFcFontMap
                +----PangoXftFontMap
 
-  GObject
+  GObject
    +----PangoRenderer
          +----PangoXftRenderer
 
@@ -133,8 +133,8 @@

Properties

-  "display"                  gpointer              : Write / Construct Only
-  "screen"                   gint                  : Write / Construct Only
+  "display"                  gpointer              : Write / Construct Only
+  "screen"                   gint                  : Write / Construct Only
 
@@ -271,8 +271,8 @@
void                pango_xft_set_default_substitute    (Display *display,
                                                          int screen,
                                                          PangoXftSubstituteFunc func,
-                                                         gpointer data,
-                                                         GDestroyNotify notify);
+ gpointer data, + GDestroyNotify notify);

Sets a function that will be called to do final configuration substitution on a FcPattern before it is used to load @@ -313,7 +313,7 @@

PangoXftSubstituteFunc ()

void                (*PangoXftSubstituteFunc)           (FcPattern *pattern,
-                                                         gpointer data);
+ gpointer data);

Function type for doing final config tweaking on prepared FcPatterns.

@@ -402,7 +402,7 @@

Returns :

-the XftFont associated to font, or NULL if font is NULL. +the XftFont associated to font, or NULL if font is NULL.
@@ -431,8 +431,8 @@

pango_xft_font_has_char ()

-
gboolean            pango_xft_font_has_char             (PangoFont *font,
-                                                         gunichar wc);
+
gboolean            pango_xft_font_has_char             (PangoFont *font,
+                                                         gunichar wc);

Warning

pango_xft_font_has_char is deprecated and should not be used in newly-written code.

@@ -457,7 +457,7 @@

Returns :

-TRUE if font has the requested codepoint. +TRUE if font has the requested codepoint.
@@ -521,8 +521,8 @@

pango_xft_font_get_glyph ()

-
guint               pango_xft_font_get_glyph            (PangoFont *font,
-                                                         gunichar wc);
+
guint               pango_xft_font_get_glyph            (PangoFont *font,
+                                                         gunichar wc);

Warning

pango_xft_font_get_glyph is deprecated and should not be used in newly-written code.

@@ -559,7 +559,7 @@

pango_xft_font_get_unknown_glyph ()

PangoGlyph          pango_xft_font_get_unknown_glyph    (PangoFont *font,
-                                                         gunichar wc);
+ gunichar wc);

Warning

pango_xft_font_get_unknown_glyph is deprecated and should not be used in newly-written code.

@@ -661,7 +661,7 @@

Returns :

the newly created PangoXftRenderer, which should -be freed with g_object_unref(). +be freed with g_object_unref().
@@ -725,8 +725,8 @@ XftColor *color, PangoFont *font, PangoGlyphString *glyphs, - gint x, - gint y); + gint x, + gint y);

Renders a PangoGlyphString onto an XftDraw object wrapping an X drawable.

@@ -768,8 +768,8 @@ Picture dest_picture, PangoFont *font, PangoGlyphString *glyphs, - gint x, - gint y); + gint x, + gint y);

Renders a PangoGlyphString onto an Xrender Picture object.

@@ -839,7 +839,7 @@

matrix :

-a PangoMatrix, or NULL to use an identity transformation +a PangoMatrix, or NULL to use an identity transformation

font :

@@ -950,13 +950,13 @@

Property Details

The "display" property

-
  "display"                  gpointer              : Write / Construct Only
+
  "display"                  gpointer              : Write / Construct Only

The display being rendered to.


The "screen" property

-
  "screen"                   gint                  : Write / Construct Only
+
  "screen"                   gint                  : Write / Construct Only

The screen being rendered to.

Allowed values: >= 0

Default value: 0

diff -Nru pango1.0-1.29.5/docs/Makefile.am pango1.0-1.30.0/docs/Makefile.am --- pango1.0-1.29.5/docs/Makefile.am 2011-11-22 19:59:53.000000000 +0000 +++ pango1.0-1.30.0/docs/Makefile.am 2012-03-27 00:33:37.000000000 +0000 @@ -160,8 +160,8 @@ .PHONY: dist-local-check-no-cross-references if ENABLE_GTK_DOC -#TESTS = check.docs -#TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE) $(AM_MAKEFLAGS)" DOC_MODULE="$(DOC_MODULE)" REPORT_FILES="$(REPORT_FILES)" +TESTS = check.docs +TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE) $(AM_MAKEFLAGS)" DOC_MODULE="$(DOC_MODULE)" REPORT_FILES="$(REPORT_FILES)" endif -include $(top_srcdir)/git.mk diff -Nru pango1.0-1.29.5/docs/Makefile.in pango1.0-1.30.0/docs/Makefile.in --- pango1.0-1.29.5/docs/Makefile.in 2011-11-22 20:00:18.000000000 +0000 +++ pango1.0-1.30.0/docs/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,11 +54,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -83,10 +83,18 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -408,6 +416,8 @@ ######################################################################## man_MANS = pango-querymodules.1 MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES) +@ENABLE_GTK_DOC_TRUE@TESTS = check.docs +@ENABLE_GTK_DOC_TRUE@TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE) $(AM_MAKEFLAGS)" DOC_MODULE="$(DOC_MODULE)" REPORT_FILES="$(REPORT_FILES)" all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -434,6 +444,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -486,9 +497,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -496,6 +505,99 @@ CTAGS: +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + fi; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ + test "$$failed" -eq 0; \ + else :; fi + distdir: $(DISTFILES) @list='$(MANS)'; if test -n "$$list"; then \ list=`for p in $$list; do \ @@ -543,6 +645,7 @@ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(MANS) all-local @@ -561,10 +664,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -648,10 +756,10 @@ uninstall-man: uninstall-man1 -.MAKE: all check install install-am install-strip +.MAKE: all check check-am install install-am install-strip -.PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ +.PHONY: all all-am all-local check check-TESTS check-am clean \ + clean-generic clean-libtool clean-local dist-hook distclean \ distclean-generic distclean-libtool distclean-local distdir \ dvi dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-local install-dvi \ @@ -822,7 +930,7 @@ rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -913,9 +1021,6 @@ .PHONY: dist-local-check-no-cross-references -#TESTS = check.docs -#TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE) $(AM_MAKEFLAGS)" DOC_MODULE="$(DOC_MODULE)" REPORT_FILES="$(REPORT_FILES)" - -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru pango1.0-1.29.5/docs/pango-querymodules.1 pango1.0-1.30.0/docs/pango-querymodules.1 --- pango1.0-1.29.5/docs/pango-querymodules.1 2011-11-22 19:10:38.000000000 +0000 +++ pango1.0-1.30.0/docs/pango-querymodules.1 2012-03-27 01:31:45.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: pango-querymodules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 11/22/2011 +.\" Date: 03/26/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "PANGO\-QUERYMODULES" "1" "11/22/2011" "[FIXME: source]" "[FIXME: manual]" +.TH "PANGO\-QUERYMODULES" "1" "03/26/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru pango1.0-1.29.5/docs/pango-sections.txt pango1.0-1.30.0/docs/pango-sections.txt --- pango1.0-1.29.5/docs/pango-sections.txt 2011-11-22 20:29:45.000000000 +0000 +++ pango1.0-1.30.0/docs/pango-sections.txt 2012-03-27 01:41:19.000000000 +0000 @@ -1175,5 +1175,3 @@ pango_bidi_type_get_type pango_direction_get_type - - diff -Nru pango1.0-1.29.5/docs/version.xml pango1.0-1.30.0/docs/version.xml --- pango1.0-1.29.5/docs/version.xml 2011-11-22 20:24:14.000000000 +0000 +++ pango1.0-1.30.0/docs/version.xml 2012-03-27 01:38:57.000000000 +0000 @@ -1 +1 @@ -1.29.5 +1.30.0 diff -Nru pango1.0-1.29.5/examples/Makefile.in pango1.0-1.30.0/examples/Makefile.in --- pango1.0-1.29.5/examples/Makefile.in 2011-11-22 19:07:57.000000000 +0000 +++ pango1.0-1.30.0/examples/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -61,8 +61,8 @@ @HAVE_CAIRO_PNG_TRUE@ $(am__DEPENDENCIES_1) \ @HAVE_CAIRO_PNG_TRUE@ $(am__DEPENDENCIES_1) $(am__append_2) @HAVE_CAIRO_PNG_TRUE@cairoshape_DEPENDENCIES = $(am__DEPENDENCIES_2) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent cairosimple_SOURCES = cairosimple.c cairosimple_OBJECTS = cairosimple.$(OBJEXT) @@ -84,21 +84,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = cairoshape.c cairosimple.c cairotwisted.c DIST_SOURCES = cairoshape.c cairosimple.c cairotwisted.c @@ -351,13 +351,13 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -cairoshape$(EXEEXT): $(cairoshape_OBJECTS) $(cairoshape_DEPENDENCIES) +cairoshape$(EXEEXT): $(cairoshape_OBJECTS) $(cairoshape_DEPENDENCIES) $(EXTRA_cairoshape_DEPENDENCIES) @rm -f cairoshape$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cairoshape_OBJECTS) $(cairoshape_LDADD) $(LIBS) -cairosimple$(EXEEXT): $(cairosimple_OBJECTS) $(cairosimple_DEPENDENCIES) +cairosimple$(EXEEXT): $(cairosimple_OBJECTS) $(cairosimple_DEPENDENCIES) $(EXTRA_cairosimple_DEPENDENCIES) @rm -f cairosimple$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cairosimple_OBJECTS) $(cairosimple_LDADD) $(LIBS) -cairotwisted$(EXEEXT): $(cairotwisted_OBJECTS) $(cairotwisted_DEPENDENCIES) +cairotwisted$(EXEEXT): $(cairotwisted_OBJECTS) $(cairotwisted_DEPENDENCIES) $(EXTRA_cairotwisted_DEPENDENCIES) @rm -f cairotwisted$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cairotwisted_OBJECTS) $(cairotwisted_LDADD) $(LIBS) @@ -374,26 +374,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -497,10 +494,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/gtk-doc.make pango1.0-1.30.0/gtk-doc.make --- pango1.0-1.29.5/gtk-doc.make 2011-11-15 04:15:10.000000000 +0000 +++ pango1.0-1.30.0/gtk-doc.make 2012-03-07 16:30:25.000000000 +0000 @@ -222,7 +222,7 @@ rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: diff -Nru pango1.0-1.29.5/INSTALL pango1.0-1.30.0/INSTALL --- pango1.0-1.29.5/INSTALL 2011-11-22 19:07:59.000000000 +0000 +++ pango1.0-1.30.0/INSTALL 2012-03-27 01:38:51.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff -Nru pango1.0-1.29.5/install-sh pango1.0-1.30.0/install-sh --- pango1.0-1.29.5/install-sh 2011-11-22 19:07:56.000000000 +0000 +++ pango1.0-1.30.0/install-sh 2012-03-27 01:38:50.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru pango1.0-1.29.5/ltmain.sh pango1.0-1.30.0/ltmain.sh --- pango1.0-1.29.5/ltmain.sh 2011-11-22 19:07:49.000000000 +0000 +++ pango1.0-1.30.0/ltmain.sh 2012-03-27 01:38:47.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru pango1.0-1.29.5/Makefile.in pango1.0-1.30.0/Makefile.in --- pango1.0-1.29.5/Makefile.in 2011-11-22 19:07:59.000000000 +0000 +++ pango1.0-1.30.0/Makefile.in 2012-03-27 01:38:52.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -68,11 +68,11 @@ pangoft2-uninstalled.pc pangoxft-uninstalled.pc \ pangocairo-uninstalled.pc pango-zip.sh config.h.win32 CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -104,6 +104,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pkgconfigdir)" DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -118,9 +124,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -147,8 +155,10 @@ done; \ reldir="$$dir2" GZIP_ENV = --best -DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.xz distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -400,7 +410,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -436,10 +446,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -505,9 +513,7 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -720,16 +726,20 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) + dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) - dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -746,7 +756,7 @@ $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -760,6 +770,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -779,6 +791,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -807,8 +820,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -842,10 +863,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -934,8 +960,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff -Nru pango1.0-1.29.5/missing pango1.0-1.30.0/missing --- pango1.0-1.29.5/missing 2011-11-22 19:07:56.000000000 +0000 +++ pango1.0-1.30.0/missing 2012-03-27 01:38:50.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru pango1.0-1.29.5/modules/arabic/Makefile.in pango1.0-1.30.0/modules/arabic/Makefile.in --- pango1.0-1.29.5/modules/arabic/Makefile.in 2011-11-22 19:07:57.000000000 +0000 +++ pango1.0-1.30.0/modules/arabic/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,6 +72,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_arabic_fc_la_LIBADD = @@ -79,8 +85,8 @@ libpango_arabic_fc_la-arabic-ot.lo am_libpango_arabic_fc_la_OBJECTS = $(am__objects_1) libpango_arabic_fc_la_OBJECTS = $(am_libpango_arabic_fc_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_arabic_fc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -134,21 +140,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_arabic_fc_la_SOURCES) \ $(libpango_arabic_lang_la_SOURCES) \ @@ -414,6 +420,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -463,13 +470,13 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-arabic-fc.la: $(libpango_arabic_fc_la_OBJECTS) $(libpango_arabic_fc_la_DEPENDENCIES) +libpango-arabic-fc.la: $(libpango_arabic_fc_la_OBJECTS) $(libpango_arabic_fc_la_DEPENDENCIES) $(EXTRA_libpango_arabic_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_arabic_fc_la_LINK) $(am_libpango_arabic_fc_la_rpath) $(libpango_arabic_fc_la_OBJECTS) $(libpango_arabic_fc_la_LIBADD) $(LIBS) -libpango-arabic-lang.la: $(libpango_arabic_lang_la_OBJECTS) $(libpango_arabic_lang_la_DEPENDENCIES) +libpango-arabic-lang.la: $(libpango_arabic_lang_la_OBJECTS) $(libpango_arabic_lang_la_DEPENDENCIES) $(EXTRA_libpango_arabic_lang_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_arabic_lang_la_LINK) $(am_libpango_arabic_lang_la_rpath) $(libpango_arabic_lang_la_OBJECTS) $(libpango_arabic_lang_la_LIBADD) $(LIBS) -pango-arabic-fc.la: $(pango_arabic_fc_la_OBJECTS) $(pango_arabic_fc_la_DEPENDENCIES) +pango-arabic-fc.la: $(pango_arabic_fc_la_OBJECTS) $(pango_arabic_fc_la_DEPENDENCIES) $(EXTRA_pango_arabic_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_arabic_fc_la_LINK) $(am_pango_arabic_fc_la_rpath) $(pango_arabic_fc_la_OBJECTS) $(pango_arabic_fc_la_LIBADD) $(LIBS) -pango-arabic-lang.la: $(pango_arabic_lang_la_OBJECTS) $(pango_arabic_lang_la_DEPENDENCIES) +pango-arabic-lang.la: $(pango_arabic_lang_la_OBJECTS) $(pango_arabic_lang_la_DEPENDENCIES) $(EXTRA_pango_arabic_lang_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_arabic_lang_la_LINK) $(am_pango_arabic_lang_la_rpath) $(pango_arabic_lang_la_OBJECTS) $(pango_arabic_lang_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -488,50 +495,44 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_arabic_fc_la-arabic-fc.lo: arabic-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_fc_la_CFLAGS) $(CFLAGS) -MT libpango_arabic_fc_la-arabic-fc.lo -MD -MP -MF $(DEPDIR)/libpango_arabic_fc_la-arabic-fc.Tpo -c -o libpango_arabic_fc_la-arabic-fc.lo `test -f 'arabic-fc.c' || echo '$(srcdir)/'`arabic-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_arabic_fc_la-arabic-fc.Tpo $(DEPDIR)/libpango_arabic_fc_la-arabic-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arabic-fc.c' object='libpango_arabic_fc_la-arabic-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='arabic-fc.c' object='libpango_arabic_fc_la-arabic-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_arabic_fc_la-arabic-fc.lo `test -f 'arabic-fc.c' || echo '$(srcdir)/'`arabic-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_arabic_fc_la-arabic-fc.lo `test -f 'arabic-fc.c' || echo '$(srcdir)/'`arabic-fc.c libpango_arabic_fc_la-arabic-ot.lo: arabic-ot.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_fc_la_CFLAGS) $(CFLAGS) -MT libpango_arabic_fc_la-arabic-ot.lo -MD -MP -MF $(DEPDIR)/libpango_arabic_fc_la-arabic-ot.Tpo -c -o libpango_arabic_fc_la-arabic-ot.lo `test -f 'arabic-ot.c' || echo '$(srcdir)/'`arabic-ot.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_arabic_fc_la-arabic-ot.Tpo $(DEPDIR)/libpango_arabic_fc_la-arabic-ot.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arabic-ot.c' object='libpango_arabic_fc_la-arabic-ot.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='arabic-ot.c' object='libpango_arabic_fc_la-arabic-ot.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_arabic_fc_la-arabic-ot.lo `test -f 'arabic-ot.c' || echo '$(srcdir)/'`arabic-ot.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_arabic_fc_la-arabic-ot.lo `test -f 'arabic-ot.c' || echo '$(srcdir)/'`arabic-ot.c libpango_arabic_lang_la-arabic-lang.lo: arabic-lang.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_lang_la_CFLAGS) $(CFLAGS) -MT libpango_arabic_lang_la-arabic-lang.lo -MD -MP -MF $(DEPDIR)/libpango_arabic_lang_la-arabic-lang.Tpo -c -o libpango_arabic_lang_la-arabic-lang.lo `test -f 'arabic-lang.c' || echo '$(srcdir)/'`arabic-lang.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_arabic_lang_la-arabic-lang.Tpo $(DEPDIR)/libpango_arabic_lang_la-arabic-lang.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arabic-lang.c' object='libpango_arabic_lang_la-arabic-lang.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='arabic-lang.c' object='libpango_arabic_lang_la-arabic-lang.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_lang_la_CFLAGS) $(CFLAGS) -c -o libpango_arabic_lang_la-arabic-lang.lo `test -f 'arabic-lang.c' || echo '$(srcdir)/'`arabic-lang.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_arabic_lang_la_CFLAGS) $(CFLAGS) -c -o libpango_arabic_lang_la-arabic-lang.lo `test -f 'arabic-lang.c' || echo '$(srcdir)/'`arabic-lang.c mostlyclean-libtool: -rm -f *.lo @@ -638,10 +639,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/basic/basic-coretext.c pango1.0-1.30.0/modules/basic/basic-coretext.c --- pango1.0-1.29.5/modules/basic/basic-coretext.c 2011-08-16 01:11:08.000000000 +0000 +++ pango1.0-1.30.0/modules/basic/basic-coretext.c 2012-03-27 00:33:41.000000000 +0000 @@ -3,6 +3,7 @@ * * Copyright (C) 2005 Imendio AB * Copyright (C) 2010 Kristian Rietveld + * Copyright (C) 2012 Kristian Rietveld * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -68,36 +69,136 @@ glyphs->glyphs[i].geometry.width = logical_rect.width; } -static void -basic_engine_shape (PangoEngineShape *engine, - PangoFont *font, - const char *text, - gint length, - const PangoAnalysis *analysis, - PangoGlyphString *glyphs) + +/* The "RunIterator" helps us to iterate over the array of runs that is obtained from + * the CoreText type setter. Even though Pango considers the string that is passed to + * the shaping engine a single run, CoreText might consider it to consist out of + * multiple runs. Because of this, we have an interface around the CoreText array of + * runs that works like iterating a single array, which makes our job in the shaping + * engine function easier. + */ + +struct RunIterator { - const char *p; - char *copy; CTLineRef line; CFStringRef cstr; + CFArrayRef runs; + CFIndex glyph_count; + + CFIndex total_ct_i; + CFIndex ct_i; + + int current_run_number; + CTRunRef current_run; + CFIndex *current_indices; + const CGGlyph *current_cgglyphs; + CTRunStatus current_run_status; +}; + +static void +run_iterator_free_current_run (struct RunIterator *iter) +{ + iter->current_run_number = -1; + iter->current_run = NULL; + iter->current_cgglyphs = NULL; + if (iter->current_indices) + free (iter->current_indices); + iter->current_indices = NULL; +} + +static void +run_iterator_set_current_run (struct RunIterator *iter, + const int run_number) +{ + CFIndex ct_glyph_count; + + run_iterator_free_current_run (iter); + + iter->current_run_number = run_number; + iter->current_run = CFArrayGetValueAtIndex (iter->runs, run_number); + iter->current_run_status = CTRunGetStatus (iter->current_run); + iter->current_cgglyphs = CTRunGetGlyphsPtr (iter->current_run); + + ct_glyph_count = CTRunGetGlyphCount (iter->current_run); + iter->current_indices = malloc (sizeof (CFIndex *) * ct_glyph_count); + CTRunGetStringIndices (iter->current_run, CFRangeMake (0, ct_glyph_count), + iter->current_indices); + + iter->ct_i = 0; +} + +static CFIndex +run_iterator_get_glyph_count (struct RunIterator *iter) +{ + CFIndex accumulator = 0; + CFIndex i; + + for (i = 0; i < CFArrayGetCount (iter->runs); i++) + accumulator += CTRunGetGlyphCount (CFArrayGetValueAtIndex (iter->runs, i)); + + return accumulator; +} + +static gboolean +run_iterator_is_rtl (struct RunIterator *iter) +{ + /* Assume run status is equal for all runs? */ + CTRunStatus run_status = CTRunGetStatus (CFArrayGetValueAtIndex (iter->runs, 0)); + + return run_status & kCTRunStatusRightToLeft; +} + +static gboolean +run_iterator_run_is_non_monotonic (struct RunIterator *iter) +{ + CTRunStatus run_status = CTRunGetStatus (iter->current_run); + + return run_status & kCTRunStatusNonMonotonic; +} + +static gunichar +run_iterator_get_character (struct RunIterator *iter) +{ + return CFStringGetCharacterAtIndex (iter->cstr, iter->current_indices[iter->ct_i]); +} + +static CGGlyph +run_iterator_get_cgglyph (struct RunIterator *iter) +{ + return iter->current_cgglyphs[iter->ct_i]; +} + +static CFIndex +run_iterator_get_index (struct RunIterator *iter) +{ + return iter->current_indices[iter->ct_i]; +} + +static void +run_iterator_create (struct RunIterator *iter, + const char *text, + const gint length, + CTFontRef ctfont) +{ + char *copy; CFDictionaryRef attributes; CFAttributedStringRef attstr; - PangoCoreTextFont *cfont = PANGO_CORE_TEXT_FONT (font); - PangoCoverage *coverage; - CFArrayRef runs; - CTRunRef run; - CTRunStatus run_status; - CFIndex i, glyph_count; - const CGGlyph *cgglyphs; CFTypeRef keys[] = { (CFTypeRef) kCTFontAttributeName }; CFTypeRef values[] = { - pango_core_text_font_get_ctfont (cfont) + ctfont }; + /* Initialize RunIterator structure */ + iter->current_run_number = -1; + iter->current_run = NULL; + iter->current_indices = NULL; + iter->current_cgglyphs = NULL; + + /* Create CTLine */ attributes = CFDictionaryCreate (kCFAllocatorDefault, (const void **)keys, (const void **)values, @@ -108,106 +209,266 @@ copy = g_strndup (text, length + 1); copy[length] = 0; - cstr = CFStringCreateWithCString (kCFAllocatorDefault, copy, - kCFStringEncodingUTF8); + iter->cstr = CFStringCreateWithCString (kCFAllocatorDefault, copy, + kCFStringEncodingUTF8); g_free (copy); attstr = CFAttributedStringCreate (kCFAllocatorDefault, - cstr, + iter->cstr, attributes); - line = CTLineCreateWithAttributedString (attstr); + iter->line = CTLineCreateWithAttributedString (attstr); + iter->runs = CTLineGetGlyphRuns (iter->line); - runs = CTLineGetGlyphRuns (line); + CFRelease (attstr); + CFRelease (attributes); + + iter->total_ct_i = 0; + iter->glyph_count = run_iterator_get_glyph_count (iter); - /* Since Pango divides things into runs already, we assume there is - * only a single run in this line. + /* If CoreText did not render any glyphs for this string (can happen, + * e.g. a run solely consisting of a BOM), glyph_count will be zero and + * we immediately set the iterator variable to indicate end of glyph list. */ - run = CFArrayGetValueAtIndex (runs, 0); - run_status = CTRunGetStatus (run); - glyph_count = CTRunGetGlyphCount (run); - cgglyphs = CTRunGetGlyphsPtr (run); + if (iter->glyph_count > 0) + run_iterator_set_current_run (iter, 0); + else + iter->total_ct_i = -1; +} - p = text; - pango_glyph_string_set_size (glyphs, glyph_count); - coverage = pango_font_get_coverage (PANGO_FONT (cfont), - analysis->language); +static void +run_iterator_free (struct RunIterator *iter) +{ + run_iterator_free_current_run (iter); + + CFRelease (iter->line); + CFRelease (iter->cstr); +} + +static gboolean +run_iterator_at_end (struct RunIterator *iter) +{ + if (iter->total_ct_i == -1) + return TRUE; - for (i = 0; i < glyph_count; i++) + return FALSE; +} + +static void +run_iterator_advance (struct RunIterator *iter) +{ + if (iter->total_ct_i >= iter->glyph_count - 1) + { + run_iterator_free_current_run (iter); + iter->ct_i = iter->total_ct_i = -1; + } + else + { + iter->total_ct_i++; + iter->ct_i++; + + if (iter->total_ct_i < iter->glyph_count && + iter->ct_i >= CTRunGetGlyphCount (iter->current_run)) + { + iter->current_run_number++; + run_iterator_set_current_run (iter, iter->current_run_number); + } + } +} + + + +struct GlyphInfo +{ + CFIndex index; + CGGlyph cgglyph; + gunichar wc; +}; + +static gint +glyph_info_compare_func (gconstpointer a, gconstpointer b) +{ + const struct GlyphInfo *gi_a = a; + const struct GlyphInfo *gi_b = b; + + if (gi_a->index < gi_b->index) + return -1; + else if (gi_a->index > gi_b->index) + return 1; + /* else */ + return 0; +} + +static void +glyph_info_free (gpointer data, gpointer user_data) +{ + g_slice_free (struct GlyphInfo, data); +} + +static GSList * +create_core_text_glyph_list (const char *text, + gint length, + CTFontRef ctfont) +{ + GSList *glyph_list = NULL; + struct RunIterator riter; + + run_iterator_create (&riter, text, length, ctfont); + + while (!run_iterator_at_end (&riter)) { - CFIndex real_i, prev_i; - gunichar wc; - gunichar mirrored_ch; + struct GlyphInfo *gi; - wc = g_utf8_get_char (p); + gi = g_slice_new (struct GlyphInfo); + gi->index = run_iterator_get_index (&riter); + gi->cgglyph = run_iterator_get_cgglyph (&riter); + gi->wc = run_iterator_get_character (&riter); - if (analysis->level % 2) - if (pango_get_mirror_char (wc, &mirrored_ch)) - wc = mirrored_ch; + glyph_list = g_slist_prepend (glyph_list, gi); + + run_iterator_advance (&riter); + } + + glyph_list = g_slist_sort (glyph_list, glyph_info_compare_func); + + run_iterator_free (&riter); + + return glyph_list; +} - if (run_status & kCTRunStatusRightToLeft) + +static void +basic_engine_shape (PangoEngineShape *engine, + PangoFont *font, + const char *text, + gint length, + const PangoAnalysis *analysis, + PangoGlyphString *glyphs) +{ + const char *p; + gulong n_chars, gs_i, gs_prev_i; + PangoCoreTextFont *cfont = PANGO_CORE_TEXT_FONT (font); + PangoCoverage *coverage; + GSList *glyph_list; + GSList *glyph_iter; + + /* We first fully iterate over the glyph sequence generated by CoreText and + * store this into a list, which is sorted after the iteration. We make a pass + * over the sorted linked list to build up the PangoGlyphString. + * + * We have to do this in order to properly handle a bunch of characteristics of the + * glyph sequence generated by the CoreText typesetter: + * # E.g. zero-width spaces do not end up in the CoreText glyph sequence. We have + * to manually account for the gap in the character indices. + * # Sometimes, CoreText generates two glyph for the same character index. We + * currently handle this "properly" as in we do not crash or corrupt memory, + * but that's about it. + * # Due to mismatches in size, the CoreText glyph sequence can either be longer or + * shorter than the PangoGlyphString. Note that the size of the PangoGlyphString + * should match the number of characters in "text". + * + * If performance becomes a problem, it is certainly possible to use a faster code + * that only does a single iteration over the string for "simple cases". Simple cases + * could include these that only consist out of one run (simple Latin text), which + * don't have gaps in the glyph sequence and which are monotonically + * increasing/decreasing. + * + * FIXME items for future fixing: + * # CoreText strings are UTF16, and the indices *often* refer to characters, + * but not *always*. Notable exception is when a character is encoded using + * two UTF16 code points. This are two characters in a CFString. At this point + * advancing a single character in the CFString and advancing a single character + * using g_utf8_next_char in the const char string goes out of sync. + * # We currently don't bother about LTR, Pango core appears to fix this up for us. + * (Even when we cared warnings were generated that strings were in the wrong + * order, this should be investigated). + * # When CoreText generates two glyphs for one character, only one is stored. + * This breaks the example strings for e.g. Georgian and Gothic. + */ + + glyph_list = create_core_text_glyph_list (text, length, + pango_core_text_font_get_ctfont (cfont)); + + /* Translate the glyph list to a PangoGlyphString */ + n_chars = g_utf8_strlen (text, length); + pango_glyph_string_set_size (glyphs, n_chars); + + glyph_iter = glyph_list; + + coverage = pango_font_get_coverage (PANGO_FONT (cfont), + analysis->language); + + for (gs_prev_i = -1, gs_i = 0, p = text; gs_i < n_chars; + gs_prev_i = gs_i, gs_i++, p = g_utf8_next_char (p)) + { + struct GlyphInfo *gi = glyph_iter != NULL ? glyph_iter->data : NULL; + + if (gi == NULL || gi->index > gs_i) { - real_i = glyph_count - i - 1; - prev_i = real_i + 1; + /* gs_i is behind, insert empty glyph */ + set_glyph (font, glyphs, gs_i, p - text, PANGO_GLYPH_EMPTY); + continue; } - else + else if (gi->index < gs_i) { - real_i = i; - prev_i = real_i - 1; + while (gi && gi->index < gs_i) + { + glyph_iter = g_slist_next (glyph_iter); + if (glyph_iter) + gi = glyph_iter->data; + else + gi = NULL; + } } - if (wc == 0xa0) /* non-break-space */ - wc = 0x20; - - if (pango_is_zero_width (wc)) - { - set_glyph (font, glyphs, real_i, p - text, PANGO_GLYPH_EMPTY); - } - else - { + if (gi != NULL && gi->index == gs_i) + { + gunichar mirrored_ch; PangoCoverageLevel result; - result = pango_coverage_get (coverage, wc); + if (analysis->level % 2) + if (g_unichar_get_mirror_char (gi->wc, &mirrored_ch)) + gi->wc = mirrored_ch; + + if (gi->wc == 0xa0) /* non-break-space */ + gi->wc = 0x20; + + result = pango_coverage_get (coverage, gi->wc); if (result != PANGO_COVERAGE_NONE) { - set_glyph (font, glyphs, real_i, p - text, cgglyphs[real_i]); + set_glyph (font, glyphs, gs_i, p - text, gi->cgglyph); - if (g_unichar_type (wc) == G_UNICODE_NON_SPACING_MARK) + if (g_unichar_type (gi->wc) == G_UNICODE_NON_SPACING_MARK) { - if (i > 0) + if (gi->index > 0) { PangoRectangle logical_rect, ink_rect; - glyphs->glyphs[real_i].geometry.width = MAX (glyphs->glyphs[prev_i].geometry.width, - glyphs->glyphs[prev_i].geometry.width); - glyphs->glyphs[prev_i].geometry.width = 0; - glyphs->log_clusters[real_i] = glyphs->log_clusters[prev_i]; + glyphs->glyphs[gs_i].geometry.width = MAX (glyphs->glyphs[gs_prev_i].geometry.width, + glyphs->glyphs[gs_i].geometry.width); + glyphs->glyphs[gs_prev_i].geometry.width = 0; + glyphs->log_clusters[gs_i] = glyphs->log_clusters[gs_prev_i]; /* Some heuristics to try to guess how overstrike glyphs are * done and compensate */ - pango_font_get_glyph_extents (font, glyphs->glyphs[real_i].glyph, &ink_rect, &logical_rect); + pango_font_get_glyph_extents (font, glyphs->glyphs[gs_i].glyph, &ink_rect, &logical_rect); if (logical_rect.width == 0 && ink_rect.x == 0) - glyphs->glyphs[real_i].geometry.x_offset = (glyphs->glyphs[real_i].geometry.width - ink_rect.width) / 2; + glyphs->glyphs[gs_i].geometry.x_offset = (glyphs->glyphs[gs_i].geometry.width - ink_rect.width) / 2; } } } else - { - set_glyph (font, glyphs, real_i, p - text, - PANGO_GET_UNKNOWN_GLYPH (wc)); - } - } + set_glyph (font, glyphs, gs_i, p - text, PANGO_GET_UNKNOWN_GLYPH (gi->wc)); - p = g_utf8_next_char (p); + glyph_iter = g_slist_next (glyph_iter); + } } - CFRelease (line); - CFRelease (attstr); - CFRelease (cstr); - CFRelease (attributes); pango_coverage_unref (coverage); + g_slist_foreach (glyph_list, glyph_info_free, NULL); + g_slist_free (glyph_list); } static void diff -Nru pango1.0-1.29.5/modules/basic/Makefile.in pango1.0-1.30.0/modules/basic/Makefile.in --- pango1.0-1.29.5/modules/basic/Makefile.in 2011-11-22 19:07:57.000000000 +0000 +++ pango1.0-1.30.0/modules/basic/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -81,6 +81,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_basic_atsui_la_LIBADD = @@ -88,8 +94,8 @@ libpango_basic_atsui_la-basic-atsui.lo libpango_basic_atsui_la_OBJECTS = \ $(am_libpango_basic_atsui_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_basic_atsui_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -201,21 +207,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_basic_atsui_la_SOURCES) \ $(libpango_basic_coretext_la_SOURCES) \ @@ -506,6 +512,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -555,25 +562,25 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-basic-atsui.la: $(libpango_basic_atsui_la_OBJECTS) $(libpango_basic_atsui_la_DEPENDENCIES) +libpango-basic-atsui.la: $(libpango_basic_atsui_la_OBJECTS) $(libpango_basic_atsui_la_DEPENDENCIES) $(EXTRA_libpango_basic_atsui_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_basic_atsui_la_LINK) $(am_libpango_basic_atsui_la_rpath) $(libpango_basic_atsui_la_OBJECTS) $(libpango_basic_atsui_la_LIBADD) $(LIBS) -libpango-basic-coretext.la: $(libpango_basic_coretext_la_OBJECTS) $(libpango_basic_coretext_la_DEPENDENCIES) +libpango-basic-coretext.la: $(libpango_basic_coretext_la_OBJECTS) $(libpango_basic_coretext_la_DEPENDENCIES) $(EXTRA_libpango_basic_coretext_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_basic_coretext_la_LINK) $(am_libpango_basic_coretext_la_rpath) $(libpango_basic_coretext_la_OBJECTS) $(libpango_basic_coretext_la_LIBADD) $(LIBS) -libpango-basic-fc.la: $(libpango_basic_fc_la_OBJECTS) $(libpango_basic_fc_la_DEPENDENCIES) +libpango-basic-fc.la: $(libpango_basic_fc_la_OBJECTS) $(libpango_basic_fc_la_DEPENDENCIES) $(EXTRA_libpango_basic_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_basic_fc_la_LINK) $(am_libpango_basic_fc_la_rpath) $(libpango_basic_fc_la_OBJECTS) $(libpango_basic_fc_la_LIBADD) $(LIBS) -libpango-basic-win32.la: $(libpango_basic_win32_la_OBJECTS) $(libpango_basic_win32_la_DEPENDENCIES) +libpango-basic-win32.la: $(libpango_basic_win32_la_OBJECTS) $(libpango_basic_win32_la_DEPENDENCIES) $(EXTRA_libpango_basic_win32_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_basic_win32_la_LINK) $(am_libpango_basic_win32_la_rpath) $(libpango_basic_win32_la_OBJECTS) $(libpango_basic_win32_la_LIBADD) $(LIBS) -libpango-basic-x.la: $(libpango_basic_x_la_OBJECTS) $(libpango_basic_x_la_DEPENDENCIES) +libpango-basic-x.la: $(libpango_basic_x_la_OBJECTS) $(libpango_basic_x_la_DEPENDENCIES) $(EXTRA_libpango_basic_x_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_basic_x_la_LINK) $(am_libpango_basic_x_la_rpath) $(libpango_basic_x_la_OBJECTS) $(libpango_basic_x_la_LIBADD) $(LIBS) -pango-basic-atsui.la: $(pango_basic_atsui_la_OBJECTS) $(pango_basic_atsui_la_DEPENDENCIES) +pango-basic-atsui.la: $(pango_basic_atsui_la_OBJECTS) $(pango_basic_atsui_la_DEPENDENCIES) $(EXTRA_pango_basic_atsui_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_basic_atsui_la_LINK) $(am_pango_basic_atsui_la_rpath) $(pango_basic_atsui_la_OBJECTS) $(pango_basic_atsui_la_LIBADD) $(LIBS) -pango-basic-coretext.la: $(pango_basic_coretext_la_OBJECTS) $(pango_basic_coretext_la_DEPENDENCIES) +pango-basic-coretext.la: $(pango_basic_coretext_la_OBJECTS) $(pango_basic_coretext_la_DEPENDENCIES) $(EXTRA_pango_basic_coretext_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_basic_coretext_la_LINK) $(am_pango_basic_coretext_la_rpath) $(pango_basic_coretext_la_OBJECTS) $(pango_basic_coretext_la_LIBADD) $(LIBS) -pango-basic-fc.la: $(pango_basic_fc_la_OBJECTS) $(pango_basic_fc_la_DEPENDENCIES) +pango-basic-fc.la: $(pango_basic_fc_la_OBJECTS) $(pango_basic_fc_la_DEPENDENCIES) $(EXTRA_pango_basic_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_basic_fc_la_LINK) $(am_pango_basic_fc_la_rpath) $(pango_basic_fc_la_OBJECTS) $(pango_basic_fc_la_LIBADD) $(LIBS) -pango-basic-win32.la: $(pango_basic_win32_la_OBJECTS) $(pango_basic_win32_la_DEPENDENCIES) +pango-basic-win32.la: $(pango_basic_win32_la_OBJECTS) $(pango_basic_win32_la_DEPENDENCIES) $(EXTRA_pango_basic_win32_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_basic_win32_la_LINK) $(am_pango_basic_win32_la_rpath) $(pango_basic_win32_la_OBJECTS) $(pango_basic_win32_la_LIBADD) $(LIBS) -pango-basic-x.la: $(pango_basic_x_la_OBJECTS) $(pango_basic_x_la_DEPENDENCIES) +pango-basic-x.la: $(pango_basic_x_la_OBJECTS) $(pango_basic_x_la_DEPENDENCIES) $(EXTRA_pango_basic_x_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_basic_x_la_LINK) $(am_pango_basic_x_la_rpath) $(pango_basic_x_la_OBJECTS) $(pango_basic_x_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -596,66 +603,58 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_basic_atsui_la-basic-atsui.lo: basic-atsui.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_atsui_la_CFLAGS) $(CFLAGS) -MT libpango_basic_atsui_la-basic-atsui.lo -MD -MP -MF $(DEPDIR)/libpango_basic_atsui_la-basic-atsui.Tpo -c -o libpango_basic_atsui_la-basic-atsui.lo `test -f 'basic-atsui.c' || echo '$(srcdir)/'`basic-atsui.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_basic_atsui_la-basic-atsui.Tpo $(DEPDIR)/libpango_basic_atsui_la-basic-atsui.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basic-atsui.c' object='libpango_basic_atsui_la-basic-atsui.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='basic-atsui.c' object='libpango_basic_atsui_la-basic-atsui.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_atsui_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_atsui_la-basic-atsui.lo `test -f 'basic-atsui.c' || echo '$(srcdir)/'`basic-atsui.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_atsui_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_atsui_la-basic-atsui.lo `test -f 'basic-atsui.c' || echo '$(srcdir)/'`basic-atsui.c libpango_basic_coretext_la-basic-coretext.lo: basic-coretext.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_coretext_la_CFLAGS) $(CFLAGS) -MT libpango_basic_coretext_la-basic-coretext.lo -MD -MP -MF $(DEPDIR)/libpango_basic_coretext_la-basic-coretext.Tpo -c -o libpango_basic_coretext_la-basic-coretext.lo `test -f 'basic-coretext.c' || echo '$(srcdir)/'`basic-coretext.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_basic_coretext_la-basic-coretext.Tpo $(DEPDIR)/libpango_basic_coretext_la-basic-coretext.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basic-coretext.c' object='libpango_basic_coretext_la-basic-coretext.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='basic-coretext.c' object='libpango_basic_coretext_la-basic-coretext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_coretext_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_coretext_la-basic-coretext.lo `test -f 'basic-coretext.c' || echo '$(srcdir)/'`basic-coretext.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_coretext_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_coretext_la-basic-coretext.lo `test -f 'basic-coretext.c' || echo '$(srcdir)/'`basic-coretext.c libpango_basic_fc_la-basic-fc.lo: basic-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_fc_la_CFLAGS) $(CFLAGS) -MT libpango_basic_fc_la-basic-fc.lo -MD -MP -MF $(DEPDIR)/libpango_basic_fc_la-basic-fc.Tpo -c -o libpango_basic_fc_la-basic-fc.lo `test -f 'basic-fc.c' || echo '$(srcdir)/'`basic-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_basic_fc_la-basic-fc.Tpo $(DEPDIR)/libpango_basic_fc_la-basic-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basic-fc.c' object='libpango_basic_fc_la-basic-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='basic-fc.c' object='libpango_basic_fc_la-basic-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_fc_la-basic-fc.lo `test -f 'basic-fc.c' || echo '$(srcdir)/'`basic-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_fc_la-basic-fc.lo `test -f 'basic-fc.c' || echo '$(srcdir)/'`basic-fc.c libpango_basic_win32_la-basic-win32.lo: basic-win32.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_win32_la_CFLAGS) $(CFLAGS) -MT libpango_basic_win32_la-basic-win32.lo -MD -MP -MF $(DEPDIR)/libpango_basic_win32_la-basic-win32.Tpo -c -o libpango_basic_win32_la-basic-win32.lo `test -f 'basic-win32.c' || echo '$(srcdir)/'`basic-win32.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_basic_win32_la-basic-win32.Tpo $(DEPDIR)/libpango_basic_win32_la-basic-win32.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basic-win32.c' object='libpango_basic_win32_la-basic-win32.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='basic-win32.c' object='libpango_basic_win32_la-basic-win32.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_win32_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_win32_la-basic-win32.lo `test -f 'basic-win32.c' || echo '$(srcdir)/'`basic-win32.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_win32_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_win32_la-basic-win32.lo `test -f 'basic-win32.c' || echo '$(srcdir)/'`basic-win32.c libpango_basic_x_la-basic-x.lo: basic-x.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_x_la_CFLAGS) $(CFLAGS) -MT libpango_basic_x_la-basic-x.lo -MD -MP -MF $(DEPDIR)/libpango_basic_x_la-basic-x.Tpo -c -o libpango_basic_x_la-basic-x.lo `test -f 'basic-x.c' || echo '$(srcdir)/'`basic-x.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_basic_x_la-basic-x.Tpo $(DEPDIR)/libpango_basic_x_la-basic-x.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='basic-x.c' object='libpango_basic_x_la-basic-x.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='basic-x.c' object='libpango_basic_x_la-basic-x.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_x_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_x_la-basic-x.lo `test -f 'basic-x.c' || echo '$(srcdir)/'`basic-x.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_basic_x_la_CFLAGS) $(CFLAGS) -c -o libpango_basic_x_la-basic-x.lo `test -f 'basic-x.c' || echo '$(srcdir)/'`basic-x.c mostlyclean-libtool: -rm -f *.lo @@ -762,10 +761,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/hangul/Makefile.in pango1.0-1.30.0/modules/hangul/Makefile.in --- pango1.0-1.29.5/modules/hangul/Makefile.in 2011-11-22 19:07:57.000000000 +0000 +++ pango1.0-1.30.0/modules/hangul/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,14 +70,20 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_hangul_fc_la_LIBADD = am__objects_1 = libpango_hangul_fc_la-hangul-fc.lo am_libpango_hangul_fc_la_OBJECTS = $(am__objects_1) libpango_hangul_fc_la_OBJECTS = $(am_libpango_hangul_fc_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_hangul_fc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -110,21 +116,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_hangul_fc_la_SOURCES) \ $(pango_hangul_fc_la_SOURCES) @@ -379,6 +385,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -428,9 +435,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-hangul-fc.la: $(libpango_hangul_fc_la_OBJECTS) $(libpango_hangul_fc_la_DEPENDENCIES) +libpango-hangul-fc.la: $(libpango_hangul_fc_la_OBJECTS) $(libpango_hangul_fc_la_DEPENDENCIES) $(EXTRA_libpango_hangul_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_hangul_fc_la_LINK) $(am_libpango_hangul_fc_la_rpath) $(libpango_hangul_fc_la_OBJECTS) $(libpango_hangul_fc_la_LIBADD) $(LIBS) -pango-hangul-fc.la: $(pango_hangul_fc_la_OBJECTS) $(pango_hangul_fc_la_DEPENDENCIES) +pango-hangul-fc.la: $(pango_hangul_fc_la_OBJECTS) $(pango_hangul_fc_la_DEPENDENCIES) $(EXTRA_pango_hangul_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_hangul_fc_la_LINK) $(am_pango_hangul_fc_la_rpath) $(pango_hangul_fc_la_OBJECTS) $(pango_hangul_fc_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -445,34 +452,30 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_hangul_fc_la-hangul-fc.lo: hangul-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hangul_fc_la_CFLAGS) $(CFLAGS) -MT libpango_hangul_fc_la-hangul-fc.lo -MD -MP -MF $(DEPDIR)/libpango_hangul_fc_la-hangul-fc.Tpo -c -o libpango_hangul_fc_la-hangul-fc.lo `test -f 'hangul-fc.c' || echo '$(srcdir)/'`hangul-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_hangul_fc_la-hangul-fc.Tpo $(DEPDIR)/libpango_hangul_fc_la-hangul-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hangul-fc.c' object='libpango_hangul_fc_la-hangul-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hangul-fc.c' object='libpango_hangul_fc_la-hangul-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hangul_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_hangul_fc_la-hangul-fc.lo `test -f 'hangul-fc.c' || echo '$(srcdir)/'`hangul-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hangul_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_hangul_fc_la-hangul-fc.lo `test -f 'hangul-fc.c' || echo '$(srcdir)/'`hangul-fc.c mostlyclean-libtool: -rm -f *.lo @@ -579,10 +582,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/hebrew/Makefile.in pango1.0-1.30.0/modules/hebrew/Makefile.in --- pango1.0-1.29.5/modules/hebrew/Makefile.in 2011-11-22 19:07:58.000000000 +0000 +++ pango1.0-1.30.0/modules/hebrew/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,6 +70,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_hebrew_fc_la_LIBADD = @@ -77,8 +83,8 @@ am__objects_2 = $(am__objects_1) libpango_hebrew_fc_la-hebrew-fc.lo am_libpango_hebrew_fc_la_OBJECTS = $(am__objects_2) libpango_hebrew_fc_la_OBJECTS = $(am_libpango_hebrew_fc_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_hebrew_fc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -112,21 +118,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_hebrew_fc_la_SOURCES) \ $(pango_hebrew_fc_la_SOURCES) @@ -379,6 +385,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -428,9 +435,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-hebrew-fc.la: $(libpango_hebrew_fc_la_OBJECTS) $(libpango_hebrew_fc_la_DEPENDENCIES) +libpango-hebrew-fc.la: $(libpango_hebrew_fc_la_OBJECTS) $(libpango_hebrew_fc_la_DEPENDENCIES) $(EXTRA_libpango_hebrew_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_hebrew_fc_la_LINK) $(am_libpango_hebrew_fc_la_rpath) $(libpango_hebrew_fc_la_OBJECTS) $(libpango_hebrew_fc_la_LIBADD) $(LIBS) -pango-hebrew-fc.la: $(pango_hebrew_fc_la_OBJECTS) $(pango_hebrew_fc_la_DEPENDENCIES) +pango-hebrew-fc.la: $(pango_hebrew_fc_la_OBJECTS) $(pango_hebrew_fc_la_DEPENDENCIES) $(EXTRA_pango_hebrew_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_hebrew_fc_la_LINK) $(am_pango_hebrew_fc_la_rpath) $(pango_hebrew_fc_la_OBJECTS) $(pango_hebrew_fc_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -447,42 +454,37 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_hebrew_fc_la-hebrew-shaper.lo: hebrew-shaper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hebrew_fc_la_CFLAGS) $(CFLAGS) -MT libpango_hebrew_fc_la-hebrew-shaper.lo -MD -MP -MF $(DEPDIR)/libpango_hebrew_fc_la-hebrew-shaper.Tpo -c -o libpango_hebrew_fc_la-hebrew-shaper.lo `test -f 'hebrew-shaper.c' || echo '$(srcdir)/'`hebrew-shaper.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_hebrew_fc_la-hebrew-shaper.Tpo $(DEPDIR)/libpango_hebrew_fc_la-hebrew-shaper.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hebrew-shaper.c' object='libpango_hebrew_fc_la-hebrew-shaper.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hebrew-shaper.c' object='libpango_hebrew_fc_la-hebrew-shaper.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hebrew_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_hebrew_fc_la-hebrew-shaper.lo `test -f 'hebrew-shaper.c' || echo '$(srcdir)/'`hebrew-shaper.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hebrew_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_hebrew_fc_la-hebrew-shaper.lo `test -f 'hebrew-shaper.c' || echo '$(srcdir)/'`hebrew-shaper.c libpango_hebrew_fc_la-hebrew-fc.lo: hebrew-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hebrew_fc_la_CFLAGS) $(CFLAGS) -MT libpango_hebrew_fc_la-hebrew-fc.lo -MD -MP -MF $(DEPDIR)/libpango_hebrew_fc_la-hebrew-fc.Tpo -c -o libpango_hebrew_fc_la-hebrew-fc.lo `test -f 'hebrew-fc.c' || echo '$(srcdir)/'`hebrew-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_hebrew_fc_la-hebrew-fc.Tpo $(DEPDIR)/libpango_hebrew_fc_la-hebrew-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hebrew-fc.c' object='libpango_hebrew_fc_la-hebrew-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hebrew-fc.c' object='libpango_hebrew_fc_la-hebrew-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hebrew_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_hebrew_fc_la-hebrew-fc.lo `test -f 'hebrew-fc.c' || echo '$(srcdir)/'`hebrew-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_hebrew_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_hebrew_fc_la-hebrew-fc.lo `test -f 'hebrew-fc.c' || echo '$(srcdir)/'`hebrew-fc.c mostlyclean-libtool: -rm -f *.lo @@ -589,10 +591,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/indic/Makefile.in pango1.0-1.30.0/modules/indic/Makefile.in --- pango1.0-1.29.5/modules/indic/Makefile.in 2011-11-22 19:07:58.000000000 +0000 +++ pango1.0-1.30.0/modules/indic/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,6 +72,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_indic_fc_la_LIBADD = @@ -81,8 +87,8 @@ libpango_indic_fc_la-mprefixups.lo am_libpango_indic_fc_la_OBJECTS = $(am__objects_1) libpango_indic_fc_la_OBJECTS = $(am_libpango_indic_fc_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_indic_fc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -136,21 +142,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_indic_fc_la_SOURCES) \ $(libpango_indic_lang_la_SOURCES) $(pango_indic_fc_la_SOURCES) \ @@ -419,6 +425,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -468,13 +475,13 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-indic-fc.la: $(libpango_indic_fc_la_OBJECTS) $(libpango_indic_fc_la_DEPENDENCIES) +libpango-indic-fc.la: $(libpango_indic_fc_la_OBJECTS) $(libpango_indic_fc_la_DEPENDENCIES) $(EXTRA_libpango_indic_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_indic_fc_la_LINK) $(am_libpango_indic_fc_la_rpath) $(libpango_indic_fc_la_OBJECTS) $(libpango_indic_fc_la_LIBADD) $(LIBS) -libpango-indic-lang.la: $(libpango_indic_lang_la_OBJECTS) $(libpango_indic_lang_la_DEPENDENCIES) +libpango-indic-lang.la: $(libpango_indic_lang_la_OBJECTS) $(libpango_indic_lang_la_DEPENDENCIES) $(EXTRA_libpango_indic_lang_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_indic_lang_la_LINK) $(am_libpango_indic_lang_la_rpath) $(libpango_indic_lang_la_OBJECTS) $(libpango_indic_lang_la_LIBADD) $(LIBS) -pango-indic-fc.la: $(pango_indic_fc_la_OBJECTS) $(pango_indic_fc_la_DEPENDENCIES) +pango-indic-fc.la: $(pango_indic_fc_la_OBJECTS) $(pango_indic_fc_la_DEPENDENCIES) $(EXTRA_pango_indic_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_indic_fc_la_LINK) $(am_pango_indic_fc_la_rpath) $(pango_indic_fc_la_OBJECTS) $(pango_indic_fc_la_LIBADD) $(LIBS) -pango-indic-lang.la: $(pango_indic_lang_la_OBJECTS) $(pango_indic_lang_la_DEPENDENCIES) +pango-indic-lang.la: $(pango_indic_lang_la_OBJECTS) $(pango_indic_lang_la_DEPENDENCIES) $(EXTRA_pango_indic_lang_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_indic_lang_la_LINK) $(am_pango_indic_lang_la_rpath) $(pango_indic_lang_la_OBJECTS) $(pango_indic_lang_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -497,66 +504,58 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_indic_fc_la-indic-fc.lo: indic-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -MT libpango_indic_fc_la-indic-fc.lo -MD -MP -MF $(DEPDIR)/libpango_indic_fc_la-indic-fc.Tpo -c -o libpango_indic_fc_la-indic-fc.lo `test -f 'indic-fc.c' || echo '$(srcdir)/'`indic-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_indic_fc_la-indic-fc.Tpo $(DEPDIR)/libpango_indic_fc_la-indic-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indic-fc.c' object='libpango_indic_fc_la-indic-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indic-fc.c' object='libpango_indic_fc_la-indic-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_fc_la-indic-fc.lo `test -f 'indic-fc.c' || echo '$(srcdir)/'`indic-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_fc_la-indic-fc.lo `test -f 'indic-fc.c' || echo '$(srcdir)/'`indic-fc.c libpango_indic_fc_la-indic-ot-class-tables.lo: indic-ot-class-tables.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -MT libpango_indic_fc_la-indic-ot-class-tables.lo -MD -MP -MF $(DEPDIR)/libpango_indic_fc_la-indic-ot-class-tables.Tpo -c -o libpango_indic_fc_la-indic-ot-class-tables.lo `test -f 'indic-ot-class-tables.c' || echo '$(srcdir)/'`indic-ot-class-tables.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_indic_fc_la-indic-ot-class-tables.Tpo $(DEPDIR)/libpango_indic_fc_la-indic-ot-class-tables.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indic-ot-class-tables.c' object='libpango_indic_fc_la-indic-ot-class-tables.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indic-ot-class-tables.c' object='libpango_indic_fc_la-indic-ot-class-tables.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_fc_la-indic-ot-class-tables.lo `test -f 'indic-ot-class-tables.c' || echo '$(srcdir)/'`indic-ot-class-tables.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_fc_la-indic-ot-class-tables.lo `test -f 'indic-ot-class-tables.c' || echo '$(srcdir)/'`indic-ot-class-tables.c libpango_indic_fc_la-indic-ot.lo: indic-ot.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -MT libpango_indic_fc_la-indic-ot.lo -MD -MP -MF $(DEPDIR)/libpango_indic_fc_la-indic-ot.Tpo -c -o libpango_indic_fc_la-indic-ot.lo `test -f 'indic-ot.c' || echo '$(srcdir)/'`indic-ot.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_indic_fc_la-indic-ot.Tpo $(DEPDIR)/libpango_indic_fc_la-indic-ot.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indic-ot.c' object='libpango_indic_fc_la-indic-ot.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indic-ot.c' object='libpango_indic_fc_la-indic-ot.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_fc_la-indic-ot.lo `test -f 'indic-ot.c' || echo '$(srcdir)/'`indic-ot.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_fc_la-indic-ot.lo `test -f 'indic-ot.c' || echo '$(srcdir)/'`indic-ot.c libpango_indic_fc_la-mprefixups.lo: mprefixups.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -MT libpango_indic_fc_la-mprefixups.lo -MD -MP -MF $(DEPDIR)/libpango_indic_fc_la-mprefixups.Tpo -c -o libpango_indic_fc_la-mprefixups.lo `test -f 'mprefixups.c' || echo '$(srcdir)/'`mprefixups.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_indic_fc_la-mprefixups.Tpo $(DEPDIR)/libpango_indic_fc_la-mprefixups.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mprefixups.c' object='libpango_indic_fc_la-mprefixups.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mprefixups.c' object='libpango_indic_fc_la-mprefixups.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_fc_la-mprefixups.lo `test -f 'mprefixups.c' || echo '$(srcdir)/'`mprefixups.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_fc_la-mprefixups.lo `test -f 'mprefixups.c' || echo '$(srcdir)/'`mprefixups.c libpango_indic_lang_la-indic-lang.lo: indic-lang.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_lang_la_CFLAGS) $(CFLAGS) -MT libpango_indic_lang_la-indic-lang.lo -MD -MP -MF $(DEPDIR)/libpango_indic_lang_la-indic-lang.Tpo -c -o libpango_indic_lang_la-indic-lang.lo `test -f 'indic-lang.c' || echo '$(srcdir)/'`indic-lang.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_indic_lang_la-indic-lang.Tpo $(DEPDIR)/libpango_indic_lang_la-indic-lang.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='indic-lang.c' object='libpango_indic_lang_la-indic-lang.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='indic-lang.c' object='libpango_indic_lang_la-indic-lang.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_lang_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_lang_la-indic-lang.lo `test -f 'indic-lang.c' || echo '$(srcdir)/'`indic-lang.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_indic_lang_la_CFLAGS) $(CFLAGS) -c -o libpango_indic_lang_la-indic-lang.lo `test -f 'indic-lang.c' || echo '$(srcdir)/'`indic-lang.c mostlyclean-libtool: -rm -f *.lo @@ -663,10 +662,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/khmer/Makefile.in pango1.0-1.30.0/modules/khmer/Makefile.in --- pango1.0-1.29.5/modules/khmer/Makefile.in 2011-11-22 19:07:58.000000000 +0000 +++ pango1.0-1.30.0/modules/khmer/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,14 +70,20 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_khmer_fc_la_LIBADD = am__objects_1 = libpango_khmer_fc_la-khmer-fc.lo am_libpango_khmer_fc_la_OBJECTS = $(am__objects_1) libpango_khmer_fc_la_OBJECTS = $(am_libpango_khmer_fc_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_khmer_fc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -110,21 +116,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_khmer_fc_la_SOURCES) $(pango_khmer_fc_la_SOURCES) DIST_SOURCES = $(libpango_khmer_fc_la_SOURCES) \ @@ -377,6 +383,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -426,9 +433,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-khmer-fc.la: $(libpango_khmer_fc_la_OBJECTS) $(libpango_khmer_fc_la_DEPENDENCIES) +libpango-khmer-fc.la: $(libpango_khmer_fc_la_OBJECTS) $(libpango_khmer_fc_la_DEPENDENCIES) $(EXTRA_libpango_khmer_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_khmer_fc_la_LINK) $(am_libpango_khmer_fc_la_rpath) $(libpango_khmer_fc_la_OBJECTS) $(libpango_khmer_fc_la_LIBADD) $(LIBS) -pango-khmer-fc.la: $(pango_khmer_fc_la_OBJECTS) $(pango_khmer_fc_la_DEPENDENCIES) +pango-khmer-fc.la: $(pango_khmer_fc_la_OBJECTS) $(pango_khmer_fc_la_DEPENDENCIES) $(EXTRA_pango_khmer_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_khmer_fc_la_LINK) $(am_pango_khmer_fc_la_rpath) $(pango_khmer_fc_la_OBJECTS) $(pango_khmer_fc_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -443,34 +450,30 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_khmer_fc_la-khmer-fc.lo: khmer-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_khmer_fc_la_CFLAGS) $(CFLAGS) -MT libpango_khmer_fc_la-khmer-fc.lo -MD -MP -MF $(DEPDIR)/libpango_khmer_fc_la-khmer-fc.Tpo -c -o libpango_khmer_fc_la-khmer-fc.lo `test -f 'khmer-fc.c' || echo '$(srcdir)/'`khmer-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_khmer_fc_la-khmer-fc.Tpo $(DEPDIR)/libpango_khmer_fc_la-khmer-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='khmer-fc.c' object='libpango_khmer_fc_la-khmer-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='khmer-fc.c' object='libpango_khmer_fc_la-khmer-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_khmer_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_khmer_fc_la-khmer-fc.lo `test -f 'khmer-fc.c' || echo '$(srcdir)/'`khmer-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_khmer_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_khmer_fc_la-khmer-fc.lo `test -f 'khmer-fc.c' || echo '$(srcdir)/'`khmer-fc.c mostlyclean-libtool: -rm -f *.lo @@ -577,10 +580,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/Makefile.in pango1.0-1.30.0/modules/Makefile.in --- pango1.0-1.29.5/modules/Makefile.in 2011-11-22 19:07:57.000000000 +0000 +++ pango1.0-1.30.0/modules/Makefile.in 2012-03-27 01:38:50.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -44,11 +44,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -547,10 +547,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/syriac/Makefile.in pango1.0-1.30.0/modules/syriac/Makefile.in --- pango1.0-1.29.5/modules/syriac/Makefile.in 2011-11-22 19:07:58.000000000 +0000 +++ pango1.0-1.30.0/modules/syriac/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,6 +70,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_syriac_fc_la_LIBADD = @@ -77,8 +83,8 @@ libpango_syriac_fc_la-syriac-ot.lo am_libpango_syriac_fc_la_OBJECTS = $(am__objects_1) libpango_syriac_fc_la_OBJECTS = $(am_libpango_syriac_fc_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_syriac_fc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -111,21 +117,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_syriac_fc_la_SOURCES) \ $(pango_syriac_fc_la_SOURCES) @@ -381,6 +387,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -430,9 +437,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-syriac-fc.la: $(libpango_syriac_fc_la_OBJECTS) $(libpango_syriac_fc_la_DEPENDENCIES) +libpango-syriac-fc.la: $(libpango_syriac_fc_la_OBJECTS) $(libpango_syriac_fc_la_DEPENDENCIES) $(EXTRA_libpango_syriac_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_syriac_fc_la_LINK) $(am_libpango_syriac_fc_la_rpath) $(libpango_syriac_fc_la_OBJECTS) $(libpango_syriac_fc_la_LIBADD) $(LIBS) -pango-syriac-fc.la: $(pango_syriac_fc_la_OBJECTS) $(pango_syriac_fc_la_DEPENDENCIES) +pango-syriac-fc.la: $(pango_syriac_fc_la_OBJECTS) $(pango_syriac_fc_la_DEPENDENCIES) $(EXTRA_pango_syriac_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_syriac_fc_la_LINK) $(am_pango_syriac_fc_la_rpath) $(pango_syriac_fc_la_OBJECTS) $(pango_syriac_fc_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -449,42 +456,37 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_syriac_fc_la-syriac-fc.lo: syriac-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_syriac_fc_la_CFLAGS) $(CFLAGS) -MT libpango_syriac_fc_la-syriac-fc.lo -MD -MP -MF $(DEPDIR)/libpango_syriac_fc_la-syriac-fc.Tpo -c -o libpango_syriac_fc_la-syriac-fc.lo `test -f 'syriac-fc.c' || echo '$(srcdir)/'`syriac-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_syriac_fc_la-syriac-fc.Tpo $(DEPDIR)/libpango_syriac_fc_la-syriac-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='syriac-fc.c' object='libpango_syriac_fc_la-syriac-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='syriac-fc.c' object='libpango_syriac_fc_la-syriac-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_syriac_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_syriac_fc_la-syriac-fc.lo `test -f 'syriac-fc.c' || echo '$(srcdir)/'`syriac-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_syriac_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_syriac_fc_la-syriac-fc.lo `test -f 'syriac-fc.c' || echo '$(srcdir)/'`syriac-fc.c libpango_syriac_fc_la-syriac-ot.lo: syriac-ot.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_syriac_fc_la_CFLAGS) $(CFLAGS) -MT libpango_syriac_fc_la-syriac-ot.lo -MD -MP -MF $(DEPDIR)/libpango_syriac_fc_la-syriac-ot.Tpo -c -o libpango_syriac_fc_la-syriac-ot.lo `test -f 'syriac-ot.c' || echo '$(srcdir)/'`syriac-ot.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_syriac_fc_la-syriac-ot.Tpo $(DEPDIR)/libpango_syriac_fc_la-syriac-ot.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='syriac-ot.c' object='libpango_syriac_fc_la-syriac-ot.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='syriac-ot.c' object='libpango_syriac_fc_la-syriac-ot.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_syriac_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_syriac_fc_la-syriac-ot.lo `test -f 'syriac-ot.c' || echo '$(srcdir)/'`syriac-ot.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_syriac_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_syriac_fc_la-syriac-ot.lo `test -f 'syriac-ot.c' || echo '$(srcdir)/'`syriac-ot.c mostlyclean-libtool: -rm -f *.lo @@ -591,10 +593,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/thai/Makefile.in pango1.0-1.30.0/modules/thai/Makefile.in --- pango1.0-1.29.5/modules/thai/Makefile.in 2011-11-22 19:07:58.000000000 +0000 +++ pango1.0-1.30.0/modules/thai/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,6 +72,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_thai_fc_la_LIBADD = @@ -80,8 +86,8 @@ am__objects_2 = $(am__objects_1) libpango_thai_fc_la-thai-fc.lo am_libpango_thai_fc_la_OBJECTS = $(am__objects_2) libpango_thai_fc_la_OBJECTS = $(am_libpango_thai_fc_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_thai_fc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -136,21 +142,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_thai_fc_la_SOURCES) \ $(libpango_thai_lang_la_SOURCES) $(pango_thai_fc_la_SOURCES) \ @@ -414,6 +420,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -463,13 +470,13 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-thai-fc.la: $(libpango_thai_fc_la_OBJECTS) $(libpango_thai_fc_la_DEPENDENCIES) +libpango-thai-fc.la: $(libpango_thai_fc_la_OBJECTS) $(libpango_thai_fc_la_DEPENDENCIES) $(EXTRA_libpango_thai_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_thai_fc_la_LINK) $(am_libpango_thai_fc_la_rpath) $(libpango_thai_fc_la_OBJECTS) $(libpango_thai_fc_la_LIBADD) $(LIBS) -libpango-thai-lang.la: $(libpango_thai_lang_la_OBJECTS) $(libpango_thai_lang_la_DEPENDENCIES) +libpango-thai-lang.la: $(libpango_thai_lang_la_OBJECTS) $(libpango_thai_lang_la_DEPENDENCIES) $(EXTRA_libpango_thai_lang_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_thai_lang_la_LINK) $(am_libpango_thai_lang_la_rpath) $(libpango_thai_lang_la_OBJECTS) $(libpango_thai_lang_la_LIBADD) $(LIBS) -pango-thai-fc.la: $(pango_thai_fc_la_OBJECTS) $(pango_thai_fc_la_DEPENDENCIES) +pango-thai-fc.la: $(pango_thai_fc_la_OBJECTS) $(pango_thai_fc_la_DEPENDENCIES) $(EXTRA_pango_thai_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_thai_fc_la_LINK) $(am_pango_thai_fc_la_rpath) $(pango_thai_fc_la_OBJECTS) $(pango_thai_fc_la_LIBADD) $(LIBS) -pango-thai-lang.la: $(pango_thai_lang_la_OBJECTS) $(pango_thai_lang_la_DEPENDENCIES) +pango-thai-lang.la: $(pango_thai_lang_la_OBJECTS) $(pango_thai_lang_la_DEPENDENCIES) $(EXTRA_pango_thai_lang_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_thai_lang_la_LINK) $(am_pango_thai_lang_la_rpath) $(pango_thai_lang_la_OBJECTS) $(pango_thai_lang_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -490,58 +497,51 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_thai_fc_la-thai-charprop.lo: thai-charprop.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -MT libpango_thai_fc_la-thai-charprop.lo -MD -MP -MF $(DEPDIR)/libpango_thai_fc_la-thai-charprop.Tpo -c -o libpango_thai_fc_la-thai-charprop.lo `test -f 'thai-charprop.c' || echo '$(srcdir)/'`thai-charprop.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_thai_fc_la-thai-charprop.Tpo $(DEPDIR)/libpango_thai_fc_la-thai-charprop.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thai-charprop.c' object='libpango_thai_fc_la-thai-charprop.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='thai-charprop.c' object='libpango_thai_fc_la-thai-charprop.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_thai_fc_la-thai-charprop.lo `test -f 'thai-charprop.c' || echo '$(srcdir)/'`thai-charprop.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_thai_fc_la-thai-charprop.lo `test -f 'thai-charprop.c' || echo '$(srcdir)/'`thai-charprop.c libpango_thai_fc_la-thai-shaper.lo: thai-shaper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -MT libpango_thai_fc_la-thai-shaper.lo -MD -MP -MF $(DEPDIR)/libpango_thai_fc_la-thai-shaper.Tpo -c -o libpango_thai_fc_la-thai-shaper.lo `test -f 'thai-shaper.c' || echo '$(srcdir)/'`thai-shaper.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_thai_fc_la-thai-shaper.Tpo $(DEPDIR)/libpango_thai_fc_la-thai-shaper.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thai-shaper.c' object='libpango_thai_fc_la-thai-shaper.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='thai-shaper.c' object='libpango_thai_fc_la-thai-shaper.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_thai_fc_la-thai-shaper.lo `test -f 'thai-shaper.c' || echo '$(srcdir)/'`thai-shaper.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_thai_fc_la-thai-shaper.lo `test -f 'thai-shaper.c' || echo '$(srcdir)/'`thai-shaper.c libpango_thai_fc_la-thai-fc.lo: thai-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -MT libpango_thai_fc_la-thai-fc.lo -MD -MP -MF $(DEPDIR)/libpango_thai_fc_la-thai-fc.Tpo -c -o libpango_thai_fc_la-thai-fc.lo `test -f 'thai-fc.c' || echo '$(srcdir)/'`thai-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_thai_fc_la-thai-fc.Tpo $(DEPDIR)/libpango_thai_fc_la-thai-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thai-fc.c' object='libpango_thai_fc_la-thai-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='thai-fc.c' object='libpango_thai_fc_la-thai-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_thai_fc_la-thai-fc.lo `test -f 'thai-fc.c' || echo '$(srcdir)/'`thai-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_thai_fc_la-thai-fc.lo `test -f 'thai-fc.c' || echo '$(srcdir)/'`thai-fc.c libpango_thai_lang_la-thai-lang.lo: thai-lang.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_lang_la_CFLAGS) $(CFLAGS) -MT libpango_thai_lang_la-thai-lang.lo -MD -MP -MF $(DEPDIR)/libpango_thai_lang_la-thai-lang.Tpo -c -o libpango_thai_lang_la-thai-lang.lo `test -f 'thai-lang.c' || echo '$(srcdir)/'`thai-lang.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_thai_lang_la-thai-lang.Tpo $(DEPDIR)/libpango_thai_lang_la-thai-lang.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='thai-lang.c' object='libpango_thai_lang_la-thai-lang.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='thai-lang.c' object='libpango_thai_lang_la-thai-lang.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_lang_la_CFLAGS) $(CFLAGS) -c -o libpango_thai_lang_la-thai-lang.lo `test -f 'thai-lang.c' || echo '$(srcdir)/'`thai-lang.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_thai_lang_la_CFLAGS) $(CFLAGS) -c -o libpango_thai_lang_la-thai-lang.lo `test -f 'thai-lang.c' || echo '$(srcdir)/'`thai-lang.c mostlyclean-libtool: -rm -f *.lo @@ -648,10 +648,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/modules/tibetan/Makefile.in pango1.0-1.30.0/modules/tibetan/Makefile.in --- pango1.0-1.29.5/modules/tibetan/Makefile.in 2011-11-22 19:07:58.000000000 +0000 +++ pango1.0-1.30.0/modules/tibetan/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,14 +70,20 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) libpango_tibetan_fc_la_LIBADD = am__objects_1 = libpango_tibetan_fc_la-tibetan-fc.lo am_libpango_tibetan_fc_la_OBJECTS = $(am__objects_1) libpango_tibetan_fc_la_OBJECTS = $(am_libpango_tibetan_fc_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_tibetan_fc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -110,21 +116,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_tibetan_fc_la_SOURCES) \ $(pango_tibetan_fc_la_SOURCES) @@ -376,6 +382,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/modules/Module.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -425,9 +432,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-tibetan-fc.la: $(libpango_tibetan_fc_la_OBJECTS) $(libpango_tibetan_fc_la_DEPENDENCIES) +libpango-tibetan-fc.la: $(libpango_tibetan_fc_la_OBJECTS) $(libpango_tibetan_fc_la_DEPENDENCIES) $(EXTRA_libpango_tibetan_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_tibetan_fc_la_LINK) $(am_libpango_tibetan_fc_la_rpath) $(libpango_tibetan_fc_la_OBJECTS) $(libpango_tibetan_fc_la_LIBADD) $(LIBS) -pango-tibetan-fc.la: $(pango_tibetan_fc_la_OBJECTS) $(pango_tibetan_fc_la_DEPENDENCIES) +pango-tibetan-fc.la: $(pango_tibetan_fc_la_OBJECTS) $(pango_tibetan_fc_la_DEPENDENCIES) $(EXTRA_pango_tibetan_fc_la_DEPENDENCIES) $(AM_V_CCLD)$(pango_tibetan_fc_la_LINK) $(am_pango_tibetan_fc_la_rpath) $(pango_tibetan_fc_la_OBJECTS) $(pango_tibetan_fc_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -442,34 +449,30 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpango_tibetan_fc_la-tibetan-fc.lo: tibetan-fc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_tibetan_fc_la_CFLAGS) $(CFLAGS) -MT libpango_tibetan_fc_la-tibetan-fc.lo -MD -MP -MF $(DEPDIR)/libpango_tibetan_fc_la-tibetan-fc.Tpo -c -o libpango_tibetan_fc_la-tibetan-fc.lo `test -f 'tibetan-fc.c' || echo '$(srcdir)/'`tibetan-fc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpango_tibetan_fc_la-tibetan-fc.Tpo $(DEPDIR)/libpango_tibetan_fc_la-tibetan-fc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tibetan-fc.c' object='libpango_tibetan_fc_la-tibetan-fc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tibetan-fc.c' object='libpango_tibetan_fc_la-tibetan-fc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_tibetan_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_tibetan_fc_la-tibetan-fc.lo `test -f 'tibetan-fc.c' || echo '$(srcdir)/'`tibetan-fc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpango_tibetan_fc_la_CFLAGS) $(CFLAGS) -c -o libpango_tibetan_fc_la-tibetan-fc.lo `test -f 'tibetan-fc.c' || echo '$(srcdir)/'`tibetan-fc.c mostlyclean-libtool: -rm -f *.lo @@ -576,10 +579,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/NEWS pango1.0-1.30.0/NEWS --- pango1.0-1.29.5/NEWS 2011-11-22 20:09:14.000000000 +0000 +++ pango1.0-1.30.0/NEWS 2012-03-27 01:28:26.000000000 +0000 @@ -1,3 +1,13 @@ +Overview of changes between 1.29.5 and 1.30.0 +============================================= +- 667799 - Fix cross-compiling bug in configure.in +- 664125 - Zero-width spaces cause missing characters +- CoreText backend: implement font fallbacks +- CoreText backend: make more robust against broken fonts +- CoreText backend: make shaping engine more robust +- CoreText backend: Guard against glyph count of zero +- Win32 build fixes + Overview of changes between 1.29.4 and 1.29.5 ============================================= - Documentation fixes diff -Nru pango1.0-1.29.5/pango/Makefile.in pango1.0-1.30.0/pango/Makefile.in --- pango1.0-1.29.5/pango/Makefile.in 2011-11-22 19:07:59.000000000 +0000 +++ pango1.0-1.30.0/pango/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -155,6 +155,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(aliasdir)" "$(DESTDIR)$(girdir)" \ "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(pangoincludedir)" @@ -170,8 +176,8 @@ pango-script.lo pango-tabs.lo pango-utils.lo reorder-items.lo \ shape.lo pango-enum-types.lo module-defs-lang.lo libpango_1_0_la_OBJECTS = $(am_libpango_1_0_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libpango_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -276,21 +282,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpango_1_0_la_SOURCES) $(libpangocairo_1_0_la_SOURCES) \ $(libpangoft2_1_0_la_SOURCES) $(libpangowin32_1_0_la_SOURCES) \ @@ -981,17 +987,17 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpango-1.0.la: $(libpango_1_0_la_OBJECTS) $(libpango_1_0_la_DEPENDENCIES) +libpango-1.0.la: $(libpango_1_0_la_OBJECTS) $(libpango_1_0_la_DEPENDENCIES) $(EXTRA_libpango_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libpango_1_0_la_LINK) -rpath $(libdir) $(libpango_1_0_la_OBJECTS) $(libpango_1_0_la_LIBADD) $(LIBS) -libpangocairo-1.0.la: $(libpangocairo_1_0_la_OBJECTS) $(libpangocairo_1_0_la_DEPENDENCIES) +libpangocairo-1.0.la: $(libpangocairo_1_0_la_OBJECTS) $(libpangocairo_1_0_la_DEPENDENCIES) $(EXTRA_libpangocairo_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libpangocairo_1_0_la_LINK) $(am_libpangocairo_1_0_la_rpath) $(libpangocairo_1_0_la_OBJECTS) $(libpangocairo_1_0_la_LIBADD) $(LIBS) -libpangoft2-1.0.la: $(libpangoft2_1_0_la_OBJECTS) $(libpangoft2_1_0_la_DEPENDENCIES) +libpangoft2-1.0.la: $(libpangoft2_1_0_la_OBJECTS) $(libpangoft2_1_0_la_DEPENDENCIES) $(EXTRA_libpangoft2_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libpangoft2_1_0_la_LINK) $(am_libpangoft2_1_0_la_rpath) $(libpangoft2_1_0_la_OBJECTS) $(libpangoft2_1_0_la_LIBADD) $(LIBS) -libpangowin32-1.0.la: $(libpangowin32_1_0_la_OBJECTS) $(libpangowin32_1_0_la_DEPENDENCIES) +libpangowin32-1.0.la: $(libpangowin32_1_0_la_OBJECTS) $(libpangowin32_1_0_la_DEPENDENCIES) $(EXTRA_libpangowin32_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libpangowin32_1_0_la_LINK) $(am_libpangowin32_1_0_la_rpath) $(libpangowin32_1_0_la_OBJECTS) $(libpangowin32_1_0_la_LIBADD) $(LIBS) -libpangox-1.0.la: $(libpangox_1_0_la_OBJECTS) $(libpangox_1_0_la_DEPENDENCIES) +libpangox-1.0.la: $(libpangox_1_0_la_OBJECTS) $(libpangox_1_0_la_DEPENDENCIES) $(EXTRA_libpangox_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libpangox_1_0_la_LINK) $(am_libpangox_1_0_la_rpath) $(libpangox_1_0_la_OBJECTS) $(libpangox_1_0_la_LIBADD) $(LIBS) -libpangoxft-1.0.la: $(libpangoxft_1_0_la_OBJECTS) $(libpangoxft_1_0_la_DEPENDENCIES) +libpangoxft-1.0.la: $(libpangoxft_1_0_la_OBJECTS) $(libpangoxft_1_0_la_DEPENDENCIES) $(EXTRA_libpangoxft_1_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libpangoxft_1_0_la_LINK) $(am_libpangoxft_1_0_la_rpath) $(libpangoxft_1_0_la_OBJECTS) $(libpangoxft_1_0_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -1052,7 +1058,7 @@ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ done; \ done; rm -f c$${pid}_.???; exit $$bad -pango-querymodules$(EXEEXT): $(pango_querymodules_OBJECTS) $(pango_querymodules_DEPENDENCIES) +pango-querymodules$(EXEEXT): $(pango_querymodules_OBJECTS) $(pango_querymodules_DEPENDENCIES) $(EXTRA_pango_querymodules_DEPENDENCIES) @rm -f pango-querymodules$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pango_querymodules_OBJECTS) $(pango_querymodules_LDADD) $(LIBS) @@ -1135,170 +1141,149 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libpangocairo_1_0_la-pangocairo-context.lo: pangocairo-context.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-context.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-context.Tpo -c -o libpangocairo_1_0_la-pangocairo-context.lo `test -f 'pangocairo-context.c' || echo '$(srcdir)/'`pangocairo-context.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-context.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-context.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-context.c' object='libpangocairo_1_0_la-pangocairo-context.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-context.c' object='libpangocairo_1_0_la-pangocairo-context.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-context.lo `test -f 'pangocairo-context.c' || echo '$(srcdir)/'`pangocairo-context.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-context.lo `test -f 'pangocairo-context.c' || echo '$(srcdir)/'`pangocairo-context.c libpangocairo_1_0_la-pangocairo-font.lo: pangocairo-font.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-font.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-font.Tpo -c -o libpangocairo_1_0_la-pangocairo-font.lo `test -f 'pangocairo-font.c' || echo '$(srcdir)/'`pangocairo-font.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-font.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-font.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-font.c' object='libpangocairo_1_0_la-pangocairo-font.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-font.c' object='libpangocairo_1_0_la-pangocairo-font.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-font.lo `test -f 'pangocairo-font.c' || echo '$(srcdir)/'`pangocairo-font.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-font.lo `test -f 'pangocairo-font.c' || echo '$(srcdir)/'`pangocairo-font.c libpangocairo_1_0_la-pangocairo-fontmap.lo: pangocairo-fontmap.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-fontmap.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fontmap.Tpo -c -o libpangocairo_1_0_la-pangocairo-fontmap.lo `test -f 'pangocairo-fontmap.c' || echo '$(srcdir)/'`pangocairo-fontmap.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fontmap.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fontmap.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-fontmap.c' object='libpangocairo_1_0_la-pangocairo-fontmap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-fontmap.c' object='libpangocairo_1_0_la-pangocairo-fontmap.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-fontmap.lo `test -f 'pangocairo-fontmap.c' || echo '$(srcdir)/'`pangocairo-fontmap.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-fontmap.lo `test -f 'pangocairo-fontmap.c' || echo '$(srcdir)/'`pangocairo-fontmap.c libpangocairo_1_0_la-pangocairo-render.lo: pangocairo-render.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-render.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-render.Tpo -c -o libpangocairo_1_0_la-pangocairo-render.lo `test -f 'pangocairo-render.c' || echo '$(srcdir)/'`pangocairo-render.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-render.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-render.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-render.c' object='libpangocairo_1_0_la-pangocairo-render.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-render.c' object='libpangocairo_1_0_la-pangocairo-render.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-render.lo `test -f 'pangocairo-render.c' || echo '$(srcdir)/'`pangocairo-render.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-render.lo `test -f 'pangocairo-render.c' || echo '$(srcdir)/'`pangocairo-render.c libpangocairo_1_0_la-pangocairo-win32font.lo: pangocairo-win32font.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-win32font.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-win32font.Tpo -c -o libpangocairo_1_0_la-pangocairo-win32font.lo `test -f 'pangocairo-win32font.c' || echo '$(srcdir)/'`pangocairo-win32font.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-win32font.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-win32font.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-win32font.c' object='libpangocairo_1_0_la-pangocairo-win32font.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-win32font.c' object='libpangocairo_1_0_la-pangocairo-win32font.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-win32font.lo `test -f 'pangocairo-win32font.c' || echo '$(srcdir)/'`pangocairo-win32font.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-win32font.lo `test -f 'pangocairo-win32font.c' || echo '$(srcdir)/'`pangocairo-win32font.c libpangocairo_1_0_la-pangocairo-win32fontmap.lo: pangocairo-win32fontmap.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-win32fontmap.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-win32fontmap.Tpo -c -o libpangocairo_1_0_la-pangocairo-win32fontmap.lo `test -f 'pangocairo-win32fontmap.c' || echo '$(srcdir)/'`pangocairo-win32fontmap.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-win32fontmap.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-win32fontmap.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-win32fontmap.c' object='libpangocairo_1_0_la-pangocairo-win32fontmap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-win32fontmap.c' object='libpangocairo_1_0_la-pangocairo-win32fontmap.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-win32fontmap.lo `test -f 'pangocairo-win32fontmap.c' || echo '$(srcdir)/'`pangocairo-win32fontmap.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-win32fontmap.lo `test -f 'pangocairo-win32fontmap.c' || echo '$(srcdir)/'`pangocairo-win32fontmap.c libpangocairo_1_0_la-pangocairo-fcfont.lo: pangocairo-fcfont.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-fcfont.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fcfont.Tpo -c -o libpangocairo_1_0_la-pangocairo-fcfont.lo `test -f 'pangocairo-fcfont.c' || echo '$(srcdir)/'`pangocairo-fcfont.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fcfont.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fcfont.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-fcfont.c' object='libpangocairo_1_0_la-pangocairo-fcfont.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-fcfont.c' object='libpangocairo_1_0_la-pangocairo-fcfont.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-fcfont.lo `test -f 'pangocairo-fcfont.c' || echo '$(srcdir)/'`pangocairo-fcfont.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-fcfont.lo `test -f 'pangocairo-fcfont.c' || echo '$(srcdir)/'`pangocairo-fcfont.c libpangocairo_1_0_la-pangocairo-fcfontmap.lo: pangocairo-fcfontmap.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-fcfontmap.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fcfontmap.Tpo -c -o libpangocairo_1_0_la-pangocairo-fcfontmap.lo `test -f 'pangocairo-fcfontmap.c' || echo '$(srcdir)/'`pangocairo-fcfontmap.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fcfontmap.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-fcfontmap.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-fcfontmap.c' object='libpangocairo_1_0_la-pangocairo-fcfontmap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-fcfontmap.c' object='libpangocairo_1_0_la-pangocairo-fcfontmap.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-fcfontmap.lo `test -f 'pangocairo-fcfontmap.c' || echo '$(srcdir)/'`pangocairo-fcfontmap.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-fcfontmap.lo `test -f 'pangocairo-fcfontmap.c' || echo '$(srcdir)/'`pangocairo-fcfontmap.c libpangocairo_1_0_la-module-defs-coretext.lo: module-defs-coretext.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-module-defs-coretext.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-module-defs-coretext.Tpo -c -o libpangocairo_1_0_la-module-defs-coretext.lo `test -f 'module-defs-coretext.c' || echo '$(srcdir)/'`module-defs-coretext.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-module-defs-coretext.Tpo $(DEPDIR)/libpangocairo_1_0_la-module-defs-coretext.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='module-defs-coretext.c' object='libpangocairo_1_0_la-module-defs-coretext.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='module-defs-coretext.c' object='libpangocairo_1_0_la-module-defs-coretext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-module-defs-coretext.lo `test -f 'module-defs-coretext.c' || echo '$(srcdir)/'`module-defs-coretext.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-module-defs-coretext.lo `test -f 'module-defs-coretext.c' || echo '$(srcdir)/'`module-defs-coretext.c libpangocairo_1_0_la-pangocoretext.lo: pangocoretext.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocoretext.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocoretext.Tpo -c -o libpangocairo_1_0_la-pangocoretext.lo `test -f 'pangocoretext.c' || echo '$(srcdir)/'`pangocoretext.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocoretext.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocoretext.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocoretext.c' object='libpangocairo_1_0_la-pangocoretext.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocoretext.c' object='libpangocairo_1_0_la-pangocoretext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocoretext.lo `test -f 'pangocoretext.c' || echo '$(srcdir)/'`pangocoretext.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocoretext.lo `test -f 'pangocoretext.c' || echo '$(srcdir)/'`pangocoretext.c libpangocairo_1_0_la-pangocoretext-fontmap.lo: pangocoretext-fontmap.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocoretext-fontmap.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocoretext-fontmap.Tpo -c -o libpangocairo_1_0_la-pangocoretext-fontmap.lo `test -f 'pangocoretext-fontmap.c' || echo '$(srcdir)/'`pangocoretext-fontmap.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocoretext-fontmap.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocoretext-fontmap.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocoretext-fontmap.c' object='libpangocairo_1_0_la-pangocoretext-fontmap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocoretext-fontmap.c' object='libpangocairo_1_0_la-pangocoretext-fontmap.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocoretext-fontmap.lo `test -f 'pangocoretext-fontmap.c' || echo '$(srcdir)/'`pangocoretext-fontmap.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocoretext-fontmap.lo `test -f 'pangocoretext-fontmap.c' || echo '$(srcdir)/'`pangocoretext-fontmap.c libpangocairo_1_0_la-pangocairo-coretextfont.lo: pangocairo-coretextfont.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-coretextfont.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-coretextfont.Tpo -c -o libpangocairo_1_0_la-pangocairo-coretextfont.lo `test -f 'pangocairo-coretextfont.c' || echo '$(srcdir)/'`pangocairo-coretextfont.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-coretextfont.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-coretextfont.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-coretextfont.c' object='libpangocairo_1_0_la-pangocairo-coretextfont.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-coretextfont.c' object='libpangocairo_1_0_la-pangocairo-coretextfont.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-coretextfont.lo `test -f 'pangocairo-coretextfont.c' || echo '$(srcdir)/'`pangocairo-coretextfont.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-coretextfont.lo `test -f 'pangocairo-coretextfont.c' || echo '$(srcdir)/'`pangocairo-coretextfont.c libpangocairo_1_0_la-pangocairo-coretextfontmap.lo: pangocairo-coretextfontmap.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-coretextfontmap.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-coretextfontmap.Tpo -c -o libpangocairo_1_0_la-pangocairo-coretextfontmap.lo `test -f 'pangocairo-coretextfontmap.c' || echo '$(srcdir)/'`pangocairo-coretextfontmap.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-coretextfontmap.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-coretextfontmap.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-coretextfontmap.c' object='libpangocairo_1_0_la-pangocairo-coretextfontmap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-coretextfontmap.c' object='libpangocairo_1_0_la-pangocairo-coretextfontmap.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-coretextfontmap.lo `test -f 'pangocairo-coretextfontmap.c' || echo '$(srcdir)/'`pangocairo-coretextfontmap.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-coretextfontmap.lo `test -f 'pangocairo-coretextfontmap.c' || echo '$(srcdir)/'`pangocairo-coretextfontmap.c libpangocairo_1_0_la-module-defs-atsui.lo: module-defs-atsui.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-module-defs-atsui.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-module-defs-atsui.Tpo -c -o libpangocairo_1_0_la-module-defs-atsui.lo `test -f 'module-defs-atsui.c' || echo '$(srcdir)/'`module-defs-atsui.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-module-defs-atsui.Tpo $(DEPDIR)/libpangocairo_1_0_la-module-defs-atsui.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='module-defs-atsui.c' object='libpangocairo_1_0_la-module-defs-atsui.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='module-defs-atsui.c' object='libpangocairo_1_0_la-module-defs-atsui.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-module-defs-atsui.lo `test -f 'module-defs-atsui.c' || echo '$(srcdir)/'`module-defs-atsui.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-module-defs-atsui.lo `test -f 'module-defs-atsui.c' || echo '$(srcdir)/'`module-defs-atsui.c libpangocairo_1_0_la-pangoatsui.lo: pangoatsui.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangoatsui.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangoatsui.Tpo -c -o libpangocairo_1_0_la-pangoatsui.lo `test -f 'pangoatsui.c' || echo '$(srcdir)/'`pangoatsui.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangoatsui.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangoatsui.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangoatsui.c' object='libpangocairo_1_0_la-pangoatsui.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangoatsui.c' object='libpangocairo_1_0_la-pangoatsui.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangoatsui.lo `test -f 'pangoatsui.c' || echo '$(srcdir)/'`pangoatsui.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangoatsui.lo `test -f 'pangoatsui.c' || echo '$(srcdir)/'`pangoatsui.c libpangocairo_1_0_la-pangoatsui-fontmap.lo: pangoatsui-fontmap.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangoatsui-fontmap.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangoatsui-fontmap.Tpo -c -o libpangocairo_1_0_la-pangoatsui-fontmap.lo `test -f 'pangoatsui-fontmap.c' || echo '$(srcdir)/'`pangoatsui-fontmap.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangoatsui-fontmap.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangoatsui-fontmap.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangoatsui-fontmap.c' object='libpangocairo_1_0_la-pangoatsui-fontmap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangoatsui-fontmap.c' object='libpangocairo_1_0_la-pangoatsui-fontmap.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangoatsui-fontmap.lo `test -f 'pangoatsui-fontmap.c' || echo '$(srcdir)/'`pangoatsui-fontmap.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangoatsui-fontmap.lo `test -f 'pangoatsui-fontmap.c' || echo '$(srcdir)/'`pangoatsui-fontmap.c libpangocairo_1_0_la-pangocairo-atsuifont.lo: pangocairo-atsuifont.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-atsuifont.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-atsuifont.Tpo -c -o libpangocairo_1_0_la-pangocairo-atsuifont.lo `test -f 'pangocairo-atsuifont.c' || echo '$(srcdir)/'`pangocairo-atsuifont.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-atsuifont.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-atsuifont.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-atsuifont.c' object='libpangocairo_1_0_la-pangocairo-atsuifont.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-atsuifont.c' object='libpangocairo_1_0_la-pangocairo-atsuifont.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-atsuifont.lo `test -f 'pangocairo-atsuifont.c' || echo '$(srcdir)/'`pangocairo-atsuifont.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-atsuifont.lo `test -f 'pangocairo-atsuifont.c' || echo '$(srcdir)/'`pangocairo-atsuifont.c libpangocairo_1_0_la-pangocairo-atsuifontmap.lo: pangocairo-atsuifontmap.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -MT libpangocairo_1_0_la-pangocairo-atsuifontmap.lo -MD -MP -MF $(DEPDIR)/libpangocairo_1_0_la-pangocairo-atsuifontmap.Tpo -c -o libpangocairo_1_0_la-pangocairo-atsuifontmap.lo `test -f 'pangocairo-atsuifontmap.c' || echo '$(srcdir)/'`pangocairo-atsuifontmap.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpangocairo_1_0_la-pangocairo-atsuifontmap.Tpo $(DEPDIR)/libpangocairo_1_0_la-pangocairo-atsuifontmap.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pangocairo-atsuifontmap.c' object='libpangocairo_1_0_la-pangocairo-atsuifontmap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pangocairo-atsuifontmap.c' object='libpangocairo_1_0_la-pangocairo-atsuifontmap.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-atsuifontmap.lo `test -f 'pangocairo-atsuifontmap.c' || echo '$(srcdir)/'`pangocairo-atsuifontmap.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpangocairo_1_0_la_CFLAGS) $(CFLAGS) -c -o libpangocairo_1_0_la-pangocairo-atsuifontmap.lo `test -f 'pangocairo-atsuifontmap.c' || echo '$(srcdir)/'`pangocairo-atsuifontmap.c mostlyclean-libtool: -rm -f *.lo @@ -1322,9 +1307,7 @@ @$(NORMAL_UNINSTALL) @list='$(alias_DATA)'; test -n "$(aliasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(aliasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(aliasdir)" && rm -f $$files + dir='$(DESTDIR)$(aliasdir)'; $(am__uninstall_files_from_dir) install-girDATA: $(gir_DATA) @$(NORMAL_INSTALL) test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)" @@ -1342,9 +1325,7 @@ @$(NORMAL_UNINSTALL) @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(girdir)" && rm -f $$files + dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) install-typelibsDATA: $(typelibs_DATA) @$(NORMAL_INSTALL) test -z "$(typelibsdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" @@ -1362,9 +1343,7 @@ @$(NORMAL_UNINSTALL) @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(typelibsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(typelibsdir)" && rm -f $$files + dir='$(DESTDIR)$(typelibsdir)'; $(am__uninstall_files_from_dir) install-pangoincludeHEADERS: $(pangoinclude_HEADERS) @$(NORMAL_INSTALL) test -z "$(pangoincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pangoincludedir)" @@ -1382,9 +1361,7 @@ @$(NORMAL_UNINSTALL) @list='$(pangoinclude_HEADERS)'; test -n "$(pangoincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pangoincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pangoincludedir)" && rm -f $$files + dir='$(DESTDIR)$(pangoincludedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -1602,14 +1579,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -1697,10 +1675,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru pango1.0-1.29.5/pango/mini-fribidi/Makefile.in pango1.0-1.30.0/pango/mini-fribidi/Makefile.in --- pango1.0-1.29.5/pango/mini-fribidi/Makefile.in 2011-11-22 19:07:59.000000000 +0000 +++ pango1.0-1.30.0/pango/mini-fribidi/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,8 +50,8 @@ am_libmini_fribidi_la_OBJECTS = fribidi.lo fribidi_char_type.lo \ fribidi_types.lo libmini_fribidi_la_OBJECTS = $(am_libmini_fribidi_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -63,21 +63,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libmini_fribidi_la_SOURCES) DIST_SOURCES = $(libmini_fribidi_la_SOURCES) @@ -340,7 +340,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libmini-fribidi.la: $(libmini_fribidi_la_OBJECTS) $(libmini_fribidi_la_DEPENDENCIES) +libmini-fribidi.la: $(libmini_fribidi_la_OBJECTS) $(libmini_fribidi_la_DEPENDENCIES) $(EXTRA_libmini_fribidi_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmini_fribidi_la_OBJECTS) $(libmini_fribidi_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -356,26 +356,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -482,10 +479,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/pango/modules.c pango1.0-1.30.0/pango/modules.c --- pango1.0-1.29.5/pango/modules.c 2011-08-16 01:11:08.000000000 +0000 +++ pango1.0-1.30.0/pango/modules.c 2012-03-27 00:33:41.000000000 +0000 @@ -400,7 +400,7 @@ } static gboolean /* Returns true if succeeded, false if failed */ -process_module_file (FILE *module_file) +process_module_file (FILE *module_file, const gchar *module_file_dir) { GString *line_buf = g_string_new (NULL); GString *tmp_buf = g_string_new (NULL); @@ -438,6 +438,11 @@ switch (i) { case 0: + if (!g_path_is_absolute (tmp_buf->str)) { + const gchar *abs_file_name = g_build_filename (module_file_dir, tmp_buf->str, NULL); + g_string_assign (tmp_buf, abs_file_name); + g_free ((gpointer) abs_file_name); + } pair->module = find_or_create_module (tmp_buf->str); break; case 1: @@ -543,7 +548,9 @@ module_file = g_fopen (files[n], "r"); if (module_file) { - process_module_file(module_file); + const gchar *module_file_dir = g_path_get_dirname (files[n]); + process_module_file(module_file, module_file_dir); + g_free ((gpointer) module_file_dir); fclose(module_file); } } diff -Nru pango1.0-1.29.5/pango/opentype/Makefile.in pango1.0-1.30.0/pango/opentype/Makefile.in --- pango1.0-1.29.5/pango/opentype/Makefile.in 2011-11-22 19:07:59.000000000 +0000 +++ pango1.0-1.30.0/pango/opentype/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -61,8 +61,8 @@ am__objects_3 = $(am__objects_1) am_libharfbuzz_la_OBJECTS = $(am__objects_2) $(am__objects_3) libharfbuzz_la_OBJECTS = $(am_libharfbuzz_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libharfbuzz_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ @@ -82,18 +82,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -101,18 +101,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_$(V)) -am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) am__v_CXX_0 = @echo " CXX " $@; CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_$(V)) -am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libharfbuzz_la_SOURCES) $(main_SOURCES) DIST_SOURCES = $(libharfbuzz_la_SOURCES) $(main_SOURCES) @@ -396,7 +396,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libharfbuzz.la: $(libharfbuzz_la_OBJECTS) $(libharfbuzz_la_DEPENDENCIES) +libharfbuzz.la: $(libharfbuzz_la_OBJECTS) $(libharfbuzz_la_DEPENDENCIES) $(EXTRA_libharfbuzz_la_DEPENDENCIES) $(AM_V_CXXLD)$(libharfbuzz_la_LINK) $(libharfbuzz_la_OBJECTS) $(libharfbuzz_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @@ -407,7 +407,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES) +main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES) $(EXTRA_main_DEPENDENCIES) @rm -f main$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(main_OBJECTS) $(main_LDADD) $(LIBS) @@ -429,122 +429,107 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libharfbuzz_la-hb-blob.lo: hb-blob.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libharfbuzz_la-hb-blob.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-blob.Tpo -c -o libharfbuzz_la-hb-blob.lo `test -f 'hb-blob.c' || echo '$(srcdir)/'`hb-blob.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-blob.Tpo $(DEPDIR)/libharfbuzz_la-hb-blob.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hb-blob.c' object='libharfbuzz_la-hb-blob.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hb-blob.c' object='libharfbuzz_la-hb-blob.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-blob.lo `test -f 'hb-blob.c' || echo '$(srcdir)/'`hb-blob.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-blob.lo `test -f 'hb-blob.c' || echo '$(srcdir)/'`hb-blob.c libharfbuzz_la-hb-buffer.lo: hb-buffer.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libharfbuzz_la-hb-buffer.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-buffer.Tpo -c -o libharfbuzz_la-hb-buffer.lo `test -f 'hb-buffer.c' || echo '$(srcdir)/'`hb-buffer.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-buffer.Tpo $(DEPDIR)/libharfbuzz_la-hb-buffer.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hb-buffer.c' object='libharfbuzz_la-hb-buffer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hb-buffer.c' object='libharfbuzz_la-hb-buffer.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-buffer.lo `test -f 'hb-buffer.c' || echo '$(srcdir)/'`hb-buffer.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-buffer.lo `test -f 'hb-buffer.c' || echo '$(srcdir)/'`hb-buffer.c libharfbuzz_la-hb-glib.lo: hb-glib.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libharfbuzz_la-hb-glib.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-glib.Tpo -c -o libharfbuzz_la-hb-glib.lo `test -f 'hb-glib.c' || echo '$(srcdir)/'`hb-glib.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-glib.Tpo $(DEPDIR)/libharfbuzz_la-hb-glib.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hb-glib.c' object='libharfbuzz_la-hb-glib.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hb-glib.c' object='libharfbuzz_la-hb-glib.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-glib.lo `test -f 'hb-glib.c' || echo '$(srcdir)/'`hb-glib.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-glib.lo `test -f 'hb-glib.c' || echo '$(srcdir)/'`hb-glib.c libharfbuzz_la-hb-shape.lo: hb-shape.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libharfbuzz_la-hb-shape.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-shape.Tpo -c -o libharfbuzz_la-hb-shape.lo `test -f 'hb-shape.c' || echo '$(srcdir)/'`hb-shape.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-shape.Tpo $(DEPDIR)/libharfbuzz_la-hb-shape.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hb-shape.c' object='libharfbuzz_la-hb-shape.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hb-shape.c' object='libharfbuzz_la-hb-shape.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-shape.lo `test -f 'hb-shape.c' || echo '$(srcdir)/'`hb-shape.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-shape.lo `test -f 'hb-shape.c' || echo '$(srcdir)/'`hb-shape.c libharfbuzz_la-hb-unicode.lo: hb-unicode.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libharfbuzz_la-hb-unicode.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-unicode.Tpo -c -o libharfbuzz_la-hb-unicode.lo `test -f 'hb-unicode.c' || echo '$(srcdir)/'`hb-unicode.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-unicode.Tpo $(DEPDIR)/libharfbuzz_la-hb-unicode.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hb-unicode.c' object='libharfbuzz_la-hb-unicode.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hb-unicode.c' object='libharfbuzz_la-hb-unicode.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-unicode.lo `test -f 'hb-unicode.c' || echo '$(srcdir)/'`hb-unicode.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libharfbuzz_la-hb-unicode.lo `test -f 'hb-unicode.c' || echo '$(srcdir)/'`hb-unicode.c .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< libharfbuzz_la-hb-font.lo: hb-font.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(libharfbuzz_la_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-font.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-font.Tpo -c -o libharfbuzz_la-hb-font.lo `test -f 'hb-font.cc' || echo '$(srcdir)/'`hb-font.cc @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-font.Tpo $(DEPDIR)/libharfbuzz_la-hb-font.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='hb-font.cc' object='libharfbuzz_la-hb-font.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-font.cc' object='libharfbuzz_la-hb-font.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(libharfbuzz_la_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-font.lo `test -f 'hb-font.cc' || echo '$(srcdir)/'`hb-font.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(libharfbuzz_la_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-font.lo `test -f 'hb-font.cc' || echo '$(srcdir)/'`hb-font.cc libharfbuzz_la-hb-ot-layout.lo: hb-ot-layout.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(libharfbuzz_la_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-layout.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-layout.Tpo -c -o libharfbuzz_la-hb-ot-layout.lo `test -f 'hb-ot-layout.cc' || echo '$(srcdir)/'`hb-ot-layout.cc @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-layout.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-layout.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='hb-ot-layout.cc' object='libharfbuzz_la-hb-ot-layout.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-layout.cc' object='libharfbuzz_la-hb-ot-layout.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(libharfbuzz_la_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-layout.lo `test -f 'hb-ot-layout.cc' || echo '$(srcdir)/'`hb-ot-layout.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(libharfbuzz_la_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-layout.lo `test -f 'hb-ot-layout.cc' || echo '$(srcdir)/'`hb-ot-layout.cc main-main.o: main.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main-main.o -MD -MP -MF $(DEPDIR)/main-main.Tpo -c -o main-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/main-main.Tpo $(DEPDIR)/main-main.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cc' object='main-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cc' object='main-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc main-main.obj: main.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main-main.obj -MD -MP -MF $(DEPDIR)/main-main.Tpo -c -o main-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/main-main.Tpo $(DEPDIR)/main-main.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cc' object='main-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cc' object='main-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -651,10 +636,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/pango/pangocairo-coretextfont.c pango1.0-1.30.0/pango/pangocairo-coretextfont.c --- pango1.0-1.29.5/pango/pangocairo-coretextfont.c 2011-08-16 01:11:08.000000000 +0000 +++ pango1.0-1.30.0/pango/pangocairo-coretextfont.c 2012-03-07 16:35:50.000000000 +0000 @@ -206,46 +206,24 @@ PangoCoreTextFont * _pango_cairo_core_text_font_new (PangoCairoCoreTextFontMap *cafontmap, - PangoContext *context, - PangoCoreTextFace *face, - const PangoFontDescription *desc) + PangoCoreTextFontKey *key) { - const char *postscript_name; gboolean synthesize_italic = FALSE; PangoCairoCoreTextFont *cafont; PangoCoreTextFont *cfont; - CFStringRef cfstr; CTFontRef font_ref; + CTFontDescriptorRef ctdescriptor; CGFontRef font_id; double size, abs_size; - double dpi; cairo_matrix_t font_matrix; - postscript_name = _pango_core_text_face_get_postscript_name (face); + abs_size = pango_core_text_font_key_get_absolute_size (key); + size = pango_units_to_double (abs_size); - abs_size = size = pango_units_to_double (pango_font_description_get_size (desc)); + ctdescriptor = pango_core_text_font_key_get_ctfontdescriptor (key); + font_ref = CTFontCreateWithFontDescriptor (ctdescriptor, size, NULL); - if (context) - { - dpi = pango_cairo_context_get_resolution (context); - - if (dpi <= 0) - dpi = cafontmap->dpi; - } - else - dpi = cafontmap->dpi; - - if (pango_font_description_get_size_is_absolute (desc)) - size *= 72. / dpi; - else - abs_size *= dpi / 72.; - - cfstr = CFStringCreateWithCString (NULL, postscript_name, - kCFStringEncodingUTF8); - font_ref = CTFontCreateWithName (cfstr, size, NULL); - CFRelease (cfstr); - - if (_pango_core_text_face_get_synthetic_italic (face)) + if (pango_core_text_font_key_get_synthetic_italic (key)) synthesize_italic = TRUE; font_id = CTFontCopyGraphicsFont (font_ref, NULL); @@ -255,10 +233,7 @@ cafont = g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT, NULL); cfont = PANGO_CORE_TEXT_FONT (cafont); - _pango_core_text_font_set_font_description (cfont, desc); - _pango_core_text_font_set_face (cfont, face); - - cafont->abs_size = abs_size * PANGO_SCALE; + cafont->abs_size = abs_size; _pango_core_text_font_set_ctfont (cfont, font_ref); @@ -270,14 +245,13 @@ else cairo_matrix_init_identity (&font_matrix); - /* Scale using absolute size */ - cairo_matrix_scale (&font_matrix, abs_size, abs_size); + cairo_matrix_scale (&font_matrix, size, size); _pango_cairo_font_private_initialize (&cafont->cf_priv, (PangoCairoFont *) cafont, - pango_font_description_get_gravity (desc), - _pango_cairo_context_get_merged_font_options (context), - pango_context_get_matrix (context), + pango_core_text_font_key_get_gravity (key), + pango_core_text_font_key_get_context_key (key), + pango_core_text_font_key_get_matrix (key), &font_matrix); return cfont; diff -Nru pango1.0-1.29.5/pango/pangocairo-coretextfontmap.c pango1.0-1.30.0/pango/pangocairo-coretextfontmap.c --- pango1.0-1.29.5/pango/pangocairo-coretextfontmap.c 2011-08-16 01:11:08.000000000 +0000 +++ pango1.0-1.30.0/pango/pangocairo-coretextfontmap.c 2012-03-07 16:35:50.000000000 +0000 @@ -44,7 +44,7 @@ } static double -pango_cairo_core_text_font_map_get_resolution (PangoCairoFontMap *cfontmap) +pango_cairo_core_text_font_map_get_resolution_cairo (PangoCairoFontMap *cfontmap) { PangoCairoCoreTextFontMap *cafontmap = PANGO_CAIRO_CORE_TEXT_FONT_MAP (cfontmap); @@ -64,7 +64,7 @@ cairo_font_map_iface_init (PangoCairoFontMapIface *iface) { iface->set_resolution = pango_cairo_core_text_font_map_set_resolution; - iface->get_resolution = pango_cairo_core_text_font_map_get_resolution; + iface->get_resolution = pango_cairo_core_text_font_map_get_resolution_cairo; iface->get_font_type = pango_cairo_core_text_font_map_get_font_type; } @@ -74,13 +74,11 @@ static PangoCoreTextFont * pango_cairo_core_text_font_map_create_font (PangoCoreTextFontMap *fontmap, - PangoContext *context, - PangoCoreTextFace *face, - const PangoFontDescription *desc) + PangoCoreTextFontKey *key) { return _pango_cairo_core_text_font_new (PANGO_CAIRO_CORE_TEXT_FONT_MAP (fontmap), - context, face, desc); + key); } static void @@ -89,6 +87,62 @@ G_OBJECT_CLASS (pango_cairo_core_text_font_map_parent_class)->finalize (object); } +static double +pango_cairo_core_text_font_map_get_resolution_core_text (PangoCoreTextFontMap *ctfontmap, + PangoContext *context) +{ + PangoCairoCoreTextFontMap *cafontmap = PANGO_CAIRO_CORE_TEXT_FONT_MAP (ctfontmap); + double dpi; + + if (context) + { + dpi = pango_cairo_context_get_resolution (context); + + if (dpi <= 0) + dpi = cafontmap->dpi; + } + else + dpi = cafontmap->dpi; + + return dpi; +} + +static gconstpointer +pango_cairo_core_text_font_map_context_key_get (PangoCoreTextFontMap *fontmap G_GNUC_UNUSED, + PangoContext *context) +{ + return _pango_cairo_context_get_merged_font_options (context); +} + +static gpointer +pango_cairo_core_text_font_map_context_key_copy (PangoCoreTextFontMap *fontmap G_GNUC_UNUSED, + gconstpointer key) +{ + return cairo_font_options_copy (key); +} + +static void +pango_cairo_core_text_font_map_context_key_free (PangoCoreTextFontMap *fontmap G_GNUC_UNUSED, + gpointer key) +{ + cairo_font_options_destroy (key); +} + +static guint32 +pango_cairo_core_text_font_map_context_key_hash (PangoCoreTextFontMap *fontmap G_GNUC_UNUSED, + gconstpointer key) +{ + return (guint32)cairo_font_options_hash (key); +} + +static gboolean +pango_cairo_core_text_font_map_context_key_equal (PangoCoreTextFontMap *fontmap G_GNUC_UNUSED, + gconstpointer key_a, + gconstpointer key_b) +{ + return cairo_font_options_equal (key_a, key_b); +} + static void pango_cairo_core_text_font_map_class_init (PangoCairoCoreTextFontMapClass *class) { @@ -97,7 +151,13 @@ object_class->finalize = pango_cairo_core_text_font_map_finalize; + ctfontmapclass->get_resolution = pango_cairo_core_text_font_map_get_resolution_core_text; ctfontmapclass->create_font = pango_cairo_core_text_font_map_create_font; + ctfontmapclass->context_key_get = pango_cairo_core_text_font_map_context_key_get; + ctfontmapclass->context_key_copy = pango_cairo_core_text_font_map_context_key_copy; + ctfontmapclass->context_key_free = pango_cairo_core_text_font_map_context_key_free; + ctfontmapclass->context_key_hash = pango_cairo_core_text_font_map_context_key_hash; + ctfontmapclass->context_key_equal = pango_cairo_core_text_font_map_context_key_equal; } static void diff -Nru pango1.0-1.29.5/pango/pangocairo-coretext.h pango1.0-1.30.0/pango/pangocairo-coretext.h --- pango1.0-1.29.5/pango/pangocairo-coretext.h 2011-08-16 01:11:08.000000000 +0000 +++ pango1.0-1.30.0/pango/pangocairo-coretext.h 2012-03-07 16:35:50.000000000 +0000 @@ -46,9 +46,7 @@ PangoCoreTextFont * _pango_cairo_core_text_font_new (PangoCairoCoreTextFontMap *cafontmap, - PangoContext *context, - PangoCoreTextFace *face, - const PangoFontDescription *desc); + PangoCoreTextFontKey *key); G_END_DECLS diff -Nru pango1.0-1.29.5/pango/pangocairo.rc pango1.0-1.30.0/pango/pangocairo.rc --- pango1.0-1.29.5/pango/pangocairo.rc 2011-11-22 20:24:14.000000000 +0000 +++ pango1.0-1.30.0/pango/pangocairo.rc 2012-03-27 01:38:57.000000000 +0000 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,29,5,0 - PRODUCTVERSION 1,29,5,0 + FILEVERSION 1,30,0,0 + PRODUCTVERSION 1,30,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoCairo" - VALUE "FileVersion", "1.29.5.0" + VALUE "FileVersion", "1.30.0.0" VALUE "InternalName", "pangocairo-1.0-0" VALUE "LegalCopyright", "Copyright © 2010 Red Hat Software." VALUE "OriginalFilename", "pangocairo-1.0-0.dll" VALUE "ProductName", "PangoCairo" - VALUE "ProductVersion", "1.29.5" + VALUE "ProductVersion", "1.30.0" END END BLOCK "VarFileInfo" diff -Nru pango1.0-1.29.5/pango/pangocoretext.c pango1.0-1.30.0/pango/pangocoretext.c --- pango1.0-1.29.5/pango/pangocoretext.c 2011-08-16 01:11:08.000000000 +0000 +++ pango1.0-1.30.0/pango/pangocoretext.c 2012-03-07 16:35:50.000000000 +0000 @@ -30,10 +30,12 @@ struct _PangoCoreTextFontPrivate { PangoCoreTextFace *face; - PangoFontDescription *desc; gpointer context_key; CTFontRef font_ref; + PangoCoreTextFontKey *key; + + PangoCoverage *coverage; PangoFontMap *fontmap; }; @@ -44,12 +46,13 @@ PangoCoreTextFont *ctfont = (PangoCoreTextFont *)object; PangoCoreTextFontPrivate *priv = ctfont->priv; - pango_font_description_free (priv->desc); - g_assert (priv->fontmap != NULL); g_object_remove_weak_pointer (G_OBJECT (priv->fontmap), (gpointer *) (gpointer) &priv->fontmap); priv->fontmap = NULL; + if (priv->coverage) + pango_coverage_unref (priv->coverage); + G_OBJECT_CLASS (pango_core_text_font_parent_class)->finalize (object); } @@ -58,8 +61,51 @@ { PangoCoreTextFont *ctfont = (PangoCoreTextFont *)font; PangoCoreTextFontPrivate *priv = ctfont->priv; + CTFontDescriptorRef ctfontdesc; + + ctfontdesc = pango_core_text_font_key_get_ctfontdescriptor (priv->key); + + return _pango_core_text_font_description_from_ct_font_descriptor (ctfontdesc); +} + +static PangoCoverage * +ct_font_descriptor_get_coverage (CTFontDescriptorRef desc) +{ + CFCharacterSetRef charset; + CFIndex i, length; + CFDataRef bitmap; + const UInt8 *ptr; + PangoCoverage *coverage; + + coverage = pango_coverage_new (); + + charset = CTFontDescriptorCopyAttribute (desc, kCTFontCharacterSetAttribute); + if (!charset) + /* Return an empty coverage */ + return coverage; + + bitmap = CFCharacterSetCreateBitmapRepresentation (kCFAllocatorDefault, + charset); + + /* We only handle the BMP plane */ + length = MIN (CFDataGetLength (bitmap), 8192); + ptr = CFDataGetBytePtr (bitmap); + + /* FIXME: can and should this be done more efficiently? */ + for (i = 0; i < length; i++) + { + int j; + + for (j = 0; j < 8; j++) + pango_coverage_set (coverage, i * 8 + j, + ((ptr[i] & (1 << j)) == (1 << j)) ? + PANGO_COVERAGE_EXACT : PANGO_COVERAGE_NONE); + } + + CFRelease (bitmap); + CFRelease (charset); - return pango_font_description_copy (priv->desc); + return coverage; } static PangoCoverage * @@ -69,8 +115,16 @@ PangoCoreTextFont *ctfont = (PangoCoreTextFont *)font; PangoCoreTextFontPrivate *priv = ctfont->priv; - return pango_coverage_ref (_pango_core_text_face_get_coverage (priv->face, - language)); + if (!priv->coverage) + { + CTFontDescriptorRef ctfontdesc; + + ctfontdesc = pango_core_text_font_key_get_ctfontdescriptor (priv->key); + + priv->coverage = ct_font_descriptor_get_coverage (ctfontdesc); + } + + return pango_coverage_ref (priv->coverage); } static PangoEngineShape * @@ -115,23 +169,6 @@ } void -_pango_core_text_font_set_font_description (PangoCoreTextFont *font, - const PangoFontDescription *desc) -{ - PangoCoreTextFontPrivate *priv = font->priv; - - priv->desc = pango_font_description_copy (desc); -} - -PangoFontDescription * -_pango_core_text_font_get_font_description (PangoCoreTextFont *font) -{ - PangoCoreTextFontPrivate *priv = font->priv; - - return priv->desc; -} - -void _pango_core_text_font_set_font_map (PangoCoreTextFont *font, PangoCoreTextFontMap *fontmap) { @@ -177,6 +214,21 @@ } void +_pango_core_text_font_set_font_key (PangoCoreTextFont *font, + PangoCoreTextFontKey *key) +{ + PangoCoreTextFontPrivate *priv = font->priv; + + priv->key = key; + + if (priv->coverage) + { + pango_coverage_unref (priv->coverage); + priv->coverage = NULL; + } +} + +void _pango_core_text_font_set_ctfont (PangoCoreTextFont *font, CTFontRef font_ref) { diff -Nru pango1.0-1.29.5/pango/pangocoretext-fontmap.c pango1.0-1.30.0/pango/pangocoretext-fontmap.c --- pango1.0-1.29.5/pango/pangocoretext-fontmap.c 2011-11-22 19:02:35.000000000 +0000 +++ pango1.0-1.30.0/pango/pangocoretext-fontmap.c 2012-03-07 16:35:50.000000000 +0000 @@ -32,6 +32,7 @@ typedef struct _FontHashKey FontHashKey; +typedef struct _PangoCoreTextFontset PangoCoreTextFontset; #define PANGO_TYPE_CORE_TEXT_FAMILY (pango_core_text_family_get_type ()) #define PANGO_CORE_TEXT_FAMILY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CORE_TEXT_FAMILY, PangoCoreTextFamily)) @@ -40,6 +41,11 @@ #define PANGO_IS_CORE_TEXT_FAMILY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_CORE_TEXT_FAMILY)) #define PANGO_CORE_TEXT_FAMILY_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), PANGO_CORE_TEXT_FAMILY, PangoCoreTextFamilyClass)) +#define PANGO_TYPE_CORE_TEXT_FONTSET (pango_core_text_fontset_get_type ()) +#define PANGO_CORE_TEXT_FONTSET(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CORE_TEXT_FONTSET, PangoCoreTextFontset)) +#define PANGO_IS_CORE_TEXT_FONTSET(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CORE_TEXT_FONTSET)) + + struct _PangoCoreTextFamily { PangoFontFamily parent_instance; @@ -72,11 +78,9 @@ PangoCoreTextFamily *family; - PangoCoverage *coverage; + CTFontDescriptorRef ctfontdescriptor; - char *postscript_name; char *style_name; - PangoWeight weight; CTFontSymbolicTraits traits; guint synthetic_italic : 1; @@ -91,6 +95,15 @@ static GType pango_core_text_family_get_type (void); static GType pango_core_text_face_get_type (void); +static GType pango_core_text_fontset_get_type (void); + +static PangoCoreTextFontset *pango_core_text_fontset_new (PangoCoreTextFontsetKey *key, + const PangoFontDescription *description); +static PangoCoreTextFontsetKey *pango_core_text_fontset_get_key (PangoCoreTextFontset *fontset); + +/* + * Helper functions to translate CoreText data to Pango + */ typedef struct { @@ -153,88 +166,139 @@ return buffer; } -static PangoCoverage * -pango_coverage_from_cf_charset (CFCharacterSetRef charset) +static char * +ct_font_descriptor_get_family_name (CTFontDescriptorRef desc) { - CFIndex i, length; - CFDataRef bitmap; - const UInt8 *ptr; - PangoCoverage *coverage; + CFStringRef cf_str; + char *buffer; + + cf_str = CTFontDescriptorCopyAttribute (desc, kCTFontFamilyNameAttribute); + if (!cf_str) + { + int i; - coverage = pango_coverage_new (); + /* No font family name is set, try to retrieve font name and deduce + * the family name from that instead. + */ + cf_str = CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute); + if (!cf_str) + { + /* This font is likely broken, return a default family name ... */ + return g_strdup ("Sans"); + } - bitmap = CFCharacterSetCreateBitmapRepresentation (kCFAllocatorDefault, - charset); + buffer = gchar_from_cf_string (cf_str); + CFRelease (cf_str); - /* We only handle the BMP plane */ - length = MIN (CFDataGetLength (bitmap), 8192); - ptr = CFDataGetBytePtr (bitmap); + for (i = 0; i < strlen (buffer); i++) + if (buffer[i] == '-') + break; - /* FIXME: can and should this be done more efficiently? */ - for (i = 0; i < length; i++) - { - int j; + if (i < strlen (buffer)) + { + char *ret; - for (j = 0; j < 8; j++) - pango_coverage_set (coverage, i * 8 + j, - ((ptr[i] & (1 << j)) == (1 << j)) ? - PANGO_COVERAGE_EXACT : PANGO_COVERAGE_NONE); + ret = g_strndup (buffer, i); + g_free (buffer); + + return ret; + } + else + return buffer; } + /* else */ - CFRelease (bitmap); + buffer = gchar_from_cf_string (cf_str); + CFRelease (cf_str); - return coverage; + return buffer; } -static inline gboolean -pango_core_text_face_is_oblique (PangoCoreTextFace *face) +static char * +ct_font_descriptor_get_style_name (CTFontDescriptorRef desc) { - return g_strrstr (face->style_name, "Oblique") != NULL; + CFStringRef cf_str; + char *buffer; + + cf_str = CTFontDescriptorCopyAttribute (desc, kCTFontStyleNameAttribute); + if (!cf_str) + return NULL; + + buffer = gchar_from_cf_string (cf_str); + CFRelease (cf_str); + + return buffer; } -static inline PangoCoreTextFace * -pango_core_text_face_from_ct_font_descriptor (CTFontDescriptorRef desc) +static CTFontSymbolicTraits +ct_font_descriptor_get_traits (CTFontDescriptorRef desc) { - SInt64 font_traits; - char *buffer; - CFStringRef str; - CFNumberRef number; - CGFloat value; CFDictionaryRef dict; - CFCharacterSetRef charset; - PangoCoreTextFace *face = g_object_new (PANGO_TYPE_CORE_TEXT_FACE, - NULL); + CFNumberRef cf_number; + SInt64 traits; - face->synthetic_italic = FALSE; + /* This is interesting, the value stored is a CTFontSymbolicTraits which + * is defined as uint32_t. CFNumber does not have an obvious type which + * deals with unsigned values. Upon inspection with CFNumberGetType, + * it turns out this value is stored as SInt64, so we use that to + * obtain the value from the CFNumber. + */ + dict = CTFontDescriptorCopyAttribute (desc, kCTFontTraitsAttribute); + cf_number = (CFNumberRef)CFDictionaryGetValue (dict, kCTFontSymbolicTrait); + if (!CFNumberGetValue (cf_number, kCFNumberSInt64Type, &traits)) + traits = 0; + CFRelease (dict); + + return (CTFontSymbolicTraits)traits; +} + +static CTFontDescriptorRef +cf_font_descriptor_copy_with_traits (CTFontDescriptorRef desc, + const CTFontSymbolicTraits traits) +{ + CFMutableDictionaryRef dict, traits_dict; + CFDictionaryRef tmp; + CTFontDescriptorRef new_desc; + SInt64 tmp_traits; - /* Get font name */ - str = CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute); - buffer = gchar_from_cf_string (str); + tmp = CTFontDescriptorCopyAttributes (desc); + dict = CFDictionaryCreateMutableCopy (kCFAllocatorDefault, 0, tmp); + CFRelease (tmp); - /* We strdup again to save space. */ - face->postscript_name = g_strdup (buffer); + tmp = CTFontDescriptorCopyAttribute (desc, kCTFontTraitsAttribute); + traits_dict = CFDictionaryCreateMutableCopy (kCFAllocatorDefault, 0, tmp); + CFRelease (tmp); - CFRelease (str); - g_free (buffer); + tmp_traits = traits; + CFDictionarySetValue (traits_dict, (CFTypeRef) kCTFontSymbolicTrait, + CFNumberCreate (kCFAllocatorDefault, kCFNumberSInt64Type, &tmp_traits)); - /* Get style name */ - str = CTFontDescriptorCopyAttribute (desc, kCTFontStyleNameAttribute); - buffer = gchar_from_cf_string (str); + CFDictionarySetValue (dict, (CFTypeRef)kCTFontTraitsAttribute, traits_dict); - face->style_name = g_strdup (buffer); + new_desc = CTFontDescriptorCreateCopyWithAttributes (desc, dict); + CFRelease (dict); + + return new_desc; +} - CFRelease (str); - g_free (buffer); +static PangoWeight +ct_font_descriptor_get_weight (CTFontDescriptorRef desc) +{ + CFDictionaryRef dict; + CFNumberRef cf_number; + CGFloat value; + PangoWeight weight; - /* Get font traits, symbolic traits */ dict = CTFontDescriptorCopyAttribute (desc, kCTFontTraitsAttribute); - number = (CFNumberRef)CFDictionaryGetValue (dict, - kCTFontWeightTrait); - if (CFNumberGetValue (number, kCFNumberCGFloatType, &value)) + cf_number = (CFNumberRef)CFDictionaryGetValue (dict, + kCTFontWeightTrait); + + if (CFNumberGetValue (cf_number, kCFNumberCGFloatType, &value)) { if (value < ct_weight_min || value > ct_weight_max) { - face->weight = PANGO_WEIGHT_NORMAL; /* This is really an error */ + /* This is really an error */ + weight = PANGO_WEIGHT_NORMAL; } else { @@ -242,36 +306,205 @@ for (i = 0; i < G_N_ELEMENTS(ct_weight_limits); i++) if (value < ct_weight_limits[i].bound) { - face->weight = ct_weight_limits[i].weight; - break; + weight = ct_weight_limits[i].weight; + break; } } } - else - face->weight = PANGO_WEIGHT_NORMAL; + else + weight = PANGO_WEIGHT_NORMAL; - /* This is interesting, the value stored is a CTFontSymbolicTraits which - * is defined as uint32_t. CFNumber does not have an obvious type which - * deals with unsigned values. Upon inspection with CFNumberGetType, - * it turns out this value is stored as SInt64, so we use that to - * obtain the value from the CFNumber. - */ - number = (CFNumberRef)CFDictionaryGetValue (dict, kCTFontSymbolicTrait); - if (CFNumberGetValue (number, kCFNumberSInt64Type, &font_traits)) - { - face->traits = font_traits; - } CFRelease (dict); - /* Get font coverage */ - charset = CTFontDescriptorCopyAttribute (desc, - kCTFontCharacterSetAttribute); - face->coverage = pango_coverage_from_cf_charset (charset); - CFRelease (charset); + return weight; +} + +static inline gboolean +pango_core_text_style_name_is_oblique (const char *style_name) +{ + if (!style_name) + return FALSE; + + return g_strrstr (style_name, "Oblique") != NULL; +} + +PangoFontDescription * +_pango_core_text_font_description_from_ct_font_descriptor (CTFontDescriptorRef desc) +{ + SInt64 font_traits; + char *family_name; + char *style_name; + PangoFontDescription *font_desc; + + font_desc = pango_font_description_new (); + + /* Family name */ + + /* FIXME: Should we actually retrieve the family name from the list of + * families in a font map? + */ + family_name = ct_font_descriptor_get_family_name (desc); + pango_font_description_set_family (font_desc, family_name); + g_free (family_name); + + /* Weight */ + pango_font_description_set_weight (font_desc, + ct_font_descriptor_get_weight (desc)); + + /* Font traits, style name; from this we deduce style and variant */ + font_traits = ct_font_descriptor_get_traits (desc); + style_name = ct_font_descriptor_get_style_name (desc); + + if ((font_traits & kCTFontItalicTrait) == kCTFontItalicTrait) + pango_font_description_set_style (font_desc, PANGO_STYLE_ITALIC); + else if (pango_core_text_style_name_is_oblique (style_name)) + pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE); + else + pango_font_description_set_style (font_desc, PANGO_STYLE_NORMAL); + + /* FIXME: How can this be figured using CoreText? */ +#if 0 + if (font_traits & NSSmallCapsFontMask) + pango_font_description_set_variant (font_desc, PANGO_VARIANT_SMALL_CAPS); + else +#endif + pango_font_description_set_variant (font_desc, PANGO_VARIANT_NORMAL); + + g_free (style_name); + + return font_desc; +} + +/* + * PangoCoreTextFace + */ + +static inline gboolean +pango_core_text_face_is_oblique (PangoCoreTextFace *face) +{ + return pango_core_text_style_name_is_oblique (face->style_name); +} + +static void +pango_core_text_face_make_italic (PangoCoreTextFace *ctface, + gboolean synthetic_italic) +{ + CTFontDescriptorRef new_desc; + + ctface->traits |= kCTFontItalicTrait; + if (synthetic_italic) + ctface->synthetic_italic = TRUE; + + /* Update the font descriptor */ + new_desc = cf_font_descriptor_copy_with_traits (ctface->ctfontdescriptor, + ctface->traits); + CFRelease (ctface->ctfontdescriptor); + ctface->ctfontdescriptor = new_desc; +} + +static inline PangoCoreTextFace * +pango_core_text_face_copy (const PangoCoreTextFace *old) +{ + PangoCoreTextFace *face; + + face = g_object_new (PANGO_TYPE_CORE_TEXT_FACE, NULL); + face->family = old->family; + face->ctfontdescriptor = CFRetain (old->ctfontdescriptor); + face->style_name = g_strdup (old->style_name); + face->weight = old->weight; + face->traits = old->traits; + face->synthetic_italic = old->synthetic_italic; + + return face; +} + +static inline PangoCoreTextFace * +pango_core_text_face_from_ct_font_descriptor (CTFontDescriptorRef desc) +{ + PangoCoreTextFace *face = g_object_new (PANGO_TYPE_CORE_TEXT_FACE, + NULL); + + face->synthetic_italic = FALSE; + + face->ctfontdescriptor = CFRetain (desc); + + face->style_name = ct_font_descriptor_get_style_name (desc); + face->traits = ct_font_descriptor_get_traits (desc); + face->weight = ct_font_descriptor_get_weight (desc); return face; } +static PangoFontDescription * +pango_core_text_face_describe (PangoFontFace *face) +{ + PangoCoreTextFace *ctface = PANGO_CORE_TEXT_FACE (face); + + return _pango_core_text_font_description_from_ct_font_descriptor (ctface->ctfontdescriptor); +} + +static const char * +pango_core_text_face_get_face_name (PangoFontFace *face) +{ + PangoCoreTextFace *ctface = PANGO_CORE_TEXT_FACE (face); + + return ctface->style_name; +} + +static void +pango_core_text_face_list_sizes (PangoFontFace *face, + int **sizes, + int *n_sizes) +{ + *n_sizes = 0; + *sizes = NULL; +} + +G_DEFINE_TYPE (PangoCoreTextFace, pango_core_text_face, PANGO_TYPE_FONT_FACE); + +static void +pango_core_text_face_init (PangoCoreTextFace *face) +{ + face->family = NULL; +} + +static void +pango_core_text_face_finalize (GObject *object) +{ + PangoCoreTextFace *ctface = PANGO_CORE_TEXT_FACE (object); + + g_free (ctface->style_name); + CFRelease (ctface->ctfontdescriptor); + + G_OBJECT_CLASS (pango_core_text_face_parent_class)->finalize (object); +} + +static gboolean +pango_core_text_face_is_synthesized (PangoFontFace *face) +{ + PangoCoreTextFace *cface = PANGO_CORE_TEXT_FACE (face); + + return cface->synthetic_italic; +} + +static void +pango_core_text_face_class_init (PangoCoreTextFaceClass *klass) +{ + GObjectClass *object_class = (GObjectClass *)klass; + PangoFontFaceClass *pfclass = PANGO_FONT_FACE_CLASS(klass); + + object_class->finalize = pango_core_text_face_finalize; + + pfclass->describe = pango_core_text_face_describe; + pfclass->get_face_name = pango_core_text_face_get_face_name; + pfclass->list_sizes = pango_core_text_face_list_sizes; + pfclass->is_synthesized = pango_core_text_face_is_synthesized; +} + +/* + * PangoCoreTextFamily + */ + static void pango_core_text_family_list_faces (PangoFontFamily *family, PangoFontFace ***faces, @@ -356,16 +589,13 @@ { PangoCoreTextFace *italic_face; - italic_face = g_object_new (PANGO_TYPE_CORE_TEXT_FACE, NULL); + italic_face = pango_core_text_face_copy (face); italic_face->family = ctfamily; - italic_face->postscript_name = g_strdup (face->postscript_name); - italic_face->weight = face->weight; - italic_face->traits = face->traits | kCTFontItalicTrait; - italic_face->synthetic_italic = TRUE; - italic_face->coverage = pango_coverage_ref (face->coverage); + pango_core_text_face_make_italic (italic_face, TRUE); /* Try to create a sensible face name. */ + g_free (italic_face->style_name); if (strcasecmp (face->style_name, "regular") == 0) italic_face->style_name = g_strdup ("Oblique"); else @@ -456,236 +686,279 @@ family->n_faces = -1; } -static PangoFontDescription * -pango_core_text_face_describe (PangoFontFace *face) -{ - PangoCoreTextFace *ctface = PANGO_CORE_TEXT_FACE (face); - PangoFontDescription *description; - PangoStyle pango_style; - PangoVariant pango_variant; - description = pango_font_description_new (); - pango_font_description_set_family (description, ctface->family->family_name); +static void pango_core_text_font_map_class_init (PangoCoreTextFontMapClass *class); +static void pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap); - if (ctface->traits & kCTFontItalicTrait) - pango_style = PANGO_STYLE_ITALIC; - else if (pango_core_text_face_is_oblique (ctface)) - pango_style = PANGO_STYLE_OBLIQUE; - else - pango_style = PANGO_STYLE_NORMAL; +G_DEFINE_TYPE (PangoCoreTextFontMap, pango_core_text_font_map, PANGO_TYPE_FONT_MAP); - /* FIXME: How can this be figured using CoreText? */ -#if 0 - if (ctface->traits & NSSmallCapsFontMask) - pango_variant = PANGO_VARIANT_SMALL_CAPS; - else -#endif - pango_variant = PANGO_VARIANT_NORMAL; +static void +pango_core_text_font_map_finalize (GObject *object) +{ + PangoCoreTextFontMap *fontmap = PANGO_CORE_TEXT_FONT_MAP (object); - pango_font_description_set_weight (description, ctface->weight); - pango_font_description_set_style (description, pango_style); - pango_font_description_set_variant (description, pango_variant); + g_hash_table_destroy (fontmap->fontset_hash); + g_hash_table_destroy (fontmap->font_hash); + g_hash_table_destroy (fontmap->families); - return description; + G_OBJECT_CLASS (pango_core_text_font_map_parent_class)->finalize (object); } -static const char * -pango_core_text_face_get_face_name (PangoFontFace *face) +/* Fowler / Noll / Vo (FNV) Hash (http://www.isthe.com/chongo/tech/comp/fnv/) + * + * Not necessarily better than a lot of other hashes, but should be OK, and + * well tested with binary data. + */ + +#define FNV_32_PRIME ((guint32)0x01000193) +#define FNV1_32_INIT ((guint32)0x811c9dc5) + +static guint32 +hash_bytes_fnv (unsigned char *buffer, + int len, + guint32 hval) { - PangoCoreTextFace *ctface = PANGO_CORE_TEXT_FACE (face); + while (len--) + { + hval *= FNV_32_PRIME; + hval ^= *buffer++; + } - return ctface->style_name; + return hval; } static void -pango_core_text_face_list_sizes (PangoFontFace *face, - int **sizes, - int *n_sizes) +get_context_matrix (PangoContext *context, + PangoMatrix *matrix) { - *n_sizes = 0; - *sizes = NULL; -} + const PangoMatrix *set_matrix; + static const PangoMatrix identity = PANGO_MATRIX_INIT; -G_DEFINE_TYPE (PangoCoreTextFace, pango_core_text_face, PANGO_TYPE_FONT_FACE); + if (context) + set_matrix = pango_context_get_matrix (context); + else + set_matrix = NULL; -static void -pango_core_text_face_init (PangoCoreTextFace *face) -{ - face->family = NULL; - face->coverage = NULL; + if (set_matrix) + *matrix = *set_matrix; + else + *matrix = identity; } +/* + * Helper functions for PangoCoreTextFontsetKey + */ - -static void -pango_core_text_face_finalize (GObject *object) +static double +pango_core_text_font_map_get_resolution (PangoCoreTextFontMap *fontmap, + PangoContext *context) { - PangoCoreTextFace *ctface = PANGO_CORE_TEXT_FACE (object); + if (PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (fontmap)->get_resolution) + return PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (fontmap)->get_resolution (fontmap, context); - if (ctface->coverage) - pango_coverage_unref (ctface->coverage); + /* FIXME: acquire DPI from CoreText using some deafault font */ + g_warning ("FIXME: returning default DPI"); - g_free (ctface->postscript_name); - g_free (ctface->style_name); - - G_OBJECT_CLASS (pango_core_text_face_parent_class)->finalize (object); + return 72.0; } -static gboolean -pango_core_text_face_is_synthesized (PangoFontFace *face) +static int +get_scaled_size (PangoCoreTextFontMap *fontmap, + PangoContext *context, + const PangoFontDescription *desc) { - PangoCoreTextFace *cface = PANGO_CORE_TEXT_FACE (face); + double size = pango_font_description_get_size (desc); - return cface->synthetic_italic; + if (!pango_font_description_get_size_is_absolute (desc)) + { + double dpi = pango_core_text_font_map_get_resolution (fontmap, context); + size = size * dpi / 72.; + } + + return .5 + pango_matrix_get_font_scale_factor (pango_context_get_matrix (context)) * size; } + +/* + * PangoCoreTextFontsetKey + */ +struct _PangoCoreTextFontsetKey +{ + PangoCoreTextFontMap *fontmap; + PangoLanguage *language; + PangoFontDescription *desc; + PangoMatrix matrix; + int pixelsize; + double resolution; + PangoGravity gravity; + gpointer context_key; +}; + static void -pango_core_text_face_class_init (PangoCoreTextFaceClass *klass) +pango_core_text_fontset_key_init (PangoCoreTextFontsetKey *key, + PangoCoreTextFontMap *fontmap, + PangoContext *context, + const PangoFontDescription *desc, + PangoLanguage *language) { - GObjectClass *object_class = (GObjectClass *)klass; - PangoFontFaceClass *pfclass = PANGO_FONT_FACE_CLASS(klass); + if (!language && context) + language = pango_context_get_language (context); - object_class->finalize = pango_core_text_face_finalize; + key->fontmap = fontmap; + get_context_matrix (context, &key->matrix); + key->language = language; + key->pixelsize = get_scaled_size (fontmap, context, desc); + key->resolution = pango_core_text_font_map_get_resolution (fontmap, context); + key->gravity = pango_context_get_gravity (context); + key->desc = pango_font_description_copy_static (desc); + pango_font_description_unset_fields (key->desc, PANGO_FONT_MASK_SIZE); - pfclass->describe = pango_core_text_face_describe; - pfclass->get_face_name = pango_core_text_face_get_face_name; - pfclass->list_sizes = pango_core_text_face_list_sizes; - pfclass->is_synthesized = pango_core_text_face_is_synthesized; + if (context && PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (fontmap)->context_key_get) + key->context_key = (gpointer)PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (fontmap)->context_key_get (fontmap, context); + else + key->context_key = NULL; } -const char * -_pango_core_text_face_get_postscript_name (PangoCoreTextFace *face) +static PangoCoreTextFontsetKey * +pango_core_text_fontset_key_copy (const PangoCoreTextFontsetKey *old) { - return face->postscript_name; -} + PangoCoreTextFontsetKey *key = g_slice_new (PangoCoreTextFontsetKey); -gboolean -_pango_core_text_face_get_synthetic_italic (PangoCoreTextFace *face) -{ - return face->synthetic_italic; -} + key->fontmap = old->fontmap; + key->matrix = old->matrix; + key->language = old->language; + key->pixelsize = old->pixelsize; + key->resolution = old->resolution; + key->gravity = old->gravity; + key->desc = pango_font_description_copy (old->desc); + if (old->context_key) + key->context_key = PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key->fontmap)->context_key_copy (key->fontmap, old->context_key); + else + key->context_key = NULL; -PangoCoverage * -_pango_core_text_face_get_coverage (PangoCoreTextFace *face, - PangoLanguage *language) -{ - return face->coverage; + return key; } -static void pango_core_text_font_map_class_init (PangoCoreTextFontMapClass *class); -static void pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap); - -static guint font_hash_key_hash (const FontHashKey *key); -static gboolean font_hash_key_equal (const FontHashKey *key_a, - const FontHashKey *key_b); -static void font_hash_key_free (FontHashKey *key); - -G_DEFINE_TYPE (PangoCoreTextFontMap, pango_core_text_font_map, PANGO_TYPE_FONT_MAP); - static void -pango_core_text_font_map_finalize (GObject *object) +pango_core_text_fontset_key_free (PangoCoreTextFontsetKey *key) { - PangoCoreTextFontMap *fontmap = PANGO_CORE_TEXT_FONT_MAP (object); + pango_font_description_free (key->desc); - g_hash_table_destroy (fontmap->font_hash); - g_hash_table_destroy (fontmap->families); + if (key->context_key) + PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key->fontmap)->context_key_free (key->fontmap, key->context_key); - G_OBJECT_CLASS (pango_core_text_font_map_parent_class)->finalize (object); + g_slice_free (PangoCoreTextFontsetKey, key); } -struct _FontHashKey { - PangoCoreTextFontMap *fontmap; - PangoMatrix matrix; - PangoFontDescription *desc; - char *postscript_name; - gpointer context_key; -}; - -/* Fowler / Noll / Vo (FNV) Hash (http://www.isthe.com/chongo/tech/comp/fnv/) - * - * Not necessarily better than a lot of other hashes, but should be OK, and - * well tested with binary data. - */ +static guint +pango_core_text_fontset_key_hash (const PangoCoreTextFontsetKey *key) +{ + guint32 hash = FNV1_32_INIT; -#define FNV_32_PRIME ((guint32)0x01000193) -#define FNV1_32_INIT ((guint32)0x811c9dc5) + hash = hash_bytes_fnv ((unsigned char *)(&key->matrix), sizeof (double) * 4, hash); + hash ^= hash_bytes_fnv ((unsigned char *)(&key->resolution), sizeof (double), hash); -static guint32 -hash_bytes_fnv (unsigned char *buffer, - int len, - guint32 hval) -{ - while (len--) - { - hval *= FNV_32_PRIME; - hval ^= *buffer++; - } + if (key->context_key) + hash ^= PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key->fontmap)->context_key_hash (key->fontmap, key->context_key); - return hval; + return (hash ^ + GPOINTER_TO_UINT (key->language) ^ + pango_font_description_hash (key->desc)); } static gboolean -font_hash_key_equal (const FontHashKey *key_a, - const FontHashKey *key_b) +pango_core_text_fontset_key_equal (const PangoCoreTextFontsetKey *key_a, + const PangoCoreTextFontsetKey *key_b) { - if (key_a->matrix.xx == key_b->matrix.xx && - key_a->matrix.xy == key_b->matrix.xy && - key_a->matrix.yx == key_b->matrix.yx && - key_a->matrix.yy == key_b->matrix.yy && + if (key_a->language == key_b->language && + key_a->pixelsize == key_b->pixelsize && + key_a->resolution == key_b->resolution && + key_a->gravity == key_b->gravity && pango_font_description_equal (key_a->desc, key_b->desc) && - strcmp (key_a->postscript_name, key_b->postscript_name) == 0) + memcmp ((void *)&key_a->matrix, (void *)&key_b->matrix, 4 * sizeof (double)) == 0) { if (key_a->context_key) return PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key_a->fontmap)->context_key_equal (key_a->fontmap, key_a->context_key, key_b->context_key); else - return TRUE; + return key_a->context_key == key_b->context_key; } - else - return FALSE; + /* else */ + return FALSE; } -static guint -font_hash_key_hash (const FontHashKey *key) +static PangoLanguage * +pango_core_text_fontset_key_get_language (const PangoCoreTextFontsetKey *key) { - guint32 hash = FNV1_32_INIT; - - /* We do a bytewise hash on the context matrix */ - hash = hash_bytes_fnv ((unsigned char *)(&key->matrix), - sizeof(double) * 4, - hash); + return key->language; +} - if (key->context_key) - hash ^= PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key->fontmap)->context_key_hash (key->fontmap, - key->context_key); +static const PangoMatrix * +pango_core_text_fontset_key_get_matrix (const PangoCoreTextFontsetKey *key) +{ + return &key->matrix; +} - hash ^= g_str_hash (key->postscript_name); +static PangoGravity +pango_core_text_fontset_key_get_gravity (const PangoCoreTextFontsetKey *key) +{ + return key->gravity; +} - return (hash ^ pango_font_description_hash (key->desc)); +static gpointer +pango_core_text_fontset_key_get_context_key (const PangoCoreTextFontsetKey *key) +{ + return key->context_key; } -static void -font_hash_key_free (FontHashKey *key) +/* + * PangoCoreTextFontKey + */ +struct _PangoCoreTextFontKey { - if (key->context_key) - PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key->fontmap)->context_key_free (key->fontmap, - key->context_key); + PangoCoreTextFontMap *fontmap; + CTFontDescriptorRef ctfontdescriptor; + PangoMatrix matrix; + PangoGravity gravity; + int pixelsize; + double resolution; + gboolean synthetic_italic; + gpointer context_key; +}; - g_slice_free (FontHashKey, key); +static void +pango_core_text_font_key_init (PangoCoreTextFontKey *key, + PangoCoreTextFontMap *ctfontmap, + PangoCoreTextFontsetKey *fontset_key, + CTFontDescriptorRef ctdescriptor, + gboolean synthetic_italic) +{ + key->fontmap = ctfontmap; + key->ctfontdescriptor = ctdescriptor; + key->matrix = *pango_core_text_fontset_key_get_matrix (fontset_key); + key->pixelsize = fontset_key->pixelsize; + key->resolution = fontset_key->resolution; + key->synthetic_italic = synthetic_italic; + key->gravity = pango_core_text_fontset_key_get_gravity (fontset_key); + key->context_key = pango_core_text_fontset_key_get_context_key (fontset_key); } -static FontHashKey * -font_hash_key_copy (FontHashKey *old) +static PangoCoreTextFontKey * +pango_core_text_font_key_copy (const PangoCoreTextFontKey *old) { - FontHashKey *key = g_slice_new (FontHashKey); + PangoCoreTextFontKey *key = g_slice_new (PangoCoreTextFontKey); key->fontmap = old->fontmap; + key->ctfontdescriptor = old->ctfontdescriptor; + CFRetain (key->ctfontdescriptor); key->matrix = old->matrix; - key->desc = pango_font_description_copy (old->desc); - key->postscript_name = g_strdup (old->postscript_name); + key->pixelsize = old->pixelsize; + key->resolution = old->resolution; + key->synthetic_italic = old->synthetic_italic; + key->gravity = old->gravity; if (old->context_key) key->context_key = PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key->fontmap)->context_key_copy (key->fontmap, old->context_key); else @@ -694,73 +967,140 @@ return key; } - static void -get_context_matrix (PangoContext *context, - PangoMatrix *matrix) +pango_core_text_font_key_free (PangoCoreTextFontKey *key) { - const PangoMatrix *set_matrix; - static const PangoMatrix identity = PANGO_MATRIX_INIT; + if (key->ctfontdescriptor) + CFRelease (key->ctfontdescriptor); - if (context) - set_matrix = pango_context_get_matrix (context); - else - set_matrix = NULL; + if (key->context_key) + PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key->fontmap)->context_key_free (key->fontmap, key->context_key); - if (set_matrix) - *matrix = *set_matrix; - else - *matrix = identity; + g_slice_free (PangoCoreTextFontKey, key); } -static void -font_hash_key_for_context (PangoCoreTextFontMap *fcfontmap, - PangoContext *context, - FontHashKey *key) +static guint +pango_core_text_font_key_hash (const PangoCoreTextFontKey *key) { - key->fontmap = fcfontmap; - get_context_matrix (context, &key->matrix); + guint32 hash = FNV1_32_INIT; + + /* Not everything is included here, probably good enough for a hash */ + + hash = hash_bytes_fnv ((unsigned char *)(&key->matrix), sizeof (double) * 4, hash); - if (PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get) - key->context_key = (gpointer)PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (fcfontmap)->context_key_get (fcfontmap, context); + if (key->context_key) + hash ^= PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key->fontmap)->context_key_hash (key->fontmap, key->context_key); + + return (hash ^ CFHash (key->ctfontdescriptor)); +} + +static gboolean +pango_core_text_font_key_equal (const PangoCoreTextFontKey *key_a, + const PangoCoreTextFontKey *key_b) +{ + if (CFEqual (key_a->ctfontdescriptor, key_b->ctfontdescriptor) && + memcmp (&key_a->matrix, &key_b->matrix, 4 * sizeof (double)) == 0 && + key_a->gravity == key_b->gravity && + key_a->pixelsize == key_b->pixelsize && + key_a->resolution == key_b->resolution && + key_a->synthetic_italic == key_b->synthetic_italic) + { + if (key_a->context_key && key_b->context_key) + return PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (key_a->fontmap)->context_key_equal (key_a->fontmap, + key_a->context_key, + key_b->context_key); + else + return key_a->context_key == key_b->context_key; + } else - key->context_key = NULL; + return FALSE; +} + +int +pango_core_text_font_key_get_absolute_size (const PangoCoreTextFontKey *key) +{ + return key->pixelsize; +} + +double +pango_core_text_font_key_get_resolution (const PangoCoreTextFontKey *key) +{ + return key->resolution; +} + +gboolean +pango_core_text_font_key_get_synthetic_italic (const PangoCoreTextFontKey *key) +{ + return key->synthetic_italic; +} + +gpointer +pango_core_text_font_key_get_context_key (const PangoCoreTextFontKey *key) +{ + return key->context_key; +} + +const PangoMatrix * +pango_core_text_font_key_get_matrix (const PangoCoreTextFontKey *key) +{ + return &key->matrix; } +PangoGravity +pango_core_text_font_key_get_gravity (const PangoCoreTextFontKey *key) +{ + return key->gravity; +} + +CTFontDescriptorRef +pango_core_text_font_key_get_ctfontdescriptor (const PangoCoreTextFontKey *key) +{ + return key->ctfontdescriptor; +} + + + static void pango_core_text_font_map_add (PangoCoreTextFontMap *ctfontmap, - PangoContext *context, + PangoCoreTextFontKey *key, PangoCoreTextFont *ctfont) { - FontHashKey key; - FontHashKey *key_copy; - PangoCoreTextFace *face; + PangoCoreTextFontKey *key_copy; _pango_core_text_font_set_font_map (ctfont, ctfontmap); - font_hash_key_for_context (ctfontmap, context, &key); - face = _pango_core_text_font_get_face (ctfont); - key.postscript_name = (char *)_pango_core_text_face_get_postscript_name (face); - key.desc = _pango_core_text_font_get_font_description (ctfont); - - key_copy = font_hash_key_copy (&key); - _pango_core_text_font_set_context_key (ctfont, key_copy->context_key); - g_hash_table_insert (ctfontmap->font_hash, key_copy, g_object_ref (ctfont)); + key_copy = pango_core_text_font_key_copy (key); + _pango_core_text_font_set_font_key (ctfont, key_copy); + g_hash_table_insert (ctfontmap->font_hash, key_copy, ctfont); } static PangoCoreTextFont * -pango_core_text_font_map_lookup (PangoCoreTextFontMap *ctfontmap, - PangoContext *context, - PangoFontDescription *desc, - PangoCoreTextFace *face) -{ - FontHashKey key; - - font_hash_key_for_context (ctfontmap, context, &key); - key.postscript_name = (char *)_pango_core_text_face_get_postscript_name (face); - key.desc = desc; +pango_core_text_font_map_new_font (PangoCoreTextFontMap *fontmap, + PangoCoreTextFontsetKey *fontset_key, + CTFontDescriptorRef ctfontdescriptor, + gboolean synthetic_italic) +{ + PangoCoreTextFontMapClass *klass; + PangoCoreTextFont *font; + PangoCoreTextFontKey key; + + pango_core_text_font_key_init (&key, fontmap, fontset_key, ctfontdescriptor, + synthetic_italic); + + font = g_hash_table_lookup (fontmap->font_hash, &key); + if (font) + return g_object_ref (font); + + /* Call create_font */ + klass = PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (fontmap); + font = klass->create_font (fontmap, &key); + + if (!font) + return NULL; - return g_hash_table_lookup (ctfontmap->font_hash, &key); + pango_core_text_font_map_add (fontmap, &key, font); + + return font; } static gboolean @@ -795,73 +1135,44 @@ return FALSE; } +static gboolean +get_first_font (PangoFontset *fontset G_GNUC_UNUSED, + PangoFont *font, + gpointer data) +{ + *(PangoFont **)data = font; + + return TRUE; +} + static PangoFont * pango_core_text_font_map_load_font (PangoFontMap *fontmap, PangoContext *context, const PangoFontDescription *description) { - PangoCoreTextFontMap *ctfontmap = (PangoCoreTextFontMap *)fontmap; - PangoCoreTextFamily *font_family; - const gchar *family; - gchar *name; - gint size; - gboolean is_absolute; + PangoLanguage *language; + PangoFontset *fontset; + PangoFont *font = NULL; - size = pango_font_description_get_size (description); - if (size < 0) - return NULL; + if (context) + language = pango_context_get_language (context); + else + language = NULL; - is_absolute = pango_font_description_get_size_is_absolute (description); + fontset = pango_font_map_load_fontset (fontmap, context, + description, language); - family = pango_font_description_get_family (description); - family = family ? family : ""; - name = g_utf8_casefold (family, -1); - font_family = g_hash_table_lookup (ctfontmap->families, name); - g_free (name); - - if (font_family) + if (fontset) { - PangoFontDescription *best_description; - PangoCoreTextFace *best_face; - PangoCoreTextFont *best_font; - - /* Force a listing of the available faces */ - pango_font_family_list_faces ((PangoFontFamily *)font_family, NULL, NULL); - - if (!find_best_match (font_family, description, &best_description, &best_face)) - return NULL; - - if (is_absolute) - pango_font_description_set_absolute_size (best_description, size); - else - pango_font_description_set_size (best_description, size); - - best_font = pango_core_text_font_map_lookup (ctfontmap, - context, - best_description, - best_face); - - if (best_font) - g_object_ref (best_font); - else - { - PangoCoreTextFontMapClass *klass; - - klass = PANGO_CORE_TEXT_FONT_MAP_GET_CLASS (ctfontmap); - best_font = klass->create_font (ctfontmap, context, - best_face, best_description); - - if (best_font) - pango_core_text_font_map_add (ctfontmap, context, best_font); - /* FIXME: Handle the else case here. */ - } + pango_fontset_foreach (fontset, get_first_font, &font); - pango_font_description_free (best_description); + if (font) + g_object_ref (font); - return (PangoFont *)best_font; + g_object_unref (fontset); } - return NULL; + return font; } static void @@ -909,6 +1220,63 @@ g_slist_free (family_list); } +static PangoFontset * +pango_core_text_font_map_load_fontset (PangoFontMap *fontmap, + PangoContext *context, + const PangoFontDescription *desc, + PangoLanguage *language) +{ + PangoCoreTextFontset *fontset; + PangoCoreTextFontsetKey key; + PangoCoreTextFontMap *ctfontmap = PANGO_CORE_TEXT_FONT_MAP (fontmap); + + pango_core_text_fontset_key_init (&key, ctfontmap, + context, desc, language); + + fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key); + + if (G_UNLIKELY (!fontset)) + { + fontset = pango_core_text_fontset_new (&key, desc); + + if (G_LIKELY (fontset)) + g_hash_table_insert (ctfontmap->fontset_hash, + pango_core_text_fontset_get_key (fontset), + fontset); + else + { + /* If no font(set) could be loaded, we fallback to "Sans", + * which should always work on Mac. + */ + PangoFontDescription *tmp_desc; + + /* Cannot use pango_core_text_fontset_key_free() here */ + pango_font_description_free (key.desc); + + tmp_desc = pango_font_description_copy_static (desc); + pango_font_description_set_family_static (tmp_desc, "Sans"); + + pango_core_text_fontset_key_init (&key, ctfontmap, context, tmp_desc, + language); + + fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key); + if (G_UNLIKELY (!fontset)) + { + fontset = pango_core_text_fontset_new (&key, tmp_desc); + g_hash_table_insert (ctfontmap->fontset_hash, + pango_core_text_fontset_get_key (fontset), + fontset); + + } + } + } + + /* Cannot use pango_core_text_fontset_key_free() here */ + pango_font_description_free (key.desc); + + return g_object_ref (fontset); +} + static void pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap) { @@ -921,18 +1289,23 @@ g_free, g_object_unref); - ctfontmap->font_hash = g_hash_table_new_full ((GHashFunc)font_hash_key_hash, - (GEqualFunc)font_hash_key_equal, - (GDestroyNotify)font_hash_key_free, + ctfontmap->font_hash = g_hash_table_new_full ((GHashFunc)pango_core_text_font_key_hash, + (GEqualFunc)pango_core_text_font_key_equal, + (GDestroyNotify)pango_core_text_font_key_free, NULL); + ctfontmap->fontset_hash = g_hash_table_new_full ((GHashFunc)pango_core_text_fontset_key_hash, + (GEqualFunc)pango_core_text_fontset_key_equal, + NULL, + (GDestroyNotify)g_object_unref); + collection = CTFontCollectionCreateFromAvailableFonts (0); ctfaces = CTFontCollectionCreateMatchingFontDescriptors (collection); count = CFArrayGetCount (ctfaces); for (i = 0; i < count; i++) { - int font_traits; + SInt64 font_traits; char *buffer; char *family_name; CFStringRef str; @@ -965,9 +1338,9 @@ number = (CFNumberRef)CFDictionaryGetValue (dict, kCTFontSymbolicTrait); - if (CFNumberGetValue (number, kCFNumberIntType, &font_traits)) + if (CFNumberGetValue (number, kCFNumberSInt64Type, &font_traits)) { - if (font_traits & kCTFontMonoSpaceTrait) + if ((font_traits & kCTFontMonoSpaceTrait) == kCTFontMonoSpaceTrait) family->is_monospace = TRUE; } @@ -1002,5 +1375,295 @@ fontmap_class->load_font = pango_core_text_font_map_load_font; fontmap_class->list_families = pango_core_text_font_map_list_families; + fontmap_class->load_fontset = pango_core_text_font_map_load_fontset; fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_CORE_TEXT; } + +/* + * PangoCoreTextFontSet + */ + +static void pango_core_text_fontset_finalize (GObject *object); +static void pango_core_text_fontset_init (PangoCoreTextFontset *fontset); +static PangoLanguage * pango_core_text_fontset_get_language (PangoFontset *fontset); +static PangoFont * pango_core_text_fontset_get_font (PangoFontset *fontset, + guint wc); +static void pango_core_text_fontset_foreach (PangoFontset *fontset, + PangoFontsetForeachFunc func, + gpointer data); + +struct _PangoCoreTextFontset +{ + PangoFontset parent_instance; + + const gchar *orig_family; + PangoFontDescription *orig_description; + + PangoCoreTextFontsetKey *key; + CFArrayRef cascade_list; + + GPtrArray *fonts; + GPtrArray *coverages; +}; + +typedef PangoFontsetClass PangoCoreTextFontsetClass; + +static PangoFontsetClass *core_text_fontset_parent_class; + + +/* This symbol does exist in the CoreText library shipped with Snow + * Leopard and Lion, however, it is not found in the public header files. + */ +CFArrayRef CTFontCopyDefaultCascadeList (CTFontRef font_ref); + +static PangoCoreTextFontset * +pango_core_text_fontset_new (PangoCoreTextFontsetKey *key, + const PangoFontDescription *description) +{ + PangoCoreTextFamily *font_family; + PangoCoreTextFontset *fontset; + PangoCoreTextFont *best_font = NULL; + const gchar *family; + gchar *name; + + family = pango_font_description_get_family (description); + family = family ? family : ""; + name = g_utf8_casefold (family, -1); + font_family = g_hash_table_lookup (key->fontmap->families, name); + g_free (name); + + if (font_family) + { + PangoFontDescription *best_description; + PangoCoreTextFace *best_face; + gint size; + gboolean is_absolute; + + /* Force a listing of the available faces */ + pango_font_family_list_faces ((PangoFontFamily *)font_family, NULL, NULL); + + if (!find_best_match (font_family, description, &best_description, &best_face)) + return NULL; + + size = pango_font_description_get_size (description); + if (size < 0) + return NULL; + + is_absolute = pango_font_description_get_size_is_absolute (description); + if (is_absolute) + pango_font_description_set_absolute_size (best_description, size); + else + pango_font_description_set_size (best_description, size); + + best_font = pango_core_text_font_map_new_font (key->fontmap, + key, + best_face->ctfontdescriptor, + best_face->synthetic_italic); + + pango_font_description_free (best_description); + } + else + return NULL; + + if (!best_font) + return NULL; + + /* Create a font set with best font */ + fontset = g_object_new (PANGO_TYPE_CORE_TEXT_FONTSET, NULL); + fontset->key = pango_core_text_fontset_key_copy (key); + fontset->orig_description = pango_font_description_copy (description); + + fontset->fonts = g_ptr_array_new (); + g_ptr_array_add (fontset->fonts, best_font); + fontset->coverages = g_ptr_array_new (); + + /* Add the cascade list for this language */ + fontset->cascade_list = CTFontCopyDefaultCascadeList (pango_core_text_font_get_ctfont (best_font)); + + /* length of cascade list + 1 for the "real" font at the front */ + g_ptr_array_set_size (fontset->fonts, CFArrayGetCount (fontset->cascade_list) + 1); + g_ptr_array_set_size (fontset->coverages, CFArrayGetCount (fontset->cascade_list) + 1); + + return fontset; +} + +static PangoFont * +pango_core_text_fontset_load_font (PangoCoreTextFontset *ctfontset, + CTFontDescriptorRef ctdescriptor) +{ + PangoCoreTextFontsetKey *key; + PangoCoreTextFont *font; + + key = pango_core_text_fontset_get_key (ctfontset); + + /* For now, we will default the fallbacks to not have synthetic italic, + * in the future this may be improved. + */ + font = pango_core_text_font_map_new_font (ctfontset->key->fontmap, + ctfontset->key, + ctdescriptor, + FALSE); + + return PANGO_FONT (font); +} + +static PangoFont * +pango_core_text_fontset_get_font_at (PangoCoreTextFontset *ctfontset, + unsigned int i) +{ + /* The first font is loaded as soon as the fontset is created */ + if (i == 0) + return g_ptr_array_index (ctfontset->fonts, i); + + if (i >= ctfontset->fonts->len) + return NULL; + + if (g_ptr_array_index (ctfontset->fonts, i) == NULL) + { + CTFontDescriptorRef ctdescriptor = CFArrayGetValueAtIndex (ctfontset->cascade_list, i - 1); + PangoFont *font = pango_core_text_fontset_load_font (ctfontset, ctdescriptor); + g_ptr_array_index (ctfontset->fonts, i) = font; + g_ptr_array_index (ctfontset->coverages, i) = NULL; + } + + return g_ptr_array_index (ctfontset->fonts, i); +} + +static void +pango_core_text_fontset_class_init (PangoCoreTextFontsetClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + PangoFontsetClass *fontset_class = PANGO_FONTSET_CLASS (klass); + + core_text_fontset_parent_class = g_type_class_peek_parent (klass); + + object_class->finalize = pango_core_text_fontset_finalize; + + fontset_class->get_font = pango_core_text_fontset_get_font; + fontset_class->get_language = pango_core_text_fontset_get_language; + fontset_class->foreach = pango_core_text_fontset_foreach; +} + +static void +pango_core_text_fontset_init (PangoCoreTextFontset *ctfontset) +{ + ctfontset->key = NULL; + ctfontset->cascade_list = NULL; + ctfontset->fonts = g_ptr_array_new (); + ctfontset->coverages = g_ptr_array_new (); +} + +static void +pango_core_text_fontset_finalize (GObject *object) +{ + PangoCoreTextFontset *ctfontset = PANGO_CORE_TEXT_FONTSET (object); + unsigned int i; + + for (i = 0; i < ctfontset->fonts->len; i++) + { + PangoFont *font = g_ptr_array_index (ctfontset->fonts, i); + if (font) + g_object_unref (font); + } + g_ptr_array_free (ctfontset->fonts, TRUE); + + for (i = 0; i < ctfontset->coverages->len; i++) + { + PangoCoverage *coverage = g_ptr_array_index (ctfontset->coverages, i); + if (coverage) + pango_coverage_unref (coverage); + } + g_ptr_array_free (ctfontset->coverages, TRUE); + + CFRelease (ctfontset->cascade_list); + + pango_font_description_free (ctfontset->orig_description); + + if (ctfontset->key) + pango_core_text_fontset_key_free (ctfontset->key); + + G_OBJECT_CLASS (core_text_fontset_parent_class)->finalize (object); +} + +static PangoCoreTextFontsetKey * +pango_core_text_fontset_get_key (PangoCoreTextFontset *fontset) +{ + return fontset->key; +} + +static PangoLanguage * +pango_core_text_fontset_get_language (PangoFontset *fontset) +{ + PangoCoreTextFontset *ctfontset = PANGO_CORE_TEXT_FONTSET (fontset); + + return pango_core_text_fontset_key_get_language (pango_core_text_fontset_get_key (ctfontset)); +} + +static PangoFont * +pango_core_text_fontset_get_font (PangoFontset *fontset, + guint wc) +{ + PangoCoreTextFontset *ctfontset = PANGO_CORE_TEXT_FONTSET (fontset); + PangoCoverageLevel best_level = PANGO_COVERAGE_NONE; + PangoCoverageLevel level; + PangoFont *font; + PangoCoverage *coverage; + int result = -1; + unsigned int i; + + for (i = 0; i < ctfontset->fonts->len; i++) + { + PangoFont *font = pango_core_text_fontset_get_font_at (ctfontset, i); + if (!font) + continue; + + coverage = g_ptr_array_index (ctfontset->coverages, i); + + if (coverage == NULL) + { + font = g_ptr_array_index (ctfontset->fonts, i); + + coverage = pango_font_get_coverage (font, ctfontset->key->language); + g_ptr_array_index (ctfontset->coverages, i) = coverage; + } + + level = pango_coverage_get (coverage, wc); + + if (result == -1 || level > best_level) + { + result = i; + best_level = level; + if (level == PANGO_COVERAGE_EXACT) + break; + } + } + + if (G_UNLIKELY (result == -1)) + return NULL; + + font = g_ptr_array_index (ctfontset->fonts, result); + return g_object_ref (font); +} + +static void +pango_core_text_fontset_foreach (PangoFontset *fontset, + PangoFontsetForeachFunc func, + gpointer data) +{ + PangoCoreTextFontset *ctfontset = PANGO_CORE_TEXT_FONTSET (fontset); + unsigned int i; + + for (i = 0; i < ctfontset->fonts->len; i++) + { + PangoFont *font = pango_core_text_fontset_get_font_at (ctfontset, i); + if (!font) + continue; + + if ((* func) (fontset, font, data)) + return; + } +} + +G_DEFINE_TYPE (PangoCoreTextFontset, + pango_core_text_fontset, + PANGO_TYPE_FONTSET); diff -Nru pango1.0-1.29.5/pango/pangocoretext-private.h pango1.0-1.30.0/pango/pangocoretext-private.h --- pango1.0-1.29.5/pango/pangocoretext-private.h 2011-08-16 01:11:08.000000000 +0000 +++ pango1.0-1.30.0/pango/pangocoretext-private.h 2012-03-07 16:35:50.000000000 +0000 @@ -44,10 +44,14 @@ typedef struct _PangoCoreTextFontMap PangoCoreTextFontMap; typedef struct _PangoCoreTextFontMapClass PangoCoreTextFontMapClass; +typedef struct _PangoCoreTextFontsetKey PangoCoreTextFontsetKey; +typedef struct _PangoCoreTextFontKey PangoCoreTextFontKey; + struct _PangoCoreTextFontMap { PangoFontMap parent_instance; + GHashTable *fontset_hash; GHashTable *font_hash; GHashTable *families; @@ -70,22 +74,15 @@ gconstpointer key_b); PangoCoreTextFont * (* create_font) (PangoCoreTextFontMap *fontmap, - PangoContext *context, - PangoCoreTextFace *face, - const PangoFontDescription *desc); + PangoCoreTextFontKey *key); + + double (* get_resolution) (PangoCoreTextFontMap *fontmap, + PangoContext *context); }; GType pango_core_text_font_map_get_type (void) G_GNUC_CONST; -const char * _pango_core_text_face_get_postscript_name (PangoCoreTextFace *face); -gboolean _pango_core_text_face_get_synthetic_italic (PangoCoreTextFace *face); -PangoCoverage * _pango_core_text_face_get_coverage (PangoCoreTextFace *face, - PangoLanguage *language); - -void _pango_core_text_font_set_font_description (PangoCoreTextFont *afont, - const PangoFontDescription *desc); -PangoFontDescription *_pango_core_text_font_get_font_description (PangoCoreTextFont *afont); void _pango_core_text_font_set_font_map (PangoCoreTextFont *afont, PangoCoreTextFontMap *fontmap); void _pango_core_text_font_set_face (PangoCoreTextFont *afont, @@ -94,9 +91,21 @@ gpointer _pango_core_text_font_get_context_key (PangoCoreTextFont *afont); void _pango_core_text_font_set_context_key (PangoCoreTextFont *afont, gpointer context_key); +void _pango_core_text_font_set_font_key (PangoCoreTextFont *font, + PangoCoreTextFontKey *key); void _pango_core_text_font_set_ctfont (PangoCoreTextFont *font, CTFontRef font_ref); +PangoFontDescription *_pango_core_text_font_description_from_ct_font_descriptor (CTFontDescriptorRef desc); + +int pango_core_text_font_key_get_absolute_size (const PangoCoreTextFontKey *key); +double pango_core_text_font_key_get_resolution (const PangoCoreTextFontKey *key); +gboolean pango_core_text_font_key_get_synthetic_italic (const PangoCoreTextFontKey *key); +gpointer pango_core_text_font_key_get_context_key (const PangoCoreTextFontKey *key); +const PangoMatrix *pango_core_text_font_key_get_matrix (const PangoCoreTextFontKey *key); +PangoGravity pango_core_text_font_key_get_gravity (const PangoCoreTextFontKey *key); +CTFontDescriptorRef pango_core_text_font_key_get_ctfontdescriptor (const PangoCoreTextFontKey *key); + G_END_DECLS #endif /* __PANGOCORETEXT_PRIVATE_H__ */ diff -Nru pango1.0-1.29.5/pango/pango-features.h pango1.0-1.30.0/pango/pango-features.h --- pango1.0-1.29.5/pango/pango-features.h 2011-11-22 19:08:10.000000000 +0000 +++ pango1.0-1.30.0/pango/pango-features.h 2012-03-27 01:29:31.000000000 +0000 @@ -3,10 +3,10 @@ #define PANGO_FEATURES_H #define PANGO_VERSION_MAJOR 1 -#define PANGO_VERSION_MINOR 29 -#define PANGO_VERSION_MICRO 5 +#define PANGO_VERSION_MINOR 30 +#define PANGO_VERSION_MICRO 0 -#define PANGO_VERSION_STRING "1.29.5" +#define PANGO_VERSION_STRING "1.30.0" #endif diff -Nru pango1.0-1.29.5/pango/pangoft2.rc pango1.0-1.30.0/pango/pangoft2.rc --- pango1.0-1.29.5/pango/pangoft2.rc 2011-11-22 20:24:14.000000000 +0000 +++ pango1.0-1.30.0/pango/pangoft2.rc 2012-03-27 01:38:57.000000000 +0000 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,29,5,0 - PRODUCTVERSION 1,29,5,0 + FILEVERSION 1,30,0,0 + PRODUCTVERSION 1,30,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoFT2" - VALUE "FileVersion", "1.29.5.0" + VALUE "FileVersion", "1.30.0.0" VALUE "InternalName", "pangoft2-1.0-0" VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software. Copyright © 2000 Tor Lillqvist" VALUE "OriginalFilename", "pangoft2-1.0-0.dll" VALUE "ProductName", "PangoFT2" - VALUE "ProductVersion", "1.29.5" + VALUE "ProductVersion", "1.30.0" END END BLOCK "VarFileInfo" diff -Nru pango1.0-1.29.5/pango/pango.rc pango1.0-1.30.0/pango/pango.rc --- pango1.0-1.29.5/pango/pango.rc 2011-11-22 20:24:14.000000000 +0000 +++ pango1.0-1.30.0/pango/pango.rc 2012-03-27 01:38:57.000000000 +0000 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,29,5,0 - PRODUCTVERSION 1,29,5,0 + FILEVERSION 1,30,0,0 + PRODUCTVERSION 1,30,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pango" - VALUE "FileVersion", "1.29.5.0" + VALUE "FileVersion", "1.30.0.0" VALUE "InternalName", "pango-1.0-0" VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software." VALUE "OriginalFilename", "pango-1.0-0.dll" VALUE "ProductName", "Pango" - VALUE "ProductVersion", "1.29.5" + VALUE "ProductVersion", "1.30.0" END END BLOCK "VarFileInfo" diff -Nru pango1.0-1.29.5/pango/pangowin32.rc pango1.0-1.30.0/pango/pangowin32.rc --- pango1.0-1.29.5/pango/pangowin32.rc 2011-11-22 20:24:14.000000000 +0000 +++ pango1.0-1.30.0/pango/pangowin32.rc 2012-03-27 01:38:57.000000000 +0000 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,29,5,0 - PRODUCTVERSION 1,29,5,0 + FILEVERSION 1,30,0,0 + PRODUCTVERSION 1,30,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoWin32" - VALUE "FileVersion", "1.29.5.0" + VALUE "FileVersion", "1.30.0.0" VALUE "InternalName", "pangowin32-1.0-0" VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software. Copyright © 2000 Tor Lillqvist" VALUE "OriginalFilename", "pangowin32-1.0-0.dll" VALUE "ProductName", "PangoWin32" - VALUE "ProductVersion", "1.29.5" + VALUE "ProductVersion", "1.30.0" END END BLOCK "VarFileInfo" diff -Nru pango1.0-1.29.5/pango/pangoxft.rc pango1.0-1.30.0/pango/pangoxft.rc --- pango1.0-1.29.5/pango/pangoxft.rc 2011-11-22 20:24:14.000000000 +0000 +++ pango1.0-1.30.0/pango/pangoxft.rc 2012-03-27 01:38:57.000000000 +0000 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,29,5,0 - PRODUCTVERSION 1,29,5,0 + FILEVERSION 1,30,0,0 + PRODUCTVERSION 1,30,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pangoxft" - VALUE "FileVersion", "1.29.5.0" + VALUE "FileVersion", "1.30.0.0" VALUE "InternalName", "pangoxft-1.0-0" VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software." VALUE "OriginalFilename", "pangoxft-1.0-0.dll" VALUE "ProductName", "Pangoxft" - VALUE "ProductVersion", "1.29.5" + VALUE "ProductVersion", "1.30.0" END END BLOCK "VarFileInfo" diff -Nru pango1.0-1.29.5/pango/pangox.rc pango1.0-1.30.0/pango/pangox.rc --- pango1.0-1.29.5/pango/pangox.rc 2011-11-22 20:24:14.000000000 +0000 +++ pango1.0-1.30.0/pango/pangox.rc 2012-03-27 01:38:57.000000000 +0000 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,29,5,0 - PRODUCTVERSION 1,29,5,0 + FILEVERSION 1,30,0,0 + PRODUCTVERSION 1,30,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pangox" - VALUE "FileVersion", "1.29.5.0" + VALUE "FileVersion", "1.30.0.0" VALUE "InternalName", "pangox-1.0-0" VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software." VALUE "OriginalFilename", "pangox-1.0-0.dll" VALUE "ProductName", "Pangox" - VALUE "ProductVersion", "1.29.5" + VALUE "ProductVersion", "1.30.0" END END BLOCK "VarFileInfo" diff -Nru pango1.0-1.29.5/pango-view/Makefile.in pango1.0-1.30.0/pango-view/Makefile.in --- pango1.0-1.29.5/pango-view/Makefile.in 2011-11-22 19:07:58.000000000 +0000 +++ pango1.0-1.30.0/pango-view/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -111,8 +111,8 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \ $(am__DEPENDENCIES_5) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -124,21 +124,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(pango_view_SOURCES) DIST_SOURCES = $(am__pango_view_SOURCES_DIST) @@ -163,6 +163,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(nodist_man_MANS) @@ -493,7 +499,7 @@ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ done; \ done; rm -f c$${pid}_.???; exit $$bad -pango-view$(EXEEXT): $(pango_view_OBJECTS) $(pango_view_DEPENDENCIES) +pango-view$(EXEEXT): $(pango_view_OBJECTS) $(pango_view_DEPENDENCIES) $(EXTRA_pango_view_DEPENDENCIES) @rm -f pango-view$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pango_view_OBJECTS) $(pango_view_LDADD) $(LIBS) @@ -516,26 +522,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -577,9 +580,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -695,10 +696,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/pango-view/pango-view.1.in pango1.0-1.30.0/pango-view/pango-view.1.in --- pango1.0-1.29.5/pango-view/pango-view.1.in 2011-11-22 19:10:36.000000000 +0000 +++ pango1.0-1.30.0/pango-view/pango-view.1.in 2012-03-27 01:37:20.000000000 +0000 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.2. -.TH PANGO-VIEW "1" "November 2011" "pango-view (pango) 1.29.5" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6. +.TH PANGO-VIEW "1" "March 2012" "pango-view (pango) 1.30.0" "User Commands" .SH NAME pango-view \- Pango text viewer .SH DESCRIPTION diff -Nru pango1.0-1.29.5/tests/Makefile.in pango1.0-1.30.0/tests/Makefile.in --- pango1.0-1.29.5/tests/Makefile.in 2011-11-22 19:07:59.000000000 +0000 +++ pango1.0-1.30.0/tests/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,8 +64,8 @@ am_cxx_test_OBJECTS = cxx-test.$(OBJEXT) cxx_test_OBJECTS = $(am_cxx_test_OBJECTS) cxx_test_LDADD = $(LDADD) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent dump_boundaries_SOURCES = dump-boundaries.c dump_boundaries_OBJECTS = dump-boundaries.$(OBJEXT) @@ -108,18 +108,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_$(V)) -am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) am__v_CXX_0 = @echo " CXX " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_$(V)) -am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -127,18 +127,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(cxx_test_SOURCES) dump-boundaries.c gen-all-unicode.c \ test-ot-tags.c testboundaries.c testboundaries_ucd.c \ @@ -415,31 +415,31 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -cxx-test$(EXEEXT): $(cxx_test_OBJECTS) $(cxx_test_DEPENDENCIES) +cxx-test$(EXEEXT): $(cxx_test_OBJECTS) $(cxx_test_DEPENDENCIES) $(EXTRA_cxx_test_DEPENDENCIES) @rm -f cxx-test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(cxx_test_OBJECTS) $(cxx_test_LDADD) $(LIBS) -dump-boundaries$(EXEEXT): $(dump_boundaries_OBJECTS) $(dump_boundaries_DEPENDENCIES) +dump-boundaries$(EXEEXT): $(dump_boundaries_OBJECTS) $(dump_boundaries_DEPENDENCIES) $(EXTRA_dump_boundaries_DEPENDENCIES) @rm -f dump-boundaries$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dump_boundaries_OBJECTS) $(dump_boundaries_LDADD) $(LIBS) -gen-all-unicode$(EXEEXT): $(gen_all_unicode_OBJECTS) $(gen_all_unicode_DEPENDENCIES) +gen-all-unicode$(EXEEXT): $(gen_all_unicode_OBJECTS) $(gen_all_unicode_DEPENDENCIES) $(EXTRA_gen_all_unicode_DEPENDENCIES) @rm -f gen-all-unicode$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gen_all_unicode_OBJECTS) $(gen_all_unicode_LDADD) $(LIBS) -test-ot-tags$(EXEEXT): $(test_ot_tags_OBJECTS) $(test_ot_tags_DEPENDENCIES) +test-ot-tags$(EXEEXT): $(test_ot_tags_OBJECTS) $(test_ot_tags_DEPENDENCIES) $(EXTRA_test_ot_tags_DEPENDENCIES) @rm -f test-ot-tags$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_ot_tags_OBJECTS) $(test_ot_tags_LDADD) $(LIBS) -testboundaries$(EXEEXT): $(testboundaries_OBJECTS) $(testboundaries_DEPENDENCIES) +testboundaries$(EXEEXT): $(testboundaries_OBJECTS) $(testboundaries_DEPENDENCIES) $(EXTRA_testboundaries_DEPENDENCIES) @rm -f testboundaries$(EXEEXT) $(AM_V_CCLD)$(LINK) $(testboundaries_OBJECTS) $(testboundaries_LDADD) $(LIBS) -testboundaries_ucd$(EXEEXT): $(testboundaries_ucd_OBJECTS) $(testboundaries_ucd_DEPENDENCIES) +testboundaries_ucd$(EXEEXT): $(testboundaries_ucd_OBJECTS) $(testboundaries_ucd_DEPENDENCIES) $(EXTRA_testboundaries_ucd_DEPENDENCIES) @rm -f testboundaries_ucd$(EXEEXT) $(AM_V_CCLD)$(LINK) $(testboundaries_ucd_OBJECTS) $(testboundaries_ucd_LDADD) $(LIBS) -testcolor$(EXEEXT): $(testcolor_OBJECTS) $(testcolor_DEPENDENCIES) +testcolor$(EXEEXT): $(testcolor_OBJECTS) $(testcolor_DEPENDENCIES) $(EXTRA_testcolor_DEPENDENCIES) @rm -f testcolor$(EXEEXT) $(AM_V_CCLD)$(LINK) $(testcolor_OBJECTS) $(testcolor_LDADD) $(LIBS) -testiter$(EXEEXT): $(testiter_OBJECTS) $(testiter_DEPENDENCIES) +testiter$(EXEEXT): $(testiter_OBJECTS) $(testiter_DEPENDENCIES) $(EXTRA_testiter_DEPENDENCIES) @rm -f testiter$(EXEEXT) $(AM_V_CCLD)$(LINK) $(testiter_OBJECTS) $(testiter_LDADD) $(LIBS) -testscript$(EXEEXT): $(testscript_OBJECTS) $(testscript_DEPENDENCIES) +testscript$(EXEEXT): $(testscript_OBJECTS) $(testscript_DEPENDENCIES) $(EXTRA_testscript_DEPENDENCIES) @rm -f testscript$(EXEEXT) $(AM_V_CCLD)$(LINK) $(testscript_OBJECTS) $(testscript_LDADD) $(LIBS) @@ -462,50 +462,44 @@ .C.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .C.obj: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .C.lo: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -646,14 +640,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -703,10 +698,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru pango1.0-1.29.5/tools/Makefile.in pango1.0-1.30.0/tools/Makefile.in --- pango1.0-1.29.5/tools/Makefile.in 2011-11-22 19:07:59.000000000 +0000 +++ pango1.0-1.30.0/tools/Makefile.in 2012-03-27 01:38:51.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -51,8 +51,8 @@ gen_script_for_lang_DEPENDENCIES = \ ../pango/libpango-$(PANGO_API_VERSION).la \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -64,21 +64,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(gen_script_for_lang_SOURCES) DIST_SOURCES = $(gen_script_for_lang_SOURCES) @@ -315,7 +315,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -gen-script-for-lang$(EXEEXT): $(gen_script_for_lang_OBJECTS) $(gen_script_for_lang_DEPENDENCIES) +gen-script-for-lang$(EXEEXT): $(gen_script_for_lang_OBJECTS) $(gen_script_for_lang_DEPENDENCIES) $(EXTRA_gen_script_for_lang_DEPENDENCIES) @rm -f gen-script-for-lang$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gen_script_for_lang_OBJECTS) $(gen_script_for_lang_LDADD) $(LIBS) @@ -330,26 +330,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -453,10 +450,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: