Mailinglist Archive: opensuse-commit (926 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package pango for openSUSE:Factory
checked in at Tue Dec 8 12:02:36 CET 2009.



--------
--- GNOME/pango/pango.changes   2009-09-23 15:25:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/pango/pango.changes    2009-11-30 
16:21:57.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Nov 30 16:06:04 CET 2009 - dimstar@xxxxxxxxxxxx
+
+- Update to version 1.26.1:
+  + [HB] Fix lookup_flag ignoring
+  + Fix leak with non-mmapped fonts
+  + Allow using uninstalled glib
+  + bgo#341481 - pangocairo kerning problem with nonidentity
+    scaling
+  + bgo#587768 - Don't build pango-view twice
+  + bgo#594101 - character class data updates to support unicode
+    5.1
+  + bgo#596837 - Typo in pango_cairo_show_layout documentation
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  pango-1.26.0.tar.bz2

New:
----
  pango-1.26.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pango.spec ++++++
--- /var/tmp/diff_new_pack.5xqgzO/_old  2009-12-08 12:02:17.000000000 +0100
+++ /var/tmp/diff_new_pack.5xqgzO/_new  2009-12-08 12:02:17.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package pango (Version 1.26.0)
+# spec file for package pango (Version 1.26.1)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -27,14 +27,14 @@
 %if %suse_version >= 1100
 BuildRequires:  libthai-devel
 %endif
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Group:          System/Libraries
 # bug437293
 %ifarch ppc64
 Obsoletes:      pango-64bit
 %endif
 #
-Version:        1.26.0
+Version:        1.26.1
 Release:        1
 Summary:        System for Layout and Rendering of Internationalised Text
 Source:         
ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2
@@ -60,7 +60,7 @@
 %if %suse_version >= 1100
 
 %package module-thai-lang
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Summary:        System for Layout and Rendering of Internationalised Text
 Group:          System/Libraries
 Provides:       locale(pango:th_TH)
@@ -81,7 +81,7 @@
 %endif
 
 %package devel
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Requires:       %{name} = %{version} cairo-devel fontconfig-devel 
freetype2-devel glib2-devel %(rpm -q --whatprovides XFree86-devel --queryformat 
'%{NAME}')
 Summary:        Include files and libraries mandatory for development
 Group:          Development/Libraries/GNOME

++++++ pango-1.26.0.tar.bz2 -> pango-1.26.1.tar.bz2 ++++++
++++ 2351 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/ChangeLog new/pango-1.26.1/ChangeLog
--- old/pango-1.26.0/ChangeLog  2009-09-21 22:59:12.000000000 +0200
+++ new/pango-1.26.1/ChangeLog  2009-11-18 03:39:06.000000000 +0100
@@ -1,3 +1,205 @@
+commit 640404de481360206d0c08f7528ff14cf9166814
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Tue Nov 17 21:38:53 2009 -0500
+
+    Release 1.26.1
+
+ NEWS         |   12 ++++++++++++
+ configure.in |    2 +-
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+commit df2d2ecbedfcc9fd470313c08f3d7edad148a0d1
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Tue Nov 17 21:09:05 2009 -0500
+
+    Fix pangocairo-fc fontsize weirdness
+
+ pango/pangocairo-fcfont.c |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+commit d9abcaf566e9cd7f702c98958f99f90fd53b4c0b
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Tue Nov 17 19:31:23 2009 -0500
+
+    Bug 341481 - pangocairo kerning problem with nonidentity scaling
+
+    Finally fix this embarrassing bug.  The fix is a kludge, but it will
+    be redone for 1.28 (harfbuzz-ng) anyway.
+
+ pango/pango-ot-buffer.c |   56
+ +++++++++++++++++++++++++++++++++++++++++-----
+ pango/pangofc-font.c    |   19 ++++++++++++++++
+ pango/pangofc-private.h |   44 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 113 insertions(+), 6 deletions(-)
+
+commit 4ccabeffc20f899163bf610356871afb197e9bf8
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Tue Nov 17 16:20:42 2009 -0500
+
+    Bug 596614 - Pango application receives SIGSEGV on pasting text
+    with U+202E
+
+    Fixed all modules to reverse glyphs if run is rtl.  Except for
+    Hangul module.
+    Fixed pango_shape() to detect that, warn, and reverse.
+
+ modules/indic/indic-fc.c     |    1 +
+ modules/khmer/khmer-fc.c     |    1 +
+ modules/thai/thai-fc.c       |    1 +
+ modules/tibetan/tibetan-fc.c |    1 +
+ pango/glyphstring.c          |    2 --
+ pango/pango-engine.c         |    3 +++
+ pango/pango-impl-utils.h     |   26 +++++++++++++++++++++++++-
+ pango/pango-ot-buffer.c      |   23 ++---------------------
+ pango/shape.c                |   34 +++++++++++++++++++++++++++++++---
+ 9 files changed, 65 insertions(+), 27 deletions(-)
+
+commit 718c533d28cb760e45c7b874420b14003445a9c1
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Wed Nov 11 11:57:59 2009 -0500
+
+    Fix typo in previous commit
+
+ pango-view/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 28e179b4f24e11f2af3b739c6c5c3bd560d2de74
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Wed Nov 11 11:03:29 2009 -0500
+
+    Bug 587768 - [patch] Don't build pango-view twice
+
+    Second try.
+
+ pango-view/Makefile.am |   28 +++++++++++++---------------
+ 1 files changed, 13 insertions(+), 15 deletions(-)
+
+commit 16c3f1d491a04eb8b12f209f97904c7862fbb9db
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Tue Nov 10 17:09:31 2009 -0500
+
+    Bug 587768 - [patch] Don't build pango-view twice
+
+    Try to fix parallel build..
+
+ pango-view/Makefile.am |   25 ++++++++++++++++---------
+ 1 files changed, 16 insertions(+), 9 deletions(-)
+
+commit 5f3d21b78679694f76e788e9308062380a0d0c8e
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Tue Nov 10 16:44:54 2009 -0500
+
+    Remove REBUILD black magic
+
+    Shouldn't be needed.
+
+ configure.in      |   13 -------------
+ pango/Makefile.am |    4 ++--
+ 2 files changed, 2 insertions(+), 15 deletions(-)
+
+commit 8e9d153733cac83bfc8ce0c068d2af455d0e9a76
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Tue Nov 3 17:11:53 2009 -0500
+
+    Fix leak with non-mmapped fonts
+
+ pango/pango-ot-info.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bfbe9aea599bc98ffd4640268a66c90d6fa21736
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Thu Oct 29 03:08:42 2009 -0400
+
+    [HB] Add glyph_metrics typedef
+
+ pango/opentype/hb-font.h |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit cdb7383be41b4ace0e6d9f3a05ac3983e8d4eaf0
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Thu Oct 29 03:05:18 2009 -0400
+
+    [HB] Add point_index to get_contour_point()
+
+    Pointed out by Keith Stribley on HarfBuzz list.
+
+ pango/opentype/hb-font.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 44164ee60f5ef2fc4f7a03846b60d72eb67ecb0e
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Thu Oct 29 03:00:44 2009 -0400
+
+    [HB] Fix lookup_flag ignoring
+
+    Reported by Keith Stribley on HarfBuzz list.
+
+ pango/opentype/hb-ot-layout-common-private.hh |    1 +
+ pango/opentype/hb-ot-layout.cc                |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 078b2d5b20c4c9e8b3f0a11d1d40e5510ef94cf6
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Fri Oct 23 16:45:36 2009 -0400
+
+    Bug 594101 - [Indic] character class data updates to support
+    unicode 5.1
+
+    Add classification for new characters.  Patch from Parag AN.
+
+ modules/indic/indic-ot-class-tables.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1038b7959944dd25d7c2a76a3c769eb26b5fd6a2
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Thu Oct 22 17:24:21 2009 -0400
+
+    Allow using uninstalled glib
+
+    Reported by mpsuzuki on gtk-i18n-list on 2009-10-09.
+
+ configure.in      |    5 +++++
+ pango/Makefile.am |    4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 72b3642ec8f689eee5463ae8675323d91496238e
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Thu Oct 22 17:17:38 2009 -0400
+
+    [configure] Allow using uninstalled cairo
+
+    Reported by mpsuzuki on gtk-i18n-list on 2009-10-16.
+
+ configure.in |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+commit 8598817414ab8bde6c218c6255faf378597394ea
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Wed Oct 21 18:26:27 2009 -0400
+
+    Update from vte
+
+ git.mk |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 6cf73f0034b6db8f10a5cdc096c7a5d1ac53af94
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Mon Oct 5 15:31:31 2009 -0400
+
+    Typo
+
+ pango/pangocairo-font.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8299e480df42f0c1c6481a87c83a6497e76856f0
+Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
+Date:   Wed Sep 30 16:35:40 2009 -0400
+
+    Bug 596837 - Typo in pango_cairo_show_layout documentation
+
+ pango/pangocairo-render.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
 commit 18b4ad750528cf5018dc7aa53ba37d1a8af44e1f
 Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
 Date:   Mon Sep 21 16:58:52 2009 -0400
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/NEWS new/pango-1.26.1/NEWS
--- old/pango-1.26.0/NEWS       2009-09-21 22:58:46.000000000 +0200
+++ new/pango-1.26.1/NEWS       2009-11-18 03:38:25.000000000 +0100
@@ -1,3 +1,15 @@
+Overview of changes between 1.26.0 and 1.26.1
+=============================================
+- Finally fix GPOS positioning and kerning with non-identity cairo matrices
+- [HB] Fix lookup_flag ignoring
+- Fix leak with non-mmapped fonts
+- Allow using uninstalled glib
+- Bugs fixed:
+    Bug 341481 - pangocairo kerning problem with nonidentity scaling
+    Bug 587768 - [patch] Don't build pango-view twice
+    Bug 594101 - [Indic] character class data updates to support unicode 5.1
+    Bug 596837 - Typo in pango_cairo_show_layout documentation
+
 Overview of changes between 1.25.6 and 1.26.0
 =============================================
 - New stable release series
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/configure.in new/pango-1.26.1/configure.in
--- old/pango-1.26.0/configure.in       2009-09-21 22:14:36.000000000 +0200
+++ new/pango-1.26.1/configure.in       2009-11-18 03:35:47.000000000 +0100
@@ -22,7 +22,7 @@
 dnl The triplet 
 m4_define([pango_version_major], [1])
 m4_define([pango_version_minor], [26])
-m4_define([pango_version_micro], [0])
+m4_define([pango_version_micro], [1])
 
 m4_define([pango_version],
           [pango_version_major.pango_version_minor.pango_version_micro])
@@ -228,19 +228,6 @@
 
 AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes])
 
