Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2017-04-29 10:48:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pango (Old) and /work/SRC/openSUSE:Factory/.pango.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pango" Sat Apr 29 10:48:47 2017 rev:104 rq:490197 version:1.40.5 Changes: -------- --- /work/SRC/openSUSE:Factory/pango/pango.changes 2017-03-22 22:57:42.370707152 +0100 +++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2017-04-29 10:48:48.712171659 +0200 @@ -1,0 +2,10 @@ +Mon Apr 10 07:01:36 UTC 2017 - [email protected] + +- Update to version 1.40.5: + + Add missing introspection annotations (bgo#778663). + + Fix line-end handling in pango_read_line (bgo#778816). + + Make alpha attribute work without color (bgo#773767). + + win32: Enable rendering colored texti and underlines + (bgo#768779). + +------------------------------------------------------------------- Old: ---- pango-1.40.4.tar.xz New: ---- pango-1.40.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.YEoSbg/_old 2017-04-29 10:48:49.852010630 +0200 +++ /var/tmp/diff_new_pack.YEoSbg/_new 2017-04-29 10:48:49.856010065 +0200 @@ -20,7 +20,7 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.40.4 +Version: 1.40.5 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ ++++++ pango-1.40.4.tar.xz -> pango-1.40.5.tar.xz ++++++ ++++ 1705 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.40.4/ChangeLog new/pango-1.40.5/ChangeLog --- old/pango-1.40.4/ChangeLog 2017-02-27 21:20:39.000000000 +0100 +++ new/pango-1.40.5/ChangeLog 2017-04-08 19:55:01.000000000 +0200 @@ -1,3 +1,206 @@ +commit 6c5d1d35061a91c3c0792f7720da3f8308ebff65 +Author: Matthias Clasen <[email protected]> +Date: Sat Apr 8 13:48:25 2017 -0400 + + 1.40.5 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 5188156587cc388b86962fb43815a303448aeb64 +Author: Matthias Clasen <[email protected]> +Date: Sat Apr 8 00:58:58 2017 -0400 + + Avoid a compiler warning + + The compiler complains that rightmost_space may be used + uninitialized. And it may be right. + + pango/pango-layout.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7fc77e1c5a9b04da172d032f8d1a2bd04a1c92a1 +Author: Philip Withnall <[email protected]> +Date: Wed Feb 15 11:06:36 2017 +0000 + + docs: Fix some introspection annotation syntax + + Signed-off-by: Philip Withnall <[email protected]> + + https://bugzilla.gnome.org/show_bug.cgi?id=778663 + + pango/pango-engine.h | 4 ++-- + pango/pango-layout.h | 2 +- + pango/pangofc-fontmap.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 6df7fcde9cde8c808344cd7242b0492e92ec10f1 +Author: Philip Withnall <[email protected]> +Date: Wed Feb 15 11:06:03 2017 +0000 + + docs: Add (skip) annotation to some non-introspectable deprecated + funcs + + To make it a bit more explicit that there’s no need to worry about + introspecting them. + + Signed-off-by: Philip Withnall <[email protected]> + + https://bugzilla.gnome.org/show_bug.cgi?id=778663 + + pango/modules.c | 4 ++-- + pango/pango-engine.h | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 9ab6ddd41723e0f0f8f0d57ca6bb37763c910d3c +Author: Philip Withnall <[email protected]> +Date: Wed Feb 15 11:05:27 2017 +0000 + + docs: Add a few missing (transfer) annotations + + This should fix a few scanner warnings, but this is not an attempt to + fix them all. + + Signed-off-by: Philip Withnall <[email protected]> + + https://bugzilla.gnome.org/show_bug.cgi?id=778663 + + pango/fonts.c | 2 +- + pango/pangoft2-fontmap.c | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 6f0648043fe2a084db15a6cdded8402625676aef +Author: Philip Withnall <[email protected]> +Date: Fri Feb 17 09:27:36 2017 +0000 + + pango-utils: Fix non-escaped \r\n line endings in pango_read_line() + + The handling for \r or \r\n line endings in pango_read_line() was + broken. It should have discarded the \r or \r\n, but was only + doing this + for \n or \n\r. The condition (c == EOF) could never have been + reached. + + Coverity ID: 1391696 + + Signed-off-by: Philip Withnall <[email protected]> + + https://bugzilla.gnome.org/show_bug.cgi?id=778816 + + pango/pango-utils.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 97fc6fbffe65d9ca4e92fc8979808faebed0ee35 +Author: Matthias Clasen <[email protected]> +Date: Fri Apr 7 22:49:00 2017 -0400 + + attributes: Make alpha work without color + + Improve the behavior of the cairo renderer to take + alpha into account even if no color specified. + + https://bugzilla.gnome.org/show_bug.cgi?id=773767 + + pango/pangocairo-render.c | 37 +++++++++++++++++++++++++++++-------- + 1 file changed, 29 insertions(+), 8 deletions(-) + +commit bab5cf24b746527020f51548e020c410dee63f71 +Author: Nicolas Hake <[email protected]> +Date: Mon Jul 11 14:27:08 2016 +0200 + + Win32: Remove "uncolored" from docs + + Since win32_render_layout and win32_render_layout_line now support + rendering in color, that word no longer applies. + + https://bugzilla.gnome.org/show_bug.cgi?id=768679 + + pango/pangowin32.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8de443dd9f426c325673d029786618da9476f6a0 +Author: Nicolas Hake <[email protected]> +Date: Mon Jul 11 13:27:31 2016 +0200 + + Win32: Fix background rect bounds + + Rectangle() uses x1, y1, x2, y2 coordinates instead of x, y, w, h. Fix + the coordinates passed to the function so it draws the background + in the + correct location. + + https://bugzilla.gnome.org/show_bug.cgi?id=768679 + + pango/pangowin32.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3166cbf809d5b005b587319ee2ef3e73e00d466e +Author: Nicolas Hake <[email protected]> +Date: Mon Jul 11 13:26:44 2016 +0200 + + Win32: Draw background box in correct color + + Adding 128 to the component value would overflow in colors with full + brightness and set the component to 0. + + https://bugzilla.gnome.org/show_bug.cgi?id=768679 + + pango/pangowin32.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 72e16506d6bd43efe4db24ebc3f69537f7208b1a +Author: Nicolas Hake <[email protected]> +Date: Mon Jul 11 13:22:05 2016 +0200 + + Win32: Reset BkMode so ETO doesn't draw its own + + If the DC's background mode is set to OPAQUE, ExtTextOut will draw its + own background boxes around glyph items. Since we don't place any + requirements on the DC, set the background mode to TRANSPARENT before + rendering any glyphs (and reset it to its original value afterwards). + + https://bugzilla.gnome.org/show_bug.cgi?id=768679 + + pango/pangowin32.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit f7927ff53afb8bbfdf7cc8f7b621c811f53ac6c5 +Author: Nicolas Hake <[email protected]> +Date: Mon Jul 11 13:20:41 2016 +0200 + + Win32: Enable colored underline drawing + + Underline drawing was using the pen selected into DC before + pango_win32_render_layout_line was called. Since layout allow the + user to + select underline colors, we have to create a temporary pen in + the correct + color before drawing it. + + https://bugzilla.gnome.org/show_bug.cgi?id=768679 + + pango/pangowin32.c | 35 ++++++++++++++++++++++++++++++++--- + 1 file changed, 32 insertions(+), 3 deletions(-) + +commit bb774bce7f99e839851834c1688c12d898f9c5ab +Author: Nicolas Hake <[email protected]> +Date: Mon Jul 11 13:03:32 2016 +0200 + + Win32: Enable rendering colored text + + Increasing the component values by 128 may overflow and result in that + component being treated as 0. Additionally, using a brush to + color text + is wrong; ExtTextOut instead uses the color set by SetTextColor + to draw + glyphs. + + https://bugzilla.gnome.org/show_bug.cgi?id=768679 + + pango/pangowin32.c | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + commit 43b9668ba688b01553abb7b453aeb206d7fd56fa Author: Matthias Clasen <[email protected]> Date: Mon Feb 27 15:03:59 2017 -0500 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.40.4/NEWS new/pango-1.40.5/NEWS --- old/pango-1.40.4/NEWS 2017-02-27 21:03:43.000000000 +0100 +++ new/pango-1.40.5/NEWS 2017-04-08 19:47:58.000000000 +0200 @@ -1,3 +1,10 @@ +Overview of changes between 1.40.4 and 1.40.5 +============================================= +- Add missing introspection annotations (#778663) +- Fix line-end handling in pango_read_line (#778816) +- Make alpha attribute work without color (#773767) +- win32: Enable rendering colored texti and underlines (#768779) + Overview of changes between 1.40.3 and 1.40.4 ============================================= - Fix some Coverity findings (#778601, #778602, #778654, #778656) 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.40.4/config.h.win32 new/pango-1.40.5/config.h.win32 --- old/pango-1.40.4/config.h.win32 2017-02-27 21:17:17.000000000 +0100 +++ new/pango-1.40.5/config.h.win32 2017-04-08 19:53:06.000000000 +0200 @@ -113,7 +113,7 @@ #define PACKAGE_NAME "pango" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pango 1.40.4" +#define PACKAGE_STRING "pango 1.40.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pango" @@ -122,19 +122,19 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.40.4" +#define PACKAGE_VERSION "1.40.5" /* PANGO binary age */ -#define PANGO_BINARY_AGE 4004 +#define PANGO_BINARY_AGE 4005 /* PANGO interface age */ -#define PANGO_INTERFACE_AGE 4 +#define PANGO_INTERFACE_AGE 5 /* PANGO major version */ #define PANGO_VERSION_MAJOR 1 /* PANGO micro version */ -#define PANGO_VERSION_MICRO 4 +#define PANGO_VERSION_MICRO 5 /* PANGO minor version */ #define PANGO_VERSION_MINOR 40 @@ -143,7 +143,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.40.4" +#define VERSION "1.40.5" /* defines how to decorate public symbols while building */ #ifdef _MSC_VER 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.40.4/configure.ac new/pango-1.40.5/configure.ac --- old/pango-1.40.4/configure.ac 2017-02-27 21:03:54.000000000 +0100 +++ new/pango-1.40.5/configure.ac 2017-04-08 19:48:10.000000000 +0200 @@ -22,7 +22,7 @@ dnl The triplet m4_define([pango_version_major], [1]) m4_define([pango_version_minor], [40]) -m4_define([pango_version_micro], [4]) +m4_define([pango_version_micro], [5]) m4_define([pango_version], [pango_version_major.pango_version_minor.pango_version_micro]) 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.40.4/docs/html/PangoFcFontMap.html new/pango-1.40.5/docs/html/PangoFcFontMap.html --- old/pango-1.40.4/docs/html/PangoFcFontMap.html 2017-02-27 21:20:42.000000000 +0100 +++ new/pango-1.40.5/docs/html/PangoFcFontMap.html 2017-04-08 19:55:02.000000000 +0200 @@ -529,8 +529,8 @@ </tr> <tr> <td class="parameter_name"><p>fcconfig</p></td> -<td class="parameter_description"><p>(nullable) a <span class="type">FcConfig</span>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a></p></td> -<td class="parameter_annotations"> </td> +<td class="parameter_description"><p> a <span class="type">FcConfig</span>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a>. </p></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td> </tr> </tbody> </table></div> 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.40.4/docs/html/index.html new/pango-1.40.5/docs/html/index.html --- old/pango-1.40.4/docs/html/index.html 2017-02-27 21:20:41.000000000 +0100 +++ new/pango-1.40.5/docs/html/index.html 2017-04-08 19:55:02.000000000 +0200 @@ -14,7 +14,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.40.4 +<div><p class="releaseinfo">for Pango 1.40.5 </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.40.4/docs/html/pango-Engines.html new/pango-1.40.5/docs/html/pango-Engines.html --- old/pango-1.40.4/docs/html/pango-Engines.html 2017-02-27 21:20:41.000000000 +0100 +++ new/pango-1.40.5/docs/html/pango-Engines.html 2017-04-08 19:55:02.000000000 +0200 @@ -138,6 +138,7 @@ <em class="parameter"><code><span class="type">int</span> *n_engines</code></em>);</pre> <div class="warning"><p><code class="literal">script_engine_list</code> has been deprecated since version 1.38 and should not be used in newly-written code.</p></div> <p>Do not use.</p> +<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p> <div class="refsect3"> <a name="script-engine-list.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="0"> @@ -169,6 +170,7 @@ script_engine_init (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/GTypeModule.html#GTypeModule-struct";><span class="type">GTypeModule</span></a> *module</code></em>);</pre> <div class="warning"><p><code class="literal">script_engine_init</code> has been deprecated since version 1.38 and should not be used in newly-written code.</p></div> <p>Do not use.</p> +<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p> <div class="refsect3"> <a name="script-engine-init.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="0"> @@ -193,6 +195,7 @@ script_engine_exit (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <div class="warning"><p><code class="literal">script_engine_exit</code> has been deprecated since version 1.38 and should not be used in newly-written code.</p></div> <p>Do not use.</p> +<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p> </div> <hr> <div class="refsect2"> @@ -201,6 +204,7 @@ script_engine_create (<em class="parameter"><code>const <span class="type">char</span> *id</code></em>);</pre> <div class="warning"><p><code class="literal">script_engine_create</code> has been deprecated since version 1.38 and should not be used in newly-written code.</p></div> <p>Do not use.</p> +<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p> <div class="refsect3"> <a name="script-engine-create.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="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.40.4/docs/html/pango-Fonts.html new/pango-1.40.5/docs/html/pango-Fonts.html --- old/pango-1.40.4/docs/html/pango-Fonts.html 2017-02-27 21:20:42.000000000 +0100 +++ new/pango-1.40.5/docs/html/pango-Fonts.html 2017-04-08 19:55:02.000000000 +0200 @@ -2273,7 +2273,8 @@ </div> <div class="refsect3"> <a name="pango-font-find-shaper.returns"></a><h4>Returns</h4> -<p> the best matching shaper.</p> +<p> the best matching shaper. </p> +<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></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.40.4/docs/html/pango-FreeType-Fonts-and-Rendering.html new/pango-1.40.5/docs/html/pango-FreeType-Fonts-and-Rendering.html --- old/pango-1.40.4/docs/html/pango-FreeType-Fonts-and-Rendering.html 2017-02-27 21:20:41.000000000 +0100 +++ new/pango-1.40.5/docs/html/pango-FreeType-Fonts-and-Rendering.html 2017-04-08 19:55:02.000000000 +0200 @@ -310,7 +310,9 @@ </div> <div class="refsect3"> <a name="pango-ft2-font-map-create-context.returns"></a><h4>Returns</h4> -<p> the newly created context; free with <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a>.</p> +<p> the newly created context; free with +<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a>. </p> +<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> <p class="since">Since: <a class="link" href="api-index-1-2.html#api-index-1.2">1.2</a></p> </div> @@ -461,7 +463,8 @@ </div> <div class="refsect3"> <a name="pango-ft2-get-context.returns"></a><h4>Returns</h4> -<p> the new <a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a></p> +<p> the new <a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a>. </p> +<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> </div> <hr> @@ -916,7 +919,8 @@ <p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p> <div class="refsect3"> <a name="pango-ft2-font-map-for-display.returns"></a><h4>Returns</h4> -<p> a <a class="link" href="pango-FreeType-Fonts-and-Rendering.html#PangoFT2FontMap"><span class="type">PangoFT2FontMap</span></a>.</p> +<p> a <a class="link" href="pango-FreeType-Fonts-and-Rendering.html#PangoFT2FontMap"><span class="type">PangoFT2FontMap</span></a>. </p> +<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></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.40.4/docs/html/pango-Layout-Objects.html new/pango-1.40.5/docs/html/pango-Layout-Objects.html --- old/pango-1.40.4/docs/html/pango-Layout-Objects.html 2017-02-27 21:20:41.000000000 +0100 +++ new/pango-1.40.5/docs/html/pango-Layout-Objects.html 2017-04-08 19:55:02.000000000 +0200 @@ -4091,7 +4091,7 @@ <td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList";><span class="type">GSList</span></a> *<em class="structfield"><code><a name="PangoLayoutLine-struct.runs"></a>runs</code></em>;</p></td> <td class="struct_member_description"><p> list of runs in the line, from left to right. </p></td> -<td class="struct_member_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym>]</span></td> +<td class="struct_member_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> Pango.LayoutRun]</span></td> </tr> <tr> <td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint";><span class="type">guint</span></a> <em class="structfield"><code><a name="PangoLayoutLine-struct.is-paragraph-start"></a>is_paragraph_start</code></em> : 1;</p></td> 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.40.4/docs/html/pango-Modules.html new/pango-1.40.5/docs/html/pango-Modules.html --- old/pango-1.40.4/docs/html/pango-Modules.html 2017-02-27 21:20:42.000000000 +0100 +++ new/pango-1.40.5/docs/html/pango-Modules.html 2017-04-08 19:55:02.000000000 +0200 @@ -152,6 +152,7 @@ <em class="parameter"><code><a class="link" href="pango-Scripts-and-Languages.html#PangoScript" title="enum PangoScript"><span class="type">PangoScript</span></a> script</code></em>);</pre> <div class="warning"><p><code class="literal">pango_map_get_engine</code> has been deprecated since version 1.38 and should not be used in newly-written code.</p></div> <p>Do not use. Does not do anything.</p> +<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p> <div class="refsect3"> <a name="pango-map-get-engine.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="0"> @@ -189,6 +190,7 @@ <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList";><span class="type">GSList</span></a> **fallback_engines</code></em>);</pre> <div class="warning"><p><code class="literal">pango_map_get_engines</code> has been deprecated since version 1.38 and should not be used in newly-written code.</p></div> <p>Do not use. Does not do anything.</p> +<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p> <div class="refsect3"> <a name="pango-map-get-engines.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="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.40.4/docs/html/pango-Version-Checking.html new/pango-1.40.5/docs/html/pango-Version-Checking.html --- old/pango-1.40.4/docs/html/pango-Version-Checking.html 2017-02-27 21:20:41.000000000 +0100 +++ new/pango-1.40.5/docs/html/pango-Version-Checking.html 2017-04-08 19:55:02.000000000 +0200 @@ -387,14 +387,14 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-MICRO:CAPS"></a><h3>PANGO_VERSION_MICRO</h3> -<pre class="programlisting">#define PANGO_VERSION_MICRO 4 +<pre class="programlisting">#define PANGO_VERSION_MICRO 5 </pre> <p>The micro component of the version of Pango available at compile-time.</p> </div> <hr> <div class="refsect2"> <a name="PANGO-VERSION-STRING:CAPS"></a><h3>PANGO_VERSION_STRING</h3> -<pre class="programlisting">#define PANGO_VERSION_STRING "1.40.4" +<pre class="programlisting">#define PANGO_VERSION_STRING "1.40.5" </pre> <p>A string literal containing the version of Pango available at compile-time.</p> </div> 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.40.4/docs/html/pango-Win32-Fonts-and-Rendering.html new/pango-1.40.5/docs/html/pango-Win32-Fonts-and-Rendering.html --- old/pango-1.40.4/docs/html/pango-Win32-Fonts-and-Rendering.html 2017-02-27 21:20:41.000000000 +0100 +++ new/pango-1.40.5/docs/html/pango-Win32-Fonts-and-Rendering.html 2017-04-08 19:55:02.000000000 +0200 @@ -409,7 +409,7 @@ <tbody> <tr> <td class="parameter_name"><p>hdc</p></td> -<td class="parameter_description"><p>DC to use for uncolored drawing</p></td> +<td class="parameter_description"><p>DC to use for drawing</p></td> <td class="parameter_annotations"> </td> </tr> <tr> @@ -451,7 +451,7 @@ <tbody> <tr> <td class="parameter_name"><p>hdc</p></td> -<td class="parameter_description"><p>HDC to use for uncolored drawing</p></td> +<td class="parameter_description"><p>HDC to use for drawing</p></td> <td class="parameter_annotations"> </td> </tr> <tr> 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.40.4/docs/version.xml new/pango-1.40.5/docs/version.xml --- old/pango-1.40.4/docs/version.xml 2017-02-27 21:17:16.000000000 +0100 +++ new/pango-1.40.5/docs/version.xml 2017-04-08 19:53:06.000000000 +0200 @@ -1 +1 @@ -1.40.4 +1.40.5 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.40.4/pango/fonts.c new/pango-1.40.5/pango/fonts.c --- old/pango-1.40.4/pango/fonts.c 2016-10-22 07:00:40.000000000 +0200 +++ new/pango-1.40.5/pango/fonts.c 2017-04-08 06:57:28.000000000 +0200 @@ -1549,7 +1549,7 @@ * Finds the best matching shaper for a font for a particular * language tag and character point. * - * Return value: the best matching shaper. + * Return value: (transfer none): the best matching shaper. **/ PangoEngineShape * pango_font_find_shaper (PangoFont *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.40.4/pango/modules.c new/pango-1.40.5/pango/modules.c --- old/pango-1.40.4/pango/modules.c 2016-10-22 07:00:40.000000000 +0200 +++ new/pango-1.40.5/pango/modules.c 2017-04-08 06:57:28.000000000 +0200 @@ -52,7 +52,7 @@ } /** - * pango_map_get_engine: + * pango_map_get_engine: (skip) * @map: a #PangoMap * @script: a #PangoScript * @@ -70,7 +70,7 @@ } /** - * pango_map_get_engines: + * pango_map_get_engines: (skip) * @map: a #PangoMap * @script: a #PangoScript * @exact_engines: location to store list of engines that exactly 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.40.4/pango/pango-engine.h new/pango-1.40.5/pango/pango-engine.h --- old/pango-1.40.4/pango/pango-engine.h 2016-10-22 07:00:39.000000000 +0200 +++ new/pango-1.40.5/pango/pango-engine.h 2017-04-08 06:57:28.000000000 +0200 @@ -169,7 +169,7 @@ typedef struct _PangoEngineShapeClass PangoEngineShapeClass; /** - * PangoEngineShape + * PangoEngineShape: * * The #PangoEngineShape class is implemented by engines that * customize the rendering-system dependent part of the @@ -241,7 +241,7 @@ typedef struct _PangoEngineScriptInfo PangoEngineScriptInfo; /** - * PangoEngineScriptInfo + * PangoEngineScriptInfo: * @script: a #PangoScript. The value %PANGO_SCRIPT_COMMON has * the special meaning here of "all scripts" * @langs: a semicolon separated list of languages that this @@ -288,7 +288,7 @@ }; /** - * script_engine_list: + * script_engine_list: (skip) * @engines: location to store a pointer to an array of engines. * @n_engines: location to store the number of elements in @engines. * @@ -301,7 +301,7 @@ int *n_engines); /** - * script_engine_init: + * script_engine_init: (skip) * @module: a #GTypeModule structure used to associate any * GObject types created in this module with the module. * @@ -314,7 +314,7 @@ /** - * script_engine_exit: + * script_engine_exit: (skip) * * Do not use. * @@ -324,7 +324,7 @@ void script_engine_exit (void); /** - * script_engine_create: + * script_engine_create: (skip) * @id: the ID of an engine as reported by script_engine_list. * * Do not use. 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.40.4/pango/pango-features.h new/pango-1.40.5/pango/pango-features.h --- old/pango-1.40.4/pango/pango-features.h 2017-02-27 21:04:49.000000000 +0100 +++ new/pango-1.40.5/pango/pango-features.h 2017-04-08 19:49:13.000000000 +0200 @@ -4,9 +4,9 @@ #define PANGO_VERSION_MAJOR 1 #define PANGO_VERSION_MINOR 40 -#define PANGO_VERSION_MICRO 4 +#define PANGO_VERSION_MICRO 5 -#define PANGO_VERSION_STRING "1.40.4" +#define PANGO_VERSION_STRING "1.40.5" #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.40.4/pango/pango-layout.c new/pango-1.40.5/pango/pango-layout.c --- old/pango-1.40.4/pango/pango-layout.c 2017-02-27 20:58:45.000000000 +0100 +++ new/pango-1.40.5/pango/pango-layout.c 2017-04-08 06:58:50.000000000 +0200 @@ -5194,7 +5194,7 @@ { gboolean leftedge = TRUE; PangoGlyphString *rightmost_glyphs = NULL; - int rightmost_space; + int rightmost_space = 0; int residual = 0; added_so_far = 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.40.4/pango/pango-layout.h new/pango-1.40.5/pango/pango-layout.h --- old/pango-1.40.4/pango/pango-layout.h 2016-10-22 07:00:40.000000000 +0200 +++ new/pango-1.40.5/pango/pango-layout.h 2017-04-08 06:57:28.000000000 +0200 @@ -99,7 +99,7 @@ * @layout: (allow-none): the layout this line belongs to, might be %NULL * @start_index: start of line as byte index into layout->text * @length: length of line in bytes - * @runs: (allow-none) (element-type: Pango.LayoutRun): list of runs in the + * @runs: (allow-none) (element-type Pango.LayoutRun): list of runs in the * line, from left to right * @is_paragraph_start: #TRUE if this is the first line of the paragraph * @resolved_dir: #Resolved PangoDirection of line 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.40.4/pango/pango-utils.c new/pango-1.40.5/pango/pango-utils.c --- old/pango-1.40.4/pango/pango-utils.c 2016-10-22 07:00:36.000000000 +0200 +++ new/pango-1.40.5/pango/pango-utils.c 2017-04-08 06:55:32.000000000 +0200 @@ -338,11 +338,12 @@ if (!comment) quoted = TRUE; break; + case '\r': case '\n': { int next_c = getc_unlocked (stream); - if (!(c == EOF || + if (!(next_c == EOF || (c == '\r' && next_c == '\n') || (c == '\n' && next_c == '\r'))) ungetc (next_c, stream); 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.40.4/pango/pango.rc new/pango-1.40.5/pango/pango.rc --- old/pango-1.40.4/pango/pango.rc 2017-02-27 21:17:16.000000000 +0100 +++ new/pango-1.40.5/pango/pango.rc 2017-04-08 19:53:06.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,40,4,0 - PRODUCTVERSION 1,40,4,0 + FILEVERSION 1,40,5,0 + PRODUCTVERSION 1,40,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pango" - VALUE "FileVersion", "1.40.4.0" + VALUE "FileVersion", "1.40.5.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.40.4" + VALUE "ProductVersion", "1.40.5" 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.40.4/pango/pangocairo-render.c new/pango-1.40.5/pango/pangocairo-render.c --- old/pango-1.40.4/pango/pangocairo-render.c 2016-10-22 07:00:36.000000000 +0200 +++ new/pango-1.40.5/pango/pangocairo-render.c 2017-04-08 06:43:42.000000000 +0200 @@ -191,17 +191,38 @@ PangoRenderPart part) { PangoColor *color = pango_renderer_get_color ((PangoRenderer *) (crenderer), part); - guint16 alpha = pango_renderer_get_alpha ((PangoRenderer *) (crenderer), part); + guint16 a = pango_renderer_get_alpha ((PangoRenderer *) (crenderer), part); + gdouble red, green, blue, alpha; - if (!alpha) - alpha = 0xffff; + if (!a && !color) + return; if (color) - cairo_set_source_rgba (crenderer->cr, - color->red / 65535., - color->green / 65535., - color->blue / 65535., - alpha / 65535.); + { + red = color->red / 65535.; + green = color->green / 65535.; + blue = color->blue / 65535.; + alpha = 1.; + } + else + { + cairo_pattern_t *pattern = cairo_get_source (crenderer->cr); + + if (pattern && cairo_pattern_get_type (pattern) == CAIRO_PATTERN_TYPE_SOLID) + cairo_pattern_get_rgba (pattern, &red, &green, &blue, &alpha); + else + { + red = 0.; + green = 0.; + blue = 0.; + alpha = 1.; + } + } + + if (a) + alpha = a / 65535.; + + cairo_set_source_rgba (crenderer->cr, red, green, blue, alpha); } /* note: modifies crenderer->cr without doing cairo_save/restore() */ 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.40.4/pango/pangocairo.rc new/pango-1.40.5/pango/pangocairo.rc --- old/pango-1.40.4/pango/pangocairo.rc 2017-02-27 21:17:16.000000000 +0100 +++ new/pango-1.40.5/pango/pangocairo.rc 2017-04-08 19:53:06.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,40,4,0 - PRODUCTVERSION 1,40,4,0 + FILEVERSION 1,40,5,0 + PRODUCTVERSION 1,40,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoCairo" - VALUE "FileVersion", "1.40.4.0" + VALUE "FileVersion", "1.40.5.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.40.4" + VALUE "ProductVersion", "1.40.5" 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.40.4/pango/pangofc-fontmap.c new/pango-1.40.5/pango/pangofc-fontmap.c --- old/pango-1.40.4/pango/pangofc-fontmap.c 2017-02-27 20:58:45.000000000 +0100 +++ new/pango-1.40.5/pango/pangofc-fontmap.c 2017-04-08 06:57:28.000000000 +0200 @@ -1831,7 +1831,7 @@ /** * pango_fc_font_map_set_config: * @fcfontmap: a #PangoFcFontMap - * @fcconfig: (nullable) a #FcConfig, or %NULL + * @fcconfig: (nullable): a #FcConfig, or %NULL * * Set the FcConfig for this font map to use. The default value * is %NULL, which causes Fontconfig to use its global "current config". 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.40.4/pango/pangoft2-fontmap.c new/pango-1.40.5/pango/pangoft2-fontmap.c --- old/pango-1.40.4/pango/pangoft2-fontmap.c 2016-10-22 07:00:39.000000000 +0200 +++ new/pango-1.40.5/pango/pangoft2-fontmap.c 2017-04-08 06:57:28.000000000 +0200 @@ -253,7 +253,8 @@ * * Create a #PangoContext for the given fontmap. * - * Return value: the newly created context; free with g_object_unref(). + * Return value: (transfer full): the newly created context; free with + * g_object_unref(). * * Since: 1.2 * @@ -276,7 +277,7 @@ * (see pango_ft2_font_map_for_display()) and sets the resolution * for the default fontmap to @dpi_x by @dpi_y. * - * Return value: the new #PangoContext + * Return value: (transfer full): the new #PangoContext * * Deprecated: 1.22: Use pango_font_map_create_context() instead. **/ @@ -302,7 +303,7 @@ * global PangoFT2 fontmap is deprecated; use pango_ft2_font_map_new() * instead. * - * Return value: a #PangoFT2FontMap. + * Return value: (transfer none): a #PangoFT2FontMap. **/ PangoFontMap * pango_ft2_font_map_for_display (void) 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.40.4/pango/pangoft2.rc new/pango-1.40.5/pango/pangoft2.rc --- old/pango-1.40.4/pango/pangoft2.rc 2017-02-27 21:17:16.000000000 +0100 +++ new/pango-1.40.5/pango/pangoft2.rc 2017-04-08 19:53:06.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,40,4,0 - PRODUCTVERSION 1,40,4,0 + FILEVERSION 1,40,5,0 + PRODUCTVERSION 1,40,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoFT2" - VALUE "FileVersion", "1.40.4.0" + VALUE "FileVersion", "1.40.5.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.40.4" + VALUE "ProductVersion", "1.40.5" 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.40.4/pango/pangowin32.c new/pango-1.40.5/pango/pangowin32.c --- old/pango-1.40.4/pango/pangowin32.c 2016-10-22 07:00:37.000000000 +0200 +++ new/pango-1.40.5/pango/pangowin32.c 2017-04-08 03:54:29.000000000 +0200 @@ -84,6 +84,8 @@ static void pango_win32_get_item_properties (PangoItem *item, PangoUnderline *uline, + PangoAttrColor *uline_color, + gboolean *uline_set, PangoAttrColor *fg_color, gboolean *fg_set, PangoAttrColor *bg_color, @@ -999,7 +1001,7 @@ /** * pango_win32_render_layout_line: - * @hdc: DC to use for uncolored drawing + * @hdc: DC to use for drawing * @line: a #PangoLayoutLine * @x: the x position of start of string (in pixels) * @y: the y position of baseline (in pixels) @@ -1018,6 +1020,7 @@ PangoRectangle overall_rect; PangoRectangle logical_rect; PangoRectangle ink_rect; + int oldbkmode = SetBkMode (hdc, TRANSPARENT); int x_off = 0; @@ -1025,17 +1028,19 @@ while (tmp_list) { - HBRUSH oldfg = NULL; - HBRUSH brush = NULL; + COLORREF oldfg = 0; + HPEN uline_pen, old_pen; POINT points[2]; PangoUnderline uline = PANGO_UNDERLINE_NONE; PangoLayoutRun *run = tmp_list->data; - PangoAttrColor fg_color, bg_color; - gboolean fg_set, bg_set; + PangoAttrColor fg_color, bg_color, uline_color; + gboolean fg_set, bg_set, uline_set; tmp_list = tmp_list->next; - pango_win32_get_item_properties (run->item, &uline, &fg_color, &fg_set, &bg_color, &bg_set); + pango_win32_get_item_properties (run->item, &uline, &uline_color, &uline_set, &fg_color, &fg_set, &bg_color, &bg_set); + if (!uline_set) + uline_color = fg_color; if (uline == PANGO_UNDERLINE_NONE) pango_glyph_string_extents (run->glyphs, run->item->analysis.font, @@ -1046,31 +1051,44 @@ if (bg_set) { - HBRUSH oldbrush; - - brush = CreateSolidBrush (RGB ((bg_color.color.red + 128) >> 8, - (bg_color.color.green + 128) >> 8, - (bg_color.color.blue + 128) >> 8)); - oldbrush = SelectObject (hdc, brush); + COLORREF bg_col = RGB ((bg_color.color.red) >> 8, + (bg_color.color.green) >> 8, + (bg_color.color.blue) >> 8); + HBRUSH bg_brush = CreateSolidBrush (bg_col); + HBRUSH old_brush = SelectObject (hdc, bg_brush); + old_pen = SelectObject (hdc, GetStockObject (NULL_PEN)); Rectangle (hdc, x + PANGO_PIXELS (x_off + logical_rect.x), y + PANGO_PIXELS (overall_rect.y), - PANGO_PIXELS (logical_rect.width), - PANGO_PIXELS (overall_rect.height)); - SelectObject (hdc, oldbrush); - DeleteObject (brush); + 1 + x + PANGO_PIXELS (x_off + logical_rect.x + logical_rect.width), + 1 + y + PANGO_PIXELS (overall_rect.y + overall_rect.height)); + SelectObject (hdc, old_brush); + DeleteObject (bg_brush); + SelectObject (hdc, old_pen); } if (fg_set) { - brush = CreateSolidBrush (RGB ((fg_color.color.red + 128) >> 8, - (fg_color.color.green + 128) >> 8, - (fg_color.color.blue + 128) >> 8)); - oldfg = SelectObject (hdc, brush); + COLORREF fg_col = RGB ((fg_color.color.red) >> 8, + (fg_color.color.green) >> 8, + (fg_color.color.blue) >> 8); + oldfg = SetTextColor (hdc, fg_col); } pango_win32_render (hdc, run->item->analysis.font, run->glyphs, x + PANGO_PIXELS (x_off), y); + if (fg_set) + SetTextColor (hdc, oldfg); + + if (uline != PANGO_UNDERLINE_NONE) + { + COLORREF uline_col = RGB ((uline_color.color.red) >> 8, + (uline_color.color.green) >> 8, + (uline_color.color.blue) >> 8); + uline_pen = CreatePen (PS_SOLID, 1, uline_col); + old_pen = SelectObject (hdc, uline_pen); + } + switch (uline) { case PANGO_UNDERLINE_NONE: @@ -1120,19 +1138,21 @@ break; } - if (fg_set) + if (uline != PANGO_UNDERLINE_NONE) { - SelectObject (hdc, oldfg); - DeleteObject (brush); + SelectObject (hdc, old_pen); + DeleteObject (uline_pen); } x_off += logical_rect.width; } + + SetBkMode (hdc, oldbkmode); } /** * pango_win32_render_layout: - * @hdc: HDC to use for uncolored drawing + * @hdc: HDC to use for drawing * @layout: a #PangoLayout * @x: the X position of the left of the layout (in pixels) * @y: the Y position of the top of the layout (in pixels) @@ -1179,6 +1199,8 @@ static void pango_win32_get_item_properties (PangoItem *item, PangoUnderline *uline, + PangoAttrColor *uline_color, + gboolean *uline_set, PangoAttrColor *fg_color, gboolean *fg_set, PangoAttrColor *bg_color, @@ -1203,6 +1225,14 @@ *uline = ((PangoAttrInt *)attr)->value; break; + case PANGO_ATTR_UNDERLINE_COLOR: + if (uline_color) + *uline_color = *((PangoAttrColor *)attr); + if (uline_set) + *uline_set = TRUE; + + break; + case PANGO_ATTR_FOREGROUND: if (fg_color) *fg_color = *((PangoAttrColor *)attr); 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.40.4/pango/pangowin32.rc new/pango-1.40.5/pango/pangowin32.rc --- old/pango-1.40.4/pango/pangowin32.rc 2017-02-27 21:17:16.000000000 +0100 +++ new/pango-1.40.5/pango/pangowin32.rc 2017-04-08 19:53:06.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,40,4,0 - PRODUCTVERSION 1,40,4,0 + FILEVERSION 1,40,5,0 + PRODUCTVERSION 1,40,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoWin32" - VALUE "FileVersion", "1.40.4.0" + VALUE "FileVersion", "1.40.5.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.40.4" + VALUE "ProductVersion", "1.40.5" 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.40.4/pango/pangoxft.rc new/pango-1.40.5/pango/pangoxft.rc --- old/pango-1.40.4/pango/pangoxft.rc 2017-02-27 21:17:16.000000000 +0100 +++ new/pango-1.40.5/pango/pangoxft.rc 2017-04-08 19:53:06.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,40,4,0 - PRODUCTVERSION 1,40,4,0 + FILEVERSION 1,40,5,0 + PRODUCTVERSION 1,40,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pangoxft" - VALUE "FileVersion", "1.40.4.0" + VALUE "FileVersion", "1.40.5.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.40.4" + VALUE "ProductVersion", "1.40.5" 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.40.4/pango-view/pango-view.1.in new/pango-1.40.5/pango-view/pango-view.1.in --- old/pango-1.40.4/pango-view/pango-view.1.in 2017-02-27 21:18:19.000000000 +0100 +++ new/pango-1.40.5/pango-view/pango-view.1.in 2017-04-08 19:53:42.000000000 +0200 @@ -1 +1,113 @@ -help2man is required to generate this file. +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH PANGO-VIEW "1" "April 2017" "pango-view (pango) 1.40.5" "User Commands" +.SH NAME +pango-view \- Pango text viewer +.SH DESCRIPTION +.SS "Usage:" +.IP +pango\-view [OPTION�\&.�] \- FILE +.SS "Help Options:" +.TP +\fB\-h\fR, \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=\fI\,1\/\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=\fI\,cairo\/\fR/xft/ft2 +Pango backend to use for rendering (default: cairo) +.TP +\fB\-\-background\fR=\fI\,red\/\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=\fI\,number\/\fR +Set the resolution +.TP +\fB\-\-align\fR=\fI\,left\/\fR/center/right +Text alignment +.TP +\fB\-\-ellipsize\fR=\fI\,start\/\fR/middle/end +Ellipsization mode +.TP +\fB\-\-font\fR=\fI\,description\/\fR +Set the font description +.TP +\fB\-\-foreground\fR=\fI\,red\/\fR/#rrggbb/#rrggbbaa +Set the text color +.TP +\fB\-\-gravity\fR=\fI\,south\/\fR/east/north/west/auto +Base gravity: glyph rotation +.TP +\fB\-\-gravity\-hint\fR=\fI\,natural\/\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=\fI\,none\/\fR/auto/full +Hinting style +.TP +\fB\-\-indent\fR=\fI\,points\/\fR +Width in points to indent paragraphs +.TP +\fB\-\-justify\fR +Align paragraph lines to be justified +.TP +\fB\-\-language\fR=\fI\,en_US\/\fR/etc +Language to use for font selection +.TP +\fB\-\-margin\fR=\fI\,CSS\-style\/\fR numbers in pixels +Set the margin on the output in pixels +.TP +\fB\-\-markup\fR +Interpret text as Pango markup +.TP +\fB\-o\fR, \fB\-\-output\fR=\fI\,file\/\fR +Save rendered image to output file +.TP +\fB\-\-pixels\fR +Use pixel units instead of points (sets dpi to 72) +.TP +\fB\-\-rtl\fR +Set base direction to right\-to\-left +.TP +\fB\-\-rotate\fR=\fI\,degrees\/\fR +Angle at which to rotate results +.TP +\fB\-n\fR, \fB\-\-runs\fR=\fI\,integer\/\fR +Run Pango layout engine this many times +.TP +\fB\-\-single\-par\fR +Enable single\-paragraph mode +.TP +\fB\-t\fR, \fB\-\-text\fR=\fI\,string\/\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=\fI\,points\/\fR +Width in points to which to wrap lines or ellipsize +.TP +\fB\-\-wrap\fR=\fI\,word\/\fR/char/word\-char +Text wrapping mode (needs a width to be set) 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.40.4/win32/vs10/pango-version-paths.props new/pango-1.40.5/win32/vs10/pango-version-paths.props --- old/pango-1.40.4/win32/vs10/pango-version-paths.props 2017-02-27 21:17:16.000000000 +0100 +++ new/pango-1.40.5/win32/vs10/pango-version-paths.props 2017-04-08 19:53:06.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>10</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>40</PangoMinorVersion> - <PangoMicroVersion>4</PangoMicroVersion> + <PangoMicroVersion>5</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.40.4/win32/vs11/pango-version-paths.props new/pango-1.40.5/win32/vs11/pango-version-paths.props --- old/pango-1.40.4/win32/vs11/pango-version-paths.props 2017-02-27 21:20:43.000000000 +0100 +++ new/pango-1.40.5/win32/vs11/pango-version-paths.props 2017-04-08 19:55:03.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>11</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>40</PangoMinorVersion> - <PangoMicroVersion>4</PangoMicroVersion> + <PangoMicroVersion>5</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.40.4/win32/vs12/pango-version-paths.props new/pango-1.40.5/win32/vs12/pango-version-paths.props --- old/pango-1.40.4/win32/vs12/pango-version-paths.props 2017-02-27 21:20:43.000000000 +0100 +++ new/pango-1.40.5/win32/vs12/pango-version-paths.props 2017-04-08 19:55:03.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>12</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>40</PangoMinorVersion> - <PangoMicroVersion>4</PangoMicroVersion> + <PangoMicroVersion>5</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.40.4/win32/vs14/pango-version-paths.props new/pango-1.40.5/win32/vs14/pango-version-paths.props --- old/pango-1.40.4/win32/vs14/pango-version-paths.props 2017-02-27 21:20:43.000000000 +0100 +++ new/pango-1.40.5/win32/vs14/pango-version-paths.props 2017-04-08 19:55:03.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>14</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>40</PangoMinorVersion> - <PangoMicroVersion>4</PangoMicroVersion> + <PangoMicroVersion>5</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.40.4/win32/vs15/pango-version-paths.props new/pango-1.40.5/win32/vs15/pango-version-paths.props --- old/pango-1.40.4/win32/vs15/pango-version-paths.props 2017-02-27 21:20:43.000000000 +0100 +++ new/pango-1.40.5/win32/vs15/pango-version-paths.props 2017-04-08 19:55:03.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>15</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>40</PangoMinorVersion> - <PangoMicroVersion>4</PangoMicroVersion> + <PangoMicroVersion>5</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.40.4/win32/vs9/pango-version-paths.vsprops new/pango-1.40.5/win32/vs9/pango-version-paths.vsprops --- old/pango-1.40.4/win32/vs9/pango-version-paths.vsprops 2017-02-27 21:17:16.000000000 +0100 +++ new/pango-1.40.5/win32/vs9/pango-version-paths.vsprops 2017-04-08 19:53:06.000000000 +0200 @@ -18,7 +18,7 @@ /> <UserMacro Name="PangoMicroVersion" - Value="4" + Value="5" /> <UserMacro Name="ApiVersion"
