Update www/amaya to 8.5

User Interface/Editing

Bug fixes

    * Windows platforms only: several transformations crashed.
    * Fix crashes in the spell checker.
    * GTK version: Amaya is now able to copy and paste utf-8 characters.
    * A significant space were sometimes removed after a copy + paste
	command.

CSS
Bug fixes

    * Local CSS files were not reparsed when they are saved.
    * Fix a confusion with classes, pseudo-classes, ids, and attributes.
    * Amaya now generates an empty User style sheet ($AmayaHome/amaya.css)
	if this file doesn't exist.
    * Amaya didn't parse correctly non-quoted font family names containing
	whitespace.

(X)HTML
Bug fixes

    * Amaya generated a new line character after an <img> element within
	headlines (<h1>, <h2>, etc.).

And more... please review http://www.w3.org/Amaya/User/New.html

5 files changed, 46 insertions, 13 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 9fc582a4e58..cb136e30e92 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2004/04/27 05:44:22 snj Exp $
+# $NetBSD: Makefile,v 1.34 2004/05/13 03:47:28 xtraeme Exp $
 #
 
-DISTNAME=	amaya-src-8.2
+DISTNAME=	amaya-src-8.5
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=			1
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
diff --git a/www/amaya/PLIST b/www/amaya/PLIST
index 89ed7f5e2b2..8f48866f8aa 100644
--- a/www/amaya/PLIST
+++ b/www/amaya/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/03 01:36:12 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/05/13 03:47:29 xtraeme Exp $
 bin/amaya
 lib/Amaya/amaya/Amaya.svg
 lib/Amaya/amaya/AmayaPage.html
@@ -11,6 +11,8 @@ lib/Amaya/amaya/HTML.STR
 lib/Amaya/amaya/HTML.conf
 lib/Amaya/amaya/HTML.en
 lib/Amaya/amaya/HTML.trans
+lib/Amaya/amaya/HTML.trans.es
+lib/Amaya/amaya/HTML.trans.fr
 lib/Amaya/amaya/HTMLP.PRS
 lib/Amaya/amaya/HTMLPBW.PRS
 lib/Amaya/amaya/HTMLPL.PRS
@@ -29,6 +31,8 @@ lib/Amaya/amaya/MathML.STR
 lib/Amaya/amaya/MathML.conf
 lib/Amaya/amaya/MathML.en
 lib/Amaya/amaya/MathML.trans
+lib/Amaya/amaya/MathML.trans.es
+lib/Amaya/amaya/MathML.trans.fr
 lib/Amaya/amaya/MathMLP.PRS
 lib/Amaya/amaya/MathMLT.TRA
 lib/Amaya/amaya/MathMLTX.TRA
@@ -336,6 +340,7 @@ lib/Amaya/doc/html/Tables.html.es
 lib/Amaya/doc/html/Tables.html.fr
 lib/Amaya/doc/html/Transform.html
 lib/Amaya/doc/html/Transform.html.es
+lib/Amaya/doc/html/Tutorial.html.fr
 lib/Amaya/doc/html/Views.html
 lib/Amaya/doc/html/Views.html.de
 lib/Amaya/doc/html/Views.html.es
@@ -706,7 +711,6 @@ lib/Amaya/doc/images/ColorMenu-fr.gif
 lib/Amaya/doc/images/ColorMenu.gif
 lib/Amaya/doc/images/CooperationMenu.gif
 lib/Amaya/doc/images/CooperationPreferences.gif
-lib/Amaya/doc/images/Cour.gif
 lib/Amaya/doc/images/DL.gif
 lib/Amaya/doc/images/Editor.gif
 lib/Amaya/doc/images/Em.gif
@@ -720,6 +724,7 @@ lib/Amaya/doc/images/H2.gif
 lib/Amaya/doc/images/H3.gif
 lib/Amaya/doc/images/IDMenu.png
 lib/Amaya/doc/images/Image.gif
+lib/Amaya/doc/images/Langue.png
 lib/Amaya/doc/images/LangueNegotiation-fr.gif
 lib/Amaya/doc/images/LangueNegotiation.gif
 lib/Amaya/doc/images/LibraryDocDefaultStyle.gif
@@ -744,10 +749,12 @@ lib/Amaya/doc/images/SaveAs.gif
 lib/Amaya/doc/images/Strong.gif
 lib/Amaya/doc/images/TemplatesMenu-fr.gif
 lib/Amaya/doc/images/TemplatesMenu.gif
+lib/Amaya/doc/images/View.png
 lib/Amaya/doc/images/align-de.png
 lib/Amaya/doc/images/alternateview-de.jpg
 lib/Amaya/doc/images/alternateview.jpg
 lib/Amaya/doc/images/amaya.gif
+lib/Amaya/doc/images/anim.gif
 lib/Amaya/doc/images/annot.png
 lib/Amaya/doc/images/annotationicon-de.png
 lib/Amaya/doc/images/annotationicon-es.png
@@ -785,6 +792,9 @@ lib/Amaya/doc/images/configuration_for_annotations.png
 lib/Amaya/doc/images/configurebox-fr.png
 lib/Amaya/doc/images/configurebox.png
 lib/Amaya/doc/images/createRule-de.png
+lib/Amaya/doc/images/create_image-fr.png
+lib/Amaya/doc/images/create_link-fr.png
+lib/Amaya/doc/images/create_table-fr.png
 lib/Amaya/doc/images/css-fr.gif
 lib/Amaya/doc/images/css.gif
 lib/Amaya/doc/images/dialog_save_as-de.png
