Changes 2.8.6:

* Preserve character properties when typing. This fixes a bad regression that
  was introduced in 2.8.5.

Changes 2.8.5:
* Fix paste of rich text from HTML and ODT, where previously some formatting
  properties were not closed properly.
* Add a number of robustness fixes to the layout engine.
* Fix a table selection bug.

6 files changed, 291 insertions, 52 deletions

diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
index 71733eed975..1b641be6512 100644
--- a/editors/abiword/patches/patch-aa
+++ b/editors/abiword/patches/patch-aa
@@ -1,13 +1,279 @@
-$NetBSD: patch-aa,v 1.11 2009/04/07 16:27:08 drochner Exp $
+$NetBSD: patch-aa,v 1.12 2010/11/26 14:49:50 adam Exp $
 
---- configure.orig	2009-03-06 20:23:34.000000000 +0100
+--- configure.orig	2010-06-13 21:17:37.000000000 +0000
 +++ configure
-@@ -5097,7 +5097,7 @@ case "$OS_NAME" in
- 		WARNING_CFLAGS=""
- 		;;
- 	*BSD|DragonFly)
--		WARNING_CFLAGS="-Wall -pedantic -D_BSD_SOURCE -pipe" #-ansi
-+		WARNING_CFLAGS="-Wall -D_BSD_SOURCE -pipe" #-ansi
- 		;;
- 	IRIX*)
- 		case "$GCC" in
+@@ -17074,7 +17074,7 @@ fi
+ 
+ # maybe just switch on TOOLKIT instead of the fancy TARGET defines
+ # also for embedded, e.g. hildon would set TOOLKIT_GTK and TOOLKIT_HILDON
+- if test "$TOOLKIT" == "cocoa"; then
++ if test "$TOOLKIT" = "cocoa"; then
+   TOOLKIT_COCOA_TRUE=
+   TOOLKIT_COCOA_FALSE='#'
+ else
+@@ -17082,7 +17082,7 @@ else
+   TOOLKIT_COCOA_FALSE=
+ fi
+ 
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+   TOOLKIT_GTK_TRUE=
+   TOOLKIT_GTK_FALSE='#'
+ else
+@@ -17090,7 +17090,7 @@ else
+   TOOLKIT_GTK_FALSE=
+ fi
+ 
+- if test "$TOOLKIT" == "win"; then
++ if test "$TOOLKIT" = "win"; then
+   TOOLKIT_WIN_TRUE=
+   TOOLKIT_WIN_FALSE='#'
+ else
+@@ -17099,15 +17099,15 @@ else
+ fi
+ 
+ 
+-if test "$enable_dynamic" == ""; then
++if test "$enable_dynamic" = ""; then
+ 	enable_dynamic="no"
+ fi
+ 
+-if test "$enable_static" == ""; then
++if test "$enable_static" = ""; then
+ 	enable_static="no"
+ fi
+ 
+-if test "$TOOLKIT" == "win"; then
++if test "$TOOLKIT" = "win"; then
+ 
+ $as_echo "#define TOOLKIT_WIN 1" >>confdefs.h
+ 
+@@ -17120,7 +17120,7 @@ $as_echo "#define _WIN32_WINNT 0x0500" >
+ 	# override static/dynamic, on win32 only static is possible
+ 	enable_dynamic="no"
+ 	enable_static="yes"
+-elif test "$TOOLKIT" == "cocoa"; then
++elif test "$TOOLKIT" = "cocoa"; then
+ 
+ $as_echo "#define TOOLKIT_COCOA 1" >>confdefs.h
+ 
+@@ -17132,7 +17132,7 @@ else
+ $as_echo "#define TOOLKIT_GTK 1" >>confdefs.h
+ 
+ fi
+- if test "$enable_dynamic" == "yes"; then
++ if test "$enable_dynamic" = "yes"; then
+   ENABLE_DYNAMIC_TRUE=
+   ENABLE_DYNAMIC_FALSE='#'
+ else
+@@ -17140,7 +17140,7 @@ else
+   ENABLE_DYNAMIC_FALSE=
+ fi
+ 
+- if test "$enable_static" == "yes"; then
++ if test "$enable_static" = "yes"; then
+   ENABLE_STATIC_TRUE=
+   ENABLE_STATIC_FALSE='#'
+ else
+@@ -17239,33 +17239,33 @@ $as_echo "yes" >&6; }
+ 
+ fi
+ PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'${WP_CPPFLAGS} -DABI_DLL'
+-if test "$TOOLKIT" == "gtk" &&
+-   test "$enable_dynamic" == "yes"; then
++if test "$TOOLKIT" = "gtk" &&
++   test "$enable_dynamic" = "yes"; then
+ 	# link plugins to work around gcc visibility issue with
+ 	# derived classes in dlopened modules
+ 	PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'" -labiword-$ABIWORD_SERIES"
+-elif test "$TOOLKIT" == "win"; then
++elif test "$TOOLKIT" = "win"; then
+ 	PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'-D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0500'
+ 	# link plugins to the executable so they can be loaded
+ 	PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src -labiword'
+-elif test "$TOOLKIT" == "cocoa" ; then
++elif test "$TOOLKIT" = "cocoa" ; then
+ 	PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'" -labiword-$ABIWORD_SERIES"
+ fi
+ 
+ 
+ 
+-if test "$abi_cv_disable_exports" == "yes"; then
++if test "$abi_cv_disable_exports" = "yes"; then
+ 
+ $as_echo "#define DISABLE_EXPORTS 1" >>confdefs.h
+ 
+ fi
+ 
+-if test "$abi_cv_menubutton" == "yes"; then
++if test "$abi_cv_menubutton" = "yes"; then
+ 
+ $as_echo "#define ENABLE_MENUBUTTON 1" >>confdefs.h
+ 
+ fi
+- if test "$abi_cv_menubutton" == "yes"; then
++ if test "$abi_cv_menubutton" = "yes"; then
+   ENABLE_MENUBUTTON_TRUE=
+   ENABLE_MENUBUTTON_FALSE='#'
+ else
+@@ -17274,12 +17274,12 @@ else
+ fi
+ 
+ 
+-if test "$abi_cv_print" == "yes"; then
++if test "$abi_cv_print" = "yes"; then
+ 
+ $as_echo "#define ENABLE_PRINT 1" >>confdefs.h
+ 
+ fi
+- if test "$abi_cv_print" == "yes"; then
++ if test "$abi_cv_print" = "yes"; then
+   ENABLE_PRINT_TRUE=
+   ENABLE_PRINT_FALSE='#'
+ else
+@@ -17288,7 +17288,7 @@ else
+ fi
+ 
+ 
+-if test "$abi_cv_spell" == "yes"; then
++if test "$abi_cv_spell" = "yes"; then
+ 
+ $as_echo "#define ENABLE_SPELL 1" >>confdefs.h
+ 
+@@ -17297,7 +17297,7 @@ $as_echo "#define ENABLE_SPELL 1" >>conf
+ $as_echo "#define WITH_ENCHANT 1" >>confdefs.h
+ 
+ fi
+- if test "$abi_cv_spell" == "yes"; then
++ if test "$abi_cv_spell" = "yes"; then
+   ENABLE_SPELL_TRUE=
+   ENABLE_SPELL_FALSE='#'
+ else
+@@ -17306,12 +17306,12 @@ else
+ fi
+ 
+ 
+-if test "$abi_cv_statusbar" == "yes"; then
++if test "$abi_cv_statusbar" = "yes"; then
+ 
+ $as_echo "#define ENABLE_STATUSBAR 1" >>confdefs.h
+ 
+ fi
+- if test "$abi_cv_statusbar" == "yes"; then
++ if test "$abi_cv_statusbar" = "yes"; then
+   ENABLE_STATUSBAR_TRUE=
+   ENABLE_STATUSBAR_FALSE='#'
+ else
+@@ -17327,7 +17327,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ fi
+- if test "$abi_cv_embedded_target" == "EMBEDDED_TARGET_HILDON"; then
++ if test "$abi_cv_embedded_target" = "EMBEDDED_TARGET_HILDON"; then
+   EMBEDDED_HILDON_TRUE=
+   EMBEDDED_HILDON_FALSE='#'
+ else
+@@ -17336,12 +17336,12 @@ else
+ fi
+ 
+ 
+-if test "$abi_cv_emacs_keybinding" == "yes"; then
++if test "$abi_cv_emacs_keybinding" = "yes"; then
+ 
+ $as_echo "#define ENABLE_EMACS_KEYBINDING 1" >>confdefs.h
+ 
+ fi
+- if test "$abi_cv_emacs_keybinding" == "yes"; then
++ if test "$abi_cv_emacs_keybinding" = "yes"; then
+   ENABLE_EMACS_KEYBINDING_TRUE=
+   ENABLE_EMACS_KEYBINDING_FALSE='#'
+ else
+@@ -17350,12 +17350,12 @@ else
+ fi
+ 
+ 
+-if test "$abi_cv_vi_keybinding" == "yes"; then
++if test "$abi_cv_vi_keybinding" = "yes"; then
+ 
+ $as_echo "#define ENABLE_VI_KEYBINDING 1" >>confdefs.h
+ 
+ fi
+- if test "$abi_cv_vi_keybinding" == "yes"; then
++ if test "$abi_cv_vi_keybinding" = "yes"; then
+   ENABLE_VI_KEYBINDING_TRUE=
+   ENABLE_VI_KEYBINDING_FALSE='#'
+ else
+@@ -17364,7 +17364,7 @@ else
+ fi
+ 
+ 
+- if test "$abi_cv_clipart" == "yes"; then
++ if test "$abi_cv_clipart" = "yes"; then
+   ENABLE_CLIPART_TRUE=
+   ENABLE_CLIPART_FALSE='#'
+ else
+@@ -17372,7 +17372,7 @@ else
+   ENABLE_CLIPART_FALSE=
+ fi
+ 
+- if test "$abi_cv_templates" == "yes"; then
++ if test "$abi_cv_templates" = "yes"; then
+   ENABLE_TEMPLATES_TRUE=
+   ENABLE_TEMPLATES_FALSE='#'
+ else
+@@ -17381,7 +17381,7 @@ else
+ fi
+ 
+ 
+-if test "$abi_cv_debug" == "yes"; then
++if test "$abi_cv_debug" = "yes"; then
+ 
+ $as_echo "#define DEBUG 1" >>confdefs.h
+ 
+@@ -17390,7 +17390,7 @@ else
+ $as_echo "#define NDEBUG 1" >>confdefs.h
+ 
+ fi
+- if test "$abi_cv_debug" == "yes"; then
++ if test "$abi_cv_debug" = "yes"; then
+   DEBUG_TRUE=
+   DEBUG_FALSE='#'
+ else
+@@ -17403,24 +17403,24 @@ fi
+ # Optional dependencies handling
+ #
+ 
+-if test "$abi_cv_gnomevfs" == "yes"; then
++if test "$abi_cv_gnomevfs" = "yes"; then
+ 
+ $as_echo "#define WITH_GNOMEVFS 1" >>confdefs.h
+ 
+ fi
+ 
+-if test "$abi_cv_gio" == "yes"; then
++if test "$abi_cv_gio" = "yes"; then
+ 
+ $as_echo "#define WITH_GIO 1" >>confdefs.h
+ 
+ fi
+ 
+-if test "$abi_cv_goffice" == "yes"; then
++if test "$abi_cv_goffice" = "yes"; then
+ 
+ $as_echo "#define WITH_GOFFICE 1" >>confdefs.h
+ 
+ fi
+- if test "$TOOLKIT" == "gtk" && test "$abi_cv_goffice" != "yes"; then
++ if test "$TOOLKIT" = "gtk" && test "$abi_cv_goffice" != "yes"; then
+   WITH_GOFFICE_BUILTIN_TRUE=
+   WITH_GOFFICE_BUILTIN_FALSE='#'
+ else
+@@ -17447,7 +17447,7 @@ if test "$abi_cv_plugins" = "auto"; then
+ 		eval $(echo "enable_$plugin")="auto"
+ 	done
+ else
+-	default_plugins="opendocument"
++	default_plugins=""
+ 
+ 	if test "$abi_cv_disable_default_plugins" != "yes"; then
+ 		PLUGINS="$default_plugins"
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab
index de2145bffd3..0f5ecb9891d 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2009/04/07 16:27:08 drochner Exp $
+$NetBSD: patch-ab,v 1.17 2010/11/26 14:49:50 adam Exp $
 
