Changes 2.2.5:

Francis Franklin
* Add a light gray border to the toolbars and adjust buttons (MacOSX)
* RTF importer fix for Unicode above 32K which are wrapped as negative (variation on a patch by Roland Kay, bug 8468)
* New document icons for RTF/DOC/WPD (MacOSX)
* Don't open files at launch time until after plugins have loaded (MacOSX)
* Improved toolbar combobox behaviour (bug 8417 & 8491)
* Don't convert Helvetica to Helvetic during RTF import (MacOSX)
* Use the correct names for units (points="pt" and pica="pi") in the Options dialog
* Use the correct scale for mm ruler units in the rulers
* Allow plugin-loading from Finder selection (MacOSX)
* If no other windows open, revert to default window position for new frame (MacOSX)
* Adjust zoom for new documents (bug 8415)
* CocoaPlugin API support for adding items to the context menu (MacOSX)
* Fix Stylist (MacOSX, bugs 8522 & 8523)
* Fix the spinners in the Insert Table dialog (MacOSX, bug 8524)

Roland Kay
* Add UTF-8 locales to supported language table (bug 8500)
* Bugfixes: 8499 (Modified by Dom Lachowicz)

Birch Knutson
* Fix bug where normal headers become even-page-only headers when exporting to RTF (bug 6217)
* Language of styles was not imported from RTF (bug 8445)
* Bugfixes: 5627 (partially), 7300 (partially)

Dom Lachowicz
*  Bugfixes: some work towards fixing bug 8359

6 files changed, 20 insertions, 25 deletions

diff --git a/editors/abiword-plugins/PLIST b/editors/abiword-plugins/PLIST
index 09eeeb22caf..e1c67236f04 100644
--- a/editors/abiword-plugins/PLIST
+++ b/editors/abiword-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/24 09:55:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/03/07 10:18:45 adam Exp $
 lib/AbiWord-2.2/plugins/libAbiApplix.la
 lib/AbiWord-2.2/plugins/libAbiBMP.la
 lib/AbiWord-2.2/plugins/libAbiBZ2.la
@@ -8,9 +8,9 @@ lib/AbiWord-2.2/plugins/libAbiDocBook.la
 lib/AbiWord-2.2/plugins/libAbiEML.la
 lib/AbiWord-2.2/plugins/libAbiJPEG.la
 lib/AbiWord-2.2/plugins/libAbiKWord.la
-lib/AbiWord-2.2/plugins/libAbiNroff.la
 lib/AbiWord-2.2/plugins/libAbiLaTeX.la
 lib/AbiWord-2.2/plugins/libAbiMSWrite.la
+lib/AbiWord-2.2/plugins/libAbiNroff.la
 lib/AbiWord-2.2/plugins/libAbiWML.la
 lib/AbiWord-2.2/plugins/libAbiXHTML.la
 lib/AbiWord-2.2/plugins/libAbiXSLFO.la
diff --git a/editors/abiword-plugins/distinfo b/editors/abiword-plugins/distinfo
index c5b7d27ac5b..f1453e479db 100644
--- a/editors/abiword-plugins/distinfo
+++ b/editors/abiword-plugins/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 09:55:48 adam Exp $
+$NetBSD: distinfo,v 1.8 2005/03/07 10:17:07 adam Exp $
 
-SHA1 (abiword-2.2.4.tar.bz2) = 28fa658b1f2fe355cab974778ee9f1ee9dff27cd
-RMD160 (abiword-2.2.4.tar.bz2) = fe8ccb1306bd1d879525d00a9ab8a76d0a215b2b
-Size (abiword-2.2.4.tar.bz2) = 23736805 bytes
+SHA1 (abiword-2.2.5.tar.bz2) = 2cfbdcc9cfd427c74e46be183d819e8d9c9cd891
+RMD160 (abiword-2.2.5.tar.bz2) = eabf1606ce1ebaa7142a03c3fe6b37d31e35569d
+Size (abiword-2.2.5.tar.bz2) = 23740589 bytes
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 33eded517f8..f5bbc810946 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.13 2005/02/24 09:55:34 adam Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/03/07 10:16:43 adam Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
-ABIWORD_VERSION=	2.2.4
+ABIWORD_VERSION=	2.2.5
 DISTNAME=	abiword-${ABIWORD_VERSION}
 
 CATEGORIES=	editors
