Hello community, here is the log from the commit of package gtkhtml for openSUSE:Factory checked in at 2013-07-31 17:25:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkhtml (Old) and /work/SRC/openSUSE:Factory/.gtkhtml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtkhtml" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkhtml/gtkhtml.changes 2013-05-13 14:53:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtkhtml.new/gtkhtml.changes 2013-07-31 17:25:43.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Jul 24 18:41:02 UTC 2013 - [email protected] + +- Update to version 4.6.6: + + Bug Fixes: bgo#699574: gtk_selection_owner_set() breaks mouse + wheel scrolling. + + Other Changes: + - Paste of HTML text removes leading/trailing whitespaces. + - Skip \n and \r from whitespace recognition on HTML text + paste. + - Underline and strikeout lines out of its position in a + printout. + - Paragraph style drawn incorrectly after font style change. + - Wrong cursor position after paste of text with <div></div>. + +------------------------------------------------------------------- Old: ---- gtkhtml-4.6.5.tar.xz New: ---- gtkhtml-4.6.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkhtml.spec ++++++ --- /var/tmp/diff_new_pack.BIVtEG/_old 2013-07-31 17:25:44.000000000 +0200 +++ /var/tmp/diff_new_pack.BIVtEG/_new 2013-07-31 17:25:44.000000000 +0200 @@ -24,7 +24,7 @@ %define _gtkhtml_editor_major 0 Name: gtkhtml -Version: 4.6.5 +Version: 4.6.6 Release: 0 Summary: Lightweight HTML rendering/printing/editing engine License: GPL-2.0+ and LGPL-2.1+ ++++++ gtkhtml-4.6.5.tar.xz -> gtkhtml-4.6.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/ChangeLog new/gtkhtml-4.6.6/ChangeLog --- old/gtkhtml-4.6.5/ChangeLog 2013-05-12 14:52:42.000000000 +0200 +++ new/gtkhtml-4.6.6/ChangeLog 2013-07-23 19:53:49.000000000 +0200 @@ -1,5 +1,103 @@ # Generated by Makefile. Do not edit. +commit cd377b530d62871901d0da775a49028c70d4a7ba +Author: Matthew Barnes <[email protected]> +Date: Tue Jul 23 13:51:32 2013 -0400 + + NEWS update for 4.6.6 release. + + NEWS | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 5d85f537d62ad598e9827dbb6b56be8b3e88a8aa +Author: Milan Crha <[email protected]> +Date: Mon Jul 15 12:16:15 2013 +0200 + + Bug #699574 - gtk_selection_owner_set() breaks mouse wheel scrolling + + gtkhtml/htmlselection.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1d96d1884bec397c8f50b5eb7da0b700de3c40f2 +Author: Milan Crha <[email protected]> +Date: Tue Jul 2 19:11:37 2013 +0200 + + Wrong cursor position after paste of text with <div></div> + + The <div /> is placed as DISPLAY_BLOCK, which adds one more character + for cursor positioning, which was not counted with, thus after paste + the cursor was positioned before the end of the pasted text. + + gtkhtml/htmlcluev.c | 18 ++++++++++++++++++ + gtkhtml/htmlcluev.h | 1 + + 2 files changed, 19 insertions(+) + +commit b2ee0cbb5f46d2e8d3b910ceb5a59429cbbae955 +Author: Milan Crha <[email protected]> +Date: Tue Jul 2 17:01:46 2013 +0200 + + Paragraph style drawn incorrectly after font style change + + For example, if there is a Header 1 paragraph, and it whole is selected, + and then a bold/italic/underline is changed, then the drawn paragraph + style is like Normal, even the above chooser still shows Header 1. Writing + a new character makes the text drawing fixed, showing the text correctly. + + The issue was that HTMLObject's parent change didn't mark the object + properties for recalculation, thus there was used stale style set, calculated + in time when there was no parent set on the object. + + gtkhtml/htmlobject.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 38286a30527c6d5a05660497a7215a8f70785bd7 +Author: Milan Crha <[email protected]> +Date: Tue Jul 2 11:57:23 2013 +0200 + + Underline and strikeout lines out of its position in a printout + + When printing, the lines for underline and strikeout were placed + out of its position. The was more visible with larger fonts. + + gtkhtml/htmlprinter.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +commit 1bdbb01b5a9cb64df2b35a539169e9f69af1491b +Author: Milan Crha <[email protected]> +Date: Fri Jun 28 19:37:20 2013 +0200 + + Skip \n and \r from whitespace recognition on HTML text paste + + This fixes a bug in the previous commit. In case of a mutliline + paste the new line markers are properly encoded within HTML tags, + thus adding them as plain text resulted in doubled new lines. + + gtkhtml/gtkhtml.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 7be37432940c62a9e5d5a52a8c476f9398eb248c +Author: Milan Crha <[email protected]> +Date: Thu Jun 27 21:02:43 2013 +0200 + + Paste of HTML text removes leading/trailing whitespaces + + Even when copying a text within composer with leading or trailing + whitespace, the text is marked as an HTML text in clipboard, and + the whitespace is removed on paste, instead of preserved. The added + code adds whitespaces as necessary. + + gtkhtml/gtkhtml.c | 35 ++++++++++++++++++++++++++++++++--- + 1 file changed, 32 insertions(+), 3 deletions(-) + +commit 53c15ac21ef22209c2b868862a27cabadb748e59 +Author: Matthew Barnes <[email protected]> +Date: Sun May 12 08:55:19 2013 -0400 + + Post-release version bump. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 005b9a2a664c545448526c27d9eb4b34ed50210d Author: Matthew Barnes <[email protected]> Date: Sun May 12 08:49:33 2013 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/Makefile.in new/gtkhtml-4.6.6/Makefile.in --- old/gtkhtml-4.6.5/Makefile.in 2013-05-12 14:50:41.000000000 +0200 +++ new/gtkhtml-4.6.6/Makefile.in 2013-07-23 19:52:02.000000000 +0200 @@ -54,7 +54,7 @@ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/gtkhtml-zip.in $(top_srcdir)/configure AUTHORS \ COPYING COPYING.LIB ChangeLog INSTALL NEWS TODO config.guess \ - config.sub depcomp install-sh ltmain.sh missing mkinstalldirs + config.sub install-sh ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/NEWS new/gtkhtml-4.6.6/NEWS --- old/gtkhtml-4.6.5/NEWS 2013-05-12 14:49:26.000000000 +0200 +++ new/gtkhtml-4.6.6/NEWS 2013-07-23 19:51:29.000000000 +0200 @@ -1,3 +1,22 @@ +GtkHTML-4.6.6 2013-07-23 +------------------------ + +Bug Fixes: + Bug 699574 - gtk_selection_owner_set() breaks mouse wheel scrolling + (Milan Crha) + +Other Changes: + * Paste of HTML text removes leading/trailing whitespaces (Milan Crha) + * Skip \n and \r from whitespace recognition on HTML text paste + (Milan Crha) + * Underline and strikeout lines out of its position in a printout + (Milan Crha) + * Paragraph style drawn incorrectly after font style change + (Milan Crha) + * Wrong cursor position after paste of text with <div></div> + (Milan Crha) + + GtkHTML-4.6.5 2013-05-12 ------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/components/editor/gtkhtml-editor-4.0.pc new/gtkhtml-4.6.6/components/editor/gtkhtml-editor-4.0.pc --- old/gtkhtml-4.6.5/components/editor/gtkhtml-editor-4.0.pc 2013-05-12 14:51:21.000000000 +0200 +++ new/gtkhtml-4.6.6/components/editor/gtkhtml-editor-4.0.pc 2013-07-23 19:52:44.000000000 +0200 @@ -8,6 +8,6 @@ Name: gtkhtml-editor Description: HTML editor widget Requires: libgtkhtml-4.0 -Version: 4.6.5 +Version: 4.6.6 Libs: -L${libdir} -lgtkhtml-editor-4.0 Cflags: -I${includedir}/libgtkhtml-4.0/editor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/configure new/gtkhtml-4.6.6/configure --- old/gtkhtml-4.6.5/configure 2013-05-12 14:50:40.000000000 +0200 +++ new/gtkhtml-4.6.6/configure 2013-07-23 19:52:01.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gtkhtml 4.6.5. +# Generated by GNU Autoconf 2.69 for gtkhtml 4.6.6. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gtkhtml' PACKAGE_TARNAME='gtkhtml' -PACKAGE_VERSION='4.6.5' -PACKAGE_STRING='gtkhtml 4.6.5' +PACKAGE_VERSION='4.6.6' +PACKAGE_STRING='gtkhtml 4.6.6' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml' PACKAGE_URL='' @@ -1432,7 +1432,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gtkhtml 4.6.5 to adapt to many kinds of systems. +\`configure' configures gtkhtml 4.6.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtkhtml 4.6.5:";; + short | recursive ) echo "Configuration of gtkhtml 4.6.6:";; esac cat <<\_ACEOF @@ -1636,7 +1636,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtkhtml configure 4.6.5 +gtkhtml configure 4.6.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2180,7 +2180,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtkhtml $as_me 4.6.5, which was +It was created by gtkhtml $as_me 4.6.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3004,7 +3004,7 @@ # Define the identity of the package. PACKAGE='gtkhtml' - VERSION='4.6.5' + VERSION='4.6.6' cat >>confdefs.h <<_ACEOF @@ -19645,7 +19645,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtkhtml $as_me 4.6.5, which was +This file was extended by gtkhtml $as_me 4.6.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19711,7 +19711,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gtkhtml config.status 4.6.5 +gtkhtml config.status 4.6.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/configure.ac new/gtkhtml-4.6.6/configure.ac --- old/gtkhtml-4.6.5/configure.ac 2013-02-19 14:40:32.000000000 +0100 +++ new/gtkhtml-4.6.6/configure.ac 2013-05-12 14:55:17.000000000 +0200 @@ -1,6 +1,6 @@ dnl Initialization AC_PREREQ(2.58) -AC_INIT([gtkhtml], [4.6.5], [http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml]) +AC_INIT([gtkhtml], [4.6.6], [http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml]) AM_INIT_AUTOMAKE([gnu 1.9 dist-xz no-dist-gzip -Wno-portability]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/gtkhtml/gtkhtml.c new/gtkhtml-4.6.6/gtkhtml/gtkhtml.c --- old/gtkhtml-4.6.5/gtkhtml/gtkhtml.c 2013-02-19 14:40:32.000000000 +0100 +++ new/gtkhtml-4.6.6/gtkhtml/gtkhtml.c 2013-07-23 19:49:26.000000000 +0200 @@ -4627,9 +4627,40 @@ g_free (utf8); utf8 = cite; } - if (utf8) - gtk_html_insert_html (GTK_HTML (widget), utf8); - else + if (utf8) { + gint leading_spaces = 0; + + /* check for leading spaces */ + while (g_ascii_isspace (utf8[leading_spaces]) && + utf8[leading_spaces] != '\n' && + utf8[leading_spaces] != '\r') + leading_spaces++; + + if (leading_spaces) + html_engine_paste_text (e, utf8, leading_spaces); + + if (utf8[leading_spaces]) + gtk_html_insert_html (GTK_HTML (widget), utf8 + leading_spaces); + + /* check for trailing spaces */ + length = g_utf8_strlen (utf8, -1); + if (length > leading_spaces) { + const gchar *ptr, *from = NULL; + + ptr = utf8; + while (ptr = g_utf8_next_char (ptr), ptr && *ptr) { + if (g_ascii_isspace (*ptr) && *ptr != '\n' && *ptr != '\r') { + if (!from) + from = ptr; + } else { + from = NULL; + } + } + + if (from) + html_engine_paste_text (e, from, g_utf8_strlen (from, -1)); + } + } else g_warning ("selection was empty"); } else if ((utf8 = (gchar *) gtk_selection_data_get_text (selection_data))) { utf8 = utf8_filter_out_bom (utf8); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/gtkhtml/htmlcluev.c new/gtkhtml-4.6.6/gtkhtml/htmlcluev.c --- old/gtkhtml-4.6.5/gtkhtml/htmlcluev.c 2013-01-21 21:07:54.000000000 +0100 +++ new/gtkhtml-4.6.6/gtkhtml/htmlcluev.c 2013-07-23 19:49:26.000000000 +0200 @@ -935,6 +935,20 @@ return HTML_CLUEV (o)->dir; } +static guint +get_recursive_length (HTMLObject *self) +{ + HTMLClueV *cluev = HTML_CLUEV (self); + guint len; + + len = (* HTML_OBJECT_CLASS (parent_class)->get_recursive_length) (self); + + if (cluev->display == DISPLAY_BLOCK) + len++; + + return len; +} + static void html_cluev_destroy (HTMLObject *self) { @@ -984,6 +998,7 @@ object_class->get_left_margin = get_left_margin; object_class->get_right_margin = get_right_margin; object_class->get_direction = html_cluev_real_get_direction; + object_class->get_recursive_length = get_recursive_length; object_class->destroy = html_cluev_destroy; clue_class->get_left_clear = get_left_clear; @@ -1027,6 +1042,7 @@ cluev->border_width = 0; cluev->border_color = NULL; cluev->background_color = NULL; + cluev->display = DISPLAY_INLINE; } HTMLObject * @@ -1064,6 +1080,7 @@ cluev->background_color = style->bg_color; if (cluev->background_color) html_color_ref (cluev->background_color); + cluev->display = style->display; } else { if (cluev->border_color) html_color_unref (cluev->border_color); @@ -1075,5 +1092,6 @@ cluev->border_width = 0; cluev->border_color = NULL; cluev->background_color = NULL; + cluev->display = DISPLAY_INLINE; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/gtkhtml/htmlcluev.h new/gtkhtml-4.6.6/gtkhtml/htmlcluev.h --- old/gtkhtml-4.6.5/gtkhtml/htmlcluev.h 2013-01-21 21:07:54.000000000 +0100 +++ new/gtkhtml-4.6.6/gtkhtml/htmlcluev.h 2013-07-23 19:49:26.000000000 +0200 @@ -44,6 +44,7 @@ HTMLColor *background_color; HTMLDirection dir; + HTMLDisplayType display; }; struct _HTMLClueVClass { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/gtkhtml/htmlobject.c new/gtkhtml-4.6.6/gtkhtml/htmlobject.c --- old/gtkhtml-4.6.5/gtkhtml/htmlobject.c 2013-01-21 21:07:54.000000000 +0100 +++ new/gtkhtml-4.6.6/gtkhtml/htmlobject.c 2013-07-23 19:49:26.000000000 +0200 @@ -1039,6 +1039,9 @@ HTMLObject *parent) { o->parent = parent; + + /* parent change requires recalc of everything */ + o->change = HTML_CHANGE_ALL; } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/gtkhtml/htmlprinter.c new/gtkhtml-4.6.6/gtkhtml/htmlprinter.c --- old/gtkhtml-4.6.5/gtkhtml/htmlprinter.c 2013-01-21 21:07:54.000000000 +0100 +++ new/gtkhtml-4.6.6/gtkhtml/htmlprinter.c 2013-07-23 19:49:26.000000000 +0200 @@ -474,11 +474,13 @@ draw_lines (HTMLPrinter *printer, double x, double y, - double width, + const PangoRectangle log_rect, PangoAnalysis *analysis, HTMLPangoProperties *properties) { PangoFontMetrics *metrics; + gint dsc, asc; + gdouble width; cairo_t *cr; if (!properties->underline && !properties->strikethrough) @@ -488,26 +490,26 @@ cr = gtk_print_context_get_cairo_context (printer->context); cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT); + width = pango_units_to_double (log_rect.width); + dsc = PANGO_PIXELS (PANGO_DESCENT (log_rect)); + asc = PANGO_PIXELS (PANGO_ASCENT (log_rect)); + if (properties->underline) { gdouble thickness = pango_units_to_double (pango_font_metrics_get_underline_thickness (metrics)); - gdouble position = pango_units_to_double (pango_font_metrics_get_underline_position (metrics)); - gdouble ly = y + position - thickness / 2; cairo_new_path (cr); - cairo_move_to (cr, x, ly + 4); - cairo_line_to (cr, x + width, ly + 4); + cairo_move_to (cr, x, y + dsc - 2); + cairo_line_to (cr, x + width, y + dsc - 2); cairo_set_line_width (cr, thickness); cairo_stroke (cr); } if (properties->strikethrough) { gdouble thickness = pango_units_to_double (pango_font_metrics_get_strikethrough_thickness (metrics)); - gdouble position = pango_units_to_double (pango_font_metrics_get_strikethrough_position (metrics)); - gdouble ly = y + position - thickness / 2; cairo_new_path (cr); - cairo_move_to (cr, x, ly - 8); - cairo_line_to (cr, x + width, ly - 8); + cairo_move_to (cr, x, y - asc + (asc + dsc) / 2); + cairo_line_to (cr, x + width, y - asc + (asc + dsc) / 2); cairo_set_line_width (cr, thickness); cairo_stroke (cr); } @@ -566,7 +568,7 @@ item->analysis.font, glyphs); draw_lines (printer, print_x, print_y, - pango_units_to_double (log_rect.width), + log_rect, &item->analysis, &properties); cairo_restore (cr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.6.5/gtkhtml/htmlselection.c new/gtkhtml-4.6.6/gtkhtml/htmlselection.c --- old/gtkhtml-4.6.5/gtkhtml/htmlselection.c 2013-01-21 21:07:54.000000000 +0100 +++ new/gtkhtml-4.6.6/gtkhtml/htmlselection.c 2013-07-23 19:49:26.000000000 +0200 @@ -421,7 +421,7 @@ /* printf ("activate selection\n"); */ if (e->selection && e->block_selection == 0 && gtk_widget_get_realized (GTK_WIDGET (e->widget))) { - gtk_selection_owner_set (GTK_WIDGET (e->widget), GDK_SELECTION_PRIMARY, time); + /* gtk_selection_owner_set (GTK_WIDGET (e->widget), GDK_SELECTION_PRIMARY, time); */ /* printf ("activated (%u).\n", time); */ clear_primary (e); html_engine_copy_object (e, &e->primary, &e->primary_len); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