---- src/af/util/xp/ut_iconv.cpp.orig	2008-04-06 17:32:28.000000000 +0200
+--- src/af/util/xp/ut_iconv.cpp.orig	2009-06-25 00:52:27.000000000 +0000
 +++ src/af/util/xp/ut_iconv.cpp
-@@ -265,9 +265,11 @@ const char * ucs4Internal ()
+@@ -267,9 +267,11 @@ const char * ucs4Internal ()
  #elif defined(_LIBICONV_H)
    // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE
    return "UCS-4-INTERNAL";
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
index 42005e50e01..8767848a01b 100644
--- a/editors/abiword/patches/patch-ac
+++ b/editors/abiword/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.16 2006/06/07 19:19:28 rillig Exp $
+$NetBSD: patch-ac,v 1.17 2010/11/26 14:49:50 adam Exp $
 
---- src/af/util/xp/ut_endian.h.orig	2005-10-08 12:53:33.000000000 +0200
-+++ src/af/util/xp/ut_endian.h	2006-06-07 21:15:51.188428052 +0200
-@@ -47,6 +47,13 @@
+--- src/af/util/xp/ut_endian.h.orig	2009-12-13 20:26:17.000000000 +0000
++++ src/af/util/xp/ut_endian.h
+@@ -56,6 +56,13 @@
  	#else
  		#define UT_BIG_ENDIAN
  	#endif