-# define a MAINT-like variable REBUILD which is set if Perl
-# is found, so autogenerated sources can be rebuilt
-
-AC_CHECK_PROGS(PERL, perl5 perl)
-
-REBUILD=\#
-if test "x$enable_rebuilds" = "xyes" && \
-     test -n "$PERL" && \
-     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
-  REBUILD=
-fi
-AC_SUBST(REBUILD)
-
 have_x=false
 if test "x$pango_os_win32" != xyes; then
   AC_PATH_XTRA
@@ -368,12 +355,10 @@
 PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, 
AC_MSG_RESULT([no]))
    
 if $have_cairo ; then
-  m4_pattern_allow([PKG_CONFIG_DISABLE_UNINSTALLED])
-  INSTALLED_CAIRO_LIBS=`PKG_CONFIG_DISABLE_UNINSTALLED=yes $PKG_CONFIG --libs 
cairo`
   pango_save_libs=$LIBS
-  LIBS="$LIBS $INSTALLED_CAIRO_LIBS"
+  LIBS="$LIBS $CAIRO_LIBS"
   pango_save_ldflags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $INSTALLED_CAIRO_LIBS"
+  LDFLAGS="$LDFLAGS $CAIRO_LIBS"
 
   have_cairo=false
   cairo_font_backends=""
@@ -472,6 +457,11 @@
 *** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of 
 *** Glib is always available from ftp://ftp.gtk.org/.]))
 
+# Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AC_SUBST(GLIB_MKENUMS)
+
+
 # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
 # necesary defines for thread-safety.
 GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/docs/html/index.html new/pango-1.26.1/docs/html/index.html
--- old/pango-1.26.0/docs/html/index.html       2009-09-21 23:01:20.000000000 
+0200
+++ new/pango-1.26.1/docs/html/index.html       2009-11-18 03:46:47.000000000 
+0100
@@ -34,7 +34,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" 
cellspacing="0"><tr><th valign="middle"><p class="title">Pango Reference 
Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for Pango 1.26.0
+<div><p class="releaseinfo">for Pango 1.26.1
 </p></div>
 </div>
 <hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/docs/html/pango-Cairo-Rendering.html 
new/pango-1.26.1/docs/html/pango-Cairo-Rendering.html
--- old/pango-1.26.0/docs/html/pango-Cairo-Rendering.html       2009-09-21 
23:01:19.000000000 +0200
+++ new/pango-1.26.1/docs/html/pango-Cairo-Rendering.html       2009-11-18 
03:46:47.000000000 +0100
@@ -1173,7 +1173,7 @@
> cairo_t</a> *cr,
                                                          <a class="link" 
href="pango-Layout-Objects.html#PangoLayout">PangoLayout</a> *layout);</pre>
 <p>
-Draws a <a class="link" href="pango-Layout-Objects.html#PangoLayoutLine" 
title="PangoLayoutLine"><span class="type">PangoLayoutLine</span></a> in the 
specified cairo context.
+Draws a <a class="link" href="pango-Layout-Objects.html#PangoLayout"><span 
class="type">PangoLayout</span></a> in the specified cairo context.
 The top-left corner of the <a class="link" 
href="pango-Layout-Objects.html#PangoLayout"><span 
class="type">PangoLayout</span></a> will be drawn
 at the current point of the cairo context.</p>
 <p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/docs/html/pango-Version-Checking.html 
new/pango-1.26.1/docs/html/pango-Version-Checking.html
--- old/pango-1.26.0/docs/html/pango-Version-Checking.html      2009-09-21 
23:01:20.000000000 +0200
+++ new/pango-1.26.1/docs/html/pango-Version-Checking.html      2009-11-18 
03:46:47.000000000 +0100
@@ -143,7 +143,7 @@
 <hr>
 <div class="refsect2" lang="en">
 <a name="PANGO-VERSION-MICRO--CAPS"></a><h3>PANGO_VERSION_MICRO</h3>
-<pre class="programlisting">#define PANGO_VERSION_MICRO 0
+<pre class="programlisting">#define PANGO_VERSION_MICRO 1
 </pre>
 <p>
 The micro component of the version of Pango available at compile-time.
@@ -152,7 +152,7 @@
 <hr>
 <div class="refsect2" lang="en">
 <a name="PANGO-VERSION-STRING--CAPS"></a><h3>PANGO_VERSION_STRING</h3>
-<pre class="programlisting">#define PANGO_VERSION_STRING "1.26.0"
+<pre class="programlisting">#define PANGO_VERSION_STRING "1.26.1"
 </pre>
 <p>
 A string literal containing the version of Pango available at compile-time.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/docs/pango-querymodules.1 
