Update to 10.0.1 and add destdir support.

Changes are large and can be found at http://www.w3.org/Amaya/User/New.html.
This update also fixes an ancient security vulnerability and makes the
package build on amd64.

20 files changed, 1004 insertions, 973 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 5b67a295a1a..d90281fe63f 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2008/09/08 08:03:15 dholland Exp $
+# $NetBSD: Makefile,v 1.52 2008/09/11 04:22:50 dholland Exp $
 
-DISTNAME=	amaya-fullsrc-9.2.1
+DISTNAME=	amaya-fullsrc-10.0.1
 PKGNAME=	${DISTNAME:S/-fullsrc//}
-PKGREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
@@ -13,48 +12,165 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.w3.org/Amaya/
 COMMENT=	Web browser/editor from the World Wide Web Consortium (W3C)
 
-EXTRACT_ELEMENTS=	Amaya libwww
-WRKSRC=			${WRKDIR}/Amaya/work
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_DIRS+=		xdg-1.1
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
+
+WRKSRC=			${WRKDIR}/Amaya/work
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ARGS+=	--without-graphic-libs	# Use pkgsrc libraries
+BUILD_TARGET=		all
+
 CFLAGS+=		-Dunix
-# link correctly with pkgsrc zlib
-LIBS+=			${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
 
 FONTS_DIRS.ttf+=	${PREFIX}/share/Amaya/fonts
 REQD_DIRS+=		${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts
 
 .include "../../mk/bsd.prefs.mk"
 
-# GNOME/KDE integration (only for Linux)
-PLIST_VARS+=	desktop
-.if ${OPSYS} == "Linux"
-PLIST.desktop=	yes
+.if !empty(PKGSRC_COMPILER:Mgcc*)
+CFLAGS+=		-fno-strict-aliasing
 .endif
 
+# GNOME/KDE desktop icon and related bits
+# These used to get installed only on Linux; in 10.0.1 they don't seem
+# to exist any more, but given the makefiles in this package that
+# doesn't prove anything, and I can't test on Linux easily. So I'm
+# going to leave this here commented out, along with the PLIST
+# entries, until they're confirmed to be gone.
+#PLIST_VARS+=	desktop
+#.if ${OPSYS} == "Linux"
+#PLIST.desktop=	yes
+#.endif
+
+#
+# Some notes on the build issues, for the benefit of the next person
+# hacking this package:
+#
+# - The build directory must be a subdir of the Amaya dir of the
+# distribution. If it isn't, the build breaks. Hence WRKSRC.
+#
+# - The copy of libwww that comes in the distfile is required; it is
+# custom-patched in unspecified ways. The copy of expat in that copy
+# of libwww is also custom-patched. This means we need to use that
+# expat and not the pkgsrc one, which is problematic because wxWidgets
+# also uses expat.
+#
+# - The build system is incapable of building that libwww without
+# help; if the libwww subdir of the build directory does not exist,
+# the makefiles won't create it, and it's not created by the configure
+# script. Thus the manual invocation of make libwww_config in
+# post-configure.
+#
+# - The distfile contains not just one but multiple included copies of
+# various basic libraries (libpng, libjpeg, zlib, expat) and for the
+# most part we don't want to use those copies, because they're out of
+# date. It is like pulling teeth - you have to patch all over the
+# place, even though the configure script ostensibly supports using
+# the system versions.
+#
+# - For now I'm using the included copy of wxWidgets, because the
+# pkgsrc copy is too old. This has a couple of its own issues, but,
+# once one forcibly persuades the Amaya configure script to configure
+# it correctly, isn't a big problem.
+#
+# - The code using redland does not work, even using the copy of
+# redland included in the distfile. The schemas it tries to build are
+# syntactically invalid. It *might* be a simple problem, I don't know
+# enough about that stuff to fix it. Maybe someone else does.
+#
+# - The DAV code does not build. It requires generated files from a
+# later part of the build to already exist when it's compiled. I don't
+# know if it also must come before that part of the build, but it
+# wouldn't entirely surprise me if it did; between this and the libwww
+# issue it's clear that whoever develops this thing never tries
+# building a clean tree. By the time I got to this I was tired of the
+# lossage and just disabled the DAV code entirely.
+#
+# - The build target is "all". This is not the default. The default
+# build target (if you just run make) also sort of builds the package
+# but doesn't actually work.
+#
+# - The makefiles link some of the internal portions of the program
+# using -l/-L, and some by explicitly listing .a files. The pkgsrc
+# wrappers reorder these and break the build. I patched the makefiles
+# to always explicitly name .a files for internal program pieces.
+#
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
 post-configure:
 	${CP} ${WRKSRC}/Options.orig ${WRKSRC}/Options
 	${TOUCH} ${WRKSRC}/Makefile
+	cd ${WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${GMAKE} libwww_config
+
+#
+# Components, deps, and included copies of libraries
+#
 
-# currently uses its own copy of these
-#.include "../../graphics/jpeg/buildlink3.mk"
-#.include "../../graphics/png/buildlink3.mk"
+EXTRACT_ELEMENTS=	Amaya
 
-.include "../../graphics/imlib/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+# Requires its own custom-patched libwww,
+# which also incl. a custom-patched expat.
+EXTRACT_ELEMENTS+=	libwww
+# -or-
+#.include "../../www/libwww/buildlink3.mk"
+#.include "../../textproc/expat/buildlink3.mk"
+
+# The Amaya portion of the distfile inclues copies of libpng, jpeg, and zlib.
+# Use pkgsrc's libpng, jpeg, and zlib instead.
+CONFIGURE_ARGS+=	--without-graphic-libs	# Use pkgsrc libraries
+# link correctly with pkgsrc zlib (XXX: is this needed or correct?)
+LIBS+=			${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+
+# The davlib code doesn't build.
+CONFIGURE_ARGS+=	--without-dav
+
+# pkgsrc doesn't have redland (yet?)
+# disable; currently doesn't work and I don't have time to chase down why
+#EXTRACT_ELEMENTS+=	redland
+#  -or-
+#CONFIGURE_ARGS+=	--enable-system-redland
+#.include "../../???/redland/buildlink3.mk"
+
+# pkgsrc's wxGTK is too old (2.6.3; 2.8.x is required)
+EXTRACT_ELEMENTS+=	wxWidgets
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+# wxWidgets has *another* copy of a bunch of image libs.
+CONFIGURE_ARGS+=	--with-libpng=sys	# Use pkgsrc libraries
+CONFIGURE_ARGS+=	--with-libjpeg=sys	# Use pkgsrc libraries
+CONFIGURE_ARGS+=	--with-libtiff=sys	# Use pkgsrc libraries
+CONFIGURE_ARGS+=	--with-libxpm=sys	# Use pkgsrc libraries
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+# wxWidgets also has a private copy of expat; since Amaya ostensibly
+# needs the patched expat in its libwww, which is at least the same
+# version as the one in wxWidgets, we'll let wxWidgets use its builtin
+# copy. That way if both are linked the fallout should be limited, and
+# maybe (ha!) the Amaya developers have seen to it. This will probably
+# break with pkgsrc wxWidgets, but we can worry about that later.
+#.include "../../textproc/expat/buildlink3.mk"
+# -or-
+#CONFIGURE_ARGS+=	--enable-system-wx	# Use pkgsrc libraries
+#.include "../../graphics/glu/buildlink3.mk"
+#.include "../../x11/wxGTK/buildlink3.mk"
+
+# also uses glib
+.include "../../devel/glib2/buildlink3.mk"
+
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/PLIST b/www/amaya/PLIST
index b4afedafb0e..9d2f3787286 100644
--- a/www/amaya/PLIST
+++ b/www/amaya/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/09/11 04:22:50 dholland Exp $
 bin/amaya
-bin/amaya-gtk
 share/Amaya/amaya/Amaya.svg
 share/Amaya/amaya/AmayaPage.html
 share/Amaya/amaya/AmayaPage.html.de
@@ -11,14 +10,17 @@ share/Amaya/amaya/AmayaPage_WX.html.de
 share/Amaya/amaya/AmayaPage_WX.html.es
 share/Amaya/amaya/AmayaPage_WX.html.fr
 share/Amaya/amaya/AmayaPage_WX.html.ru
+share/Amaya/amaya/AmayaPage_WX.html.sk
 share/Amaya/amaya/AmayaSrcSyncIndex.gif
 share/Amaya/amaya/Annot.conf
+share/Amaya/amaya/COPYRIGHT
 share/Amaya/amaya/HTML.STR
 share/Amaya/amaya/HTML.conf
 share/Amaya/amaya/HTML.en
 share/Amaya/amaya/HTML.trans
 share/Amaya/amaya/HTML.trans.es
 share/Amaya/amaya/HTML.trans.fr
+share/Amaya/amaya/HTML.trans.new
 share/Amaya/amaya/HTMLP.PRS
 share/Amaya/amaya/HTMLPBW.PRS
 share/Amaya/amaya/HTMLPL.PRS
@@ -45,9 +47,16 @@ share/Amaya/amaya/MathMLTX.TRA
 share/Amaya/amaya/SVG.STR
 share/Amaya/amaya/SVG.conf
 share/Amaya/amaya/SVG.en
+share/Amaya/amaya/SVG.trans
+share/Amaya/amaya/SVG.trans.fr
 share/Amaya/amaya/SVGP.PRS
 share/Amaya/amaya/SVGT.TRA
 share/Amaya/amaya/SVGTX.TRA
+share/Amaya/amaya/Template.STR
+share/Amaya/amaya/Template.en
+share/Amaya/amaya/TemplateP.PRS
+share/Amaya/amaya/TemplateT.TRA
+share/Amaya/amaya/TemplateTX.TRA
 share/Amaya/amaya/TextFile.STR
 share/Amaya/amaya/TextFile.conf
 share/Amaya/amaya/TextFile.en
@@ -88,6 +97,7 @@ share/Amaya/amaya/anim_motion_sh_db.png
 share/Amaya/amaya/annot.gif
 share/Amaya/amaya/annot.png
 share/Amaya/amaya/annotorp.gif
+share/Amaya/amaya/bullet.png
 share/Amaya/amaya/change.png
 share/Amaya/amaya/collapse1.png
 share/Amaya/amaya/collapse2.png
@@ -95,6 +105,7 @@ share/Amaya/amaya/comment.png
 share/Amaya/amaya/example.png
 share/Amaya/amaya/explanation.png
 share/Amaya/amaya/lost.gif
+share/Amaya/amaya/menu.png
 share/Amaya/amaya/option.gif
 share/Amaya/amaya/question.png
 share/Amaya/amaya/radio-s.gif
@@ -106,20 +117,33 @@ share/Amaya/amaya/target.gif
 share/Amaya/amaya/timeline_arrow.gif
 share/Amaya/amaya/timeline_cross.gif
 share/Amaya/amaya/timelinetoolbar_sh4.png
+share/Amaya/amaya/title.png
 share/Amaya/amaya/toggle-s.gif
 share/Amaya/amaya/toggle.gif
+share/Amaya/amaya/top.png
+share/Amaya/amaya/xtigerbag.png
+share/Amaya/amaya/xtigeroption.png
+share/Amaya/amaya/xtigerrepeat.png
+share/Amaya/amaya/xtigeruse.png
 share/Amaya/annotlib/Topics.en
 share/Amaya/annotlib/closed.png
 share/Amaya/annotlib/open.png
 share/Amaya/annotlib/selected.gif
+share/Amaya/config/Classic.css
+share/Amaya/config/Modern.css
+share/Amaya/config/Standard.css
 share/Amaya/config/XKeysymDB
 share/Amaya/config/amaya.emacs
 share/Amaya/config/amaya.kb
+share/Amaya/config/amaya.kb-mac
 share/Amaya/config/amaya.keyboard
 share/Amaya/config/amaya.profiles
 share/Amaya/config/annot.schemas
 share/Amaya/config/annotschema.rdf
 share/Amaya/config/annottypes.rdf
+share/Amaya/config/cn-amayadialogue
+share/Amaya/config/cn-amayamsg
+share/Amaya/config/cn-libdialogue
 share/Amaya/config/de-amayadialogue
 share/Amaya/config/de-amayamsg
 share/Amaya/config/de-libdialogue
@@ -134,14 +158,15 @@ share/Amaya/config/fi-amayamsg
 share/Amaya/config/fi-libdialogue
 share/Amaya/config/fonts.gl
 share/Amaya/config/fonts.gl.deb
+share/Amaya/config/fonts.gl.deb1
 share/Amaya/config/fonts.gl.mac
-share/Amaya/config/fonts.gl.mac.def
 share/Amaya/config/fonts.gl.rd
 share/Amaya/config/fonts.gl.win
 share/Amaya/config/fonts.gl.win.nt
 share/Amaya/config/fonts.tmpl
 share/Amaya/config/fonts.unix
 share/Amaya/config/fonts.unix.deb
+share/Amaya/config/fonts.unix.rd
 share/Amaya/config/fonts.win
 share/Amaya/config/fr-amayadialogue
 share/Amaya/config/fr-amayamsg
@@ -153,8 +178,16 @@ share/Amaya/config/hu-libdialogue
 share/Amaya/config/it-amayadialogue
 share/Amaya/config/it-amayamsg
 share/Amaya/config/it-libdialogue
+share/Amaya/config/jp-amayadialogue
+share/Amaya/config/jp-amayamsg
+share/Amaya/config/jp-libdialogue
+share/Amaya/config/ka-amayadialogue
+share/Amaya/config/ka-amayamsg
+share/Amaya/config/ka-libdialogue
 share/Amaya/config/libconfig/Forward.png
 share/Amaya/config/libconfig/Forward.svg
+share/Amaya/config/libconfig/amaya_logo.png
+share/Amaya/config/libconfig/amaya_logo.svg
 share/Amaya/config/libconfig/arrow1.png
 share/Amaya/config/libconfig/arrow1.svg
 share/Amaya/config/libconfig/arrow2.png
@@ -175,6 +208,8 @@ share/Amaya/config/libconfig/catalogue.css
 share/Amaya/config/libconfig/colorbox.png
 share/Amaya/config/libconfig/colorbox.svg
 share/Amaya/config/libconfig/default_cat.lhtml
+share/Amaya/config/libconfig/star.png
+share/Amaya/config/libconfig/star.svg
 share/Amaya/config/libconfig/trash.png
 share/Amaya/config/libconfig/trash.svg
 share/Amaya/config/pt-amayadialogue
@@ -184,10 +219,16 @@ share/Amaya/config/replytypes.rdf
 share/Amaya/config/ru-amayadialogue
 share/Amaya/config/ru-amayamsg
 share/Amaya/config/ru-libdialogue
+share/Amaya/config/sk-amayadialogue
+share/Amaya/config/sk-amayamsg
+share/Amaya/config/sk-libdialogue
 share/Amaya/config/thread.rdf
 share/Amaya/config/tr-amayadialogue
 share/Amaya/config/tr-amayamsg
 share/Amaya/config/tr-libdialogue
+share/Amaya/config/tw-amayadialogue
+share/Amaya/config/tw-amayamsg
+share/Amaya/config/tw-libdialogue
 share/Amaya/config/typeIcon.rdf
 share/Amaya/config/unix-thot.rc
 share/Amaya/dicopar/Eperso.dic
@@ -230,6 +271,11 @@ share/Amaya/doc/WX/HTML-elements/40styling.html.de
 share/Amaya/doc/WX/HTML-elements/40styling.html.es
 share/Amaya/doc/WX/HTML-elements/40styling.html.fr
 share/Amaya/doc/WX/HTML-elements/40styling.html.ru
+share/Amaya/doc/WX/HTML-elements/HTML.html
+share/Amaya/doc/WX/HTML-elements/HTML.html.de
+share/Amaya/doc/WX/HTML-elements/HTML.html.es
+share/Amaya/doc/WX/HTML-elements/HTML.html.fr
+share/Amaya/doc/WX/HTML-elements/HTML.html.ru
 share/Amaya/doc/WX/HTML-elements/address.html
 share/Amaya/doc/WX/HTML-elements/address.html.de
 share/Amaya/doc/WX/HTML-elements/address.html.es
@@ -260,11 +306,6 @@ share/Amaya/doc/WX/HTML-elements/structure.html.de
 share/Amaya/doc/WX/HTML-elements/structure.html.es
 share/Amaya/doc/WX/HTML-elements/structure.html.fr
 share/Amaya/doc/WX/HTML-elements/structure.html.ru
-share/Amaya/doc/WX/HTML.html
-share/Amaya/doc/WX/HTML.html.de
-share/Amaya/doc/WX/HTML.html.es
-share/Amaya/doc/WX/HTML.html.fr
-share/Amaya/doc/WX/HTML.html.ru
 share/Amaya/doc/WX/ImageMaps.html
 share/Amaya/doc/WX/ImageMaps.html.fr
 share/Amaya/doc/WX/Index.html
@@ -275,10 +316,13 @@ share/Amaya/doc/WX/MakeBook.html
 share/Amaya/doc/WX/MakeBook.html.fr
 share/Amaya/doc/WX/Manual.html
 share/Amaya/doc/WX/Manual.html.fr
+share/Amaya/doc/WX/Manual.html.sk
 share/Amaya/doc/WX/Math.html
 share/Amaya/doc/WX/Math.html.fr
+share/Amaya/doc/WX/Math.html.sk
 share/Amaya/doc/WX/Numbering.html
 share/Amaya/doc/WX/Numbering.html.fr
+share/Amaya/doc/WX/Numbering.html.sk
 share/Amaya/doc/WX/Printing.html
 share/Amaya/doc/WX/Printing.html.fr
 share/Amaya/doc/WX/Publishing.html
@@ -289,6 +333,12 @@ share/Amaya/doc/WX/Searching.html
 share/Amaya/doc/WX/Searching.html.fr
 share/Amaya/doc/WX/Selecting.html
 share/Amaya/doc/WX/Selecting.html.fr
+share/Amaya/doc/WX/ShortCuts-Linux.html
+share/Amaya/doc/WX/ShortCuts-Linux.html.fr
+share/Amaya/doc/WX/ShortCuts-MacOSX.html
+share/Amaya/doc/WX/ShortCuts-MacOSX.html.fr
+share/Amaya/doc/WX/ShortCuts-Windows.html
+share/Amaya/doc/WX/ShortCuts-Windows.html.fr
 share/Amaya/doc/WX/ShortCuts.html
 share/Amaya/doc/WX/ShortCuts.html.fr
 share/Amaya/doc/WX/SpellChecking.html
@@ -297,692 +347,26 @@ share/Amaya/doc/WX/StyleSheets.html
 share/Amaya/doc/WX/StyleSheets.html.fr
 share/Amaya/doc/WX/Tables.html
 share/Amaya/doc/WX/Tables.html.fr
+share/Amaya/doc/WX/Templates.html
+share/Amaya/doc/WX/Templates.html.fr
 share/Amaya/doc/WX/Transform.html
 share/Amaya/doc/WX/Tutorial.html.fr
 share/Amaya/doc/WX/Views.html
 share/Amaya/doc/WX/Views.html.fr
 share/Amaya/doc/WX/WebDAV.html
+share/Amaya/doc/WX/WebDAV.html.fr
 share/Amaya/doc/WX/Xml.html
 share/Amaya/doc/WX/Xml.html.fr
 share/Amaya/doc/WX/bookmarks.html
 share/Amaya/doc/WX/style.css
 share/Amaya/doc/WX/timeline_help.html
-share/Amaya/doc/html/Access.html
-share/Amaya/doc/html/Access.html.de
-share/Amaya/doc/html/Access.html.es
-share/Amaya/doc/html/Access.html.fr
-share/Amaya/doc/html/Access.html.ru
-share/Amaya/doc/html/Animation.html.fr
-share/Amaya/doc/html/Annotations.html
-share/Amaya/doc/html/Annotations.html.de
-share/Amaya/doc/html/Annotations.html.es
-share/Amaya/doc/html/Annotations.html.fr
-share/Amaya/doc/html/Annotations.html.ru
-share/Amaya/doc/html/Attributes.html
-share/Amaya/doc/html/Attributes.html.de
-share/Amaya/doc/html/Attributes.html.es
-share/Amaya/doc/html/Attributes.html.fr
-share/Amaya/doc/html/Attributes.html.ru
-share/Amaya/doc/html/Browsing.html
-share/Amaya/doc/html/Browsing.html.de
-share/Amaya/doc/html/Browsing.html.es
-share/Amaya/doc/html/Browsing.html.fr
-share/Amaya/doc/html/Browsing.html.ru
-share/Amaya/doc/html/Changing.html
-share/Amaya/doc/html/Changing.html.de
-share/Amaya/doc/html/Changing.html.es
-share/Amaya/doc/html/Changing.html.fr
-share/Amaya/doc/html/Changing.html.ru
-share/Amaya/doc/html/Configure.html
-share/Amaya/doc/html/Configure.html.de
-share/Amaya/doc/html/Configure.html.es
-share/Amaya/doc/html/Configure.html.fr
-share/Amaya/doc/html/Configure.html.ru
-share/Amaya/doc/html/Cover.html.de
-share/Amaya/doc/html/Creating.html
-share/Amaya/doc/html/Creating.html.de
-share/Amaya/doc/html/Creating.html.es
-share/Amaya/doc/html/Creating.html.fr
-share/Amaya/doc/html/Creating.html.ru
-share/Amaya/doc/html/Document.html
-share/Amaya/doc/html/Document.html.de
-share/Amaya/doc/html/Document.html.es
-share/Amaya/doc/html/Document.html.fr
-share/Amaya/doc/html/Document.html.ru
-share/Amaya/doc/html/EditChar.html
-share/Amaya/doc/html/EditChar.html.de
-share/Amaya/doc/html/EditChar.html.es
-share/Amaya/doc/html/EditChar.html.fr
-share/Amaya/doc/html/EditChar.html.ru
-share/Amaya/doc/html/HTML-elements/40styling.html
-share/Amaya/doc/html/HTML-elements/40styling.html.de
-share/Amaya/doc/html/HTML-elements/40styling.html.es
-share/Amaya/doc/html/HTML-elements/40styling.html.fr
-share/Amaya/doc/html/HTML-elements/40styling.html.ru
-share/Amaya/doc/html/HTML-elements/address.html
-share/Amaya/doc/html/HTML-elements/address.html.de
-share/Amaya/doc/html/HTML-elements/address.html.es
-share/Amaya/doc/html/HTML-elements/address.html.fr
-share/Amaya/doc/html/HTML-elements/address.html.ru
-share/Amaya/doc/html/HTML-elements/creating_new_documents.html.de
-share/Amaya/doc/html/HTML-elements/headings.html
-share/Amaya/doc/html/HTML-elements/headings.html.de
-share/Amaya/doc/html/HTML-elements/headings.html.es
-share/Amaya/doc/html/HTML-elements/headings.html.fr
-share/Amaya/doc/html/HTML-elements/headings.html.ru
-share/Amaya/doc/html/HTML-elements/infoTypes.html
-share/Amaya/doc/html/HTML-elements/infoTypes.html.de
-share/Amaya/doc/html/HTML-elements/infoTypes.html.es
-share/Amaya/doc/html/HTML-elements/infoTypes.html.fr
-share/Amaya/doc/html/HTML-elements/infoTypes.html.ru
-share/Amaya/doc/html/HTML-elements/inline.html
-share/Amaya/doc/html/HTML-elements/inline.html.de
-share/Amaya/doc/html/HTML-elements/inline.html.es
-share/Amaya/doc/html/HTML-elements/inline.html.fr
-share/Amaya/doc/html/HTML-elements/inline.html.ru
-share/Amaya/doc/html/HTML-elements/lists.html
-share/Amaya/doc/html/HTML-elements/lists.html.de
-share/Amaya/doc/html/HTML-elements/lists.html.es
-share/Amaya/doc/html/HTML-elements/lists.html.fr
-share/Amaya/doc/html/HTML-elements/lists.html.ru
-share/Amaya/doc/html/HTML-elements/structure.html
-share/Amaya/doc/html/HTML-elements/structure.html.de
-share/Amaya/doc/html/HTML-elements/structure.html.es
-share/Amaya/doc/html/HTML-elements/structure.html.fr
-share/Amaya/doc/html/HTML-elements/structure.html.ru
-share/Amaya/doc/html/HTML.html
-share/Amaya/doc/html/HTML.html.de
-share/Amaya/doc/html/HTML.html.es
-share/Amaya/doc/html/HTML.html.fr
-share/Amaya/doc/html/HTML.html.ru
-share/Amaya/doc/html/ImageMaps.html
-share/Amaya/doc/html/ImageMaps.html.de
-share/Amaya/doc/html/ImageMaps.html.es
-share/Amaya/doc/html/ImageMaps.html.fr
-share/Amaya/doc/html/ImageMaps.html.ru
-share/Amaya/doc/html/Index-org.html.de
-share/Amaya/doc/html/Index.html
-share/Amaya/doc/html/Index.html.de
-share/Amaya/doc/html/Index.html.es
-share/Amaya/doc/html/Index.html.fr
-share/Amaya/doc/html/Index.html.ru
-share/Amaya/doc/html/Keyboard.html.es
-share/Amaya/doc/html/Links.html
-share/Amaya/doc/html/Links.html.de
-share/Amaya/doc/html/Links.html.es
-share/Amaya/doc/html/Links.html.fr
-share/Amaya/doc/html/Links.html.ru
-share/Amaya/doc/html/MakeBook.html
-share/Amaya/doc/html/MakeBook.html.de
-share/Amaya/doc/html/MakeBook.html.es
-share/Amaya/doc/html/MakeBook.html.fr
-share/Amaya/doc/html/MakeBook.html.ru
-share/Amaya/doc/html/Manual.html
-share/Amaya/doc/html/Manual.html.de
-share/Amaya/doc/html/Manual.html.es
-share/Amaya/doc/html/Manual.html.fr
-share/Amaya/doc/html/Manual.html.ru
-share/Amaya/doc/html/Math.html
-share/Amaya/doc/html/Math.html.de
-share/Amaya/doc/html/Math.html.es
-share/Amaya/doc/html/Math.html.fr
-share/Amaya/doc/html/Math.html.ru
-share/Amaya/doc/html/Numbering.html
-share/Amaya/doc/html/Numbering.html.de
-share/Amaya/doc/html/Numbering.html.es
-share/Amaya/doc/html/Numbering.html.fr
-share/Amaya/doc/html/Numbering.html.ru
-share/Amaya/doc/html/Printing.html
-share/Amaya/doc/html/Printing.html.de
-share/Amaya/doc/html/Printing.html.es
-share/Amaya/doc/html/Printing.html.fr
-share/Amaya/doc/html/Printing.html.ru
-share/Amaya/doc/html/Publishing.html
-share/Amaya/doc/html/Publishing.html.de
-share/Amaya/doc/html/Publishing.html.es
-share/Amaya/doc/html/Publishing.html.fr
-share/Amaya/doc/html/Publishing.html.ru
-share/Amaya/doc/html/SVG.html
-share/Amaya/doc/html/SVG.html.de
-share/Amaya/doc/html/SVG.html.es
-share/Amaya/doc/html/SVG.html.fr
-share/Amaya/doc/html/SVG.html.ru
-share/Amaya/doc/html/Searching.html
-share/Amaya/doc/html/Searching.html.de
-share/Amaya/doc/html/Searching.html.es
-share/Amaya/doc/html/Searching.html.fr
-share/Amaya/doc/html/Searching.html.ru
-share/Amaya/doc/html/Selecting.html
-share/Amaya/doc/html/Selecting.html.de
-share/Amaya/doc/html/Selecting.html.es
-share/Amaya/doc/html/Selecting.html.fr
-share/Amaya/doc/html/Selecting.html.ru
-share/Amaya/doc/html/ShortCuts.html
-share/Amaya/doc/html/ShortCuts.html.de
-share/Amaya/doc/html/ShortCuts.html.es
-share/Amaya/doc/html/ShortCuts.html.fr
-share/Amaya/doc/html/ShortCuts.html.ru
-share/Amaya/doc/html/SpellChecking.html
-share/Amaya/doc/html/SpellChecking.html.de
-share/Amaya/doc/html/SpellChecking.html.es
-share/Amaya/doc/html/SpellChecking.html.fr
-share/Amaya/doc/html/SpellChecking.html.ru
-share/Amaya/doc/html/StyleSheets.html
-share/Amaya/doc/html/StyleSheets.html.de
-share/Amaya/doc/html/StyleSheets.html.es
-share/Amaya/doc/html/StyleSheets.html.fr
-share/Amaya/doc/html/StyleSheets.html.ru
-share/Amaya/doc/html/Tables.html
-share/Amaya/doc/html/Tables.html.de
-share/Amaya/doc/html/Tables.html.es
-share/Amaya/doc/html/Tables.html.fr
-share/Amaya/doc/html/Tables.html.ru
-share/Amaya/doc/html/Transform.html
-share/Amaya/doc/html/Transform.html.es
-share/Amaya/doc/html/Transform.html.ru
-share/Amaya/doc/html/Tutorial.html.fr
-share/Amaya/doc/html/Views.html
-share/Amaya/doc/html/Views.html.de
-share/Amaya/doc/html/Views.html.es
-share/Amaya/doc/html/Views.html.fr
-share/Amaya/doc/html/Views.html.ru
-share/Amaya/doc/html/WebDAV.html
-share/Amaya/doc/html/WebDAV.html.es
-share/Amaya/doc/html/WebDAV.html.ru
-share/Amaya/doc/html/Xml.html
-share/Amaya/doc/html/Xml.html.de
-share/Amaya/doc/html/Xml.html.es
-share/Amaya/doc/html/Xml.html.fr
-share/Amaya/doc/html/Xml.html.ru
-share/Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html
-share/Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html.de
-share/Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html.es
-share/Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html.ru
-share/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html
-share/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html.de
-share/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html.es
-share/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html.ru
-share/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html
-share/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.de
-share/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.es
-share/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.ru
-share/Amaya/doc/html/attaching_annotations/about_reading_annotations.html
-share/Amaya/doc/html/attaching_annotations/about_reading_annotations.html.de
-share/Amaya/doc/html/attaching_annotations/about_reading_annotations.html.es
-share/Amaya/doc/html/attaching_annotations/about_reading_annotations.html.ru
-share/Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html
-share/Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html.de
-share/Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html.es
-share/Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html.ru
-share/Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html
-share/Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html.de
-share/Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html.es
-share/Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html.ru
-share/Amaya/doc/html/attaching_annotations/annotation_issues.html
-share/Amaya/doc/html/attaching_annotations/annotation_issues.html.de
-share/Amaya/doc/html/attaching_annotations/annotation_issues.html.es
-share/Amaya/doc/html/attaching_annotations/annotation_issues.html.ru
-share/Amaya/doc/html/attaching_annotations/annotation_menu.html
-share/Amaya/doc/html/attaching_annotations/annotation_menu.html.de
-share/Amaya/doc/html/attaching_annotations/annotation_menu.html.es
-share/Amaya/doc/html/attaching_annotations/annotation_menu.html.ru
-share/Amaya/doc/html/attaching_annotations/configuring_annotation_settings.html
-share/Amaya/doc/html/attaching_annotations/configuring_annotation_settings.html.de
-share/Amaya/doc/html/attaching_annotations/configuring_annotation_settings.html.es
-share/Amaya/doc/html/attaching_annotations/configuring_annotation_settings.html.ru
-share/Amaya/doc/html/attaching_annotations/configuring_icons.html
-share/Amaya/doc/html/attaching_annotations/configuring_icons.html.de
-share/Amaya/doc/html/attaching_annotations/configuring_icons.html.es
-share/Amaya/doc/html/attaching_annotations/configuring_icons.html.ru
-share/Amaya/doc/html/attaching_annotations/creating_an_annotation.html
-share/Amaya/doc/html/attaching_annotations/creating_an_annotation.html.de
-share/Amaya/doc/html/attaching_annotations/creating_an_annotation.html.es
-share/Amaya/doc/html/attaching_annotations/creating_an_annotation.html.ru
-share/Amaya/doc/html/attaching_annotations/deleting_an_annotation.html
-share/Amaya/doc/html/attaching_annotations/deleting_an_annotation.html.de
-share/Amaya/doc/html/attaching_annotations/deleting_an_annotation.html.es
-share/Amaya/doc/html/attaching_annotations/deleting_an_annotation.html.ru
-share/Amaya/doc/html/attaching_annotations/loading_and_presenting_annotations.html
-share/Amaya/doc/html/attaching_annotations/loading_and_presenting_annotations.html.de
-share/Amaya/doc/html/attaching_annotations/loading_and_presenting_annotations.html.es
-share/Amaya/doc/html/attaching_annotations/loading_and_presenting_annotations.html.ru
-share/Amaya/doc/html/attaching_annotations/moving_annotations.html
-share/Amaya/doc/html/attaching_annotations/moving_annotations.html.de
-share/Amaya/doc/html/attaching_annotations/moving_annotations.html.es
-share/Amaya/doc/html/attaching_annotations/moving_annotations.html.ru
-share/Amaya/doc/html/attaching_annotations/navigating_annotations.html
-share/Amaya/doc/html/attaching_annotations/navigating_annotations.html.de
-share/Amaya/doc/html/attaching_annotations/navigating_annotations.html.es
-share/Amaya/doc/html/attaching_annotations/navigating_annotations.html.ru
-share/Amaya/doc/html/attaching_annotations/replying_to_annotations.html
-share/Amaya/doc/html/attaching_annotations/replying_to_annotations.html.de
-share/Amaya/doc/html/attaching_annotations/replying_to_annotations.html.es
-share/Amaya/doc/html/attaching_annotations/replying_to_annotations.html.ru
-share/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html
-share/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html.de
-share/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html.es
-share/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html.ru
-share/Amaya/doc/html/bookmarks.html
-share/Amaya/doc/html/bookmarks.html.es
-share/Amaya/doc/html/bookmarks.html.ru
-share/Amaya/doc/html/browsing/about_access_keys.html
-share/Amaya/doc/html/browsing/about_access_keys.html.de
-share/Amaya/doc/html/browsing/about_access_keys.html.es
-share/Amaya/doc/html/browsing/about_access_keys.html.ru
-share/Amaya/doc/html/browsing/about_moving_backward_and_forward.html
-share/Amaya/doc/html/browsing/about_moving_backward_and_forward.html.de
-share/Amaya/doc/html/browsing/about_moving_backward_and_forward.html.es
-share/Amaya/doc/html/browsing/about_moving_backward_and_forward.html.ru
-share/Amaya/doc/html/browsing/about_target_anchors.html
-share/Amaya/doc/html/browsing/about_target_anchors.html.de
-share/Amaya/doc/html/browsing/about_target_anchors.html.es
-share/Amaya/doc/html/browsing/about_target_anchors.html.ru
-share/Amaya/doc/html/browsing/activating_a_link.html
-share/Amaya/doc/html/browsing/activating_a_link.html.de
-share/Amaya/doc/html/browsing/activating_a_link.html.es
-share/Amaya/doc/html/browsing/activating_a_link.html.ru
-share/Amaya/doc/html/browsing/forms.html
-share/Amaya/doc/html/browsing/forms.html.de
-share/Amaya/doc/html/browsing/forms.html.es
-share/Amaya/doc/html/browsing/forms.html.ru
-share/Amaya/doc/html/browsing/opening_documents.html
-share/Amaya/doc/html/browsing/opening_documents.html.de
-share/Amaya/doc/html/browsing/opening_documents.html.es
-share/Amaya/doc/html/browsing/opening_documents.html.ru
-share/Amaya/doc/html/browsing/reloading_a_page.html
-share/Amaya/doc/html/browsing/reloading_a_page.html.de
-share/Amaya/doc/html/browsing/reloading_a_page.html.es
-share/Amaya/doc/html/browsing/reloading_a_page.html.ru
-share/Amaya/doc/html/browsing/working_with_the_amaya_browser_and_editor.html
-share/Amaya/doc/html/browsing/working_with_the_amaya_browser_and_editor.html.de
-share/Amaya/doc/html/browsing/working_with_the_amaya_browser_and_editor.html.es
-share/Amaya/doc/html/browsing/working_with_the_amaya_browser_and_editor.html.ru
-share/Amaya/doc/html/configuring_amaya/about_configuration_directory_and_file_conventions.html
-share/Amaya/doc/html/configuring_amaya/about_configuration_directory_and_file_conventions.html.de
-share/Amaya/doc/html/configuring_amaya/about_configuration_directory_and_file_conventions.html.es
-share/Amaya/doc/html/configuring_amaya/about_configuration_directory_and_file_conventions.html.ru
-share/Amaya/doc/html/configuring_amaya/about_keyboard_shortcuts.html
-share/Amaya/doc/html/configuring_amaya/about_keyboard_shortcuts.html.de
-share/Amaya/doc/html/configuring_amaya/about_keyboard_shortcuts.html.es
-share/Amaya/doc/html/configuring_amaya/about_keyboard_shortcuts.html.ru
-share/Amaya/doc/html/configuring_amaya/configuring_amaya.html
-share/Amaya/doc/html/configuring_amaya/configuring_amaya.html.de
-share/Amaya/doc/html/configuring_amaya/configuring_amaya.html.es
-share/Amaya/doc/html/configuring_amaya/configuring_amaya.html.ru
-share/Amaya/doc/html/configuring_amaya/menu_preferences.html
-share/Amaya/doc/html/configuring_amaya/menu_preferences.html.de
-share/Amaya/doc/html/configuring_amaya/menu_preferences.html.es
-share/Amaya/doc/html/configuring_amaya/menu_preferences.html.ru
-share/Amaya/doc/html/editing_attributes/copying_attributes.html
-share/Amaya/doc/html/editing_attributes/copying_attributes.html.de
-share/Amaya/doc/html/editing_attributes/copying_attributes.html.es
-share/Amaya/doc/html/editing_attributes/copying_attributes.html.ru
-share/Amaya/doc/html/editing_attributes/editing_attributes_in_the_structure_view.html
-share/Amaya/doc/html/editing_attributes/editing_attributes_in_the_structure_view.html.de
-share/Amaya/doc/html/editing_attributes/editing_attributes_in_the_structure_view.html.es
-share/Amaya/doc/html/editing_attributes/editing_attributes_in_the_structure_view.html.ru
-share/Amaya/doc/html/editing_attributes/editing_attributes_through_the_attributes_menu.html
-share/Amaya/doc/html/editing_attributes/editing_attributes_through_the_attributes_menu.html.de
-share/Amaya/doc/html/editing_attributes/editing_attributes_through_the_attributes_menu.html.es
-share/Amaya/doc/html/editing_attributes/editing_attributes_through_the_attributes_menu.html.ru
-share/Amaya/doc/html/editing_attributes/working_with_attributes.html
-share/Amaya/doc/html/editing_attributes/working_with_attributes.html.de
-share/Amaya/doc/html/editing_attributes/working_with_attributes.html.es
-share/Amaya/doc/html/editing_attributes/working_with_attributes.html.ru
-share/Amaya/doc/html/editing_documents/Transform.html.de
-share/Amaya/doc/html/editing_documents/about_inserting_a_division.html
-share/Amaya/doc/html/editing_documents/about_inserting_a_division.html.de
-share/Amaya/doc/html/editing_documents/about_inserting_a_division.html.es
-share/Amaya/doc/html/editing_documents/about_inserting_a_division.html.ru
-share/Amaya/doc/html/editing_documents/about_merging_elements.html
-share/Amaya/doc/html/editing_documents/about_merging_elements.html.de
-share/Amaya/doc/html/editing_documents/about_merging_elements.html.es
-share/Amaya/doc/html/editing_documents/about_merging_elements.html.ru
-share/Amaya/doc/html/editing_documents/changing_the_document_structure.html
-share/Amaya/doc/html/editing_documents/changing_the_document_structure.html.de
-share/Amaya/doc/html/editing_documents/changing_the_document_structure.html.es
-share/Amaya/doc/html/editing_documents/changing_the_document_structure.html.ru
-share/Amaya/doc/html/editing_documents/creating_new_documents.html
-share/Amaya/doc/html/editing_documents/creating_new_documents.html.es
-share/Amaya/doc/html/editing_documents/creating_new_documents.html.ru
-share/Amaya/doc/html/editing_documents/the_transform_command.html
-share/Amaya/doc/html/editing_documents/the_transform_command.html.de
-share/Amaya/doc/html/editing_documents/the_transform_command.html.es
-share/Amaya/doc/html/editing_documents/the_transform_command.html.ru
-share/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html
-share/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html.de
-share/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html.es
-share/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html.ru
-share/Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html
-share/Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html.de
-share/Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html.es
-share/Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html.ru
-share/Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html
-share/Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html.de
-share/Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html.es
-share/Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html.ru
-share/Amaya/doc/html/editing_mathematics/about_entering_math_characters.html
-share/Amaya/doc/html/editing_mathematics/about_entering_math_characters.html.de
-share/Amaya/doc/html/editing_mathematics/about_entering_math_characters.html.es
-share/Amaya/doc/html/editing_mathematics/about_entering_math_characters.html.ru
-share/Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html
-share/Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html.de
-share/Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html.es
-share/Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html.ru
-share/Amaya/doc/html/editing_mathematics/about_linking_in_mathml.html
-share/Amaya/doc/html/editing_mathematics/about_linking_in_mathml.html.de
-share/Amaya/doc/html/editing_mathematics/about_linking_in_mathml.html.es
-share/Amaya/doc/html/editing_mathematics/about_linking_in_mathml.html.ru
-share/Amaya/doc/html/editing_mathematics/editing_math_expressions.html
-share/Amaya/doc/html/editing_mathematics/editing_math_expressions.html.de
-share/Amaya/doc/html/editing_mathematics/editing_math_expressions.html.es
-share/Amaya/doc/html/editing_mathematics/editing_math_expressions.html.ru
-share/Amaya/doc/html/editing_mathematics/math_issues.html
-share/Amaya/doc/html/editing_mathematics/math_issues.html.de
-share/Amaya/doc/html/editing_mathematics/math_issues.html.es
-share/Amaya/doc/html/editing_mathematics/math_issues.html.ru
-share/Amaya/doc/html/editing_mathematics/the_math_palette_and_the_types.html
-share/Amaya/doc/html/editing_mathematics/the_math_palette_and_the_types.html.de
-share/Amaya/doc/html/editing_mathematics/the_math_palette_and_the_types.html.es
-share/Amaya/doc/html/editing_mathematics/the_math_palette_and_the_types.html.ru
-share/Amaya/doc/html/editing_mathematics/viewing_structure_in_mathml.html
-share/Amaya/doc/html/editing_mathematics/viewing_structure_in_mathml.html.de
-share/Amaya/doc/html/editing_mathematics/viewing_structure_in_mathml.html.es
-share/Amaya/doc/html/editing_mathematics/viewing_structure_in_mathml.html.ru
-share/Amaya/doc/html/editing_mathematics/working_with_math_expressions.html
-share/Amaya/doc/html/editing_mathematics/working_with_math_expressions.html.de
-share/Amaya/doc/html/editing_mathematics/working_with_math_expressions.html.es
-share/Amaya/doc/html/editing_mathematics/working_with_math_expressions.html.ru
-share/Amaya/doc/html/editing_tables/add_column.html
-share/Amaya/doc/html/editing_tables/add_column.html.de
-share/Amaya/doc/html/editing_tables/add_column.html.es
-share/Amaya/doc/html/editing_tables/add_column.html.ru
-share/Amaya/doc/html/editing_tables/add_row.html
-share/Amaya/doc/html/editing_tables/add_row.html.de
-share/Amaya/doc/html/editing_tables/add_row.html.es
-share/Amaya/doc/html/editing_tables/add_row.html.ru
-share/Amaya/doc/html/editing_tables/add_tbody.html
-share/Amaya/doc/html/editing_tables/add_tbody.html.de
-share/Amaya/doc/html/editing_tables/add_tbody.html.es
-share/Amaya/doc/html/editing_tables/add_tbody.html.ru
-share/Amaya/doc/html/editing_tables/create_table.html
-share/Amaya/doc/html/editing_tables/create_table.html.de
-share/Amaya/doc/html/editing_tables/create_table.html.es
-share/Amaya/doc/html/editing_tables/create_table.html.ru
-share/Amaya/doc/html/editing_tables/remove_column.html
-share/Amaya/doc/html/editing_tables/remove_column.html.de
-share/Amaya/doc/html/editing_tables/remove_column.html.es
-share/Amaya/doc/html/editing_tables/remove_column.html.ru
-share/Amaya/doc/html/editing_tables/working_with_tables.html
-share/Amaya/doc/html/editing_tables/working_with_tables.html.de
-share/Amaya/doc/html/editing_tables/working_with_tables.html.es
-share/Amaya/doc/html/editing_tables/working_with_tables.html.ru
-share/Amaya/doc/html/elements/buttons_and_types_menu.html
-share/Amaya/doc/html/elements/buttons_and_types_menu.html.de
-share/Amaya/doc/html/elements/buttons_and_types_menu.html.es
-share/Amaya/doc/html/elements/buttons_and_types_menu.html.ru
-share/Amaya/doc/html/elements/changing_the_document_title.html
-share/Amaya/doc/html/elements/changing_the_document_title.html.de
-share/Amaya/doc/html/elements/changing_the_document_title.html.es
-share/Amaya/doc/html/elements/changing_the_document_title.html.ru
-share/Amaya/doc/html/elements/creating_nested_structures.html
-share/Amaya/doc/html/elements/creating_nested_structures.html.de
-share/Amaya/doc/html/elements/creating_nested_structures.html.es
-share/Amaya/doc/html/elements/creating_nested_structures.html.ru
-share/Amaya/doc/html/elements/exiting_anchors.html
-share/Amaya/doc/html/elements/exiting_anchors.html.de
-share/Amaya/doc/html/elements/exiting_anchors.html.es
-share/Amaya/doc/html/elements/exiting_anchors.html.ru
-share/Amaya/doc/html/elements/the_enter_key.html
-share/Amaya/doc/html/elements/the_enter_key.html.de
-share/Amaya/doc/html/elements/the_enter_key.html.es
-share/Amaya/doc/html/elements/the_enter_key.html.ru
-share/Amaya/doc/html/elements/the_structure_menu.html
-share/Amaya/doc/html/elements/the_structure_menu.html.de
-share/Amaya/doc/html/elements/the_structure_menu.html.es
-share/Amaya/doc/html/elements/the_structure_menu.html.ru
-share/Amaya/doc/html/index.css
-share/Amaya/doc/html/linking/changing_a_link.html
-share/Amaya/doc/html/linking/changing_a_link.html.de
-share/Amaya/doc/html/linking/changing_a_link.html.es
-share/Amaya/doc/html/linking/changing_a_link.html.ru
-share/Amaya/doc/html/linking/creating_a_target_anchor.html
-share/Amaya/doc/html/linking/creating_a_target_anchor.html.de
-share/Amaya/doc/html/linking/creating_a_target_anchor.html.es
-share/Amaya/doc/html/linking/creating_a_target_anchor.html.ru
-share/Amaya/doc/html/linking/creating_a_target_element.html
-share/Amaya/doc/html/linking/creating_a_target_element.html.de
-share/Amaya/doc/html/linking/creating_a_target_element.html.es
-share/Amaya/doc/html/linking/creating_a_target_element.html.ru
-share/Amaya/doc/html/linking/creating_an_external_link.html
-share/Amaya/doc/html/linking/creating_an_external_link.html.de
-share/Amaya/doc/html/linking/creating_an_external_link.html.es
-share/Amaya/doc/html/linking/creating_an_external_link.html.ru
-share/Amaya/doc/html/linking/creating_an_internal_link.html
-share/Amaya/doc/html/linking/creating_an_internal_link.html.de
-share/Amaya/doc/html/linking/creating_an_internal_link.html.es
-share/Amaya/doc/html/linking/creating_an_internal_link.html.ru
-share/Amaya/doc/html/linking/removing_a_link_or_a_target_anchor.html
-share/Amaya/doc/html/linking/removing_a_link_or_a_target_anchor.html.de
-share/Amaya/doc/html/linking/removing_a_link_or_a_target_anchor.html.es
-share/Amaya/doc/html/linking/removing_a_link_or_a_target_anchor.html.ru
-share/Amaya/doc/html/printing/about_controlling_printing_with_css.html
-share/Amaya/doc/html/printing/about_controlling_printing_with_css.html.de
-share/Amaya/doc/html/printing/about_controlling_printing_with_css.html.es
-share/Amaya/doc/html/printing/about_controlling_printing_with_css.html.ru
-share/Amaya/doc/html/printing/print_command.html
-share/Amaya/doc/html/printing/print_command.html.de
-share/Amaya/doc/html/printing/print_command.html.es
-share/Amaya/doc/html/printing/print_command.html.ru
-share/Amaya/doc/html/printing/printing_documents.html
-share/Amaya/doc/html/printing/printing_documents.html.de
-share/Amaya/doc/html/printing/printing_documents.html.es
-share/Amaya/doc/html/printing/printing_documents.html.ru
-share/Amaya/doc/html/printing/unix_platforms.html
-share/Amaya/doc/html/printing/unix_platforms.html.de
-share/Amaya/doc/html/printing/unix_platforms.html.es
-share/Amaya/doc/html/printing/unix_platforms.html.ru
-share/Amaya/doc/html/printing/using_the_setup_and_print_command.html
-share/Amaya/doc/html/printing/using_the_setup_and_print_command.html.de
-share/Amaya/doc/html/printing/using_the_setup_and_print_command.html.es
-share/Amaya/doc/html/printing/using_the_setup_and_print_command.html.ru
-share/Amaya/doc/html/printing/windows_platforms.html
-share/Amaya/doc/html/printing/windows_platforms.html.de
-share/Amaya/doc/html/printing/windows_platforms.html.es
-share/Amaya/doc/html/printing/windows_platforms.html.ru
-share/Amaya/doc/html/saving_and_publishing_documents/about_saving_in_html.html
-share/Amaya/doc/html/saving_and_publishing_documents/about_saving_in_html.html.de
-share/Amaya/doc/html/saving_and_publishing_documents/about_saving_in_html.html.es
-share/Amaya/doc/html/saving_and_publishing_documents/about_saving_in_html.html.ru
-share/Amaya/doc/html/saving_and_publishing_documents/saving_and_publishing_documents.html
-share/Amaya/doc/html/saving_and_publishing_documents/saving_and_publishing_documents.html.de
-share/Amaya/doc/html/saving_and_publishing_documents/saving_and_publishing_documents.html.es
-share/Amaya/doc/html/saving_and_publishing_documents/saving_and_publishing_documents.html.ru
-share/Amaya/doc/html/saving_and_publishing_documents/saving_documents_as_text.html
-share/Amaya/doc/html/saving_and_publishing_documents/saving_documents_as_text.html.de
-share/Amaya/doc/html/saving_and_publishing_documents/saving_documents_as_text.html.es
-share/Amaya/doc/html/saving_and_publishing_documents/saving_documents_as_text.html.ru
-share/Amaya/doc/html/saving_and_publishing_documents/the_save_command.html
-share/Amaya/doc/html/saving_and_publishing_documents/the_save_command.html.de
-share/Amaya/doc/html/saving_and_publishing_documents/the_save_command.html.es
-share/Amaya/doc/html/saving_and_publishing_documents/the_save_command.html.ru
-share/Amaya/doc/html/saving_and_publishing_documents/the_saveas_command.html
-share/Amaya/doc/html/saving_and_publishing_documents/the_saveas_command.html.de
-share/Amaya/doc/html/saving_and_publishing_documents/the_saveas_command.html.es
-share/Amaya/doc/html/saving_and_publishing_documents/the_saveas_command.html.ru
-share/Amaya/doc/html/searching_and_replacing_text/searching_and_replacing_text.html
-share/Amaya/doc/html/searching_and_replacing_text/searching_and_replacing_text.html.de
-share/Amaya/doc/html/searching_and_replacing_text/searching_and_replacing_text.html.es
-share/Amaya/doc/html/searching_and_replacing_text/searching_and_replacing_text.html.ru
-share/Amaya/doc/html/selecting/selecting_by_structure.html
-share/Amaya/doc/html/selecting/selecting_by_structure.html.de
-share/Amaya/doc/html/selecting/selecting_by_structure.html.es
-share/Amaya/doc/html/selecting/selecting_by_structure.html.ru
-share/Amaya/doc/html/selecting/selecting_images.html
-share/Amaya/doc/html/selecting/selecting_images.html.de
-share/Amaya/doc/html/selecting/selecting_images.html.es
-share/Amaya/doc/html/selecting/selecting_images.html.ru
-share/Amaya/doc/html/selecting/selecting_with_keyboard_and_mouse.html
-share/Amaya/doc/html/selecting/selecting_with_keyboard_and_mouse.html.de
-share/Amaya/doc/html/selecting/selecting_with_keyboard_and_mouse.html.es
-share/Amaya/doc/html/selecting/selecting_with_keyboard_and_mouse.html.ru
-share/Amaya/doc/html/spell_checking/spell_checking.html
-share/Amaya/doc/html/spell_checking/spell_checking.html.de
-share/Amaya/doc/html/spell_checking/spell_checking.html.es
-share/Amaya/doc/html/spell_checking/spell_checking.html.ru
-share/Amaya/doc/html/style.css
-share/Amaya/doc/html/style_sheets/about_applying_style_using_html_elements.html
-share/Amaya/doc/html/style_sheets/about_applying_style_using_html_elements.html.de
-share/Amaya/doc/html/style_sheets/about_applying_style_using_html_elements.html.es
-share/Amaya/doc/html/style_sheets/about_applying_style_using_html_elements.html.ru
-share/Amaya/doc/html/style_sheets/about_linking_external_and_user_style_sheets.html
-share/Amaya/doc/html/style_sheets/about_linking_external_and_user_style_sheets.html.de
-share/Amaya/doc/html/style_sheets/about_linking_external_and_user_style_sheets.html.es
-share/Amaya/doc/html/style_sheets/about_linking_external_and_user_style_sheets.html.ru
-share/Amaya/doc/html/style_sheets/creating_and_updating_a_style_attribute.html
-share/Amaya/doc/html/style_sheets/creating_and_updating_a_style_attribute.html.de
-share/Amaya/doc/html/style_sheets/creating_and_updating_a_style_attribute.html.es
-share/Amaya/doc/html/style_sheets/creating_and_updating_a_style_attribute.html.ru
-share/Amaya/doc/html/style_sheets/creating_generic_style_for_an_element_or_a_class.html
-share/Amaya/doc/html/style_sheets/creating_generic_style_for_an_element_or_a_class.html.de
-share/Amaya/doc/html/style_sheets/creating_generic_style_for_an_element_or_a_class.html.es
-share/Amaya/doc/html/style_sheets/creating_generic_style_for_an_element_or_a_class.html.ru
-share/Amaya/doc/html/style_sheets/creating_html_style_elements.html
-share/Amaya/doc/html/style_sheets/creating_html_style_elements.html.de
-share/Amaya/doc/html/style_sheets/creating_html_style_elements.html.es
-share/Amaya/doc/html/style_sheets/creating_html_style_elements.html.ru
-share/Amaya/doc/html/style_sheets/handling_external_css.html
-share/Amaya/doc/html/style_sheets/handling_external_css.html.de
-share/Amaya/doc/html/style_sheets/handling_external_css.html.es
-share/Amaya/doc/html/style_sheets/handling_external_css.html.ru
-share/Amaya/doc/html/style_sheets/removing_style.html
-share/Amaya/doc/html/style_sheets/removing_style.html.de
-share/Amaya/doc/html/style_sheets/removing_style.html.es
-share/Amaya/doc/html/style_sheets/removing_style.html.ru
-share/Amaya/doc/html/style_sheets/working_with_styles.html
-share/Amaya/doc/html/style_sheets/working_with_styles.html.de
-share/Amaya/doc/html/style_sheets/working_with_styles.html.es
-share/Amaya/doc/html/style_sheets/working_with_styles.html.ru
-share/Amaya/doc/html/tans_annot.html.de
-share/Amaya/doc/html/timeline_help.html
-share/Amaya/doc/html/translate.html.ru
-share/Amaya/doc/html/using_graphics/AddSVGLib.html
-share/Amaya/doc/html/using_graphics/AddSVGLib.html.de
-share/Amaya/doc/html/using_graphics/AddSVGLib.html.es
-share/Amaya/doc/html/using_graphics/AddSVGLib.html.ru
-share/Amaya/doc/html/using_graphics/Animation.html
-share/Amaya/doc/html/using_graphics/Animation.html.de
-share/Amaya/doc/html/using_graphics/Animation.html.es
-share/Amaya/doc/html/using_graphics/Animation.html.ru
-share/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html
-share/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html.de
-share/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html.es
-share/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html.ru
-share/Amaya/doc/html/using_graphics/SVGLibrary.html
-share/Amaya/doc/html/using_graphics/SVGLibrary.html.de
-share/Amaya/doc/html/using_graphics/SVGLibrary.html.es
-share/Amaya/doc/html/using_graphics/SVGLibrary.html.ru
-share/Amaya/doc/html/using_graphics/UseSVGLib.html
-share/Amaya/doc/html/using_graphics/UseSVGLib.html.de
-share/Amaya/doc/html/using_graphics/UseSVGLib.html.es
-share/Amaya/doc/html/using_graphics/UseSVGLib.html.ru
-share/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html
-share/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.de
-share/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.es
-share/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.ru
-share/Amaya/doc/html/using_graphics/moving_graphics.html
-share/Amaya/doc/html/using_graphics/moving_graphics.html.de
-share/Amaya/doc/html/using_graphics/moving_graphics.html.es
-share/Amaya/doc/html/using_graphics/moving_graphics.html.ru
-share/Amaya/doc/html/using_graphics/painting_graphics.html
-share/Amaya/doc/html/using_graphics/painting_graphics.html.de
-share/Amaya/doc/html/using_graphics/painting_graphics.html.es
-share/Amaya/doc/html/using_graphics/painting_graphics.html.ru
-share/Amaya/doc/html/using_graphics/resizing_graphics.html
-share/Amaya/doc/html/using_graphics/resizing_graphics.html.de
-share/Amaya/doc/html/using_graphics/resizing_graphics.html.es
-share/Amaya/doc/html/using_graphics/resizing_graphics.html.ru
-share/Amaya/doc/html/using_graphics/working_with_graphics.html
-share/Amaya/doc/html/using_graphics/working_with_graphics.html.de
-share/Amaya/doc/html/using_graphics/working_with_graphics.html.es
-share/Amaya/doc/html/using_graphics/working_with_graphics.html.ru
-share/Amaya/doc/html/using_image_maps/about_alternative_text_and_long_descriptions.html
-share/Amaya/doc/html/using_image_maps/about_alternative_text_and_long_descriptions.html.de
-share/Amaya/doc/html/using_image_maps/about_alternative_text_and_long_descriptions.html.es
-share/Amaya/doc/html/using_image_maps/about_alternative_text_and_long_descriptions.html.ru
-share/Amaya/doc/html/using_image_maps/adding_an_image.html
-share/Amaya/doc/html/using_image_maps/adding_an_image.html.de
-share/Amaya/doc/html/using_image_maps/adding_an_image.html.es
-share/Amaya/doc/html/using_image_maps/adding_an_image.html.ru
-share/Amaya/doc/html/using_image_maps/creating_clientside_image_maps.html
-share/Amaya/doc/html/using_image_maps/creating_clientside_image_maps.html.de
-share/Amaya/doc/html/using_image_maps/creating_clientside_image_maps.html.es
-share/Amaya/doc/html/using_image_maps/creating_clientside_image_maps.html.ru
-share/Amaya/doc/html/using_image_maps/moving_image_map_areas.html
-share/Amaya/doc/html/using_image_maps/moving_image_map_areas.html.de
-share/Amaya/doc/html/using_image_maps/moving_image_map_areas.html.es
-share/Amaya/doc/html/using_image_maps/moving_image_map_areas.html.ru
-share/Amaya/doc/html/using_image_maps/resizing_image_map_areas.html
-share/Amaya/doc/html/using_image_maps/resizing_image_map_areas.html.de
-share/Amaya/doc/html/using_image_maps/resizing_image_map_areas.html.es
-share/Amaya/doc/html/using_image_maps/resizing_image_map_areas.html.ru
-share/Amaya/doc/html/using_image_maps/using_clientside_image_maps.html
-share/Amaya/doc/html/using_image_maps/using_clientside_image_maps.html.de
-share/Amaya/doc/html/using_image_maps/using_clientside_image_maps.html.es
-share/Amaya/doc/html/using_image_maps/using_clientside_image_maps.html.ru
-share/Amaya/doc/html/using_image_maps/working_with_image_maps.html
-share/Amaya/doc/html/using_image_maps/working_with_image_maps.html.de
-share/Amaya/doc/html/using_image_maps/working_with_image_maps.html.es
-share/Amaya/doc/html/using_image_maps/working_with_image_maps.html.ru
-share/Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html
-share/Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html.de
-share/Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html.es
-share/Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html.ru
-share/Amaya/doc/html/using_xml/editing_xml_document.html
-share/Amaya/doc/html/using_xml/editing_xml_document.html.de
-share/Amaya/doc/html/using_xml/editing_xml_document.html.es
-share/Amaya/doc/html/using_xml/editing_xml_document.html.ru
-share/Amaya/doc/html/using_xml/loading_xml_document.html
-share/Amaya/doc/html/using_xml/loading_xml_document.html.de
-share/Amaya/doc/html/using_xml/loading_xml_document.html.es
-share/Amaya/doc/html/using_xml/loading_xml_document.html.ru
-share/Amaya/doc/html/using_xml/xml_using_style.html
-share/Amaya/doc/html/using_xml/xml_using_style.html.de
-share/Amaya/doc/html/using_xml/xml_using_style.html.es
-share/Amaya/doc/html/using_xml/xml_using_style.html.ru
-share/Amaya/doc/html/viewing/about_synchronized_views.html
-share/Amaya/doc/html/viewing/about_synchronized_views.html.de
-share/Amaya/doc/html/viewing/about_synchronized_views.html.es
-share/Amaya/doc/html/viewing/about_synchronized_views.html.ru
-share/Amaya/doc/html/viewing/closing_a_view.html
-share/Amaya/doc/html/viewing/closing_a_view.html.de
-share/Amaya/doc/html/viewing/closing_a_view.html.es
-share/Amaya/doc/html/viewing/closing_a_view.html.ru
-share/Amaya/doc/html/viewing/opening_a_view.html
-share/Amaya/doc/html/viewing/opening_a_view.html.de
-share/Amaya/doc/html/viewing/opening_a_view.html.es
-share/Amaya/doc/html/viewing/opening_a_view.html.ru
-share/Amaya/doc/html/viewing/working_with_document_views.html
-share/Amaya/doc/html/viewing/working_with_document_views.html.de
-share/Amaya/doc/html/viewing/working_with_document_views.html.es
-share/Amaya/doc/html/viewing/working_with_document_views.html.ru
 share/Amaya/doc/images/Back.gif
 share/Amaya/doc/images/Browser.gif
-share/Amaya/doc/images/BrowsingMenu-fr.gif
-share/Amaya/doc/images/CacheMenu-fr.gif
-share/Amaya/doc/images/CacheMenu.gif
-share/Amaya/doc/images/ColorMenu-de.gif
-share/Amaya/doc/images/ColorMenu-fr.gif
-share/Amaya/doc/images/ColorMenu.gif
 share/Amaya/doc/images/CooperationMenu.gif
 share/Amaya/doc/images/CooperationPreferences.gif
 share/Amaya/doc/images/DL.gif
-share/Amaya/doc/images/Editor.gif
 share/Amaya/doc/images/Em.gif
 share/Amaya/doc/images/Forward.gif
-share/Amaya/doc/images/GeneralMenu-fr.gif
-share/Amaya/doc/images/GeomMenu-fr.gif
-share/Amaya/doc/images/GeomMenu.gif
 share/Amaya/doc/images/Graph.gif
 share/Amaya/doc/images/H1.gif
 share/Amaya/doc/images/H2.gif
@@ -990,8 +374,6 @@ share/Amaya/doc/images/H3.gif
 share/Amaya/doc/images/IDMenu.png
 share/Amaya/doc/images/Image.gif
 share/Amaya/doc/images/Langue.png
-share/Amaya/doc/images/LangueNegotiation-fr.gif
-share/Amaya/doc/images/LangueNegotiation.gif
 share/Amaya/doc/images/LibraryDocDefaultStyle.gif
 share/Amaya/doc/images/Link.gif
 share/Amaya/doc/images/Math.gif
@@ -1000,17 +382,9 @@ share/Amaya/doc/images/NoLibraryDocStyle.gif
 share/Amaya/doc/images/NumList.gif
 share/Amaya/doc/images/OList.gif
 share/Amaya/doc/images/Print.gif
-share/Amaya/doc/images/ProfilesMenu-fr.gif
-share/Amaya/doc/images/ProfilesMenu.gif
-share/Amaya/doc/images/ProxyMenu-fr.gif
-share/Amaya/doc/images/ProxyMenu.gif
-share/Amaya/doc/images/PublishMenu-fr.gif
-share/Amaya/doc/images/PublishMenu.gif
 share/Amaya/doc/images/Reload.gif
 share/Amaya/doc/images/Reload.png
 share/Amaya/doc/images/SVGLibrary.gif
-share/Amaya/doc/images/SaveAs-fr.gif
-share/Amaya/doc/images/SaveAs.gif
 share/Amaya/doc/images/Strong.gif
 share/Amaya/doc/images/align-de.png
 share/Amaya/doc/images/alternateview-de.jpg
@@ -1042,14 +416,10 @@ share/Amaya/doc/images/color-de.png
 share/Amaya/doc/images/configuration_for_annotations-de.png
 share/Amaya/doc/images/configuration_for_annotations-es.png
 share/Amaya/doc/images/configuration_for_annotations.png
-share/Amaya/doc/images/configurebox-fr.png
-share/Amaya/doc/images/configurebox.png
 share/Amaya/doc/images/createRule-de.png
 share/Amaya/doc/images/create_image-fr.png
 share/Amaya/doc/images/create_link-fr.png
 share/Amaya/doc/images/create_table-fr.png
-share/Amaya/doc/images/css-fr.gif
-share/Amaya/doc/images/css.gif
 share/Amaya/doc/images/dialog_save_as-de.png
 share/Amaya/doc/images/doc48x.gif
 share/Amaya/doc/images/enrichissement_lib.png
@@ -1132,12 +502,19 @@ share/Amaya/fonts/icones.ff
 share/Amaya/fonts/icones.pcf
 share/Amaya/fonts/icones1.fb
 share/Amaya/fonts/icones11.fb
-share/Amaya/gtk/bin/amaya
-share/Amaya/gtk/bin/print
 share/Amaya/resources/icons/16x16/BG_norepeat.png
 share/Amaya/resources/icons/16x16/BG_repeat.png
 share/Amaya/resources/icons/16x16/BG_repeat_x.png
 share/Amaya/resources/icons/16x16/BG_repeat_y.png
+share/Amaya/resources/icons/16x16/CSS_center.png
+share/Amaya/resources/icons/16x16/CSS_d_line.png
+share/Amaya/resources/icons/16x16/CSS_h_line.png
+share/Amaya/resources/icons/16x16/CSS_indent.png
+share/Amaya/resources/icons/16x16/CSS_justify.png
+share/Amaya/resources/icons/16x16/CSS_left.png
+share/Amaya/resources/icons/16x16/CSS_noindent.png
+share/Amaya/resources/icons/16x16/CSS_right.png
+share/Amaya/resources/icons/16x16/CSS_s_line.png
 share/Amaya/resources/icons/16x16/MATHML_Bmath.png
 share/Amaya/resources/icons/16x16/MATHML_F_divers.png
 share/Amaya/resources/icons/16x16/MATHML_F_fleches.png
@@ -1147,94 +524,289 @@ share/Amaya/resources/icons/16x16/MATHML_F_maths.png
 share/Amaya/resources/icons/16x16/MATHML_F_operateurs.png
 share/Amaya/resources/icons/16x16/MATHML_F_relations_binaires.png
 share/Amaya/resources/icons/16x16/MATHML_F_relations_negation.png
+share/Amaya/resources/icons/16x16/MATHML_abs.png
+share/Amaya/resources/icons/16x16/MATHML_alephsub.png
+share/Amaya/resources/icons/16x16/MATHML_and.png
+share/Amaya/resources/icons/16x16/MATHML_andbinary.png
+share/Amaya/resources/icons/16x16/MATHML_approx.png
+share/Amaya/resources/icons/16x16/MATHML_arg.png
+share/Amaya/resources/icons/16x16/MATHML_arrow1.png
+share/Amaya/resources/icons/16x16/MATHML_arrow2.png
+share/Amaya/resources/icons/16x16/MATHML_card.png
+share/Amaya/resources/icons/16x16/MATHML_card2.png
+share/Amaya/resources/icons/16x16/MATHML_cartesianproduct.png
+share/Amaya/resources/icons/16x16/MATHML_cartesianproductbinary.png
+share/Amaya/resources/icons/16x16/MATHML_ceiling.png
+share/Amaya/resources/icons/16x16/MATHML_codomain.png
+share/Amaya/resources/icons/16x16/MATHML_combination.png
+share/Amaya/resources/icons/16x16/MATHML_complement.png
+share/Amaya/resources/icons/16x16/MATHML_complementsub.png
+share/Amaya/resources/icons/16x16/MATHML_complexcartesian.png
+share/Amaya/resources/icons/16x16/MATHML_complexcartesian2.png
+share/Amaya/resources/icons/16x16/MATHML_complexes.png
+share/Amaya/resources/icons/16x16/MATHML_complexpolar.png
+share/Amaya/resources/icons/16x16/MATHML_compose.png
+share/Amaya/resources/icons/16x16/MATHML_composebinary.png
+share/Amaya/resources/icons/16x16/MATHML_congru.png
+share/Amaya/resources/icons/16x16/MATHML_conjugate.png
+share/Amaya/resources/icons/16x16/MATHML_couple.png
+share/Amaya/resources/icons/16x16/MATHML_curl.png
+share/Amaya/resources/icons/16x16/MATHML_determinant.png
+share/Amaya/resources/icons/16x16/MATHML_determinant2.png
+share/Amaya/resources/icons/16x16/MATHML_diagonalintersection.png
+share/Amaya/resources/icons/16x16/MATHML_diff.png
+share/Amaya/resources/icons/16x16/MATHML_diff2.png
+share/Amaya/resources/icons/16x16/MATHML_diff3.png
+share/Amaya/resources/icons/16x16/MATHML_directsum.png
+share/Amaya/resources/icons/16x16/MATHML_divergence2.png
+share/Amaya/resources/icons/16x16/MATHML_divide.png
+share/Amaya/resources/icons/16x16/MATHML_domain.png
+share/Amaya/resources/icons/16x16/MATHML_emptyset.png
+share/Amaya/resources/icons/16x16/MATHML_enclose.png
+share/Amaya/resources/icons/16x16/MATHML_enclose2.png
+share/Amaya/resources/icons/16x16/MATHML_eq.png
+share/Amaya/resources/icons/16x16/MATHML_equivalent.png
+share/Amaya/resources/icons/16x16/MATHML_equivalent2.png
+share/Amaya/resources/icons/16x16/MATHML_equivalent2binary.png
+share/Amaya/resources/icons/16x16/MATHML_equivalentbinary.png
+share/Amaya/resources/icons/16x16/MATHML_equivalentunder.png
+share/Amaya/resources/icons/16x16/MATHML_eulergamma.png
+share/Amaya/resources/icons/16x16/MATHML_exists.png
+share/Amaya/resources/icons/16x16/MATHML_exists2.png
+share/Amaya/resources/icons/16x16/MATHML_exponentiale.png
+share/Amaya/resources/icons/16x16/MATHML_factorial.png
+share/Amaya/resources/icons/16x16/MATHML_factorof.png
+share/Amaya/resources/icons/16x16/MATHML_false.png
 share/Amaya/resources/icons/16x16/MATHML_fence.png
+share/Amaya/resources/icons/16x16/MATHML_fence2.png
+share/Amaya/resources/icons/16x16/MATHML_floor.png
+share/Amaya/resources/icons/16x16/MATHML_forall.png
 share/Amaya/resources/icons/16x16/MATHML_frac.png
+share/Amaya/resources/icons/16x16/MATHML_gcd.png
+share/Amaya/resources/icons/16x16/MATHML_geq.png
+share/Amaya/resources/icons/16x16/MATHML_geqbinary.png
+share/Amaya/resources/icons/16x16/MATHML_gg.png
+share/Amaya/resources/icons/16x16/MATHML_grad.png
 share/Amaya/resources/icons/16x16/MATHML_greek.png
+share/Amaya/resources/icons/16x16/MATHML_gt.png
+share/Amaya/resources/icons/16x16/MATHML_ident.png
+share/Amaya/resources/icons/16x16/MATHML_image.png
+share/Amaya/resources/icons/16x16/MATHML_imaginary.png
+share/Amaya/resources/icons/16x16/MATHML_imaginaryi.png
+share/Amaya/resources/icons/16x16/MATHML_implies.png
+share/Amaya/resources/icons/16x16/MATHML_in.png
+share/Amaya/resources/icons/16x16/MATHML_inf.png
+share/Amaya/resources/icons/16x16/MATHML_infinity.png
+share/Amaya/resources/icons/16x16/MATHML_infunder.png
 share/Amaya/resources/icons/16x16/MATHML_insert.png
+share/Amaya/resources/icons/16x16/MATHML_int.png
+share/Amaya/resources/icons/16x16/MATHML_int2.png
+share/Amaya/resources/icons/16x16/MATHML_integers.png
+share/Amaya/resources/icons/16x16/MATHML_intersect.png
+share/Amaya/resources/icons/16x16/MATHML_intersectbinary.png
+share/Amaya/resources/icons/16x16/MATHML_intersectunder.png
+share/Amaya/resources/icons/16x16/MATHML_interval.png
+share/Amaya/resources/icons/16x16/MATHML_intunder.png
+share/Amaya/resources/icons/16x16/MATHML_inverse.png
+share/Amaya/resources/icons/16x16/MATHML_isomorphic.png
+share/Amaya/resources/icons/16x16/MATHML_lambda.png
+share/Amaya/resources/icons/16x16/MATHML_laplacian.png
+share/Amaya/resources/icons/16x16/MATHML_lcm.png
+share/Amaya/resources/icons/16x16/MATHML_leq.png
+share/Amaya/resources/icons/16x16/MATHML_leqbinary.png
+share/Amaya/resources/icons/16x16/MATHML_lim.png
+share/Amaya/resources/icons/16x16/MATHML_limtendsto.png
+share/Amaya/resources/icons/16x16/MATHML_listextension.png
+share/Amaya/resources/icons/16x16/MATHML_listseparation.png
+share/Amaya/resources/icons/16x16/MATHML_ll.png
+share/Amaya/resources/icons/16x16/MATHML_lt.png
+share/Amaya/resources/icons/16x16/MATHML_map.png
 share/Amaya/resources/icons/16x16/MATHML_matrix.png
+share/Amaya/resources/icons/16x16/MATHML_matrix2.png
+share/Amaya/resources/icons/16x16/MATHML_max.png
+share/Amaya/resources/icons/16x16/MATHML_maxunder.png
+share/Amaya/resources/icons/16x16/MATHML_mean.png
+share/Amaya/resources/icons/16x16/MATHML_median.png
+share/Amaya/resources/icons/16x16/MATHML_min.png
+share/Amaya/resources/icons/16x16/MATHML_minunder.png
+share/Amaya/resources/icons/16x16/MATHML_minusbinary.png
+share/Amaya/resources/icons/16x16/MATHML_minusunary.png
+share/Amaya/resources/icons/16x16/MATHML_mode.png
+share/Amaya/resources/icons/16x16/MATHML_moment.png
+share/Amaya/resources/icons/16x16/MATHML_mphantom.png
+share/Amaya/resources/icons/16x16/MATHML_mrow.png
 share/Amaya/resources/icons/16x16/MATHML_mscript.png
+share/Amaya/resources/icons/16x16/MATHML_naturals.png
+share/Amaya/resources/icons/16x16/MATHML_neq.png
+share/Amaya/resources/icons/16x16/MATHML_norm.png
+share/Amaya/resources/icons/16x16/MATHML_not.png
+share/Amaya/resources/icons/16x16/MATHML_notanumber.png
+share/Amaya/resources/icons/16x16/MATHML_notin.png
+share/Amaya/resources/icons/16x16/MATHML_notprsubset.png
+share/Amaya/resources/icons/16x16/MATHML_notsubset.png
+share/Amaya/resources/icons/16x16/MATHML_nuplet.png
+share/Amaya/resources/icons/16x16/MATHML_o.png
+share/Amaya/resources/icons/16x16/MATHML_omegasub.png
+share/Amaya/resources/icons/16x16/MATHML_oo.png
+share/Amaya/resources/icons/16x16/MATHML_or.png
+share/Amaya/resources/icons/16x16/MATHML_orbinary.png
+share/Amaya/resources/icons/16x16/MATHML_orthogonal.png
+share/Amaya/resources/icons/16x16/MATHML_orthogonalcomplement.png
+share/Amaya/resources/icons/16x16/MATHML_outerproduct.png
 share/Amaya/resources/icons/16x16/MATHML_over.png
+share/Amaya/resources/icons/16x16/MATHML_overarrow.png
+share/Amaya/resources/icons/16x16/MATHML_overbar.png
+share/Amaya/resources/icons/16x16/MATHML_overbrace.png
+share/Amaya/resources/icons/16x16/MATHML_overbreve.png
+share/Amaya/resources/icons/16x16/MATHML_overcheck.png
+share/Amaya/resources/icons/16x16/MATHML_overdot.png
+share/Amaya/resources/icons/16x16/MATHML_overfrown.png
+share/Amaya/resources/icons/16x16/MATHML_overhat.png
+share/Amaya/resources/icons/16x16/MATHML_overtilde.png
 share/Amaya/resources/icons/16x16/MATHML_overunder.png
+share/Amaya/resources/icons/16x16/MATHML_parallel.png
+share/Amaya/resources/icons/16x16/MATHML_parenthesis.png
+share/Amaya/resources/icons/16x16/MATHML_partialdiff.png
+share/Amaya/resources/icons/16x16/MATHML_partialdiff2.png
+share/Amaya/resources/icons/16x16/MATHML_pi.png
+share/Amaya/resources/icons/16x16/MATHML_piecewise.png
+share/Amaya/resources/icons/16x16/MATHML_plus.png
+share/Amaya/resources/icons/16x16/MATHML_power.png
+share/Amaya/resources/icons/16x16/MATHML_powerset.png
+share/Amaya/resources/icons/16x16/MATHML_primes.png
+share/Amaya/resources/icons/16x16/MATHML_produnder.png
+share/Amaya/resources/icons/16x16/MATHML_produnderover.png
+share/Amaya/resources/icons/16x16/MATHML_prsubset.png
+share/Amaya/resources/icons/16x16/MATHML_prsubsetbinary.png
+share/Amaya/resources/icons/16x16/MATHML_quaternions.png
+share/Amaya/resources/icons/16x16/MATHML_quotient.png
+share/Amaya/resources/icons/16x16/MATHML_rationnals.png
+share/Amaya/resources/icons/16x16/MATHML_real.png
+share/Amaya/resources/icons/16x16/MATHML_reals.png
+share/Amaya/resources/icons/16x16/MATHML_rem.png
 share/Amaya/resources/icons/16x16/MATHML_root.png
+share/Amaya/resources/icons/16x16/MATHML_scalarproduct.png
+share/Amaya/resources/icons/16x16/MATHML_sdev.png
+share/Amaya/resources/icons/16x16/MATHML_selector.png
+share/Amaya/resources/icons/16x16/MATHML_setdiff.png
+share/Amaya/resources/icons/16x16/MATHML_setextension.png
+share/Amaya/resources/icons/16x16/MATHML_setseparation.png
+share/Amaya/resources/icons/16x16/MATHML_setsymdiff.png
 share/Amaya/resources/icons/16x16/MATHML_sqrt.png
 share/Amaya/resources/icons/16x16/MATHML_sub.png
+share/Amaya/resources/icons/16x16/MATHML_subset.png
+share/Amaya/resources/icons/16x16/MATHML_subsetbinary.png
 share/Amaya/resources/icons/16x16/MATHML_subsup.png
+share/Amaya/resources/icons/16x16/MATHML_sum.png
+share/Amaya/resources/icons/16x16/MATHML_sumunder.png
 share/Amaya/resources/icons/16x16/MATHML_sup.png
+share/Amaya/resources/icons/16x16/MATHML_sup2.png
+share/Amaya/resources/icons/16x16/MATHML_supminus.png
+share/Amaya/resources/icons/16x16/MATHML_supplus.png
+share/Amaya/resources/icons/16x16/MATHML_supunder.png
+share/Amaya/resources/icons/16x16/MATHML_tendsto.png
+share/Amaya/resources/icons/16x16/MATHML_tendstotendsto.png
+share/Amaya/resources/icons/16x16/MATHML_times.png
+share/Amaya/resources/icons/16x16/MATHML_timesbinary.png
+share/Amaya/resources/icons/16x16/MATHML_transpose.png
+share/Amaya/resources/icons/16x16/MATHML_true.png
 share/Amaya/resources/icons/16x16/MATHML_under.png
+share/Amaya/resources/icons/16x16/MATHML_underbrace.png
+share/Amaya/resources/icons/16x16/MATHML_union.png
+share/Amaya/resources/icons/16x16/MATHML_unionbinary.png
+share/Amaya/resources/icons/16x16/MATHML_unionunary.png
+share/Amaya/resources/icons/16x16/MATHML_unionunder.png
+share/Amaya/resources/icons/16x16/MATHML_variance.png
+share/Amaya/resources/icons/16x16/MATHML_vectorcolumn.png
+share/Amaya/resources/icons/16x16/MATHML_vectorproduct.png
+share/Amaya/resources/icons/16x16/MATHML_vectorrow.png
+share/Amaya/resources/icons/16x16/MATHML_verticalbrace.png
+share/Amaya/resources/icons/16x16/MATHML_xor.png
+share/Amaya/resources/icons/16x16/MATHML_xorbinary.png
+share/Amaya/resources/icons/16x16/Table_bottom.png
+share/Amaya/resources/icons/16x16/Table_col.png
+share/Amaya/resources/icons/16x16/Table_col_a.png
+share/Amaya/resources/icons/16x16/Table_merge.png
+share/Amaya/resources/icons/16x16/Table_right.png
+share/Amaya/resources/icons/16x16/Table_row.png
+share/Amaya/resources/icons/16x16/Table_row_a.png
+share/Amaya/resources/icons/16x16/Table_split_h.png
+share/Amaya/resources/icons/16x16/Table_split_v.png
 share/Amaya/resources/icons/16x16/XHTML_B.png
 share/Amaya/resources/icons/16x16/XHTML_Bullet.png
 share/Amaya/resources/icons/16x16/XHTML_Comment.png
+share/Amaya/resources/icons/16x16/XHTML_DD.png
 share/Amaya/resources/icons/16x16/XHTML_DL.png
+share/Amaya/resources/icons/16x16/XHTML_DT.png
 share/Amaya/resources/icons/16x16/XHTML_DelTarget.png
+share/Amaya/resources/icons/16x16/XHTML_Div.png
 share/Amaya/resources/icons/16x16/XHTML_H1.png
 share/Amaya/resources/icons/16x16/XHTML_H2.png
 share/Amaya/resources/icons/16x16/XHTML_H3.png
+share/Amaya/resources/icons/16x16/XHTML_H4.png
+share/Amaya/resources/icons/16x16/XHTML_H5.png
+share/Amaya/resources/icons/16x16/XHTML_H6.png
 share/Amaya/resources/icons/16x16/XHTML_I.png
 share/Amaya/resources/icons/16x16/XHTML_Image.png
 share/Amaya/resources/icons/16x16/XHTML_Link.png
 share/Amaya/resources/icons/16x16/XHTML_Num.png
+share/Amaya/resources/icons/16x16/XHTML_P.png
 share/Amaya/resources/icons/16x16/XHTML_T.png
 share/Amaya/resources/icons/16x16/XHTML_Table.png
 share/Amaya/resources/icons/16x16/XHTML_Target.png
 share/Amaya/resources/icons/16x16/XHTML_br.png
+share/Amaya/resources/icons/16x16/XHTML_check.png
+share/Amaya/resources/icons/16x16/XHTML_date.png
+share/Amaya/resources/icons/16x16/XHTML_del.png
 share/Amaya/resources/icons/16x16/XHTML_hr.png
+share/Amaya/resources/icons/16x16/XHTML_ins.png
+share/Amaya/resources/icons/16x16/XHTML_menu.png
+share/Amaya/resources/icons/16x16/XHTML_object.png
 share/Amaya/resources/icons/16x16/XHTML_quote.png
+share/Amaya/resources/icons/16x16/XHTML_radio.png
+share/Amaya/resources/icons/16x16/XHTML_sub.png
+share/Amaya/resources/icons/16x16/XHTML_submit.png
+share/Amaya/resources/icons/16x16/XHTML_sup.png
+share/Amaya/resources/icons/16x16/XHTML_text.png
 share/Amaya/resources/icons/16x16/about.png
 share/Amaya/resources/icons/16x16/append.png
 share/Amaya/resources/icons/16x16/back.png
+share/Amaya/resources/icons/16x16/border.png
 share/Amaya/resources/icons/16x16/border_bottom.png
 share/Amaya/resources/icons/16x16/border_left.png
 share/Amaya/resources/icons/16x16/border_right.png
 share/Amaya/resources/icons/16x16/border_top.png
 share/Amaya/resources/icons/16x16/cancel.png
+share/Amaya/resources/icons/16x16/center_image.png
 share/Amaya/resources/icons/16x16/char.png
 share/Amaya/resources/icons/16x16/circle.png
-share/Amaya/resources/icons/16x16/close_tab.png
 share/Amaya/resources/icons/16x16/colorize.png
 share/Amaya/resources/icons/16x16/copy.png
+share/Amaya/resources/icons/16x16/css.png
 share/Amaya/resources/icons/16x16/cut.png
-share/Amaya/resources/icons/16x16/default.png
-share/Amaya/resources/icons/16x16/document_annot.gif
 share/Amaya/resources/icons/16x16/document_annot.png
-share/Amaya/resources/icons/16x16/document_bookmark.gif
 share/Amaya/resources/icons/16x16/document_bookmark.png
-share/Amaya/resources/icons/16x16/document_css.gif
 share/Amaya/resources/icons/16x16/document_css.png
-share/Amaya/resources/icons/16x16/document_default.gif
 share/Amaya/resources/icons/16x16/document_default.png
-share/Amaya/resources/icons/16x16/document_html.gif
 share/Amaya/resources/icons/16x16/document_html.png
-share/Amaya/resources/icons/16x16/document_image.gif
 share/Amaya/resources/icons/16x16/document_image.png
-share/Amaya/resources/icons/16x16/document_info.png
-share/Amaya/resources/icons/16x16/document_library.gif
 share/Amaya/resources/icons/16x16/document_library.png
-share/Amaya/resources/icons/16x16/document_log.gif
 share/Amaya/resources/icons/16x16/document_log.png
-share/Amaya/resources/icons/16x16/document_math.gif
 share/Amaya/resources/icons/16x16/document_math.png
-share/Amaya/resources/icons/16x16/document_source.gif
 share/Amaya/resources/icons/16x16/document_source.png
-share/Amaya/resources/icons/16x16/document_svg.gif
 share/Amaya/resources/icons/16x16/document_svg.png
-share/Amaya/resources/icons/16x16/document_text.gif
 share/Amaya/resources/icons/16x16/document_text.png
-share/Amaya/resources/icons/16x16/document_xml.gif
 share/Amaya/resources/icons/16x16/document_xml.png
-share/Amaya/resources/icons/16x16/dummy.gif
+share/Amaya/resources/icons/16x16/down.png
 share/Amaya/resources/icons/16x16/dummy.ico
 share/Amaya/resources/icons/16x16/dummy.png
+share/Amaya/resources/icons/16x16/editadd.png
 share/Amaya/resources/icons/16x16/editdelete.png
 share/Amaya/resources/icons/16x16/error.png
-share/Amaya/resources/icons/16x16/exit.png
 share/Amaya/resources/icons/16x16/find.png
-share/Amaya/resources/icons/16x16/format_center.png
-share/Amaya/resources/icons/16x16/format_justify.png
-share/Amaya/resources/icons/16x16/format_left.png
-share/Amaya/resources/icons/16x16/format_right.png
 share/Amaya/resources/icons/16x16/forward.png
-share/Amaya/resources/icons/16x16/fullscreen.png
 share/Amaya/resources/icons/16x16/home.png
+share/Amaya/resources/icons/16x16/inline_image.png
 share/Amaya/resources/icons/16x16/insert.png
 share/Amaya/resources/icons/16x16/insert_table_col_after.png
 share/Amaya/resources/icons/16x16/insert_table_col_before.png
@@ -1242,7 +814,9 @@ share/Amaya/resources/icons/16x16/insert_table_row_after.png
 share/Amaya/resources/icons/16x16/insert_table_row_before.png
 share/Amaya/resources/icons/16x16/ledgreen.png
 share/Amaya/resources/icons/16x16/ledred.png
+share/Amaya/resources/icons/16x16/left_image.png
 share/Amaya/resources/icons/16x16/logo.png
+share/Amaya/resources/icons/16x16/new.png
 share/Amaya/resources/icons/16x16/ok.png
 share/Amaya/resources/icons/16x16/open.png
 share/Amaya/resources/icons/16x16/paste.png
@@ -1253,126 +827,46 @@ share/Amaya/resources/icons/16x16/rectangle.png
 share/Amaya/resources/icons/16x16/redo.png
 share/Amaya/resources/icons/16x16/refresh.png
 share/Amaya/resources/icons/16x16/reload.png
+share/Amaya/resources/icons/16x16/right_image.png
 share/Amaya/resources/icons/16x16/save.png
-share/Amaya/resources/icons/16x16/saveas.png
-share/Amaya/resources/icons/16x16/setup_and_print.png
+share/Amaya/resources/icons/16x16/save_all.png
 share/Amaya/resources/icons/16x16/spellcheck.png
 share/Amaya/resources/icons/16x16/split_horizontaly.png
 share/Amaya/resources/icons/16x16/split_verticaly.png
 share/Amaya/resources/icons/16x16/stop.png
-share/Amaya/resources/icons/16x16/sub.png
-share/Amaya/resources/icons/16x16/super.png
-share/Amaya/resources/icons/16x16/synchronize.png
+share/Amaya/resources/icons/16x16/tableaux.png
 share/Amaya/resources/icons/16x16/trash.png
 share/Amaya/resources/icons/16x16/undo.png
-share/Amaya/resources/icons/16x16/zoom_minus.png
-share/Amaya/resources/icons/16x16/zoom_plus.png
-share/Amaya/resources/icons/22x22/BG_norepeat.png
-share/Amaya/resources/icons/22x22/BG_repeat.png
-share/Amaya/resources/icons/22x22/BG_repeat_x.png
-share/Amaya/resources/icons/22x22/BG_repeat_y.png
-share/Amaya/resources/icons/22x22/MATHML_Bmath.png
-share/Amaya/resources/icons/22x22/MATHML_F_divers.png
-share/Amaya/resources/icons/22x22/MATHML_F_fleches.png
-share/Amaya/resources/icons/22x22/MATHML_F_greek.png
-share/Amaya/resources/icons/22x22/MATHML_F_greek_maj.png
-share/Amaya/resources/icons/22x22/MATHML_F_maths.png
-share/Amaya/resources/icons/22x22/MATHML_F_operateurs.png
-share/Amaya/resources/icons/22x22/MATHML_F_relations_binaires.png
-share/Amaya/resources/icons/22x22/MATHML_F_relations_negation.png
-share/Amaya/resources/icons/22x22/MATHML_fence.png
-share/Amaya/resources/icons/22x22/MATHML_frac.png
-share/Amaya/resources/icons/22x22/MATHML_greek.png
-share/Amaya/resources/icons/22x22/MATHML_insert.png
-share/Amaya/resources/icons/22x22/MATHML_matrix.png
-share/Amaya/resources/icons/22x22/MATHML_mscript.png
-share/Amaya/resources/icons/22x22/MATHML_over.png
-share/Amaya/resources/icons/22x22/MATHML_overunder.png
-share/Amaya/resources/icons/22x22/MATHML_root.png
-share/Amaya/resources/icons/22x22/MATHML_sqrt.png
-share/Amaya/resources/icons/22x22/MATHML_sub.png
-share/Amaya/resources/icons/22x22/MATHML_subsup.png
-share/Amaya/resources/icons/22x22/MATHML_sup.png
-share/Amaya/resources/icons/22x22/MATHML_under.png
-share/Amaya/resources/icons/22x22/XHTML_B.png
-share/Amaya/resources/icons/22x22/XHTML_Bullet.png
-share/Amaya/resources/icons/22x22/XHTML_Comment.png
-share/Amaya/resources/icons/22x22/XHTML_DL.png
-share/Amaya/resources/icons/22x22/XHTML_DelTarget.png
-share/Amaya/resources/icons/22x22/XHTML_H1.png
-share/Amaya/resources/icons/22x22/XHTML_H2.png
-share/Amaya/resources/icons/22x22/XHTML_H3.png
-share/Amaya/resources/icons/22x22/XHTML_I.png
-share/Amaya/resources/icons/22x22/XHTML_Image.png
-share/Amaya/resources/icons/22x22/XHTML_Link.png
-share/Amaya/resources/icons/22x22/XHTML_Num.png
-share/Amaya/resources/icons/22x22/XHTML_T.png
-share/Amaya/resources/icons/22x22/XHTML_Table.png
-share/Amaya/resources/icons/22x22/XHTML_Target.png
-share/Amaya/resources/icons/22x22/XHTML_br.png
-share/Amaya/resources/icons/22x22/XHTML_hr.png
-share/Amaya/resources/icons/22x22/XHTML_quote.png
-share/Amaya/resources/icons/22x22/about.png
+share/Amaya/resources/icons/16x16/up.png
 share/Amaya/resources/icons/22x22/back.png
-share/Amaya/resources/icons/22x22/border_bottom.png
-share/Amaya/resources/icons/22x22/border_left.png
-share/Amaya/resources/icons/22x22/border_right.png
-share/Amaya/resources/icons/22x22/border_top.png
-share/Amaya/resources/icons/22x22/cancel.png
-share/Amaya/resources/icons/22x22/circle.png
-share/Amaya/resources/icons/22x22/close_tab.png
-share/Amaya/resources/icons/22x22/colorize.png
 share/Amaya/resources/icons/22x22/copy.png
+share/Amaya/resources/icons/22x22/css.png
 share/Amaya/resources/icons/22x22/cut.png
-share/Amaya/resources/icons/22x22/document_info.png
-share/Amaya/resources/icons/22x22/dummy.gif
-share/Amaya/resources/icons/22x22/dummy.ico
-share/Amaya/resources/icons/22x22/dummy.png
-share/Amaya/resources/icons/22x22/editdelete.png
-share/Amaya/resources/icons/22x22/exit.png
 share/Amaya/resources/icons/22x22/find.png
-share/Amaya/resources/icons/22x22/format_center.png
-share/Amaya/resources/icons/22x22/format_justify.png
-share/Amaya/resources/icons/22x22/format_left.png
-share/Amaya/resources/icons/22x22/format_right.png
 share/Amaya/resources/icons/22x22/forward.png
-share/Amaya/resources/icons/22x22/fullscreen.png
 share/Amaya/resources/icons/22x22/home.png
-share/Amaya/resources/icons/22x22/insert.png
-share/Amaya/resources/icons/22x22/insert_table_col_after.png
-share/Amaya/resources/icons/22x22/insert_table_col_before.png
-share/Amaya/resources/icons/22x22/insert_table_row_after.png
-share/Amaya/resources/icons/22x22/insert_table_row_before.png
-share/Amaya/resources/icons/22x22/ledgreen.png
-share/Amaya/resources/icons/22x22/ledred.png
 share/Amaya/resources/icons/22x22/logo.png
-share/Amaya/resources/icons/22x22/ok.png
+share/Amaya/resources/icons/22x22/new.png
 share/Amaya/resources/icons/22x22/open.png
 share/Amaya/resources/icons/22x22/paste.png
-share/Amaya/resources/icons/22x22/polygon.png
-share/Amaya/resources/icons/22x22/preferences.png
 share/Amaya/resources/icons/22x22/print.png
-share/Amaya/resources/icons/22x22/rectangle.png
 share/Amaya/resources/icons/22x22/redo.png
 share/Amaya/resources/icons/22x22/reload.png
 share/Amaya/resources/icons/22x22/save.png
-share/Amaya/resources/icons/22x22/saveas.png
-share/Amaya/resources/icons/22x22/setup_and_print.png
+share/Amaya/resources/icons/22x22/save_all.png
 share/Amaya/resources/icons/22x22/spellcheck.png
-share/Amaya/resources/icons/22x22/split_horizontaly.png
-share/Amaya/resources/icons/22x22/split_verticaly.png
 share/Amaya/resources/icons/22x22/stop.png
-share/Amaya/resources/icons/22x22/sub.png
-share/Amaya/resources/icons/22x22/super.png
-share/Amaya/resources/icons/22x22/synchronize.png
-share/Amaya/resources/icons/22x22/trash.png
 share/Amaya/resources/icons/22x22/undo.png
-share/Amaya/resources/icons/22x22/zoom_minus.png
-share/Amaya/resources/icons/22x22/zoom_plus.png
-share/Amaya/resources/icons/misc/black_white.png
+share/Amaya/resources/icons/22x22/view_min.png
+share/Amaya/resources/icons/22x22/view_plus.png
+share/Amaya/resources/icons/misc/MATHML_integral_contour.png
+share/Amaya/resources/icons/misc/MATHML_integral_number.png
+share/Amaya/resources/icons/misc/MATHML_integral_type.png
+share/Amaya/resources/icons/misc/MATHML_operator0.png
+share/Amaya/resources/icons/misc/MATHML_operator1.png
+share/Amaya/resources/icons/misc/MATHML_operator2.png
 share/Amaya/resources/icons/misc/detach.png
 share/Amaya/resources/icons/misc/detach_floating.png
-share/Amaya/resources/icons/misc/dummy.gif
 share/Amaya/resources/icons/misc/dummy.ico
 share/Amaya/resources/icons/misc/dummy.png
 share/Amaya/resources/icons/misc/empty.png
@@ -1380,81 +874,65 @@ share/Amaya/resources/icons/misc/expand_off.png
 share/Amaya/resources/icons/misc/expand_on.png
 share/Amaya/resources/icons/misc/left.png
 share/Amaya/resources/icons/misc/logo.ico
+share/Amaya/resources/icons/misc/logo.png
 share/Amaya/resources/icons/misc/right.png
-share/Amaya/resources/icons/misc/switch_colors.png
 share/Amaya/resources/icons/misc/up.png
 share/Amaya/resources/xrc/AuthentDlgWX.xrc
-share/Amaya/resources/xrc/BgImageDlgWX.xrc
 share/Amaya/resources/xrc/CheckedListDlgWX.xrc
 share/Amaya/resources/xrc/ConfirmCloseTab.xrc
 share/Amaya/resources/xrc/CreateTableDlgWX.xrc
 share/Amaya/resources/xrc/DocInfoDlgWX.xrc
-share/Amaya/resources/xrc/EnumListDlgWX.xrc
+share/Amaya/resources/xrc/EmailDlg.xrc
+share/Amaya/resources/xrc/FontDlgWX.xrc
 share/Amaya/resources/xrc/HRefDlgWX.xrc
 share/Amaya/resources/xrc/ImageDlgWX.xrc
+share/Amaya/resources/xrc/ImageDlgWX_new.xrc
 share/Amaya/resources/xrc/InitConfirmDlgWX.xrc
 share/Amaya/resources/xrc/ListDlgWX.xrc
 share/Amaya/resources/xrc/ListEditDlgWX.xrc
-share/Amaya/resources/xrc/NewTemplateDocDlgWX.xrc
-share/Amaya/resources/xrc/NumDlgWX.xrc
+share/Amaya/resources/xrc/MakeIdDlgWX.xrc
 share/Amaya/resources/xrc/ObjectDlgWX.xrc
 share/Amaya/resources/xrc/OpenDocDlgWX.xrc
 share/Amaya/resources/xrc/Panel.xrc
 share/Amaya/resources/xrc/Panel_ApplyClass.xrc
 share/Amaya/resources/xrc/Panel_Attribute.xrc
-share/Amaya/resources/xrc/Panel_CharStyle.xrc
-share/Amaya/resources/xrc/Panel_Colors.xrc
-share/Amaya/resources/xrc/Panel_Format.xrc
+share/Amaya/resources/xrc/Panel_Explorer.xrc
 share/Amaya/resources/xrc/Panel_MathML.xrc
-share/Amaya/resources/xrc/Panel_SpeChar.xrc
+share/Amaya/resources/xrc/Panel_Style.xrc
+share/Amaya/resources/xrc/Panel_StyleList.xrc
 share/Amaya/resources/xrc/Panel_XHTML.xrc
 share/Amaya/resources/xrc/Panel_XML.xrc
 share/Amaya/resources/xrc/PreferenceDlgWX.xrc
 share/Amaya/resources/xrc/PrintDlgWX.xrc
 share/Amaya/resources/xrc/SaveAsDlgWX.xrc
 share/Amaya/resources/xrc/SearchDlgWX.xrc
+share/Amaya/resources/xrc/SelectFenceAttributesDlgWX.xrc
+share/Amaya/resources/xrc/SelectIntegralDlgWX.xrc
+share/Amaya/resources/xrc/SelectOperatorDlgWX.xrc
+share/Amaya/resources/xrc/SendByMailDlgWX.xrc
 share/Amaya/resources/xrc/SpellCheckDlgWX.xrc
 share/Amaya/resources/xrc/StyleDlgWX.xrc
-share/Amaya/resources/xrc/TextDlgWX.xrc
+share/Amaya/resources/xrc/TableDlgWX.xrc
 share/Amaya/resources/xrc/TitleDlgWX.xrc
 share/Amaya/resources/xrc/Toolbar.xrc
+share/Amaya/resources/xrc/Toolbar_mac.xrc
 share/Amaya/resources/xrc/WinPrintDlgWX.xrc
-${PLIST.desktop}share/applications/amaya-8.8.1.desktop
-${PLIST.desktop}share/pixmaps/amaya-8.8.1.png
+@comment These no longer seem to exist, but I might be wrong.
+@comment ${PLIST.desktop}share/applications/amaya-8.8.1.desktop
+@comment ${PLIST.desktop}share/pixmaps/amaya-8.8.1.png
+share/Amaya/wx/bin/amaya
+share/Amaya/wx/bin/amaya_bin
+share/Amaya/wx/bin/print
+@dirrm share/Amaya/wx/bin
+@dirrm share/Amaya/wx
 @dirrm share/Amaya/resources/xrc
 @dirrm share/Amaya/resources/icons/misc
 @dirrm share/Amaya/resources/icons/22x22
 @dirrm share/Amaya/resources/icons/16x16
 @dirrm share/Amaya/resources/icons
 @dirrm share/Amaya/resources
-@dirrm share/Amaya/gtk/bin
-@dirrm share/Amaya/gtk
 @comment in REQD_DIRS: @dirrm share/Amaya/fonts
 @dirrm share/Amaya/doc/images
-@dirrm share/Amaya/doc/html/viewing
-@dirrm share/Amaya/doc/html/using_xml
-@dirrm share/Amaya/doc/html/using_the_makebook_function
-@dirrm share/Amaya/doc/html/using_image_maps
-@dirrm share/Amaya/doc/html/using_graphics
-@dirrm share/Amaya/doc/html/style_sheets
-@dirrm share/Amaya/doc/html/spell_checking
-@dirrm share/Amaya/doc/html/selecting
-@dirrm share/Amaya/doc/html/searching_and_replacing_text
-@dirrm share/Amaya/doc/html/saving_and_publishing_documents
-@dirrm share/Amaya/doc/html/printing
-@dirrm share/Amaya/doc/html/linking
-@dirrm share/Amaya/doc/html/elements
-@dirrm share/Amaya/doc/html/editing_tables
-@dirrm share/Amaya/doc/html/editing_mathematics
-@dirrm share/Amaya/doc/html/editing_iso-latin-1_characters
-@dirrm share/Amaya/doc/html/editing_documents
-@dirrm share/Amaya/doc/html/editing_attributes
-@dirrm share/Amaya/doc/html/configuring_amaya
-@dirrm share/Amaya/doc/html/browsing
-@dirrm share/Amaya/doc/html/attaching_annotations
-@dirrm share/Amaya/doc/html/accessibility_in_amaya
-@dirrm share/Amaya/doc/html/HTML-elements
-@dirrm share/Amaya/doc/html
 @dirrm share/Amaya/doc/WX/HTML-elements
 @dirrm share/Amaya/doc/WX
 @dirrm share/Amaya/doc
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 0b24f808284..0e1bec0f2d1 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,14 +1,19 @@
-$NetBSD: distinfo,v 1.18 2006/10/07 19:16:57 schwarz Exp $
+$NetBSD: distinfo,v 1.19 2008/09/11 04:22:50 dholland Exp $
 
-SHA1 (amaya-fullsrc-9.2.1.tgz) = 1736bc9a7ad997b128fa435bc99594f9f4b60b05
-RMD160 (amaya-fullsrc-9.2.1.tgz) = 74b8ce30c6c85c05b0ab94b6f950f214cbe0f512
-Size (amaya-fullsrc-9.2.1.tgz) = 23112083 bytes
-SHA1 (patch-aa) = daa3b4ad4e00d6e6ca855bb638cc8ec8d2565791
-SHA1 (patch-ab) = 942957562f8b607227812d8b377b4be61685af32
-SHA1 (patch-ac) = 5d9df3fc894f06c981b26d82f216ff223a821954
-SHA1 (patch-ad) = 405499e719944030e131c0815e4472efeed5df64
-SHA1 (patch-ae) = e479ca874e3c2f33545e692997743f85956d9aa6
-SHA1 (patch-af) = f8a60d26788fddd66d65331105e6bfd5fe2873b6
-SHA1 (patch-ag) = fc437e97392f91d26309da3b977add6485b9656c
-SHA1 (patch-ah) = a0ea86df77bc1afa1db9e4f012f25d5c84c2b093
-SHA1 (patch-ai) = cea93adfb159c1a3ddd603d0052cb7a8e46d0365
+SHA1 (amaya-fullsrc-10.0.1.tgz) = a2dcceedaa2c0256f04aaa86e3dc319d4ff26ade
+RMD160 (amaya-fullsrc-10.0.1.tgz) = d1a20a03a18ef3b06cf9dcbab907fb412de0ad6b
+Size (amaya-fullsrc-10.0.1.tgz) = 28608680 bytes
+SHA1 (patch-aa) = 9e4eff617bc0304aa85e711c264ca78ab9578fce
+SHA1 (patch-ab) = 2a745ed9e857482cc0383d082050b02ea3a3333d
+SHA1 (patch-ac) = 6fa5063a186ac8bfbb8763a7914d57a552b4d39c
+SHA1 (patch-ae) = d8748493ab506c8a47c9c57a7c8f9f8d30375940
+SHA1 (patch-ag) = ad4caeca06a5fb3769cfd625d63c1b06ec7f4a84
+SHA1 (patch-ai) = 0d1c9d5f2dc4208fa93adc9abc9b939073719c1e
+SHA1 (patch-aj) = 747e2c3dc8636f3c1f9b51a8533ceee1d13804fe
+SHA1 (patch-ak) = 493e1ca8849571d582201fd0c7f15189c179599a
+SHA1 (patch-al) = 172ab5106ecdc8fac825bcca8e57202010c980a3
+SHA1 (patch-am) = 152800baf4b750dbfe1bfa731313222b471d28ab
+SHA1 (patch-an) = 5d2e98d7046394960d7c172ed7d491ecb0f0992e
+SHA1 (patch-ao) = 34f6b0fe289d966c2a7553799be8bf59426091b4
+SHA1 (patch-ap) = d4ba3426bbeffc5f9f8f30002d4bb75e0c3816c6
+SHA1 (patch-aq) = 3885a77d86fa1c3892a6aab7c9538d119951cd4a
diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
index 722821fd386..4a367430d5c 100644
--- a/www/amaya/patches/patch-aa
+++ b/www/amaya/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2003/03/22 06:46:20 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2008/09/11 04:22:50 dholland Exp $
 
---- ../config.h.in.orig	Thu Jan 30 10:40:15 2003
-+++ ../config.h.in
+--- ../config.h.in~	2003-01-07 09:33:07.000000000 -0500
++++ ../config.h.in	2008-09-08 04:37:57.000000000 -0400
 @@ -321,6 +321,9 @@
  /* Define if you have the <unixlib.h> header file.  */
  #undef HAVE_UNIXLIB_H
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
index 031fb048750..b2905920546 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2005/07/14 08:06:58 adam Exp $
+$NetBSD: patch-ab,v 1.13 2008/09/11 04:22:50 dholland Exp $
 
---- ../configure.orig	2005-07-12 13:50:46.000000000 +0000
-+++ ../configure
-@@ -4944,7 +4944,7 @@ done
+--- ../configure.orig	2008-01-31 09:07:46.000000000 -0500
++++ ../configure	2008-09-09 20:44:33.000000000 -0400
+@@ -4939,7 +4939,7 @@ done
  
  
  
@@ -11,12 +11,37 @@ $NetBSD: patch-ab,v 1.12 2005/07/14 08:06:58 adam Exp $
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -13927,8 +13927,6 @@ if test "$with_debug" = "yes" ; then
+@@ -13574,11 +13574,11 @@ echo "$as_me: error: wxWidgets library s
+     #   --enable-unicode        compile wxString with Unicode support
+     #   --with-gtk              use GTK+
+     #   --with-opengl           use OpenGL (or Mesa)
+-    WXCONFIGURE_OPTION="--build=$build_alias --host=$host_alias --target=$target_alias --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared  --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin  --with-libxpm=builtin $WXCONFIGURE_TUNNING_OPTION"
++    WXCONFIGURE_OPTION="--build=$build_alias --host=$host_alias --target=$target_alias --with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --disable-shared  --with-libpng=sys --with-libjpeg=sys --with-libtiff=sys  --with-libxpm=sys --disable-precomp-headers $WXCONFIGURE_TUNNING_OPTION"
+   fi
+   if test "$AMAYAOS" = "MACOSX" ; then
+     # MACOSX
+-    WXCONFIGURE_OPTION="--with-opengl --disable-shared --disable-tga --enable-unicode --with-libpng=builtin --with-libjpeg=builtin"
++    WXCONFIGURE_OPTION="--with-opengl --disable-shared --disable-tga --enable-unicode --with-libpng=sys --with-libjpeg=sys --with-libtiff=sys --with-libxpm=sys"
+   fi
+   if test $with_wxdebug = yes ; then
+     WXCONFIGURE_OPTION="$WXCONFIGURE_OPTION --enable-debug"
+@@ -13696,8 +13696,8 @@ if test "$with_debug" = "yes" ; then
    CXXFLAGS="-g"
  else
    with_debug="no"
 -  CFLAGS="-O2"
 -  CXXFLAGS="-O2"
++  #CFLAGS="-O2"
++  #CXXFLAGS="-O2"
  fi
  
  if test "${CC}" = "gcc" ; then
+@@ -14510,7 +14510,7 @@ if test "${VPATHOPT}" = "" ; then
+ 	VPATHOPT="VPATH"
+ fi
+ 
+-AMAYA_INSTALLDIR="Amaya"
++AMAYA_INSTALLDIR="share/Amaya"
+ 
+ 
+ 
diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac
index 125ba90739e..c3b18561282 100644
--- a/www/amaya/patches/patch-ac
+++ b/www/amaya/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.10 2004/05/13 03:47:29 xtraeme Exp $
+$NetBSD: patch-ac,v 1.11 2008/09/11 04:22:50 dholland Exp $
 
---- ../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
+--- ../thotlib/include/ustring.h~	2007-10-18 03:40:32.000000000 -0400
++++ ../thotlib/include/ustring.h	2008-09-08 04:46:10.000000000 -0400
 @@ -6,6 +6,11 @@
  #include <windows.h>
  #endif /* _WINGUI */
  
-+#include "config.h" 
-+#ifdef HAVE_WCHAR_H 
-+#include <wchar.h> 
-+#endif 
++#include "config.h"
++#ifdef HAVE_WCHAR_H
++#include <wchar.h>
++#endif
 +
  #ifdef _WINDOWS
  #define strncasecmp _strnicmp
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
deleted file mode 100644
index 1052fc776bf..00000000000
--- a/www/amaya/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2005/07/12 14:34:22 adam Exp $
-
---- ../Options.in.orig	2005-07-12 15:10:31.000000000 +0000
-+++ ../Options.in
-@@ -47,7 +47,7 @@ EXPAT_INCLUDES=
- EXPAT_LIBRARIES=
- EXPAT_OPTIONS=-DXML_DTD -DXML_NS
- 
--AMAYA_INSTALLDIR=Amaya-@APP_VER@
-+AMAYA_INSTALLDIR=share/Amaya
- 
- # used to identify amaya gui/os when 'make install' is called.
- AMAYAGUI=@AMAYAGUI@
diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae
index 1ac97dde403..2718a6d2e70 100644
--- a/www/amaya/patches/patch-ae
+++ b/www/amaya/patches/patch-ae
@@ -1,22 +1,13 @@
-$NetBSD: patch-ae,v 1.9 2006/04/20 22:54:53 wiz Exp $
+$NetBSD: patch-ae,v 1.10 2008/09/11 04:22:50 dholland Exp $
 
---- ../thotlib/image/pnghandler.c.orig	2005-05-31 11:50:35.000000000 +0200
-+++ ../thotlib/image/pnghandler.c
-@@ -217,8 +217,6 @@ static unsigned char *ReadPng (FILE *pfF
-     png_read_end(png_ptr, NULL);
-     TtaFreeMemory (ppbRowPointers);
-     ppbRowPointers = NULL; 
--    /* clean up after the read, and free any memory allocated */
--    png_read_destroy (png_ptr, info_ptr, (png_info*) NULL);
-     /* Free all of the memory associated with the png_ptr and info_ptr */
-     png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
-     return pixels;
-@@ -586,8 +584,6 @@ static unsigned char *ReadPng (FILE *inf
-       *bg = -1;
+--- ../thotlib/image/pnghandler.c~	2007-03-02 05:33:21.000000000 -0500
++++ ../thotlib/image/pnghandler.c	2008-09-08 04:47:23.000000000 -0400
+@@ -587,7 +587,7 @@ static unsigned char *ReadPng (FILE *inf
      }
  
--  /* clean up after the read, and free any memory allocated */
+   /* clean up after the read, and free any memory allocated */
 -  png_read_destroy (png_ptr, info_ptr, (png_info*) NULL);
++  //png_read_destroy (png_ptr, info_ptr, (png_info*) NULL);
    /* Free all of the memory associated with the png_ptr and info_ptr */
    png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
    /* free the structures */
diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af
deleted file mode 100644
index f4db67257a1..00000000000
--- a/www/amaya/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.7 2006/10/07 19:16:57 schwarz Exp $
-
---- ../thotlib/view/tesse.c.orig	2006-10-06 21:36:50.000000000 +0200
-+++ ../thotlib/view/tesse.c	2006-10-06 21:37:08.000000000 +0200
-@@ -11,7 +11,9 @@
-  */
- 
- #include <stdio.h>
-+#ifndef _MACOS
- #include <malloc.h>
-+#endif
- #include <string.h>
- 
- #ifdef _WINGUI
diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag
index d486b8d502d..a499fb327d3 100644
--- a/www/amaya/patches/patch-ag
+++ b/www/amaya/patches/patch-ag
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.6 2006/10/07 19:16:57 schwarz Exp $
+$NetBSD: patch-ag,v 1.7 2008/09/11 04:22:50 dholland Exp $
 
---- ../tools/cextract-1.7/xtract.h.orig	2006-10-07 20:26:18.000000000 +0200
-+++ ../tools/cextract-1.7/xtract.h	2006-10-07 20:29:52.000000000 +0200
-@@ -15,7 +15,8 @@
+--- ../tools/cextract-1.7/xtract.h.orig	2005-05-30 10:21:42.000000000 -0400
++++ ../tools/cextract-1.7/xtract.h	2008-09-08 05:20:38.000000000 -0400
+@@ -15,9 +15,7 @@
  #include <stdio.h>
  #include <ctype.h>
  #include <time.h>
 -#ifdef _POSIX_SOURCE
-+#if defined(_POSIX_SOURCE) || defined(__APPLE__)
-+/* Darwin defines malloc() in stdlib.h. */
  #include <stdlib.h>
- #endif /* _POSIX_SOURCE_ */
+-#endif /* _POSIX_SOURCE_ */
  #if __STDC__ 
+ #ifndef VMS
+ #include <unistd.h>
diff --git a/www/amaya/patches/patch-ah b/www/amaya/patches/patch-ah
deleted file mode 100644
index ed7f70eddf9..00000000000
--- a/www/amaya/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2005/07/12 14:34:22 adam Exp $
-
---- ../thotlib/presentation/presvariables.c.orig	2005-06-07 13:37:13.000000000 +0000
-+++ ../thotlib/presentation/presvariables.c
-@@ -1109,8 +1109,8 @@ ThotBool NewVariable (int varNum, PtrSSc
- {
-    int                 f, l;
-    int                 i;
--   long                tod;
--   long               *pt;
-+   time_t                tod;
-+   time_t               *pt;
-    struct tm          *ptm;
-    PtrTextBuffer       isOld, isNew;
-    PtrAttribute        pA;
diff --git a/www/amaya/patches/patch-ai b/www/amaya/patches/patch-ai
index cd281c4ecd3..5c7807bd0f2 100644
--- a/www/amaya/patches/patch-ai
+++ b/www/amaya/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2006/10/07 19:16:57 schwarz Exp $
+$NetBSD: patch-ai,v 1.2 2008/09/11 04:22:50 dholland Exp $
 
---- ../amaya/Makefile.in.orig	2006-10-07 20:38:11.000000000 +0200
-+++ ../amaya/Makefile.in	2006-10-07 20:38:40.000000000 +0200
-@@ -615,7 +615,7 @@
- 	fi)
+--- ../batch/script_install_macosxbundle.in~	2007-03-29 09:24:04.000000000 -0400
++++ ../batch/script_install_macosxbundle.in	2008-09-08 04:50:37.000000000 -0400
+@@ -44,7 +44,7 @@ fi
+ $ECHO "-- Creating a MacOSX bundle for $AMAYA_INSTALLDIR into $PREFIX/Amaya.app --"
  
  # MACOSX bundelization
--	@(if test $(AMAYAOS) = "MACOSX" ; then \
-+	@(if test $(AMAYAOS) = "XXXXXX" ; then \
- 			$(RM) -r $(prefix)/Amaya.app ; \
- 			$(MKDIR) $(prefix)/Amaya.app ; \
- 			$(MKDIR) $(prefix)/Amaya.app/Contents ; \
+-if test $AMAYAOS = "MACOSX" ; then
++if test $AMAYAOS = "XXXXXX" ; then
+   $RM -r $PREFIX/Amaya.app
+   $MKDIR $PREFIX/Amaya.app
+   $MKDIR $PREFIX/Amaya.app/Contents
diff --git a/www/amaya/patches/patch-aj b/www/amaya/patches/patch-aj
new file mode 100644
index 00000000000..265221766b2
--- /dev/null
+++ b/www/amaya/patches/patch-aj
@@ -0,0 +1,208 @@
+$NetBSD: patch-aj,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../Makefile.in.orig	2007-12-06 08:09:56.000000000 -0500
++++ ../Makefile.in	2008-09-08 14:19:26.000000000 -0400
+@@ -37,44 +37,44 @@ force :
+ 
+ batch: rebuild force
+ 	@(if test -d batch ; then cd batch ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" ; fi)
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" ; fi) || exit 1
+ 
+ tools: rebuild force
+ 	@(if test -d tools ; then cd tools ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi)
++	  $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi) || exit 1
+ 
+ thotlib: rebuild force
+ 	@(if test -d thotlib ; then cd thotlib ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi)
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; fi) || exit 1
+ 
+ amaya_prog: rebuild force bin/str
+ 	@(if test -d amaya ; then cd amaya ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" amaya ; fi)
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" amaya ; fi) || exit 1
+ 
+ wxwidgets: rebuild force
+ 	@(if test -d "$(WX_BUILDDIR)" ; then cd "$(WX_BUILDDIR)" ; \
+-	  $(MAKE) ; fi)
++	  $(MAKE) ; fi) || exit 1
+ 
+ gl: rebuild force
+ 	@(if test -d "$(GL_BUILDDIR)" ; then cd "$(GL_BUILDDIR)" ; \
+-	  $(MAKE) ; fi)
++	  $(MAKE) ; fi) || exit 1
+ 
+ print_prog: rebuild force bin/str
+ 	@(if test -d thotlib ; then cd thotlib ; \
+-  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi)
++  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi) || exit 1
+ 
+ all : rebuild
+ 	@(for dir in $(EXTRA_SUBDIRS) $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" all || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ clean : rebuild
+ 	$(RM) libpng.a libz.a libjpeg.a
+ 	@(for dir in $(SUBDIRS) $(EXTRA_SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" clean ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" clean || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ reallyclean : clean
+ 	$(RM) config.cache config.h config.log config.status
+@@ -87,14 +87,14 @@ tempclean : 
+ install : rebuild
+ 	@(for dir in $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" install ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" install || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ uninstall : 
+ 	@(for dir in $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" uninstall ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" uninstall || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ update :
+ 	@(cd $(THOTDIR) ; cvs update -dP)
+@@ -105,26 +105,26 @@ commit :
+ 	@(cd $(THOTDIR) ; cvs commit)
+ 
+ tools/mkdep/mkdep :
+-	@(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" mkdep)
++	@(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" mkdep) || exit 1
+ 
+ depend depends : rebuild tools/mkdep/mkdep
+ 	@(for dir in $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" depend ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" depend || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ bin/cextract :
+-	@(cd tools/cextract-$(CEXTRACT_VER) ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" cextract)
++	@(cd tools/cextract-$(CEXTRACT_VER) ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" cextract) || exit 1
+ 
+ proto : rebuild bin/cextract
+ 	@(for dir in $(SUBDIRS) ;\
+ 	  do if test -d $$dir ; then cd $$dir ; \
+-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" proto ; \
+-	  cd .. ; fi ;done )
++	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" proto || exit 1; \
++	  cd .. ; fi ;done ) || exit 1
+ 
+ mkid : 
+ 	@(echo rebuilding $(THOTDIR)/ID reference file)
+-	@(cd $(THOTDIR); mkid --lang-map=makes/id-lang.map . classes/org/w3c/*)
++	@(cd $(THOTDIR); mkid --lang-map=makes/id-lang.map . classes/org/w3c/*) || exit 1
+ 
+ #
+ # Rules to rebuild the libWWW package
+@@ -150,11 +150,11 @@ AMAYA_LIBWWW_STANDARD_LIBS = \
+ 
+ libwww_config :
+ 	@(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \
+-	      $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; \
+-	  fi)
++	      $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; exit 1; \
++	  fi) || exit 1
+ 	@(if [ ! -d $(LIBWWW) ] ; then \
+ 		$(MKDIR) $(LIBWWW) ; \
+-          fi)
++          fi) || exit 1
+ #MKP: adding --with-dav
+ 	@(localdir=`pwd` ; libwwwdir="$$localdir/../../$(LIBWWW)" ; \
+ 	  cd $(LIBWWW) ; unset LANG; \
+@@ -170,7 +170,7 @@ libwww_config :
+ 		$(SED) "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \
+ 			wwwconf.h.orig > wwwconf.h ; \
+                 $(ECHO) "wwwconf.h patched !" ; \
+-	  fi)
++	  fi) || exit 1
+ 
+ libwww_make_module_md5 \
+ libmd5 : force
+@@ -178,7 +178,7 @@ libmd5 : force
+ 		 cd $(LIBWWW)/modules/md5 ; \
+ 		 $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
+ 		 CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
+-	        	    libmd5.la)
++	        	    libmd5.la) || exit 1
+ 
+ libwww_install_module_md5 : force
+ 		@(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \
+@@ -194,7 +194,7 @@ libexpat : force
+ 		  cd $(LIBWWW)/modules/expat/ ; \
+ 		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
+ 		  CPPFLAGS="$(CPPFLAGS)" \
+-	        	    )
++	        	    ) || exit 1
+ 
+ libwww_install_module_expat : force
+ 		@(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
+@@ -230,7 +230,7 @@ $(AMAYA_LIBWWW_STANDARD_LIBS) : force
+ 		  cd $(LIBWWW)/Library/src ; \
+ 		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
+ 		  CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
+-			     $$all_libs)
++			     $$all_libs) || exit 1
+ 
+ libwww_install_standard : force
+ 		@(for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
+@@ -299,7 +299,7 @@ redland_config: @MAKEREDLAND@ force
+ redland_make: @MAKEREDLAND@ force
+ 	@(cd $(REDLAND) ; \
+ 	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -DLIBRDF_INTERNAL=1"; \
+-	)
++	) || exit 1
+ 
+ redland: @MAKEREDLAND@ redland_config redland_make
+ 	@($(ECHO) "redland is installed")
+@@ -308,25 +308,25 @@ redland: @MAKEREDLAND@ redland_config re
+ # Rules to rebuild the libjpeg package
+ #
+ 
+-libjpeg libjpeg.a : force
+-	@($(RM) $(THOTDIR)/libjpeg/*.o)
+-	@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#libjpeg libjpeg.a : force
++#	@($(RM) $(THOTDIR)/libjpeg/*.o)
++#	@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
+ 
+ #
+ # Rules to rebuild the libpng package
+ #
+ 
+-libpng libpng.a : force
+-	@($(RM) $(THOTDIR)/libpng/*.o)
+-	@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#libpng libpng.a : force
++#	@($(RM) $(THOTDIR)/libpng/*.o)
++#	@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
+ 
+ #
+ # Rules to rebuild the libpng package
+ #
+ 
+-libz libz.a : force
+-	@($(RM) $(THOTDIR)/libpng/libz/*.o)
+-	@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#libz libz.a : force
++#	@($(RM) $(THOTDIR)/libpng/libz/*.o)
++#	@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c") || exit 1
+ 
+ #
+ # This section try to maintain the Makefile(s) up-to-date in
diff --git a/www/amaya/patches/patch-ak b/www/amaya/patches/patch-ak
new file mode 100644
index 00000000000..0dc0ef4ee68
--- /dev/null
+++ b/www/amaya/patches/patch-ak
@@ -0,0 +1,43 @@
+$NetBSD: patch-ak,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../amaya/Makefile.in.orig	2008-02-05 05:31:51.000000000 -0500
++++ ../amaya/Makefile.in	2008-09-08 15:33:36.000000000 -0400
+@@ -17,7 +17,7 @@ INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUD
+ LIBS	=  $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \
+ 	   @AMAYA_RAPTOR_LIBS@ \
+ 	   $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \
+-           -L../thotlib -L.. -lThotEditor \
++           ../thotlib/libThotEditor.a \
+           $(AMAYA_OPTION_EXTRA_LIBS) $(IMGLIBS) $(EXPAT_LIBRARIES) \
+ 	  $(AMAYA_LIBWWW_LIBS) \
+ 	  @LIBS@ $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \
+@@ -73,14 +73,14 @@ force :
+ ../thotlib/libThotEditor.a : force
+ 	@(cd ../thotlib ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" libThotEditor)
+ 
+-../libjpeg.a : @MAKEJPEG@ force
+-	@(cd ../libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#../libjpeg.a : @MAKEJPEG@ force
++#	@(cd ../libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+ 
+-../libpng.a : @MAKEPNG@ force
+-	@(cd ../libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#../libpng.a : @MAKEPNG@ force
++#	@(cd ../libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+ 
+-../libz.a : @MAKEPNG@ force
+-	@(cd ../libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
++#../libz.a : @MAKEPNG@ force
++#	@(cd ../libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+ 
+ ../tools/mkdep/mkdep : 
+ 	@(cd ../tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
+@@ -169,7 +169,7 @@ AMAYA_LIBS= ../thotlib/libThotEditor.a \
+             libCSS.a $(AMAYA_OPTION_LIBS) \
+              $(WX_LINKDEPS)
+ 
+-HTML2THOT_LIBS= -L../thotlib/ -lThotKernel -L.. -lz
++HTML2THOT_LIBS= ../thotlib/libThotKernel.a -lz
+ 
+ amaya_schemas : compHTML compHTMLP compHTMLT compTextFile  compTextFileP compTextFileT compXLink compXLinkP compXLinkT compXML compXMLP compXMLT compHTMLA compTextFileA compXLinkA compXMLA $(svg_schema) $(math_schema) $(annot_schema) compEDITORA $(template_schema)
+ 
diff --git a/www/amaya/patches/patch-al b/www/amaya/patches/patch-al
new file mode 100644
index 00000000000..afcdb2126a1
--- /dev/null
+++ b/www/amaya/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../tools/cextract-1.7/io.c~	2005-05-30 10:21:55.000000000 -0400
++++ ../tools/cextract-1.7/io.c	2008-09-08 05:30:58.000000000 -0400
+@@ -2224,7 +2224,7 @@ do_config ()
+ char *
+ mach_time ()
+ {
+-  long timeval;
++  time_t timeval;
+ 
+   timeval = time(0);
+   return(ctime(&timeval));
diff --git a/www/amaya/patches/patch-am b/www/amaya/patches/patch-am
new file mode 100644
index 00000000000..b8149b7f19f
--- /dev/null
+++ b/www/amaya/patches/patch-am
@@ -0,0 +1,30 @@
+$NetBSD: patch-am,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../thotlib/base/testcase.c~	2007-04-25 03:25:54.000000000 -0400
++++ ../thotlib/base/testcase.c	2008-09-08 05:34:11.000000000 -0400
+@@ -208,9 +208,9 @@ void TtaStopBenchmarkTimer( int bench_id
+   FILE *fp = g_benchmark_timer[bench_id].fp;
+   if (fp)
+     {
+-      fprintf (fp, "[%s] Stop timer\tElapsed time=%ld ms.\n",
++      fprintf (fp, "[%s] Stop timer\tElapsed time=%u ms.\n",
+ 	       g_benchmark_timer[bench_id].name,
+-	       (g_benchmark_timer[bench_id].time-g_benchmark_timer[bench_id].start_time)/(CLOCKS_PER_SEC/1000));
++	       (g_benchmark_timer[bench_id].time-g_benchmark_timer[bench_id].start_time)*1000/CLOCKS_PER_SEC);
+       TtaWriteClose(fp);
+     }
+ 
+@@ -236,10 +236,10 @@ void TtaSetBenchmarkMark( int bench_id, 
+   FILE *fp = g_benchmark_timer[bench_id].fp;
+   if (fp)
+     {
+-      fprintf (fp, "[%s] %s\tElapsed time=%ld ms\tDelta time=%ld ms.\n",
++      fprintf (fp, "[%s] %s\tElapsed time=%u ms\tDelta time=%u ms.\n",
+ 	       g_benchmark_timer[bench_id].name,
+ 	       mark_name,
+-	       (g_benchmark_timer[bench_id].time-g_benchmark_timer[bench_id].start_time)/(CLOCKS_PER_SEC/1000),
+-	       (g_benchmark_timer[bench_id].time-last_time)/(CLOCKS_PER_SEC/1000));
++	       (g_benchmark_timer[bench_id].time-g_benchmark_timer[bench_id].start_time)*1000/CLOCKS_PER_SEC,
++	       (g_benchmark_timer[bench_id].time-last_time)*1000/CLOCKS_PER_SEC);
+     }
+ }
diff --git a/www/amaya/patches/patch-an b/www/amaya/patches/patch-an
new file mode 100644
index 00000000000..ffa38395d3a
--- /dev/null
+++ b/www/amaya/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../thotlib/unicode/ustring.c~	2007-10-18 03:40:32.000000000 -0400
++++ ../thotlib/unicode/ustring.c	2008-09-08 05:37:01.000000000 -0400
+@@ -437,7 +437,7 @@ CHARSET TtaGetLocaleCharset ()
+   if (LocaleSystemCharset == UNSUPPORTED_CHARSET)
+     {
+       char *buffer;
+-      buffer = nl_langinfo(_NL_MESSAGES_CODESET);
++      buffer = nl_langinfo(CODESET);
+       if (buffer != NULL)
+         LocaleSystemCharset = TtaGetCharset(buffer);
+     }
diff --git a/www/amaya/patches/patch-ao b/www/amaya/patches/patch-ao
new file mode 100644
index 00000000000..17c5a04ebb2
--- /dev/null
+++ b/www/amaya/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../thotlib/base/structlist.c~	2008-01-21 06:24:18.000000000 -0500
++++ ../thotlib/base/structlist.c	2008-09-08 05:45:32.000000000 -0400
+@@ -577,7 +577,7 @@ static void WrTree (PtrElement pNode, in
+               switch (pAttr1->AttrType)
+                 {
+                 case AtNumAttr:
+-                  fprintf (fileDescriptor, "%d", pAttr->AeAttrValue);
++                  fprintf (fileDescriptor, "%lld", (long long) pAttr->AeAttrValue);
+                   break;
+                 case AtTextAttr:
+                   if (pAttr->AeAttrText)
diff --git a/www/amaya/patches/patch-ap b/www/amaya/patches/patch-ap
new file mode 100644
index 00000000000..4d3543350ed
--- /dev/null
+++ b/www/amaya/patches/patch-ap
@@ -0,0 +1,125 @@
+$NetBSD: patch-ap,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../../wxWidgets/configure.orig	2007-05-14 05:08:25.000000000 -0400
++++ ../../wxWidgets/configure	2008-09-08 06:27:09.000000000 -0400
+@@ -23470,43 +23470,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ SEARCH_INCLUDE="\
+-    /usr/local/include        \
+-                              \
+-    /usr/Motif-2.1/include    \
+-    /usr/Motif-1.2/include    \
+-    /usr/include/Motif1.2     \
+-                              \
+-    /usr/dt/include           \
+-    /usr/openwin/include      \
+-                              \
+-    /usr/include/Xm           \
+-                              \
+-    /usr/X11R6/include        \
+-    /usr/X11R6.4/include      \
+-    /usr/X11R5/include        \
+-    /usr/X11R4/include        \
+-                              \
+-    /usr/include/X11R6        \
+-    /usr/include/X11R5        \
+-    /usr/include/X11R4        \
+-                              \
+-    /usr/local/X11R6/include  \
+-    /usr/local/X11R5/include  \
+-    /usr/local/X11R4/include  \
+-                              \
+-    /usr/local/include/X11R6  \
+-    /usr/local/include/X11R5  \
+-    /usr/local/include/X11R4  \
+-                              \
+-    /usr/X11/include          \
+-    /usr/include/X11          \
+-    /usr/local/X11/include    \
+-    /usr/local/include/X11    \
+-                              \
+-    /usr/XFree86/include/X11  \
+-    /usr/pkg/include          \
+-                              \
+-    /usr/openwin/share/include"
++    ${BUILDLINK_DIR}/include  \
++"
+ 
+ echo "$as_me:$LINENO: checking for libraries directory" >&5
+ echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
+@@ -23596,16 +23561,16 @@ esac
+ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
+ echo "${ECHO_T}$wx_cv_std_libpath" >&6
+ 
+-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
++SEARCH_LIB="${BUILDLINK_DIR}/lib"
+ 
+ if test "$build" != "$host" -a "$GCC" = yes; then
+                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+         cross_root=`dirname $cross_root`
+         cross_root=`dirname $cross_root`
+ 
+-                        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+-        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+-        SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include"
++#                        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
++#        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
++#        SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include"
+ 
+                 if test -z "$PKG_CONFIG_PATH"; then
+             PKG_CONFIG_PATH="$cross_root/local/lib/pkgconfig:$cross_root/lib/pkgconfig"
+@@ -23615,7 +23580,7 @@ if test "$build" != "$host" -a "$GCC" = 
+                                 if test -z "$x_includes" -o "$x_includes" = NONE; then
+ 
+ ac_find_includes=
+-for ac_dir in $SEARCH_INCLUDE /usr/include;
++for ac_dir in $SEARCH_INCLUDE;
+   do
+     if test -f "$ac_dir/X11/Intrinsic.h"; then
+       ac_find_includes=$ac_dir
+@@ -30134,7 +30099,7 @@ echo "$as_me: error: Unicode configurati
+ echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6
+ 
+ ac_find_includes=
+-for ac_dir in $SEARCH_INCLUDE /usr/include;
++for ac_dir in $SEARCH_INCLUDE;
+   do
+     if test -f "$ac_dir/Xm/Xm.h"; then
+       ac_find_includes=$ac_dir
+@@ -31685,7 +31650,7 @@ echo "$as_me: WARNING: wxGLCanvas not im
+ echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6
+ 
+ ac_find_includes=
+-for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include;
++for ac_dir in $SEARCH_INCLUDE;
+   do
+     if test -f "$ac_dir/GL/gl.h"; then
+       ac_find_includes=$ac_dir
+@@ -31908,7 +31873,7 @@ if test $ac_cv_header_GL_glu_h = yes; th
+ echo $ECHO_N "checking for -lGL... $ECHO_C" >&6
+ 
+   ac_find_libraries=
+-  for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib;
++  for ac_dir in $SEARCH_LIB;
+   do
+     for ac_extension in a so sl dylib dll.a; do
+       if test -f "$ac_dir/libGL.$ac_extension"; then
+@@ -45541,7 +45506,7 @@ fi
+ 
+ if test "$wxUSE_MAC" = 1 ; then
+     if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
+-                        if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
++                        if test "x$wxUSE_UNIVERSAL_BINARY" = xyes; then
+             OSX_UNIV_OPTS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+         else
+                                     OSX_UNIV_OPTS=${wxUSE_UNIVERSAL_BINARY:+"-isysroot '$wxUSE_UNIVERSAL_BINARY'"}
+@@ -46566,7 +46531,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
+             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+         fi
+ 
+-        if test "x$GCC" == "xyes"; then
++        if test "x$GCC" = "xyes"; then
+             PIC_FLAG="-dynamic -fPIC"
+         fi
+         if test "x$XLCC" = "xyes"; then
diff --git a/www/amaya/patches/patch-aq b/www/amaya/patches/patch-aq
new file mode 100644
index 00000000000..25f36492dda
--- /dev/null
+++ b/www/amaya/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2008/09/11 04:22:50 dholland Exp $
+
+--- ../batch/Makefile.in~	2006-11-13 07:24:16.000000000 -0500
++++ ../batch/Makefile.in	2008-09-08 07:32:38.000000000 -0400
+@@ -11,7 +11,7 @@ THOTDIR = @top_srcdir@
+ 
+ include ../Options
+ 
+-LIBS	= -L../thotlib/ -lThotKernel -lz @LIBS@ $(WX_LIBRARIES)
++LIBS	= ../thotlib/libThotKernel.a -lz @LIBS@ $(WX_LIBRARIES)
+ INCLUDES= -DHAVE_CONFIG_H -I.. -I@srcdir@/f @THOTINCLUDES@ $(GUI_INCLUDES)
+ 
+ prefix = @prefix@