diff --git a/editors/abiword/PLIST b/editors/abiword/PLIST
index 9e07881e2ca..c0068a6acdf 100644
--- a/editors/abiword/PLIST
+++ b/editors/abiword/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/02/24 09:55:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/03/07 10:16:43 adam Exp $
 bin/AbiWord-2.2
 bin/abiword
 bin/ttfadmin.sh
@@ -735,6 +735,7 @@ share/AbiSuite-2.2/AbiWord/strings/id-ID.strings
 share/AbiSuite-2.2/AbiWord/strings/it-IT.strings
 share/AbiSuite-2.2/AbiWord/strings/ja-JP.strings
 share/AbiSuite-2.2/AbiWord/strings/jbo.strings
+share/AbiSuite-2.2/AbiWord/strings/ku.strings
 share/AbiSuite-2.2/AbiWord/strings/lt-LT.strings
 share/AbiSuite-2.2/AbiWord/strings/lv-LV.strings
 share/AbiSuite-2.2/AbiWord/strings/mg-MG.strings
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 5e31b44cb14..e794ccfbcab 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2005/02/24 09:55:34 adam Exp $
+$NetBSD: distinfo,v 1.38 2005/03/07 10:16:43 adam Exp $
 
-SHA1 (abiword-2.2.4.tar.bz2) = 28fa658b1f2fe355cab974778ee9f1ee9dff27cd
-RMD160 (abiword-2.2.4.tar.bz2) = fe8ccb1306bd1d879525d00a9ab8a76d0a215b2b
-Size (abiword-2.2.4.tar.bz2) = 23736805 bytes
+SHA1 (abiword-2.2.5.tar.bz2) = 2cfbdcc9cfd427c74e46be183d819e8d9c9cd891
+RMD160 (abiword-2.2.5.tar.bz2) = eabf1606ce1ebaa7142a03c3fe6b37d31e35569d
+Size (abiword-2.2.5.tar.bz2) = 23740589 bytes
 SHA1 (patch-aa) = e54908d64747a3fc78e13036ebbd909b2b1b64aa
 SHA1 (patch-ab) = 5957635eb05d4b6f9d623c8585ae252d9c484408
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5
-SHA1 (patch-ae) = aededf86e6a48e7901680ecb05aee3fa9fa9a48a
+SHA1 (patch-ae) = 5eab37824f36bfd21238d5cd11507062ac8dccdb
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
index 8b9d22ae87b..33f574a0c40 100644
--- a/editors/abiword/patches/patch-ae
+++ b/editors/abiword/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.14 2004/12/28 01:56:41 reed Exp $
+$NetBSD: patch-ae,v 1.15 2005/03/07 10:16:43 adam Exp $
 
---- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig	Fri Dec 17 16:05:43 2004
-+++ src/af/xap/unix/xap_UnixEncodingManager.cpp	Fri Dec 17 16:23:13 2004
-@@ -548,7 +548,7 @@
+--- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig	2005-03-01 00:14:21.000000000 +0000
++++ src/af/xap/unix/xap_UnixEncodingManager.cpp
+@@ -546,7 +546,7 @@ void  XAP_UnixEncodingManager::initializ
  					MYLANG += LanguageISOName;
  					MYLANG += "_";
  					MYLANG += LanguageISOTerritory;
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.14 2004/12/28 01:56:41 reed Exp $
  #else
  					UT_UTF8String MYLANG (LanguageISOName);
  					MYLANG += "_";
-@@ -571,7 +571,7 @@
+@@ -569,7 +569,7 @@ void  XAP_UnixEncodingManager::initializ
  #if defined(SETENV_MISSING)
  					MYLANG = "LANG=";
  					MYLANG += OLDLANG;
@@ -20,9 +20,3 @@ $NetBSD: patch-ae,v 1.14 2004/12/28 01:56:41 reed Exp $
  #else
  					setenv("LANG", OLDLANG.utf8_str(), 1);
  #endif			
-@@ -584,4 +584,4 @@
- 		}
- 	}
- 	describe();
--}
-+};