new/pango-1.26.1/docs/pango-querymodules.1
--- old/pango-1.26.0/docs/pango-querymodules.1  2009-04-18 03:19:00.000000000 
+0200
+++ new/pango-1.26.1/docs/pango-querymodules.1  2009-11-17 05:51:06.000000000 
+0100
@@ -2,12 +2,12 @@
 .\"     Title: pango-querymodules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
-.\"      Date: 04/17/2009
+.\"      Date: 11/16/2009
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "PANGO\-QUERYMODULES" "1" "04/17/2009" "[FIXME: source]" "[FIXME: manual]"
+.TH "PANGO\-QUERYMODULES" "1" "11/16/2009" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/docs/version.xml new/pango-1.26.1/docs/version.xml
--- old/pango-1.26.0/docs/version.xml   2009-09-21 22:15:54.000000000 +0200
+++ new/pango-1.26.1/docs/version.xml   2009-11-18 03:36:59.000000000 +0100
@@ -1 +1 @@
-1.26.0
+1.26.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/docs/xml/pango-version.xml 
new/pango-1.26.1/docs/xml/pango-version.xml
--- old/pango-1.26.0/docs/xml/pango-version.xml 2009-09-21 23:01:19.000000000 
+0200
+++ new/pango-1.26.1/docs/xml/pango-version.xml 2009-11-18 03:46:46.000000000 
+0100
@@ -91,14 +91,14 @@
 </para></refsect2>
 <refsect2 id="PANGO-VERSION-MICRO--CAPS" role="macro">
 <title>PANGO_VERSION_MICRO</title>
-<indexterm zone="PANGO-VERSION-MICRO--CAPS"><primary 
sortas="PANGO_VERSION_MICRO">PANGO_VERSION_MICRO</primary></indexterm><programlisting>#define
 PANGO_VERSION_MICRO 0
+<indexterm zone="PANGO-VERSION-MICRO--CAPS"><primary 
sortas="PANGO_VERSION_MICRO">PANGO_VERSION_MICRO</primary></indexterm><programlisting>#define
 PANGO_VERSION_MICRO 1
 </programlisting>
 <para>
 The micro component of the version of Pango available at compile-time.
 </para></refsect2>
 <refsect2 id="PANGO-VERSION-STRING--CAPS" role="macro">
 <title>PANGO_VERSION_STRING</title>
-<indexterm zone="PANGO-VERSION-STRING--CAPS"><primary 
sortas="PANGO_VERSION_STRING">PANGO_VERSION_STRING</primary></indexterm><programlisting>#define
 PANGO_VERSION_STRING "1.26.0"
+<indexterm zone="PANGO-VERSION-STRING--CAPS"><primary 
sortas="PANGO_VERSION_STRING">PANGO_VERSION_STRING</primary></indexterm><programlisting>#define
 PANGO_VERSION_STRING "1.26.1"
 </programlisting>
 <para>
 A string literal containing the version of Pango available at compile-time.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/docs/xml/pangocairo.xml 
new/pango-1.26.1/docs/xml/pangocairo.xml
--- old/pango-1.26.0/docs/xml/pangocairo.xml    2009-09-21 23:01:19.000000000 
+0200
+++ new/pango-1.26.1/docs/xml/pangocairo.xml    2009-11-18 03:46:46.000000000 
+0100
@@ -727,7 +727,7 @@
 <indexterm zone="pango-cairo-show-layout" role="1.10"><primary 
sortas="pango_cairo_show_layout">pango_cairo_show_layout</primary></indexterm><programlisting><link
 linkend="void">void</link>                pango_cairo_show_layout             
(<link linkend="cairo-t">cairo_t</link> *cr,
                                                          <link 
linkend="PangoLayout">PangoLayout</link> *layout);</programlisting>
 <para>
-Draws a <link linkend="PangoLayoutLine"><type>PangoLayoutLine</type></link> in 
the specified cairo context.
+Draws a <link linkend="PangoLayout"><type>PangoLayout</type></link> in the 
specified cairo context.
 The top-left corner of the <link 
linkend="PangoLayout"><type>PangoLayout</type></link> will be drawn
 at the current point of the cairo context.</para>
 <para>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/modules/indic/indic-fc.c 
new/pango-1.26.1/modules/indic/indic-fc.c
--- old/pango-1.26.0/modules/indic/indic-fc.c   2009-02-07 00:49:34.000000000 
+0100
+++ new/pango-1.26.1/modules/indic/indic-fc.c   2009-11-17 20:49:48.000000000 
+0100
@@ -252,6 +252,7 @@
 
   pango_glyph_string_set_size (glyphs, n_glyphs);
   buffer = pango_ot_buffer_new (fc_font);
+  pango_ot_buffer_set_rtl (buffer, analysis->level % 2 != 0);
 
   set_glyphs(font, wc_out, tags, n_glyphs, buffer,
             (indic_shape_engine->classTable->scriptFlags & SF_PROCESS_ZWJ) != 
0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/modules/indic/indic-ot-class-tables.c 
new/pango-1.26.1/modules/indic/indic-ot-class-tables.c
--- old/pango-1.26.0/modules/indic/indic-ot-class-tables.c      2009-05-21 
15:10:01.000000000 +0200
+++ new/pango-1.26.1/modules/indic/indic-ot-class-tables.c      2009-11-17 
05:49:11.000000000 +0100
@@ -105,7 +105,7 @@
     _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _cn, _ct, _ct, _ct, _ct, _ct, 
_ct, /* 0920 - 092F */
     _rv, _cn, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _xx, _xx, _nu, _xx, _dr, 
_dl, /* 0930 - 093F */
     _dr, _db, _db, _db, _db, _da, _da, _da, _da, _dr, _dr, _dr, _dr, _vr, _xx, 
_xx, /* 0940 - 094F */
-    _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _cn, _cn, _cn, _cn, _cn, _cn, _cn, 
_cn, /* 0950 - 095F */
+    _xx, _xx, _db, _da, _da, _xx, _xx, _xx, _cn, _cn, _cn, _cn, _cn, _cn, _cn, 
_cn, /* 0950 - 095F */
     _iv, _iv, _db, _db, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, 
_xx, /* 0960 - 096F */
     _xx, _xx, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _ct, _ct, _ct, _ct, 
_ct  /* 0970 - 097F */
 };
@@ -147,7 +147,7 @@
     _rv, _xx, _ct, _ct, _xx, _ct, _ct, _ct, _ct, _ct, _xx, _xx, _nu, _xx, _dr, 
_dl, /* 0AB0 - 0ABF */
     _dr, _db, _db, _db, _db, _da, _xx, _da, _da, _dr, _xx, _dr, _dr, _vr, _xx, 
_xx, /* 0AC0 - 0ACF */
     _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, 
_xx, /* 0AD0 - 0ADF */
-    _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, 
_xx  /* 0AE0 - 0AEF */
+    _iv, _xx, _db, _db, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, 
_xx  /* 0AE0 - 0AEF */
 };
 
 static const IndicOTCharClass oryaCharClasses[] =
@@ -200,10 +200,10 @@
     _xx, _xx, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _iv, 
_iv, /* 0C80 - 0C8F */
     _iv, _xx, _iv, _iv, _iv, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, 
_bb, /* 0C90 - 0C9F */
     _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, 
_bb, /* 0CA0 - 0CAF */
-    _rb, _ct, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _xx, _xx, _xx, _xx, _dr, 
_da, /* 0CB0 - 0CBF */
+    _rb, _ct, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _xx, _xx, _nu, _xx, _dr, 
_da, /* 0CB0 - 0CBF */
     _s1, _dr, _dr, _lm, _lm, _xx, _da, _s2, _s3, _xx, _s4, _s5, _da, _vr, _xx, 