@@ -802,17 +812,21 @@ lib/Amaya/doc/images/geometry_preferences-de.png
 lib/Amaya/doc/images/geometry_preferences-es.png
 lib/Amaya/doc/images/geometry_preferences.png
 lib/Amaya/doc/images/graphics_palette-de.png
+lib/Amaya/doc/images/home.gif
 lib/Amaya/doc/images/image_button.gif
+lib/Amaya/doc/images/invalid_profile-fr.png
 lib/Amaya/doc/images/language_negotiation-de.png
 lib/Amaya/doc/images/language_negotiation-es.png
 lib/Amaya/doc/images/language_negotiation.png
 lib/Amaya/doc/images/left.gif
+lib/Amaya/doc/images/libsvg.gif
 lib/Amaya/doc/images/linksview-de.jpg
 lib/Amaya/doc/images/linksview.jpg
 lib/Amaya/doc/images/linkwindow.png
 lib/Amaya/doc/images/localfilter-es.png
 lib/Amaya/doc/images/localfilter.png
 lib/Amaya/doc/images/math_palette-de.png
+lib/Amaya/doc/images/not_well_formed-fr.png
 lib/Amaya/doc/images/open.png
 lib/Amaya/doc/images/printoptions_w32-de.png
 lib/Amaya/doc/images/profiles_preferences-de.png
@@ -828,9 +842,12 @@ lib/Amaya/doc/images/put.gif
 lib/Amaya/doc/images/right.gif
 lib/Amaya/doc/images/scenario_graphique.png
 lib/Amaya/doc/images/search_and_replace-de.png
+lib/Amaya/doc/images/search_and_replace-fr.png
 lib/Amaya/doc/images/sourceview-de.jpg
 lib/Amaya/doc/images/sourceview.jpg
 lib/Amaya/doc/images/spellchecking-de.png
+lib/Amaya/doc/images/spellchecking-fr.png
+lib/Amaya/doc/images/stop.gif
 lib/Amaya/doc/images/structureview-de.jpg
 lib/Amaya/doc/images/structureview.jpg
 lib/Amaya/doc/images/table.gif
@@ -850,6 +867,9 @@ lib/Amaya/fonts/icones.ff
 lib/Amaya/fonts/icones.pcf
 lib/Amaya/fonts/icones1.fb
 lib/Amaya/fonts/icones11.fb
+lib/Amaya/resources/xrc/InitConfirmDlgWX.xrc
+@dirrm lib/Amaya/resources/xrc
+@dirrm lib/Amaya/resources
 @dirrm lib/Amaya/fonts
 @dirrm lib/Amaya/doc/images
 @dirrm lib/Amaya/doc/html/viewing
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 5416b776d3a..a643855540c 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2003/12/03 01:36:12 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2004/05/13 03:47:29 xtraeme Exp $
 
-SHA1 (amaya-src-8.2.tgz) = 0c5b83ccc5f275c7a2ee35a3ab8076acf2221b75
-Size (amaya-src-8.2.tgz) = 9306337 bytes
+SHA1 (amaya-src-8.5.tgz) = 58d9cc29328883f788c962f623f9c345828cfee6
+Size (amaya-src-8.5.tgz) = 9713795 bytes
 SHA1 (patch-aa) = daa3b4ad4e00d6e6ca855bb638cc8ec8d2565791
 SHA1 (patch-ab) = 7a3dbdff2acc18202cd31b7516b1f645a1bc0f68
-SHA1 (patch-ac) = f17a0a2112aa32481b2768871a84fdf64c1cea3b
+SHA1 (patch-ac) = 5d9df3fc894f06c981b26d82f216ff223a821954
+SHA1 (patch-ad) = 19a895425342fa5379ed24953cf0c0ce2eda0760
diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac
index bd8f994a84c..125ba90739e 100644
--- a/www/amaya/patches/patch-ac
+++ b/www/amaya/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.9 2003/12/03 01:36:12 xtraeme Exp $
+$NetBSD: patch-ac,v 1.10 2004/05/13 03:47:29 xtraeme Exp $
 
---- ../thotlib/include/ustring.h.orig	Fri Jul  4 14:35:37 2003
-+++ ../thotlib/include/ustring.h
+--- ../thotlib/include/ustring.h.orig	2004-05-13 05:33:50.000000000 +0200
++++ ../thotlib/include/ustring.h	2004-05-13 05:34:13.000000000 +0200
 @@ -6,6 +6,11 @@
  #include <windows.h>
- #endif /* _WINDOWS */
+ #endif /* _WINGUI */
  
 +#include "config.h" 
 +#ifdef HAVE_WCHAR_H 
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
new file mode 100644
index 00000000000..a8f32e8f9b7
--- /dev/null
+++ b/www/amaya/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.8 2004/05/13 03:47:29 xtraeme Exp $
+
+--- ../tools/mkdep/mkdep.c.orig	2004-05-13 05:34:59.000000000 +0200
++++ ../tools/mkdep/mkdep.c	2004-05-13 05:35:12.000000000 +0200
+@@ -385,7 +385,7 @@
+ 	res = munmap(mmap_map, (size_t) mmap_mapsize);
+         if (res < 0) perror("unmap failed");
+ #else
+-        mmap_map = malloc(mmap_mapsize);
++        mmap_map = (char *)malloc(mmap_mapsize);
+ 	if (mmap_map == NULL) {
+ 	    perror("malloc failed");
+ 	    exit(1);