@@ -16,12 +16,3 @@ $NetBSD: patch-ac,v 1.16 2006/06/07 19:19:28 rillig Exp $
  #elif defined(__sgi)
  	#include <sys/endian.h>
  	#if BYTE_ORDER == LITTLE_ENDIAN
-@@ -60,7 +67,7 @@
- 	#else
- 		#define UT_LITTLE_ENDIAN
- 	#endif
--#elif defined(SunOS)	/* this is defined by src/config/platform/sunos.mk */
-+#elif defined(SunOS) || defined(__sun)	/* this is defined by src/config/platform/sunos.mk */
-         #include <sys/isa_defs.h>
-         #if defined(_BIG_ENDIAN)
-                 #define UT_BIG_ENDIAN
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
index cb8ea2afdea..ae5fe156f36 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.14 2005/01/11 11:09:27 adam Exp $
+$NetBSD: patch-ad,v 1.15 2010/11/26 14:49:50 adam Exp $
 
---- src/af/util/xp/ut_iconv.h.orig	2003-11-19 02:38:27.000000000 +0000
+--- src/af/util/xp/ut_iconv.h.orig	2009-06-25 00:52:27.000000000 +0000
 +++ src/af/util/xp/ut_iconv.h
 @@ -32,8 +32,14 @@
  
@@ -16,4 +16,4 @@ $NetBSD: patch-ad,v 1.14 2005/01/11 11:09:27 adam Exp $
 +
  #ifdef __cplusplus
  
- #include "ut_exception.h"
+ 
diff --git a/editors/abiword/patches/patch-ah b/editors/abiword/patches/patch-ah
deleted file mode 100644
index 7831ebced17..00000000000
--- a/editors/abiword/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2009/04/07 16:27:08 drochner Exp $
-
---- src/af/util/xp/ut_mbtowc.cpp.orig	2009-03-12 14:54:05.000000000 +0100
-+++ src/af/util/xp/ut_mbtowc.cpp
-@@ -179,11 +179,11 @@ int UT_UCS4_mbtowc::mbtowc (UT_UCS4Char 
-   const char * inptr = m_buf;
- 
-   // need eight bytes in order for the hack below to work (see below)
--  UT_UCS4Char ucs4[2];
-+  UT_UCS4Char ucs4[5];
-   char * outptr = reinterpret_cast<char *>(&ucs4);
- 
-   size_t inlen = m_bufLen;
--  size_t outlen = sizeof (ucs4[0]);
-+  size_t outlen = 4 * sizeof (ucs4[0]);
- 
-   const UT_iconv_t cd = m_converter->cd ();
- 
diff --git a/editors/abiword/patches/patch-sa b/editors/abiword/patches/patch-sa
index a81135ee2ef..4440c95b854 100644
--- a/editors/abiword/patches/patch-sa
+++ b/editors/abiword/patches/patch-sa
@@ -1,8 +1,8 @@
-$NetBSD: patch-sa,v 1.2 2009/04/07 16:27:08 drochner Exp $
+$NetBSD: patch-sa,v 1.3 2010/11/26 14:49:50 adam Exp $
 
---- src/af/util/xp/ut_misc.cpp.orig	2008-11-10 22:00:35.000000000 +0100
+--- src/af/util/xp/ut_misc.cpp.orig	2009-06-28 22:09:08.000000000 +0000
 +++ src/af/util/xp/ut_misc.cpp
-@@ -1077,7 +1077,7 @@ const gchar ** UT_splitPropsToArray(gcha
+@@ -625,7 +625,7 @@ const gchar ** UT_splitPropsToArray(gcha
  		}
  
  		char * semi = NULL;
@@ -11,7 +11,7 @@ $NetBSD: patch-sa,v 1.2 2009/04/07 16:27:08 drochner Exp $
   		while((semi = (char *) strchr(p, ';')))
  		{
  			*semi = 0;
-@@ -1091,7 +1091,7 @@ const gchar ** UT_splitPropsToArray(gcha
+@@ -639,7 +639,7 @@ const gchar ** UT_splitPropsToArray(gcha
  		const gchar ** pPropsArray = new const gchar *[2 * iPropCount + 1];
  		UT_return_val_if_fail( pPropsArray, NULL );