_xx, /* 0CC0 - 0CCF */
     _xx, _xx, _xx, _xx, _xx, _lm, _lm, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _ct, 
_xx, /* 0CD0 - 0CDF */
-    _iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, 
_xx  /* 0CE0 - 0CEF */
+    _iv, _iv, _lm, _lm, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, 
_xx  /* 0CE0 - 0CEF */
 };
 
 /*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/modules/khmer/khmer-fc.c 
new/pango-1.26.1/modules/khmer/khmer-fc.c
--- old/pango-1.26.0/modules/khmer/khmer-fc.c   2009-02-07 00:49:34.000000000 
+0100
+++ new/pango-1.26.1/modules/khmer/khmer-fc.c   2009-11-17 20:49:52.000000000 
+0100
@@ -481,6 +481,7 @@
     return;
 
   buffer = pango_ot_buffer_new (fc_font);
+  pango_ot_buffer_set_rtl (buffer, analysis->level % 2 != 0);
 
   wcs = g_utf8_to_ucs4_fast (text, length, &n_chars);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/modules/thai/thai-fc.c new/pango-1.26.1/modules/thai/thai-fc.c
--- old/pango-1.26.0/modules/thai/thai-fc.c     2009-02-07 00:49:34.000000000 
+0100
+++ new/pango-1.26.1/modules/thai/thai-fc.c     2009-11-17 20:50:05.000000000 
+0100
@@ -298,6 +298,7 @@
   thai_set_glyphs (font_info, text, length, analysis->script, glyphs); 
 
   buffer = pango_ot_buffer_new (PANGO_FC_FONT (font));
+  pango_ot_buffer_set_rtl (buffer, analysis->level % 2 != 0);
 
   for (i = 0; i < glyphs->num_glyphs; i++)
     pango_ot_buffer_add_glyph (buffer,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/modules/tibetan/tibetan-fc.c 
new/pango-1.26.1/modules/tibetan/tibetan-fc.c
--- old/pango-1.26.0/modules/tibetan/tibetan-fc.c       2009-02-07 
00:49:34.000000000 +0100
+++ new/pango-1.26.1/modules/tibetan/tibetan-fc.c       2009-11-17 
20:50:09.000000000 +0100
@@ -443,6 +443,7 @@
     return;
 
   buffer = pango_ot_buffer_new (fc_font);
+  pango_ot_buffer_set_rtl (buffer, analysis->level % 2 != 0);
 
   wcs = g_utf8_to_ucs4_fast (text, length, &n_chars);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/Makefile.am new/pango-1.26.1/pango/Makefile.am
--- old/pango-1.26.0/pango/Makefile.am  2009-08-28 19:10:40.000000000 +0200
+++ new/pango-1.26.1/pango/Makefile.am  2009-11-17 17:35:44.000000000 +0100
@@ -132,8 +132,8 @@
 
 pango-enum-types.h: s-enum-types-h
        $(AM_V_GEN) true
-s-enum-types-h: @REBUILD@ $(pango_headers) Makefile
-       $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
+s-enum-types-h: $(pango_headers) Makefile
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
                        --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define 
__PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
                        --fprod "/* enumerations from \"@filename@\" */\n" \
                        --vhead "GType @enum_name@_get_type (void);\n#define 
@ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"  \
@@ -145,8 +145,8 @@
 
 pango-enum-types.c: s-enum-types-c
        $(AM_V_GEN) true
-s-enum-types-c: @REBUILD@ $(pango_headers) Makefile
-       $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
+s-enum-types-c: $(pango_headers) Makefile
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
                        --fhead "#include <pango.h>" \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
                        --vhead "GType\n@enum_name@_get_type (void)\n{\n  
static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value 
values[] = {"     \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/glyphstring.c new/pango-1.26.1/pango/glyphstring.c
--- old/pango-1.26.0/pango/glyphstring.c        2009-08-28 19:10:40.000000000 
+0200
+++ new/pango-1.26.1/pango/glyphstring.c        2009-11-17 21:59:06.000000000 
+0100
@@ -659,5 +659,3 @@
        }
     }
 }
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/opentype/hb-font.h 
new/pango-1.26.1/pango/opentype/hb-font.h
--- old/pango-1.26.0/pango/opentype/hb-font.h   2009-08-28 19:10:40.000000000 
+0200
+++ new/pango-1.26.1/pango/opentype/hb-font.h   2009-11-17 17:35:44.000000000 
+0100
@@ -98,10 +98,20 @@
 /* funcs */
 
 typedef struct _hb_glyph_metrics_t hb_glyph_metrics_t;
+struct _hb_glyph_metrics_t
+{
+    hb_position_t x_advance;
+    hb_position_t y_advance;
+    hb_position_t x_offset;
+    hb_position_t y_offset;
+    hb_position_t width;
+    hb_position_t height;
+};
 
 typedef hb_codepoint_t (*hb_font_get_glyph_func_t) (hb_font_t *font, hb_face_t 
*face, const void *user_data,
                                                    hb_codepoint_t unicode, 
hb_codepoint_t variant_selector);
 typedef hb_bool_t (*hb_font_get_contour_point_func_t) (hb_font_t *font, 
hb_face_t *face, const void *user_data,
+                                                      unsigned int point_index,
                                                       hb_codepoint_t glyph, 
hb_position_t *x, hb_position_t *y);
 typedef void (*hb_font_get_glyph_metrics_func_t) (hb_font_t *font, hb_face_t 
*face, const void *user_data,
                                                  hb_codepoint_t glyph, 
hb_glyph_metrics_t *metrics);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/opentype/hb-ot-layout-common-private.hh 
new/pango-1.26.1/pango/opentype/hb-ot-layout-common-private.hh
--- old/pango-1.26.0/pango/opentype/hb-ot-layout-common-private.hh      
2009-08-28 23:15:12.000000000 +0200
+++ new/pango-1.26.1/pango/opentype/hb-ot-layout-common-private.hh      
2009-11-17 17:35:44.000000000 +0100
@@ -244,6 +244,7 @@
     IgnoreBaseGlyphs   = 0x0002u,
     IgnoreLigatures    = 0x0004u,
     IgnoreMarks                = 0x0008u,
+    IgnoreFlags                = 0x000Eu,
     UseMarkFilteringSet        = 0x0010u,
     Reserved           = 0x00E0u,
     MarkAttachmentType = 0xFF00u
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/opentype/hb-ot-layout.cc 
new/pango-1.26.1/pango/opentype/hb-ot-layout.cc
--- old/pango-1.26.0/pango/opentype/hb-ot-layout.cc     2009-08-28 
19:10:40.000000000 +0200
+++ new/pango-1.26.1/pango/opentype/hb-ot-layout.cc     2009-11-17 
17:35:44.000000000 +0100
@@ -148,7 +148,7 @@
   /* Not covered, if, for example, glyph class is ligature and
    * lookup_flags includes LookupFlags::IgnoreLigatures
    */
-  if (property & lookup_flags)
+  if (property & lookup_flags & LookupFlag::IgnoreFlags)
     return false;
 
   if (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pango-engine.c new/pango-1.26.1/pango/pango-engine.c
--- old/pango-1.26.0/pango/pango-engine.c       2009-07-26 01:08:41.000000000 
+0200
+++ new/pango-1.26.1/pango/pango-engine.c       2009-11-17 22:01:00.000000000 
+0100
@@ -140,6 +140,9 @@
 
       p = g_utf8_next_char (p);
     }
+
+  if (analysis->level & 1)
+    pango_glyph_string_reverse_range (glyphs, 0, glyphs->num_glyphs);
 }
 
 static PangoCoverageLevel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pango-features.h new/pango-1.26.1/pango/pango-features.h
--- old/pango-1.26.0/pango/pango-features.h     2009-09-21 22:15:57.000000000 
+0200
+++ new/pango-1.26.1/pango/pango-features.h     2009-11-18 03:37:04.000000000 
+0100
@@ -4,9 +4,9 @@
 
 #define PANGO_VERSION_MAJOR 1
 #define PANGO_VERSION_MINOR 26
-#define PANGO_VERSION_MICRO 0
+#define PANGO_VERSION_MICRO 1
 
-#define PANGO_VERSION_STRING "1.26.0"
+#define PANGO_VERSION_STRING "1.26.1"
 
 
 #endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pango-impl-utils.h 
new/pango-1.26.1/pango/pango-impl-utils.h
--- old/pango-1.26.0/pango/pango-impl-utils.h   2009-07-26 01:08:41.000000000 
+0200
+++ new/pango-1.26.1/pango/pango-impl-utils.h   2009-11-18 00:53:17.000000000 
+0100
@@ -150,7 +150,31 @@
   return len;
 }
 
+
+/* To be made public at some point */
+
+static G_GNUC_UNUSED void
+pango_glyph_string_reverse_range (PangoGlyphString *glyphs,
+                                 int start, int end)
+{
+  int i, j;
+
+  for (i = start, j = end - 1; i < j; i++, j--)
+    {
+      PangoGlyphInfo glyph_info;
+      gint log_cluster;
+
+      glyph_info = glyphs->glyphs[i];
+      glyphs->glyphs[i] = glyphs->glyphs[j];
+      glyphs->glyphs[j] = glyph_info;
+
+      log_cluster = glyphs->log_clusters[i];
+      glyphs->log_clusters[i] = glyphs->log_clusters[j];
+      glyphs->log_clusters[j] = log_cluster;
+    }
+}
+
+
 G_END_DECLS
 
 #endif /* __PANGO_IMPL_UTILS_H__ */
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pango-ot-buffer.c 
new/pango-1.26.1/pango/pango-ot-buffer.c
--- old/pango-1.26.0/pango/pango-ot-buffer.c    2009-08-28 23:21:21.000000000 
+0200
+++ new/pango-1.26.1/pango/pango-ot-buffer.c    2009-11-18 00:51:59.000000000 
+0100
@@ -23,6 +23,7 @@
 
 #include "pango-ot-private.h"
 #include "pangofc-private.h"
+#include "pango-impl-utils.h"
 
 /* cache a single hb_buffer_t */
 static hb_buffer_t *cached_buffer = NULL;
@@ -204,28 +205,11 @@
 }
 
 static void
-swap_range (PangoGlyphString *glyphs, int start, int end)
-{
-  int i, j;
-
-  for (i = start, j = end - 1; i < j; i++, j--)
-    {
-      PangoGlyphInfo glyph_info;
-      gint log_cluster;
-
-      glyph_info = glyphs->glyphs[i];
-      glyphs->glyphs[i] = glyphs->glyphs[j];
-      glyphs->glyphs[j] = glyph_info;
-
-      log_cluster = glyphs->log_clusters[i];
-      glyphs->log_clusters[i] = glyphs->log_clusters[j];
-      glyphs->log_clusters[j] = log_cluster;
-    }
-}
-
-static void
 apply_gpos_ltr (PangoGlyphString    *glyphs,
                hb_glyph_position_t *positions,
+               gboolean             scale,
+               double               xscale,
+               double               yscale,
                gboolean             is_hinted)
 {
   int i;
@@ -243,6 +227,8 @@
 
       if (is_hinted)
        adjustment = PANGO_UNITS_ROUND (adjustment);
+      if (G_UNLIKELY (scale))
+       adjustment *= xscale;
 
       if (positions[i].new_advance)
        glyphs->glyphs[i].geometry.width  = adjustment;
@@ -260,14 +246,25 @@
       for (j = back; j < i; j++)
        glyphs->glyphs[i].geometry.x_offset -= glyphs->glyphs[j].geometry.width;
 
-      glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos);
-      glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos);
+      if (G_UNLIKELY (scale))
+        {
+         glyphs->glyphs[i].geometry.x_offset += xscale * 
PANGO_UNITS_26_6(x_pos);
+         glyphs->glyphs[i].geometry.y_offset -= yscale * 
PANGO_UNITS_26_6(y_pos);
+       }
+      else
+        {
+         glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos);
+         glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos);
+       }
     }
 }
 
 static void
 apply_gpos_rtl (PangoGlyphString    *glyphs,
                hb_glyph_position_t *positions,
+               gboolean             scale,
+               double               xscale,
+               double               yscale,
                gboolean             is_hinted)
 {
   int i;
@@ -287,6 +284,8 @@
 
       if (is_hinted)
        adjustment = PANGO_UNITS_ROUND (adjustment);
+      if (G_UNLIKELY (scale))
+       adjustment *= xscale;
 
       if (positions[i_rev].new_advance)
        glyphs->glyphs[i].geometry.width  = adjustment;
@@ -306,8 +305,16 @@
       for (j = i; j < back; j++)
        glyphs->glyphs[i].geometry.x_offset += glyphs->glyphs[j].geometry.width;
 
-      glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos);
-      glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos);
+      if (G_UNLIKELY (scale))
+        {
+         glyphs->glyphs[i].geometry.x_offset += xscale * 
PANGO_UNITS_26_6(x_pos);
+         glyphs->glyphs[i].geometry.y_offset -= yscale * 
PANGO_UNITS_26_6(y_pos);
+       }
+      else
+        {
+         glyphs->glyphs[i].geometry.x_offset += PANGO_UNITS_26_6(x_pos);
+         glyphs->glyphs[i].geometry.y_offset -= PANGO_UNITS_26_6(y_pos);
+       }
     }
 }
 
@@ -389,16 +396,34 @@
   if (buffer->rtl)
     {
       /* Swap all glyphs */
-      swap_range (glyphs, 0, glyphs->num_glyphs);
+      pango_glyph_string_reverse_range (glyphs, 0, glyphs->num_glyphs);
     }
 
   positions = hb_buffer_get_glyph_positions (buffer->buffer);
   if (buffer->applied_gpos)
     {
+      gboolean scale = FALSE;
+      double xscale = 1, yscale = 1;
+      PangoFcFontKey *key = _pango_fc_font_get_font_key (buffer->font);
+
+      /* This is a kludge, and dupped in pango_fc_font_kern_glyphs().
+       * Should move the scale factor to PangoFcFont layer. */
+      if (key) {
+       const PangoMatrix *matrix = pango_fc_font_key_get_matrix (key);
+       PangoMatrix identity = PANGO_MATRIX_INIT;
+       if (G_UNLIKELY (matrix && 0 != memcmp (&identity, matrix, 4 * sizeof 
(double))))
+         {
+           scale = TRUE;
+           pango_matrix_get_font_scale_factors (matrix, &xscale, &yscale);
+           if (xscale) xscale = 1 / xscale;
+           if (yscale) yscale = 1 / yscale;
+         }
+      }
+
       if (buffer->rtl)
-       apply_gpos_rtl (glyphs, positions, buffer->font->is_hinted);
+       apply_gpos_rtl (glyphs, positions, scale, xscale, yscale, 
buffer->font->is_hinted);
       else
-       apply_gpos_ltr (glyphs, positions, buffer->font->is_hinted);
+       apply_gpos_ltr (glyphs, positions, scale, xscale, yscale, 
buffer->font->is_hinted);
     }
   else
     {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pango-ot-info.c new/pango-1.26.1/pango/pango-ot-info.c
--- old/pango-1.26.0/pango/pango-ot-info.c      2009-08-28 19:10:40.000000000 
+0200
+++ new/pango-1.26.1/pango/pango-ot-info.c      2009-11-17 17:35:44.000000000 
+0100
@@ -112,7 +112,7 @@
 
   return hb_blob_create ((const char *) buffer, length,
                         HB_MEMORY_MODE_WRITABLE,
-                        g_free, NULL);
+                        g_free, buffer);
 }
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pango.rc new/pango-1.26.1/pango/pango.rc
--- old/pango-1.26.0/pango/pango.rc     2009-09-21 22:15:53.000000000 +0200
+++ new/pango-1.26.1/pango/pango.rc     2009-11-18 03:36:57.000000000 +0100
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,26,0,0
-  PRODUCTVERSION 1,26,0,0
+  FILEVERSION 1,26,1,0
+  PRODUCTVERSION 1,26,1,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
       BEGIN
        VALUE "CompanyName", "Red Hat Software"
        VALUE "FileDescription", "Pango"
-       VALUE "FileVersion", "1.26.0.0"
+       VALUE "FileVersion", "1.26.1.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.26.0"
+       VALUE "ProductVersion", "1.26.1"
       END
     END
     BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangocairo-fcfont.c 
new/pango-1.26.1/pango/pangocairo-fcfont.c
--- old/pango-1.26.0/pango/pangocairo-fcfont.c  2009-05-21 15:10:01.000000000 
+0200
+++ new/pango-1.26.1/pango/pangocairo-fcfont.c  2009-11-18 03:08:35.000000000 
+0100
@@ -166,7 +166,7 @@
   double dpi;
 
   if (FcPatternGetDouble (pattern, FC_PIXEL_SIZE, 0, &size) == FcResultMatch)
-    return size * PANGO_SCALE;
+    return size;
 
   /* Just in case FC_PIXEL_SIZE got unset between pango_fc_make_pattern()
    * and here.  That would be very weird.
@@ -240,8 +240,7 @@
                     fc_matrix.yy,
                     0., 0.);
 
-  cairo_matrix_scale (&font_matrix,
-                     size / PANGO_SCALE, size / PANGO_SCALE);
+  cairo_matrix_scale (&font_matrix, size, size);
 
   _pango_cairo_font_private_initialize (&cffont->cf_priv,
                                        (PangoCairoFont *) cffont,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangocairo-font.c 
new/pango-1.26.1/pango/pangocairo-font.c
--- old/pango-1.26.0/pango/pangocairo-font.c    2009-04-27 03:42:51.000000000 
+0200
+++ new/pango-1.26.1/pango/pangocairo-font.c    2009-11-17 05:49:11.000000000 
+0100
@@ -133,7 +133,7 @@
          if (!font_face)
                g_warning ("font_face is NULL");
          else
-               g_warning ("font_font status is: %s",
+               g_warning ("font_face status is: %s",
                           cairo_status_to_string (cairo_font_face_status 
(font_face)));
 
          if (!scaled_font)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangocairo-render.c 
new/pango-1.26.1/pango/pangocairo-render.c
--- old/pango-1.26.0/pango/pangocairo-render.c  2009-02-16 20:26:21.000000000 
+0100
+++ new/pango-1.26.1/pango/pangocairo-render.c  2009-11-17 05:49:11.000000000 
+0100
@@ -990,7 +990,7 @@
  * @cr: a Cairo context
  * @layout: a Pango layout
  *
- * Draws a #PangoLayoutLine in the specified cairo context.
+ * Draws a #PangoLayout in the specified cairo context.
  * The top-left corner of the #PangoLayout will be drawn
  * at the current point of the cairo context.
  *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangofc-font.c new/pango-1.26.1/pango/pangofc-font.c
--- old/pango-1.26.0/pango/pangofc-font.c       2009-07-26 01:08:41.000000000 
+0200
+++ new/pango-1.26.1/pango/pangofc-font.c       2009-11-18 00:52:25.000000000 
+0100
@@ -807,6 +807,9 @@
   FT_Vector kerning;
   int i;
   gboolean hinting = font->is_hinted;
+  gboolean scale = FALSE;
+  double xscale = 1;
+  PangoFcFontKey *key;
 
   g_return_if_fail (PANGO_IS_FC_FONT (font));
   g_return_if_fail (glyphs != NULL);
@@ -821,6 +824,20 @@
       return;
     }
 
+  /* This is a kludge, and dupped in pango_ot_buffer_output().
+   * Should move the scale factor to PangoFcFont layer. */
+  key = _pango_fc_font_get_font_key (font);
+  if (key) {
+    const PangoMatrix *matrix = pango_fc_font_key_get_matrix (key);
+    PangoMatrix identity = PANGO_MATRIX_INIT;
+    if (G_UNLIKELY (matrix && 0 != memcmp (&identity, matrix, 2 * sizeof 
(double))))
+      {
+       scale = TRUE;
+       pango_matrix_get_font_scale_factors (matrix, &xscale, NULL);
+       if (xscale) xscale = 1 / xscale;
+      }
+  }
+
   for (i = 1; i < glyphs->num_glyphs; ++i)
     {
       error = FT_Get_Kerning (face,
@@ -834,6 +851,8 @@
 
        if (hinting)
          adjustment = PANGO_UNITS_ROUND (adjustment);
+       if (G_UNLIKELY (scale))
+         adjustment *= xscale;
 
        glyphs->glyphs[i-1].geometry.width += adjustment;
       }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangofc-private.h 
new/pango-1.26.1/pango/pangofc-private.h
--- old/pango-1.26.0/pango/pangofc-private.h    2009-05-21 15:10:01.000000000 
+0200
+++ new/pango-1.26.1/pango/pangofc-private.h    2009-11-18 00:53:34.000000000 
+0100
@@ -93,6 +93,50 @@
 PangoFontMetrics *pango_fc_font_create_metrics_for_context (PangoFcFont   
*font,
                                                            PangoContext  
*context);
 
+
+
+/* To be made public at some point */
+
+#include <math.h>
+
+static G_GNUC_UNUSED void
+pango_matrix_get_font_scale_factors (const PangoMatrix *matrix,
+                                    double *xscale, double *yscale)
+{
+/*
+ * Based on cairo-matrix.c:_cairo_matrix_compute_scale_factors()
+ *
+ * Copyright 2005, Keith Packard
+ */
+  double major = 0, minor = 0;
+
+  if (matrix) {
+    double det = matrix->xx * matrix->yy - matrix->yx * matrix->xy;
+
+    if (det)
+      {
+       double x = matrix->xx;
+       double y = matrix->yx;
+
+       major = sqrt (x*x + y*y);
+
+       /*
+        * ignore mirroring
+        */
+       if (det < 0)
+         det = - det;
+
+       if (major)
+         minor = det / major;
+      }
+  }
+
+  if (xscale)
+    *xscale = major;
+  if (yscale)
+    *yscale = minor;
+}
+
 G_END_DECLS
 
 #endif /* __PANGOFC_PRIVATE_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangoft2.rc new/pango-1.26.1/pango/pangoft2.rc
--- old/pango-1.26.0/pango/pangoft2.rc  2009-09-21 22:15:53.000000000 +0200
+++ new/pango-1.26.1/pango/pangoft2.rc  2009-11-18 03:36:57.000000000 +0100
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,26,0,0
-  PRODUCTVERSION 1,26,0,0
+  FILEVERSION 1,26,1,0
+  PRODUCTVERSION 1,26,1,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
       BEGIN
        VALUE "CompanyName", "Red Hat Software"
        VALUE "FileDescription", "PangoFT2"
-       VALUE "FileVersion", "1.26.0.0"
+       VALUE "FileVersion", "1.26.1.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.26.0"
+       VALUE "ProductVersion", "1.26.1"
       END
     END
     BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangowin32.rc new/pango-1.26.1/pango/pangowin32.rc
--- old/pango-1.26.0/pango/pangowin32.rc        2009-09-21 22:15:53.000000000 
+0200
+++ new/pango-1.26.1/pango/pangowin32.rc        2009-11-18 03:36:57.000000000 
+0100
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,26,0,0
-  PRODUCTVERSION 1,26,0,0
+  FILEVERSION 1,26,1,0
+  PRODUCTVERSION 1,26,1,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
       BEGIN
        VALUE "CompanyName", "Red Hat Software"
        VALUE "FileDescription", "PangoWin32"
-       VALUE "FileVersion", "1.26.0.0"
+       VALUE "FileVersion", "1.26.1.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.26.0"
+       VALUE "ProductVersion", "1.26.1"
       END
     END
     BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangox.rc new/pango-1.26.1/pango/pangox.rc
--- old/pango-1.26.0/pango/pangox.rc    2009-09-21 22:15:53.000000000 +0200
+++ new/pango-1.26.1/pango/pangox.rc    2009-11-18 03:36:58.000000000 +0100
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,26,0,0
-  PRODUCTVERSION 1,26,0,0
+  FILEVERSION 1,26,1,0
+  PRODUCTVERSION 1,26,1,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
       BEGIN
        VALUE "CompanyName", "Red Hat Software"
        VALUE "FileDescription", "Pangox"
-       VALUE "FileVersion", "1.26.0.0"
+       VALUE "FileVersion", "1.26.1.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.26.0"
+       VALUE "ProductVersion", "1.26.1"
       END
     END
     BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/pangoxft.rc new/pango-1.26.1/pango/pangoxft.rc
--- old/pango-1.26.0/pango/pangoxft.rc  2009-09-21 22:15:53.000000000 +0200
+++ new/pango-1.26.1/pango/pangoxft.rc  2009-11-18 03:36:58.000000000 +0100
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,26,0,0
-  PRODUCTVERSION 1,26,0,0
+  FILEVERSION 1,26,1,0
+  PRODUCTVERSION 1,26,1,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
   FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
       BEGIN
        VALUE "CompanyName", "Red Hat Software"
        VALUE "FileDescription", "Pangoxft"
-       VALUE "FileVersion", "1.26.0.0"
+       VALUE "FileVersion", "1.26.1.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.26.0"
+       VALUE "ProductVersion", "1.26.1"
       END
     END
     BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango/shape.c new/pango-1.26.1/pango/shape.c
--- old/pango-1.26.0/pango/shape.c      2009-02-07 00:49:34.000000000 +0100
+++ new/pango-1.26.1/pango/shape.c      2009-11-17 22:19:13.000000000 +0100
@@ -108,20 +108,21 @@
   else
     glyphs->num_glyphs = 0;
 
-  if (!glyphs->num_glyphs)
+  if (G_UNLIKELY (!glyphs->num_glyphs))
     {
       PangoEngineShape *fallback_engine = _pango_get_fallback_shaper ();
 
       _pango_engine_shape_shape (fallback_engine, analysis->font,
                                 text, length, analysis, glyphs);
+      if (G_UNLIKELY (!glyphs->num_glyphs))
+        return;
     }
 
   /* make sure last_cluster is invalid */
   last_cluster = glyphs->log_clusters[0] - 1;
   for (i = 0; i < glyphs->num_glyphs; i++)
     {
-     /* Set glyphs[i].attr.is_cluster_start based on log_clusters[]
-      */
+      /* Set glyphs[i].attr.is_cluster_start based on log_clusters[] */
       if (glyphs->log_clusters[i] != last_cluster)
        {
          glyphs->glyphs[i].attr.is_cluster_start = TRUE;
@@ -141,4 +142,31 @@
          glyphs->glyphs[i].geometry.x_offset += 
glyphs->glyphs[i].geometry.width;
        }
     }
+
+  /* Make sure glyphstring direction conforms to analysis->level */
+  if (G_UNLIKELY ((analysis->level & 1) &&
+                 glyphs->log_clusters[0] < 
glyphs->log_clusters[glyphs->num_glyphs - 1]))
+    {
+      /* Warn once per shaper */
+      static GQuark warned_quark = 0;
+
+      if (!warned_quark)
+       warned_quark = g_quark_from_static_string ("pango-shape-warned");
+
+      if (analysis->shape_engine && !g_object_get_qdata (G_OBJECT 
(analysis->shape_engine), warned_quark))
+       {
+         GType engine_type = G_OBJECT_TYPE (analysis->shape_engine);
+         const char *engine_name = g_type_name (engine_type);
+         if (!engine_name)
+           engine_name = "(unknown)";
+
+         g_warning ("Expected RTL run but shape-engine='%s' returned LTR. 
Fixing.", engine_name);
+
+         g_object_set_qdata_full (G_OBJECT (analysis->shape_engine), 
warned_quark,
+                                  GINT_TO_POINTER (1), NULL);
+       }
+
+      /* *Fix* it so we don't crash later */
+      pango_glyph_string_reverse_range (glyphs, 0, glyphs->num_glyphs);
+    }
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango-view/Makefile.am new/pango-1.26.1/pango-view/Makefile.am
--- old/pango-1.26.0/pango-view/Makefile.am     2009-08-28 19:10:40.000000000 
+0200
+++ new/pango-1.26.1/pango-view/Makefile.am     2009-11-17 17:35:44.000000000 
+0100
@@ -84,20 +84,25 @@
 
 #########################################################
 
-MAINTAINERCLEANFILES = pango-view.1
-
-dist_man_MANS = pango-view.1
-
-$(srcdir)/pango-view.1: ../configure.in $(pango_view_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) pango-view$(EXEEXT)
+MAINTAINERCLEANFILES = pango-view.1.in
+EXTRA_DIST += pango-view.1.in
+CLEANFILES += pango-view.1
+
+nodist_man_MANS = pango-view.1
+
+# The indirection through pango-view.1.in is to make parallel build work.
+# See bug 587768.
+$(srcdir)/pango-view.1.in: ../configure.in $(pango_view_SOURCES)
        $(AM_V_GEN) $(top_builddir)/missing --run \
           help2man --no-info --section=1 \
                    --help-option="--help-all" --output="$@.tmp" \
                    --name 'Pango text viewer' ./pango-view \
         && mv "$@.tmp" "$@" \
-         || ($(RM) "$@"; \
-             echo Failed to update pango-view.1, the man page may be outdated 
> &2; \
+         || (echo Failed to update pango-view.1, the man page may be outdated 
> &2; \
              (test -f "$@" || echo help2man is required to generate this file. 
> > "$@"));
+pango-view.1: pango-view$(EXEEXT)
+       $(AM_V_GEN) $(MAKE) $(AM_MAKEFLAGS) pango-view.1.in && \
+       cp $(srcdir)/pango-view.1.in $@
 
 #########################################################
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango-view/pango-view.1 
new/pango-1.26.1/pango-view/pango-view.1
--- old/pango-1.26.0/pango-view/pango-view.1    2009-09-21 22:59:19.000000000 
+0200
+++ new/pango-1.26.1/pango-view/pango-view.1    1970-01-01 01:00:00.000000000 
+0100
@@ -1,116 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH PANGO-VIEW "1" "September 2009" "pango-view (pango) 1.26.0" "User Commands"
-.SH NAME
-pango-view \- Pango text viewer
-.SH DESCRIPTION
-.SS "Usage:"
-.IP
-pango\-view [OPTION...] \- FILE
-.SS "Help Options:"
-.TP
-\-?, \fB\-\-help\fR
-Show help options
-.TP
-\fB\-\-help\-all\fR
-Show all help options
-.TP
-\fB\-\-help\-cairo\fR
-Options understood by the cairo backend
-.SS "Cairo backend options:"
-.TP
-\fB\-\-annotate\fR=\fI1\fR or 2
-Annotate the output
-.SS "Application Options:"
-.TP
-\fB\-\-no\-auto\-dir\fR
-No layout direction according to contents
-.TP
-\fB\-\-backend\fR=\fIcairo\fR/xft/ft2/x
-Pango backend to use for rendering (default: cairo)
-.TP
-\fB\-\-background\fR=\fIred\fR/#rrggbb/#rrggbbaa/transparent
-Set the background color
-.TP
-\fB\-q\fR, \fB\-\-no\-display\fR
-Do not display (just write to file or whatever)
-.TP
-\fB\-\-dpi\fR=\fInumber\fR
-Set the resolution
-.TP
-\fB\-\-align\fR=\fIleft\fR/center/right
-Text alignment
-.TP
-\fB\-\-ellipsize\fR=\fIstart\fR/middle/end
-Ellipsization mode
-.TP
-\fB\-\-font\fR=\fIdescription\fR
-Set the font description
-.TP
-\fB\-\-foreground\fR=\fIred\fR/#rrggbb/#rrggbbaa
-Set the text color
-.TP
-\fB\-\-gravity\fR=\fIsouth\fR/east/north/west/auto
-Base gravity: glyph rotation
-.TP
-\fB\-\-gravity\-hint\fR=\fInatural\fR/strong/line
-Gravity hint
-.TP
-\fB\-\-header\fR
-Display the options in the output
-.TP
-\fB\-\-height=\fR+points/\-numlines
-Height in points (positive) or number of lines (negative) for ellipsizing
-.TP
-\fB\-\-hinting\fR=\fInone\fR/auto/full
-Hinting style
-.TP
-\fB\-\-indent\fR=\fIpoints\fR
-Width in points to indent paragraphs
-.TP
-\fB\-\-justify\fR
-Align paragraph lines to be justified
-.TP
-\fB\-\-language\fR=\fIen_US\fR/etc
-Language to use for font selection
-.TP
-\fB\-\-margin\fR=\fIpixels\fR
-Set the margin on the output in pixels
-.TP
-\fB\-\-markup\fR
-Interpret text as Pango markup
-.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIfile\fR
-Save rendered image to output file
-.TP
-\fB\-\-pangorc\fR=\fIfile\fR
-pangorc file to use (default is ./pangorc)
-.TP
-\fB\-\-rtl\fR
-Set base direction to right\-to\-left
-.TP
-\fB\-\-rotate\fR=\fIdegrees\fR
-Angle at which to rotate results
-.TP
-\fB\-n\fR, \fB\-\-runs\fR=\fIinteger\fR
-Run Pango layout engine this many times
-.TP
-\fB\-\-single\-par\fR
-Enable single\-paragraph mode
-.TP
-\fB\-t\fR, \fB\-\-text\fR=\fIstring\fR
-Text to display (instead of a file)
-.TP
-\fB\-\-version\fR
-Show version numbers
-.TP
-\fB\-\-waterfall\fR
-Create a waterfall display
-.TP
-\fB\-w\fR, \fB\-\-width\fR=\fIpoints\fR
-Width in points to which to wrap lines or ellipsize
-.TP
-\fB\-\-wrap\fR=\fIword\fR/char/word\-char
-Text wrapping mode (needs a width to be set)
-.PP
-Pango module interface version: 1.6.0
-Linked Pango library has a different version: 1.25.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/pango-1.26.0/pango-view/pango-view.1.in 
new/pango-1.26.1/pango-view/pango-view.1.in
--- old/pango-1.26.0/pango-view/pango-view.1.in 1970-01-01 01:00:00.000000000 
+0100
+++ new/pango-1.26.1/pango-view/pango-view.1.in 2009-11-18 03:39:19.000000000 
+0100
@@ -0,0 +1,115 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH PANGO-VIEW "1" "November 2009" "pango-view (pango) 1.26.0" "User Commands"
+.SH NAME
+pango-view \- Pango text viewer
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+pango\-view [OPTION...] \- FILE
+.SS "Help Options:"
+.TP
+\-?, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-cairo\fR
+Options understood by the cairo backend
+.SS "Cairo backend options:"
+.TP
+\fB\-\-annotate\fR=\fI1\fR or 2
+Annotate the output
+.SS "Application Options:"
+.TP
+\fB\-\-no\-auto\-dir\fR
+No layout direction according to contents
+.TP
+\fB\-\-backend\fR=\fIcairo\fR/xft/ft2/x
+Pango backend to use for rendering (default: cairo)
+.TP
+\fB\-\-background\fR=\fIred\fR/#rrggbb/#rrggbbaa/transparent
+Set the background color
+.TP
+\fB\-q\fR, \fB\-\-no\-display\fR
+Do not display (just write to file or whatever)
+.TP
+\fB\-\-dpi\fR=\fInumber\fR
+Set the resolution
+.TP
+\fB\-\-align\fR=\fIleft\fR/center/right
+Text alignment
+.TP
+\fB\-\-ellipsize\fR=\fIstart\fR/middle/end
+Ellipsization mode
+.TP
+\fB\-\-font\fR=\fIdescription\fR
+Set the font description
+.TP
+\fB\-\-foreground\fR=\fIred\fR/#rrggbb/#rrggbbaa
+Set the text color
+.TP
+\fB\-\-gravity\fR=\fIsouth\fR/east/north/west/auto
+Base gravity: glyph rotation
+.TP
+\fB\-\-gravity\-hint\fR=\fInatural\fR/strong/line
+Gravity hint
+.TP
+\fB\-\-header\fR
+Display the options in the output
+.TP
+\fB\-\-height=\fR+points/\-numlines
+Height in points (positive) or number of lines (negative) for ellipsizing
+.TP
+\fB\-\-hinting\fR=\fInone\fR/auto/full
+Hinting style
+.TP
+\fB\-\-indent\fR=\fIpoints\fR
+Width in points to indent paragraphs
+.TP
+\fB\-\-justify\fR
+Align paragraph lines to be justified
+.TP
+\fB\-\-language\fR=\fIen_US\fR/etc
+Language to use for font selection
+.TP
+\fB\-\-margin\fR=\fIpixels\fR
+Set the margin on the output in pixels
+.TP
+\fB\-\-markup\fR
+Interpret text as Pango markup
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fIfile\fR
+Save rendered image to output file
+.TP
+\fB\-\-pangorc\fR=\fIfile\fR
+pangorc file to use (default is ./pangorc)
+.TP
+\fB\-\-rtl\fR
+Set base direction to right\-to\-left
+.TP
+\fB\-\-rotate\fR=\fIdegrees\fR
+Angle at which to rotate results
+.TP
+\fB\-n\fR, \fB\-\-runs\fR=\fIinteger\fR
+Run Pango layout engine this many times
+.TP
+\fB\-\-single\-par\fR
+Enable single\-paragraph mode
+.TP
+\fB\-t\fR, \fB\-\-text\fR=\fIstring\fR
+Text to display (instead of a file)
+.TP
+\fB\-\-version\fR
+Show version numbers
+.TP
+\fB\-\-waterfall\fR
+Create a waterfall display
+.TP
+\fB\-w\fR, \fB\-\-width\fR=\fIpoints\fR
+Width in points to which to wrap lines or ellipsize
+.TP
+\fB\-\-wrap\fR=\fIword\fR/char/word\-char
+Text wrapping mode (needs a width to be set)
+.PP
+Pango module interface version: 1.6.0


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx