Changes 9.0:

* A new User interface based on wxWidgets
* Amaya provides now a panel of tools on the left which can be hidden or shown
* All Amaya versions use now F2 key. A message is displayed when the Esc key is used
* Default GTK fonts are now expressed in point sizes
* WX version: when a 2nd Amaya instance is launched, the argument of the 2nd
  instance is sent to the first instance and the 2nd one stops

6 files changed, 336 insertions, 90 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 776dfe654f2..b7fe2347f7c 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2004/10/03 00:18:23 tv Exp $
-#
+# $NetBSD: Makefile,v 1.36 2005/01/18 16:35:18 adam Exp $
 
-DISTNAME=	amaya-src-8.5
-PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
+DISTNAME=	amaya-fullsrc-9.0
+PKGNAME=	${DISTNAME:S/-fullsrc//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
@@ -15,16 +13,17 @@ 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
 
-WRKSRC=		${WRKDIR}/Amaya/work
-USE_BUILDLINK3=	YES
-USE_X11=	YES
-USE_GNU_TOOLS+=	make
-GNU_CONFIGURE=	YES
-
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ARGS+=	--without-graphic-libs	# Use pkgsrc libraries
 CFLAGS+=		-Dunix
+# link correctly with pkgsrc zlib
+LIBS+=			-Wl,-R${LOCALBASE}/lib
 
 post-extract:
 	${MKDIR} ${WRKSRC}
@@ -35,7 +34,7 @@ post-patch:
 	files="amaya/Makefile.in";					\
 	for file in $${files}; do					\
 		${MV} $${file} $${file}.fixme;				\
-		${SED}	-e "s|\$$(prefix)/Amaya|\$$(prefix)/lib/Amaya|g" \
+		${SED} -e "s|\$$(prefix)/Amaya|\$$(prefix)/lib/Amaya|g" \
 			$${file}.fixme >  $${file};			\
 	done
 
diff --git a/www/amaya/PLIST b/www/amaya/PLIST
index 8f48866f8aa..8fbf3929c95 100644
--- a/www/amaya/PLIST
+++ b/www/amaya/PLIST
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.6 2004/05/13 03:47:29 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/01/18 16:35:18 adam Exp $
 bin/amaya
+bin/amaya-gtk
 lib/Amaya/amaya/Amaya.svg
 lib/Amaya/amaya/AmayaPage.html
 lib/Amaya/amaya/AmayaPage.html.de
 lib/Amaya/amaya/AmayaPage.html.es
 lib/Amaya/amaya/AmayaPage.html.fr
+lib/Amaya/amaya/AmayaPage_WX.html
+lib/Amaya/amaya/AmayaPage_WX.html.de
+lib/Amaya/amaya/AmayaPage_WX.html.es
+lib/Amaya/amaya/AmayaPage_WX.html.fr
+lib/Amaya/amaya/AmayaPage_WX.html.ru
 lib/Amaya/amaya/AmayaSrcSyncIndex.gif
 lib/Amaya/amaya/Annot.conf
 lib/Amaya/amaya/HTML.STR
@@ -72,6 +78,7 @@ lib/Amaya/amaya/XMLPPUS.PRS
 lib/Amaya/amaya/XMLT.TRA
 lib/Amaya/amaya/XMLUSL.PRS
 lib/Amaya/amaya/advice.png
+lib/Amaya/amaya/amaya.css
 lib/Amaya/amaya/amaya.png
 lib/Amaya/amaya/anim_color_sh.png
 lib/Amaya/amaya/anim_color_sh_db.png
@@ -101,17 +108,10 @@ lib/Amaya/amaya/timeline_cross.gif
 lib/Amaya/amaya/timelinetoolbar_sh4.png
 lib/Amaya/amaya/toggle-s.gif
 lib/Amaya/amaya/toggle.gif
-lib/Amaya/annotlib/Annot.STR
-lib/Amaya/annotlib/AnnotP.PRS
-lib/Amaya/annotlib/AnnotT.TRA
-lib/Amaya/annotlib/Topics.STR
 lib/Amaya/annotlib/Topics.en
-lib/Amaya/annotlib/TopicsP.PRS
 lib/Amaya/annotlib/closed.png
 lib/Amaya/annotlib/open.png
 lib/Amaya/annotlib/selected.gif
-lib/Amaya/applis/bin/amaya
-lib/Amaya/applis/bin/print
 lib/Amaya/config/XKeysymDB
 lib/Amaya/config/amaya.emacs
 lib/Amaya/config/amaya.keyboard
@@ -121,22 +121,19 @@ lib/Amaya/config/annotschema.rdf
 lib/Amaya/config/annottypes.rdf
 lib/Amaya/config/de-amayadialogue
 lib/Amaya/config/de-amayamsg
-lib/Amaya/config/de-corrdialogue
 lib/Amaya/config/de-libdialogue
 lib/Amaya/config/en-amayadialogue
 lib/Amaya/config/en-amayamsg
-lib/Amaya/config/en-corrdialogue
 lib/Amaya/config/en-libdialogue
 lib/Amaya/config/es-amayadialogue
 lib/Amaya/config/es-amayamsg
-lib/Amaya/config/es-corrdialogue
 lib/Amaya/config/es-libdialogue
 lib/Amaya/config/fi-amayadialogue
 lib/Amaya/config/fi-amayamsg
-lib/Amaya/config/fi-corrdialogue
 lib/Amaya/config/fi-libdialogue
 lib/Amaya/config/fonts.gl
 lib/Amaya/config/fonts.gl.deb
+lib/Amaya/config/fonts.gl.rd
 lib/Amaya/config/fonts.gl.win
 lib/Amaya/config/fonts.tmpl
 lib/Amaya/config/fonts.unix
@@ -144,11 +141,10 @@ lib/Amaya/config/fonts.unix.deb
 lib/Amaya/config/fonts.win
 lib/Amaya/config/fr-amayadialogue
 lib/Amaya/config/fr-amayamsg
-lib/Amaya/config/fr-corrdialogue
 lib/Amaya/config/fr-libdialogue
+lib/Amaya/config/gtkrc
 lib/Amaya/config/it-amayadialogue
 lib/Amaya/config/it-amayamsg
-lib/Amaya/config/it-corrdialogue
 lib/Amaya/config/it-libdialogue
 lib/Amaya/config/libconfig/Forward.png
 lib/Amaya/config/libconfig/Forward.svg
@@ -176,13 +172,14 @@ lib/Amaya/config/libconfig/trash.png
 lib/Amaya/config/libconfig/trash.svg
 lib/Amaya/config/pt-amayadialogue
 lib/Amaya/config/pt-amayamsg
-lib/Amaya/config/pt-corrdialogue
 lib/Amaya/config/pt-libdialogue
 lib/Amaya/config/replytypes.rdf
+lib/Amaya/config/ru-amayadialogue
+lib/Amaya/config/ru-amayamsg
+lib/Amaya/config/ru-libdialogue
 lib/Amaya/config/thread.rdf
 lib/Amaya/config/tr-amayadialogue
 lib/Amaya/config/tr-amayamsg
-lib/Amaya/config/tr-corrdialogue
 lib/Amaya/config/tr-libdialogue
 lib/Amaya/config/typeIcon.rdf
 lib/Amaya/config/unix-thot.rc
@@ -206,501 +203,661 @@ lib/Amaya/doc/html/Access.html
 lib/Amaya/doc/html/Access.html.de
 lib/Amaya/doc/html/Access.html.es
 lib/Amaya/doc/html/Access.html.fr
+lib/Amaya/doc/html/Access.html.ru
+lib/Amaya/doc/html/Animation.html.fr
 lib/Amaya/doc/html/Annotations.html
 lib/Amaya/doc/html/Annotations.html.de
 lib/Amaya/doc/html/Annotations.html.es
 lib/Amaya/doc/html/Annotations.html.fr
+lib/Amaya/doc/html/Annotations.html.ru
 lib/Amaya/doc/html/Attributes.html
 lib/Amaya/doc/html/Attributes.html.de
 lib/Amaya/doc/html/Attributes.html.es
 lib/Amaya/doc/html/Attributes.html.fr
+lib/Amaya/doc/html/Attributes.html.ru
 lib/Amaya/doc/html/Browsing.html
 lib/Amaya/doc/html/Browsing.html.de
 lib/Amaya/doc/html/Browsing.html.es
 lib/Amaya/doc/html/Browsing.html.fr
+lib/Amaya/doc/html/Browsing.html.ru
 lib/Amaya/doc/html/Changing.html
 lib/Amaya/doc/html/Changing.html.de
 lib/Amaya/doc/html/Changing.html.es
 lib/Amaya/doc/html/Changing.html.fr
+lib/Amaya/doc/html/Changing.html.ru
 lib/Amaya/doc/html/Configure.html
 lib/Amaya/doc/html/Configure.html.de
 lib/Amaya/doc/html/Configure.html.es
 lib/Amaya/doc/html/Configure.html.fr
+lib/Amaya/doc/html/Configure.html.ru
 lib/Amaya/doc/html/Cover.html.de
 lib/Amaya/doc/html/Creating.html
 lib/Amaya/doc/html/Creating.html.de
 lib/Amaya/doc/html/Creating.html.es
 lib/Amaya/doc/html/Creating.html.fr
+lib/Amaya/doc/html/Creating.html.ru
 lib/Amaya/doc/html/Document.html
 lib/Amaya/doc/html/Document.html.de
 lib/Amaya/doc/html/Document.html.es
 lib/Amaya/doc/html/Document.html.fr
+lib/Amaya/doc/html/Document.html.ru
 lib/Amaya/doc/html/EditChar.html
 lib/Amaya/doc/html/EditChar.html.de
 lib/Amaya/doc/html/EditChar.html.es
 lib/Amaya/doc/html/EditChar.html.fr
+lib/Amaya/doc/html/EditChar.html.ru
 lib/Amaya/doc/html/HTML-elements/40styling.html
 lib/Amaya/doc/html/HTML-elements/40styling.html.de
 lib/Amaya/doc/html/HTML-elements/40styling.html.es
 lib/Amaya/doc/html/HTML-elements/40styling.html.fr
+lib/Amaya/doc/html/HTML-elements/40styling.html.ru
 lib/Amaya/doc/html/HTML-elements/address.html
 lib/Amaya/doc/html/HTML-elements/address.html.de
 lib/Amaya/doc/html/HTML-elements/address.html.es
 lib/Amaya/doc/html/HTML-elements/address.html.fr
+lib/Amaya/doc/html/HTML-elements/address.html.ru
 lib/Amaya/doc/html/HTML-elements/creating_new_documents.html.de
 lib/Amaya/doc/html/HTML-elements/headings.html
 lib/Amaya/doc/html/HTML-elements/headings.html.de
 lib/Amaya/doc/html/HTML-elements/headings.html.es
 lib/Amaya/doc/html/HTML-elements/headings.html.fr
+lib/Amaya/doc/html/HTML-elements/headings.html.ru
 lib/Amaya/doc/html/HTML-elements/infoTypes.html
 lib/Amaya/doc/html/HTML-elements/infoTypes.html.de
 lib/Amaya/doc/html/HTML-elements/infoTypes.html.es
 lib/Amaya/doc/html/HTML-elements/infoTypes.html.fr
+lib/Amaya/doc/html/HTML-elements/infoTypes.html.ru
 lib/Amaya/doc/html/HTML-elements/inline.html
 lib/Amaya/doc/html/HTML-elements/inline.html.de
 lib/Amaya/doc/html/HTML-elements/inline.html.es
 lib/Amaya/doc/html/HTML-elements/inline.html.fr
+lib/Amaya/doc/html/HTML-elements/inline.html.ru
 lib/Amaya/doc/html/HTML-elements/lists.html
 lib/Amaya/doc/html/HTML-elements/lists.html.de
 lib/Amaya/doc/html/HTML-elements/lists.html.es
 lib/Amaya/doc/html/HTML-elements/lists.html.fr
+lib/Amaya/doc/html/HTML-elements/lists.html.ru
 lib/Amaya/doc/html/HTML-elements/structure.html
 lib/Amaya/doc/html/HTML-elements/structure.html.de
 lib/Amaya/doc/html/HTML-elements/structure.html.es
 lib/Amaya/doc/html/HTML-elements/structure.html.fr
+lib/Amaya/doc/html/HTML-elements/structure.html.ru
 lib/Amaya/doc/html/HTML.html
 lib/Amaya/doc/html/HTML.html.de
 lib/Amaya/doc/html/HTML.html.es
 lib/Amaya/doc/html/HTML.html.fr
+lib/Amaya/doc/html/HTML.html.ru
 lib/Amaya/doc/html/ImageMaps.html
 lib/Amaya/doc/html/ImageMaps.html.de
 lib/Amaya/doc/html/ImageMaps.html.es
 lib/Amaya/doc/html/ImageMaps.html.fr
+lib/Amaya/doc/html/ImageMaps.html.ru
 lib/Amaya/doc/html/Index-org.html.de
 lib/Amaya/doc/html/Index.html
 lib/Amaya/doc/html/Index.html.de
 lib/Amaya/doc/html/Index.html.es
 lib/Amaya/doc/html/Index.html.fr
+lib/Amaya/doc/html/Index.html.ru
 lib/Amaya/doc/html/Keyboard.html.es
 lib/Amaya/doc/html/Links.html
 lib/Amaya/doc/html/Links.html.de
 lib/Amaya/doc/html/Links.html.es
 lib/Amaya/doc/html/Links.html.fr
+lib/Amaya/doc/html/Links.html.ru
 lib/Amaya/doc/html/MakeBook.html
 lib/Amaya/doc/html/MakeBook.html.de
 lib/Amaya/doc/html/MakeBook.html.es
 lib/Amaya/doc/html/MakeBook.html.fr
+lib/Amaya/doc/html/MakeBook.html.ru
 lib/Amaya/doc/html/Manual.html
 lib/Amaya/doc/html/Manual.html.de
 lib/Amaya/doc/html/Manual.html.es
 lib/Amaya/doc/html/Manual.html.fr
+lib/Amaya/doc/html/Manual.html.ru
 lib/Amaya/doc/html/Math.html
 lib/Amaya/doc/html/Math.html.de
 lib/Amaya/doc/html/Math.html.es
 lib/Amaya/doc/html/Math.html.fr
+lib/Amaya/doc/html/Math.html.ru
 lib/Amaya/doc/html/Numbering.html
 lib/Amaya/doc/html/Numbering.html.de
 lib/Amaya/doc/html/Numbering.html.es
 lib/Amaya/doc/html/Numbering.html.fr
+lib/Amaya/doc/html/Numbering.html.ru
 lib/Amaya/doc/html/Printing.html
 lib/Amaya/doc/html/Printing.html.de
 lib/Amaya/doc/html/Printing.html.es
 lib/Amaya/doc/html/Printing.html.fr
+lib/Amaya/doc/html/Printing.html.ru
 lib/Amaya/doc/html/Publishing.html
 lib/Amaya/doc/html/Publishing.html.de
 lib/Amaya/doc/html/Publishing.html.es
 lib/Amaya/doc/html/Publishing.html.fr
+lib/Amaya/doc/html/Publishing.html.ru
 lib/Amaya/doc/html/SVG.html
 lib/Amaya/doc/html/SVG.html.de
 lib/Amaya/doc/html/SVG.html.es
 lib/Amaya/doc/html/SVG.html.fr
+lib/Amaya/doc/html/SVG.html.ru
 lib/Amaya/doc/html/Searching.html
 lib/Amaya/doc/html/Searching.html.de
 lib/Amaya/doc/html/Searching.html.es
 lib/Amaya/doc/html/Searching.html.fr
+lib/Amaya/doc/html/Searching.html.ru
 lib/Amaya/doc/html/Selecting.html
 lib/Amaya/doc/html/Selecting.html.de
 lib/Amaya/doc/html/Selecting.html.es
 lib/Amaya/doc/html/Selecting.html.fr
+lib/Amaya/doc/html/Selecting.html.ru
 lib/Amaya/doc/html/ShortCuts.html
 lib/Amaya/doc/html/ShortCuts.html.de
 lib/Amaya/doc/html/ShortCuts.html.es
 lib/Amaya/doc/html/ShortCuts.html.fr
+lib/Amaya/doc/html/ShortCuts.html.ru
 lib/Amaya/doc/html/SpellChecking.html
 lib/Amaya/doc/html/SpellChecking.html.de
 lib/Amaya/doc/html/SpellChecking.html.es
 lib/Amaya/doc/html/SpellChecking.html.fr
+lib/Amaya/doc/html/SpellChecking.html.ru
 lib/Amaya/doc/html/StyleSheets.html
 lib/Amaya/doc/html/StyleSheets.html.de
 lib/Amaya/doc/html/StyleSheets.html.es
 lib/Amaya/doc/html/StyleSheets.html.fr
+lib/Amaya/doc/html/StyleSheets.html.ru
 lib/Amaya/doc/html/Tables.html
 lib/Amaya/doc/html/Tables.html.de
 lib/Amaya/doc/html/Tables.html.es
 lib/Amaya/doc/html/Tables.html.fr
+lib/Amaya/doc/html/Tables.html.ru
 lib/Amaya/doc/html/Transform.html
 lib/Amaya/doc/html/Transform.html.es
+lib/Amaya/doc/html/Transform.html.ru
 lib/Amaya/doc/html/Tutorial.html.fr
 lib/Amaya/doc/html/Views.html
 lib/Amaya/doc/html/Views.html.de
 lib/Amaya/doc/html/Views.html.es
 lib/Amaya/doc/html/Views.html.fr
+lib/Amaya/doc/html/Views.html.ru
 lib/Amaya/doc/html/WebDAV.html
 lib/Amaya/doc/html/WebDAV.html.es
+lib/Amaya/doc/html/WebDAV.html.ru
 lib/Amaya/doc/html/Xml.html
 lib/Amaya/doc/html/Xml.html.de
 lib/Amaya/doc/html/Xml.html.es
 lib/Amaya/doc/html/Xml.html.fr
+lib/Amaya/doc/html/Xml.html.ru
 lib/Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html
 lib/Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html.de
 lib/Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html.es
+lib/Amaya/doc/html/accessibility_in_amaya/about_amayas_accessibility_features.html.ru
 lib/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html
 lib/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html.de
 lib/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html.es
+lib/Amaya/doc/html/accessibility_in_amaya/about_producing_accessible_content.html.ru
 lib/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html
 lib/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.de
 lib/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.es
+lib/Amaya/doc/html/accessibility_in_amaya/accessibility_in_amaya.html.ru
 lib/Amaya/doc/html/attaching_annotations/about_reading_annotations.html
 lib/Amaya/doc/html/attaching_annotations/about_reading_annotations.html.de
 lib/Amaya/doc/html/attaching_annotations/about_reading_annotations.html.es
+lib/Amaya/doc/html/attaching_annotations/about_reading_annotations.html.ru
 lib/Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html
 lib/Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html.de
 lib/Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html.es
+lib/Amaya/doc/html/attaching_annotations/about_storing_local_annotations.html.ru
 lib/Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html
 lib/Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html.de
 lib/Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html.es
+lib/Amaya/doc/html/attaching_annotations/about_storing_remote_annotations.html.ru
 lib/Amaya/doc/html/attaching_annotations/annotation_issues.html
 lib/Amaya/doc/html/attaching_annotations/annotation_issues.html.de
 lib/Amaya/doc/html/attaching_annotations/annotation_issues.html.es
+lib/Amaya/doc/html/attaching_annotations/annotation_issues.html.ru
 lib/Amaya/doc/html/attaching_annotations/annotation_menu.html
 lib/Amaya/doc/html/attaching_annotations/annotation_menu.html.de
 lib/Amaya/doc/html/attaching_annotations/annotation_menu.html.es
+lib/Amaya/doc/html/attaching_annotations/annotation_menu.html.ru
 lib/Amaya/doc/html/attaching_annotations/configuring_annotation_settings.html
 lib/Amaya/doc/html/attaching_annotations/configuring_annotation_settings.html.de
 lib/Amaya/doc/html/attaching_annotations/configuring_annotation_settings.html.es
+lib/Amaya/doc/html/attaching_annotations/configuring_annotation_settings.html.ru
 lib/Amaya/doc/html/attaching_annotations/configuring_icons.html
 lib/Amaya/doc/html/attaching_annotations/configuring_icons.html.de
 lib/Amaya/doc/html/attaching_annotations/configuring_icons.html.es
+lib/Amaya/doc/html/attaching_annotations/configuring_icons.html.ru
 lib/Amaya/doc/html/attaching_annotations/creating_an_annotation.html
 lib/Amaya/doc/html/attaching_annotations/creating_an_annotation.html.de
 lib/Amaya/doc/html/attaching_annotations/creating_an_annotation.html.es
+lib/Amaya/doc/html/attaching_annotations/creating_an_annotation.html.ru
 lib/Amaya/doc/html/attaching_annotations/deleting_an_annotation.html
 lib/Amaya/doc/html/attaching_annotations/deleting_an_annotation.html.de
 lib/Amaya/doc/html/attaching_annotations/deleting_an_annotation.html.es
+lib/Amaya/doc/html/attaching_annotations/deleting_an_annotation.html.ru
 lib/Amaya/doc/html/attaching_annotations/loading_and_presenting_annotations.html
 lib/Amaya/doc/html/attaching_annotations/loading_and_presenting_annotations.html.de
 lib/Amaya/doc/html/attaching_annotations/loading_and_presenting_annotations.html.es
+lib/Amaya/doc/html/attaching_annotations/loading_and_presenting_annotations.html.ru
 lib/Amaya/doc/html/attaching_annotations/moving_annotations.html
 lib/Amaya/doc/html/attaching_annotations/moving_annotations.html.de
 lib/Amaya/doc/html/attaching_annotations/moving_annotations.html.es
+lib/Amaya/doc/html/attaching_annotations/moving_annotations.html.ru
 lib/Amaya/doc/html/attaching_annotations/navigating_annotations.html
 lib/Amaya/doc/html/attaching_annotations/navigating_annotations.html.de
 lib/Amaya/doc/html/attaching_annotations/navigating_annotations.html.es
+lib/Amaya/doc/html/attaching_annotations/navigating_annotations.html.ru
 lib/Amaya/doc/html/attaching_annotations/replying_to_annotations.html
 lib/Amaya/doc/html/attaching_annotations/replying_to_annotations.html.de
 lib/Amaya/doc/html/attaching_annotations/replying_to_annotations.html.es
+lib/Amaya/doc/html/attaching_annotations/replying_to_annotations.html.ru
 lib/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html
 lib/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html.de
 lib/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html.es
+lib/Amaya/doc/html/attaching_annotations/what_is_an_annotation.html.ru
 lib/Amaya/doc/html/bookmarks.html
 lib/Amaya/doc/html/bookmarks.html.es
+lib/Amaya/doc/html/bookmarks.html.ru
 lib/Amaya/doc/html/browsing/about_access_keys.html
 lib/Amaya/doc/html/browsing/about_access_keys.html.de
 lib/Amaya/doc/html/browsing/about_access_keys.html.es
+lib/Amaya/doc/html/browsing/about_access_keys.html.ru
 lib/Amaya/doc/html/browsing/about_moving_backward_and_forward.html
 lib/Amaya/doc/html/browsing/about_moving_backward_and_forward.html.de
 lib/Amaya/doc/html/browsing/about_moving_backward_and_forward.html.es
+lib/Amaya/doc/html/browsing/about_moving_backward_and_forward.html.ru
 lib/Amaya/doc/html/browsing/about_target_anchors.html
 lib/Amaya/doc/html/browsing/about_target_anchors.html.de
 lib/Amaya/doc/html/browsing/about_target_anchors.html.es
+lib/Amaya/doc/html/browsing/about_target_anchors.html.ru
 lib/Amaya/doc/html/browsing/activating_a_link.html
 lib/Amaya/doc/html/browsing/activating_a_link.html.de
 lib/Amaya/doc/html/browsing/activating_a_link.html.es
+lib/Amaya/doc/html/browsing/activating_a_link.html.ru
 lib/Amaya/doc/html/browsing/forms.html
 lib/Amaya/doc/html/browsing/forms.html.de
 lib/Amaya/doc/html/browsing/forms.html.es
+lib/Amaya/doc/html/browsing/forms.html.ru
 lib/Amaya/doc/html/browsing/opening_documents.html
 lib/Amaya/doc/html/browsing/opening_documents.html.de
 lib/Amaya/doc/html/browsing/opening_documents.html.es
+lib/Amaya/doc/html/browsing/opening_documents.html.ru
 lib/Amaya/doc/html/browsing/reloading_a_page.html
 lib/Amaya/doc/html/browsing/reloading_a_page.html.de
 lib/Amaya/doc/html/browsing/reloading_a_page.html.es
+lib/Amaya/doc/html/browsing/reloading_a_page.html.ru
 lib/Amaya/doc/html/browsing/working_with_the_amaya_browser_and_editor.html
 lib/Amaya/doc/html/browsing/working_with_the_amaya_browser_and_editor.html.de
 lib/Amaya/doc/html/browsing/working_with_the_amaya_browser_and_editor.html.es
+lib/Amaya/doc/html/browsing/working_with_the_amaya_browser_and_editor.html.ru
 lib/Amaya/doc/html/configuring_amaya/about_configuration_directory_and_file_conventions.html
 lib/Amaya/doc/html/configuring_amaya/about_configuration_directory_and_file_conventions.html.de
 lib/Amaya/doc/html/configuring_amaya/about_configuration_directory_and_file_conventions.html.es
+lib/Amaya/doc/html/configuring_amaya/about_configuration_directory_and_file_conventions.html.ru
 lib/Amaya/doc/html/configuring_amaya/about_keyboard_shortcuts.html
 lib/Amaya/doc/html/configuring_amaya/about_keyboard_shortcuts.html.de
 lib/Amaya/doc/html/configuring_amaya/about_keyboard_shortcuts.html.es
+lib/Amaya/doc/html/configuring_amaya/about_keyboard_shortcuts.html.ru
 lib/Amaya/doc/html/configuring_amaya/configuring_amaya.html
 lib/Amaya/doc/html/configuring_amaya/configuring_amaya.html.de
 lib/Amaya/doc/html/configuring_amaya/configuring_amaya.html.es
+lib/Amaya/doc/html/configuring_amaya/configuring_amaya.html.ru
 lib/Amaya/doc/html/configuring_amaya/menu_preferences.html
 lib/Amaya/doc/html/configuring_amaya/menu_preferences.html.de
 lib/Amaya/doc/html/configuring_amaya/menu_preferences.html.es
+lib/Amaya/doc/html/configuring_amaya/menu_preferences.html.ru
 lib/Amaya/doc/html/editing_attributes/copying_attributes.html
 lib/Amaya/doc/html/editing_attributes/copying_attributes.html.de
 lib/Amaya/doc/html/editing_attributes/copying_attributes.html.es
+lib/Amaya/doc/html/editing_attributes/copying_attributes.html.ru
 lib/Amaya/doc/html/editing_attributes/editing_attributes_in_the_structure_view.html
 lib/Amaya/doc/html/editing_attributes/editing_attributes_in_the_structure_view.html.de
 lib/Amaya/doc/html/editing_attributes/editing_attributes_in_the_structure_view.html.es
+lib/Amaya/doc/html/editing_attributes/editing_attributes_in_the_structure_view.html.ru
 lib/Amaya/doc/html/editing_attributes/editing_attributes_through_the_attributes_menu.html
 lib/Amaya/doc/html/editing_attributes/editing_attributes_through_the_attributes_menu.html.de
 lib/Amaya/doc/html/editing_attributes/editing_attributes_through_the_attributes_menu.html.es
+lib/Amaya/doc/html/editing_attributes/editing_attributes_through_the_attributes_menu.html.ru
 lib/Amaya/doc/html/editing_attributes/working_with_attributes.html
 lib/Amaya/doc/html/editing_attributes/working_with_attributes.html.de
 lib/Amaya/doc/html/editing_attributes/working_with_attributes.html.es
+lib/Amaya/doc/html/editing_attributes/working_with_attributes.html.ru
 lib/Amaya/doc/html/editing_documents/Transform.html.de
 lib/Amaya/doc/html/editing_documents/about_inserting_a_division.html
 lib/Amaya/doc/html/editing_documents/about_inserting_a_division.html.de
 lib/Amaya/doc/html/editing_documents/about_inserting_a_division.html.es
+lib/Amaya/doc/html/editing_documents/about_inserting_a_division.html.ru
 lib/Amaya/doc/html/editing_documents/about_merging_elements.html
 lib/Amaya/doc/html/editing_documents/about_merging_elements.html.de
 lib/Amaya/doc/html/editing_documents/about_merging_elements.html.es
+lib/Amaya/doc/html/editing_documents/about_merging_elements.html.ru
 lib/Amaya/doc/html/editing_documents/changing_the_document_structure.html
 lib/Amaya/doc/html/editing_documents/changing_the_document_structure.html.de
 lib/Amaya/doc/html/editing_documents/changing_the_document_structure.html.es
+lib/Amaya/doc/html/editing_documents/changing_the_document_structure.html.ru
 lib/Amaya/doc/html/editing_documents/creating_new_documents.html
 lib/Amaya/doc/html/editing_documents/creating_new_documents.html.es
+lib/Amaya/doc/html/editing_documents/creating_new_documents.html.ru
 lib/Amaya/doc/html/editing_documents/the_transform_command.html
 lib/Amaya/doc/html/editing_documents/the_transform_command.html.de
 lib/Amaya/doc/html/editing_documents/the_transform_command.html.es
+lib/Amaya/doc/html/editing_documents/the_transform_command.html.ru
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html.de
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html.es
+lib/Amaya/doc/html/editing_iso-latin-1_characters/about_standard_multikey_support.html.ru
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html.de
 lib/Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html.es
+lib/Amaya/doc/html/editing_iso-latin-1_characters/about_white_space_handling.html.ru
 lib/Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html
 lib/Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html.de
 lib/Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html.es
+lib/Amaya/doc/html/editing_iso-latin-1_characters/entering_ISOLatin1_characters_in_amaya.html.ru
 lib/Amaya/doc/html/editing_mathematics/about_entering_math_characters.html
 lib/Amaya/doc/html/editing_mathematics/about_entering_math_characters.html.de
 lib/Amaya/doc/html/editing_mathematics/about_entering_math_characters.html.es
+lib/Amaya/doc/html/editing_mathematics/about_entering_math_characters.html.ru
 lib/Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html
 lib/Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html.de
 lib/Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html.es
+lib/Amaya/doc/html/editing_mathematics/about_entering_math_constructs_using_the_keyboard.html.ru
 lib/Amaya/doc/html/editing_mathematics/about_linking_in_mathml.html
 lib/Amaya/doc/html/editing_mathematics/about_linking_in_mathml.html.de
 lib/Amaya/doc/html/editing_mathematics/about_linking_in_mathml.html.es
+lib/Amaya/doc/html/editing_mathematics/about_linking_in_mathml.html.ru
 lib/Amaya/doc/html/editing_mathematics/editing_math_expressions.html
 lib/Amaya/doc/html/editing_mathematics/editing_math_expressions.html.de
 lib/Amaya/doc/html/editing_mathematics/editing_math_expressions.html.es
+lib/Amaya/doc/html/editing_mathematics/editing_math_expressions.html.ru
 lib/Amaya/doc/html/editing_mathematics/math_issues.html
 lib/Amaya/doc/html/editing_mathematics/math_issues.html.de
 lib/Amaya/doc/html/editing_mathematics/math_issues.html.es
+lib/Amaya/doc/html/editing_mathematics/math_issues.html.ru
 lib/Amaya/doc/html/editing_mathematics/the_math_palette_and_the_types.html
 lib/Amaya/doc/html/editing_mathematics/the_math_palette_and_the_types.html.de
 lib/Amaya/doc/html/editing_mathematics/the_math_palette_and_the_types.html.es
+lib/Amaya/doc/html/editing_mathematics/the_math_palette_and_the_types.html.ru
 lib/Amaya/doc/html/editing_mathematics/viewing_structure_in_mathml.html
 lib/Amaya/doc/html/editing_mathematics/viewing_structure_in_mathml.html.de
 lib/Amaya/doc/html/editing_mathematics/viewing_structure_in_mathml.html.es
+lib/Amaya/doc/html/editing_mathematics/viewing_structure_in_mathml.html.ru
 lib/Amaya/doc/html/editing_mathematics/working_with_math_expressions.html
 lib/Amaya/doc/html/editing_mathematics/working_with_math_expressions.html.de
 lib/Amaya/doc/html/editing_mathematics/working_with_math_expressions.html.es
+lib/Amaya/doc/html/editing_mathematics/working_with_math_expressions.html.ru
 lib/Amaya/doc/html/editing_tables/add_column.html
 lib/Amaya/doc/html/editing_tables/add_column.html.de
 lib/Amaya/doc/html/editing_tables/add_column.html.es
+lib/Amaya/doc/html/editing_tables/add_column.html.ru
 lib/Amaya/doc/html/editing_tables/add_row.html
 lib/Amaya/doc/html/editing_tables/add_row.html.de
 lib/Amaya/doc/html/editing_tables/add_row.html.es
+lib/Amaya/doc/html/editing_tables/add_row.html.ru
 lib/Amaya/doc/html/editing_tables/add_tbody.html
 lib/Amaya/doc/html/editing_tables/add_tbody.html.de
 lib/Amaya/doc/html/editing_tables/add_tbody.html.es
+lib/Amaya/doc/html/editing_tables/add_tbody.html.ru
 lib/Amaya/doc/html/editing_tables/create_table.html
 lib/Amaya/doc/html/editing_tables/create_table.html.de
 lib/Amaya/doc/html/editing_tables/create_table.html.es
+lib/Amaya/doc/html/editing_tables/create_table.html.ru
 lib/Amaya/doc/html/editing_tables/remove_column.html
 lib/Amaya/doc/html/editing_tables/remove_column.html.de
 lib/Amaya/doc/html/editing_tables/remove_column.html.es
+lib/Amaya/doc/html/editing_tables/remove_column.html.ru
 lib/Amaya/doc/html/editing_tables/working_with_tables.html
 lib/Amaya/doc/html/editing_tables/working_with_tables.html.de
 lib/Amaya/doc/html/editing_tables/working_with_tables.html.es
+lib/Amaya/doc/html/editing_tables/working_with_tables.html.ru
 lib/Amaya/doc/html/elements/buttons_and_types_menu.html
 lib/Amaya/doc/html/elements/buttons_and_types_menu.html.de
 lib/Amaya/doc/html/elements/buttons_and_types_menu.html.es
+lib/Amaya/doc/html/elements/buttons_and_types_menu.html.ru
 lib/Amaya/doc/html/elements/changing_the_document_title.html
 lib/Amaya/doc/html/elements/changing_the_document_title.html.de
 lib/Amaya/doc/html/elements/changing_the_document_title.html.es
+lib/Amaya/doc/html/elements/changing_the_document_title.html.ru
 lib/Amaya/doc/html/elements/creating_nested_structures.html
 lib/Amaya/doc/html/elements/creating_nested_structures.html.de
 lib/Amaya/doc/html/elements/creating_nested_structures.html.es
+lib/Amaya/doc/html/elements/creating_nested_structures.html.ru
 lib/Amaya/doc/html/elements/exiting_anchors.html
 lib/Amaya/doc/html/elements/exiting_anchors.html.de
 lib/Amaya/doc/html/elements/exiting_anchors.html.es
+lib/Amaya/doc/html/elements/exiting_anchors.html.ru
 lib/Amaya/doc/html/elements/the_enter_key.html
 lib/Amaya/doc/html/elements/the_enter_key.html.de
 lib/Amaya/doc/html/elements/the_enter_key.html.es
+lib/Amaya/doc/html/elements/the_enter_key.html.ru
 lib/Amaya/doc/html/elements/the_structure_menu.html
 lib/Amaya/doc/html/elements/the_structure_menu.html.de
 lib/Amaya/doc/html/elements/the_structure_menu.html.es
+lib/Amaya/doc/html/elements/the_structure_menu.html.ru
 lib/Amaya/doc/html/index.css
 lib/Amaya/doc/html/linking/changing_a_link.html
 lib/Amaya/doc/html/linking/changing_a_link.html.de
 lib/Amaya/doc/html/linking/changing_a_link.html.es
+lib/Amaya/doc/html/linking/changing_a_link.html.ru
 lib/Amaya/doc/html/linking/creating_a_target_anchor.html
 lib/Amaya/doc/html/linking/creating_a_target_anchor.html.de
 lib/Amaya/doc/html/linking/creating_a_target_anchor.html.es
+lib/Amaya/doc/html/linking/creating_a_target_anchor.html.ru
 lib/Amaya/doc/html/linking/creating_a_target_element.html
 lib/Amaya/doc/html/linking/creating_a_target_element.html.de
 lib/Amaya/doc/html/linking/creating_a_target_element.html.es
+lib/Amaya/doc/html/linking/creating_a_target_element.html.ru
 lib/Amaya/doc/html/linking/creating_an_external_link.html
 lib/Amaya/doc/html/linking/creating_an_external_link.html.de
 lib/Amaya/doc/html/linking/creating_an_external_link.html.es
+lib/Amaya/doc/html/linking/creating_an_external_link.html.ru
 lib/Amaya/doc/html/linking/creating_an_internal_link.html
 lib/Amaya/doc/html/linking/creating_an_internal_link.html.de
 lib/Amaya/doc/html/linking/creating_an_internal_link.html.es
+lib/Amaya/doc/html/linking/creating_an_internal_link.html.ru
 lib/Amaya/doc/html/linking/removing_a_link_or_a_target_anchor.html
 lib/Amaya/doc/html/linking/removing_a_link_or_a_target_anchor.html.de
 lib/Amaya/doc/html/linking/removing_a_link_or_a_target_anchor.html.es
-lib/Amaya/doc/html/numbering_sections/numbering_sections.html
-lib/Amaya/doc/html/numbering_sections/numbering_sections.html.de
-lib/Amaya/doc/html/numbering_sections/numbering_sections.html.es
+lib/Amaya/doc/html/linking/removing_a_link_or_a_target_anchor.html.ru
 lib/Amaya/doc/html/printing/about_controlling_printing_with_css.html
 lib/Amaya/doc/html/printing/about_controlling_printing_with_css.html.de
 lib/Amaya/doc/html/printing/about_controlling_printing_with_css.html.es
+lib/Amaya/doc/html/printing/about_controlling_printing_with_css.html.ru
 lib/Amaya/doc/html/printing/print_command.html
 lib/Amaya/doc/html/printing/print_command.html.de
 lib/Amaya/doc/html/printing/print_command.html.es
+lib/Amaya/doc/html/printing/print_command.html.ru
 lib/Amaya/doc/html/printing/printing_documents.html
 lib/Amaya/doc/html/printing/printing_documents.html.de
 lib/Amaya/doc/html/printing/printing_documents.html.es
+lib/Amaya/doc/html/printing/printing_documents.html.ru
 lib/Amaya/doc/html/printing/unix_platforms.html
 lib/Amaya/doc/html/printing/unix_platforms.html.de
 lib/Amaya/doc/html/printing/unix_platforms.html.es
+lib/Amaya/doc/html/printing/unix_platforms.html.ru
 lib/Amaya/doc/html/printing/using_the_setup_and_print_command.html
 lib/Amaya/doc/html/printing/using_the_setup_and_print_command.html.de
 lib/Amaya/doc/html/printing/using_the_setup_and_print_command.html.es
+lib/Amaya/doc/html/printing/using_the_setup_and_print_command.html.ru
 lib/Amaya/doc/html/printing/windows_platforms.html
 lib/Amaya/doc/html/printing/windows_platforms.html.de
 lib/Amaya/doc/html/printing/windows_platforms.html.es
+lib/Amaya/doc/html/printing/windows_platforms.html.ru
 lib/Amaya/doc/html/saving_and_publishing_documents/about_saving_in_html.html
 lib/Amaya/doc/html/saving_and_publishing_documents/about_saving_in_html.html.de
 lib/Amaya/doc/html/saving_and_publishing_documents/about_saving_in_html.html.es
+lib/Amaya/doc/html/saving_and_publishing_documents/about_saving_in_html.html.ru
 lib/Amaya/doc/html/saving_and_publishing_documents/saving_and_publishing_documents.html
 lib/Amaya/doc/html/saving_and_publishing_documents/saving_and_publishing_documents.html.de
 lib/Amaya/doc/html/saving_and_publishing_documents/saving_and_publishing_documents.html.es
+lib/Amaya/doc/html/saving_and_publishing_documents/saving_and_publishing_documents.html.ru
 lib/Amaya/doc/html/saving_and_publishing_documents/saving_documents_as_text.html
 lib/Amaya/doc/html/saving_and_publishing_documents/saving_documents_as_text.html.de
 lib/Amaya/doc/html/saving_and_publishing_documents/saving_documents_as_text.html.es
+lib/Amaya/doc/html/saving_and_publishing_documents/saving_documents_as_text.html.ru
 lib/Amaya/doc/html/saving_and_publishing_documents/the_save_command.html
 lib/Amaya/doc/html/saving_and_publishing_documents/the_save_command.html.de
 lib/Amaya/doc/html/saving_and_publishing_documents/the_save_command.html.es
+lib/Amaya/doc/html/saving_and_publishing_documents/the_save_command.html.ru
 lib/Amaya/doc/html/saving_and_publishing_documents/the_saveas_command.html
 lib/Amaya/doc/html/saving_and_publishing_documents/the_saveas_command.html.de
 lib/Amaya/doc/html/saving_and_publishing_documents/the_saveas_command.html.es
+lib/Amaya/doc/html/saving_and_publishing_documents/the_saveas_command.html.ru
 lib/Amaya/doc/html/searching_and_replacing_text/searching_and_replacing_text.html
 lib/Amaya/doc/html/searching_and_replacing_text/searching_and_replacing_text.html.de
 lib/Amaya/doc/html/searching_and_replacing_text/searching_and_replacing_text.html.es
+lib/Amaya/doc/html/searching_and_replacing_text/searching_and_replacing_text.html.ru
 lib/Amaya/doc/html/selecting/selecting_by_structure.html
 lib/Amaya/doc/html/selecting/selecting_by_structure.html.de
 lib/Amaya/doc/html/selecting/selecting_by_structure.html.es
+lib/Amaya/doc/html/selecting/selecting_by_structure.html.ru
 lib/Amaya/doc/html/selecting/selecting_images.html
 lib/Amaya/doc/html/selecting/selecting_images.html.de
 lib/Amaya/doc/html/selecting/selecting_images.html.es
+lib/Amaya/doc/html/selecting/selecting_images.html.ru
 lib/Amaya/doc/html/selecting/selecting_with_keyboard_and_mouse.html
 lib/Amaya/doc/html/selecting/selecting_with_keyboard_and_mouse.html.de
 lib/Amaya/doc/html/selecting/selecting_with_keyboard_and_mouse.html.es
+lib/Amaya/doc/html/selecting/selecting_with_keyboard_and_mouse.html.ru
 lib/Amaya/doc/html/spell_checking/spell_checking.html
 lib/Amaya/doc/html/spell_checking/spell_checking.html.de
 lib/Amaya/doc/html/spell_checking/spell_checking.html.es
+lib/Amaya/doc/html/spell_checking/spell_checking.html.ru
 lib/Amaya/doc/html/style.css
 lib/Amaya/doc/html/style_sheets/about_applying_style_using_html_elements.html
 lib/Amaya/doc/html/style_sheets/about_applying_style_using_html_elements.html.de
 lib/Amaya/doc/html/style_sheets/about_applying_style_using_html_elements.html.es
+lib/Amaya/doc/html/style_sheets/about_applying_style_using_html_elements.html.ru
 lib/Amaya/doc/html/style_sheets/about_linking_external_and_user_style_sheets.html
 lib/Amaya/doc/html/style_sheets/about_linking_external_and_user_style_sheets.html.de
 lib/Amaya/doc/html/style_sheets/about_linking_external_and_user_style_sheets.html.es
+lib/Amaya/doc/html/style_sheets/about_linking_external_and_user_style_sheets.html.ru
 lib/Amaya/doc/html/style_sheets/creating_and_updating_a_style_attribute.html
 lib/Amaya/doc/html/style_sheets/creating_and_updating_a_style_attribute.html.de
 lib/Amaya/doc/html/style_sheets/creating_and_updating_a_style_attribute.html.es
+lib/Amaya/doc/html/style_sheets/creating_and_updating_a_style_attribute.html.ru
 lib/Amaya/doc/html/style_sheets/creating_generic_style_for_an_element_or_a_class.html
 lib/Amaya/doc/html/style_sheets/creating_generic_style_for_an_element_or_a_class.html.de
 lib/Amaya/doc/html/style_sheets/creating_generic_style_for_an_element_or_a_class.html.es
+lib/Amaya/doc/html/style_sheets/creating_generic_style_for_an_element_or_a_class.html.ru
 lib/Amaya/doc/html/style_sheets/creating_html_style_elements.html
 lib/Amaya/doc/html/style_sheets/creating_html_style_elements.html.de
 lib/Amaya/doc/html/style_sheets/creating_html_style_elements.html.es
+lib/Amaya/doc/html/style_sheets/creating_html_style_elements.html.ru
 lib/Amaya/doc/html/style_sheets/handling_external_css.html
 lib/Amaya/doc/html/style_sheets/handling_external_css.html.de
 lib/Amaya/doc/html/style_sheets/handling_external_css.html.es
+lib/Amaya/doc/html/style_sheets/handling_external_css.html.ru
 lib/Amaya/doc/html/style_sheets/removing_style.html
 lib/Amaya/doc/html/style_sheets/removing_style.html.de
 lib/Amaya/doc/html/style_sheets/removing_style.html.es
+lib/Amaya/doc/html/style_sheets/removing_style.html.ru
 lib/Amaya/doc/html/style_sheets/working_with_styles.html
 lib/Amaya/doc/html/style_sheets/working_with_styles.html.de
 lib/Amaya/doc/html/style_sheets/working_with_styles.html.es
+lib/Amaya/doc/html/style_sheets/working_with_styles.html.ru
 lib/Amaya/doc/html/tans_annot.html.de
 lib/Amaya/doc/html/timeline_help.html
+lib/Amaya/doc/html/translate.html.ru
 lib/Amaya/doc/html/using_graphics/AddSVGLib.html
+lib/Amaya/doc/html/using_graphics/AddSVGLib.html.de
 lib/Amaya/doc/html/using_graphics/AddSVGLib.html.es
+lib/Amaya/doc/html/using_graphics/AddSVGLib.html.ru
+lib/Amaya/doc/html/using_graphics/Animation.html
+lib/Amaya/doc/html/using_graphics/Animation.html.de
+lib/Amaya/doc/html/using_graphics/Animation.html.es
+lib/Amaya/doc/html/using_graphics/Animation.html.ru
 lib/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html
+lib/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html.de
 lib/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html.es
+lib/Amaya/doc/html/using_graphics/ChangeSVGLibPresentation.html.ru
 lib/Amaya/doc/html/using_graphics/SVGLibrary.html
+lib/Amaya/doc/html/using_graphics/SVGLibrary.html.de
 lib/Amaya/doc/html/using_graphics/SVGLibrary.html.es
+lib/Amaya/doc/html/using_graphics/SVGLibrary.html.ru
 lib/Amaya/doc/html/using_graphics/UseSVGLib.html
+lib/Amaya/doc/html/using_graphics/UseSVGLib.html.de
 lib/Amaya/doc/html/using_graphics/UseSVGLib.html.es
+lib/Amaya/doc/html/using_graphics/UseSVGLib.html.ru
 lib/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html
 lib/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.de
 lib/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.es
+lib/Amaya/doc/html/using_graphics/creating_graphics_with_the_palette.html.ru
 lib/Amaya/doc/html/using_graphics/moving_graphics.html
 lib/Amaya/doc/html/using_graphics/moving_graphics.html.de
 lib/Amaya/doc/html/using_graphics/moving_graphics.html.es
+lib/Amaya/doc/html/using_graphics/moving_graphics.html.ru
 lib/Amaya/doc/html/using_graphics/painting_graphics.html
 lib/Amaya/doc/html/using_graphics/painting_graphics.html.de
 lib/Amaya/doc/html/using_graphics/painting_graphics.html.es
+lib/Amaya/doc/html/using_graphics/painting_graphics.html.ru
 lib/Amaya/doc/html/using_graphics/resizing_graphics.html
 lib/Amaya/doc/html/using_graphics/resizing_graphics.html.de
 lib/Amaya/doc/html/using_graphics/resizing_graphics.html.es
+lib/Amaya/doc/html/using_graphics/resizing_graphics.html.ru
 lib/Amaya/doc/html/using_graphics/working_with_graphics.html
 lib/Amaya/doc/html/using_graphics/working_with_graphics.html.de
 lib/Amaya/doc/html/using_graphics/working_with_graphics.html.es
+lib/Amaya/doc/html/using_graphics/working_with_graphics.html.ru
 lib/Amaya/doc/html/using_image_maps/about_alternative_text_and_long_descriptions.html
 lib/Amaya/doc/html/using_image_maps/about_alternative_text_and_long_descriptions.html.de
 lib/Amaya/doc/html/using_image_maps/about_alternative_text_and_long_descriptions.html.es
+lib/Amaya/doc/html/using_image_maps/about_alternative_text_and_long_descriptions.html.ru
 lib/Amaya/doc/html/using_image_maps/adding_an_image.html
 lib/Amaya/doc/html/using_image_maps/adding_an_image.html.de
 lib/Amaya/doc/html/using_image_maps/adding_an_image.html.es
+lib/Amaya/doc/html/using_image_maps/adding_an_image.html.ru
 lib/Amaya/doc/html/using_image_maps/creating_clientside_image_maps.html
 lib/Amaya/doc/html/using_image_maps/creating_clientside_image_maps.html.de
 lib/Amaya/doc/html/using_image_maps/creating_clientside_image_maps.html.es
+lib/Amaya/doc/html/using_image_maps/creating_clientside_image_maps.html.ru
 lib/Amaya/doc/html/using_image_maps/moving_image_map_areas.html
 lib/Amaya/doc/html/using_image_maps/moving_image_map_areas.html.de
 lib/Amaya/doc/html/using_image_maps/moving_image_map_areas.html.es
+lib/Amaya/doc/html/using_image_maps/moving_image_map_areas.html.ru
 lib/Amaya/doc/html/using_image_maps/resizing_image_map_areas.html
 lib/Amaya/doc/html/using_image_maps/resizing_image_map_areas.html.de
 lib/Amaya/doc/html/using_image_maps/resizing_image_map_areas.html.es
+lib/Amaya/doc/html/using_image_maps/resizing_image_map_areas.html.ru
 lib/Amaya/doc/html/using_image_maps/using_clientside_image_maps.html
 lib/Amaya/doc/html/using_image_maps/using_clientside_image_maps.html.de
 lib/Amaya/doc/html/using_image_maps/using_clientside_image_maps.html.es
+lib/Amaya/doc/html/using_image_maps/using_clientside_image_maps.html.ru
 lib/Amaya/doc/html/using_image_maps/working_with_image_maps.html
 lib/Amaya/doc/html/using_image_maps/working_with_image_maps.html.de
 lib/Amaya/doc/html/using_image_maps/working_with_image_maps.html.es
+lib/Amaya/doc/html/using_image_maps/working_with_image_maps.html.ru
 lib/Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html
 lib/Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html.de
 lib/Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html.es
+lib/Amaya/doc/html/using_the_makebook_function/assembling_large_document_collections.html.ru
 lib/Amaya/doc/html/using_xml/editing_xml_document.html
 lib/Amaya/doc/html/using_xml/editing_xml_document.html.de
 lib/Amaya/doc/html/using_xml/editing_xml_document.html.es
+lib/Amaya/doc/html/using_xml/editing_xml_document.html.ru
 lib/Amaya/doc/html/using_xml/loading_xml_document.html
 lib/Amaya/doc/html/using_xml/loading_xml_document.html.de
 lib/Amaya/doc/html/using_xml/loading_xml_document.html.es
+lib/Amaya/doc/html/using_xml/loading_xml_document.html.ru
 lib/Amaya/doc/html/using_xml/xml_using_style.html
 lib/Amaya/doc/html/using_xml/xml_using_style.html.de
 lib/Amaya/doc/html/using_xml/xml_using_style.html.es
+lib/Amaya/doc/html/using_xml/xml_using_style.html.ru
 lib/Amaya/doc/html/viewing/about_synchronized_views.html
 lib/Amaya/doc/html/viewing/about_synchronized_views.html.de
 lib/Amaya/doc/html/viewing/about_synchronized_views.html.es
+lib/Amaya/doc/html/viewing/about_synchronized_views.html.ru
 lib/Amaya/doc/html/viewing/closing_a_view.html
 lib/Amaya/doc/html/viewing/closing_a_view.html.de
 lib/Amaya/doc/html/viewing/closing_a_view.html.es
+lib/Amaya/doc/html/viewing/closing_a_view.html.ru
 lib/Amaya/doc/html/viewing/opening_a_view.html
 lib/Amaya/doc/html/viewing/opening_a_view.html.de
 lib/Amaya/doc/html/viewing/opening_a_view.html.es
+lib/Amaya/doc/html/viewing/opening_a_view.html.ru
 lib/Amaya/doc/html/viewing/working_with_document_views.html
 lib/Amaya/doc/html/viewing/working_with_document_views.html.de
 lib/Amaya/doc/html/viewing/working_with_document_views.html.es
+lib/Amaya/doc/html/viewing/working_with_document_views.html.ru
 lib/Amaya/doc/images/Back.gif
 lib/Amaya/doc/images/Browser.gif
 lib/Amaya/doc/images/BrowsingMenu-fr.gif
@@ -747,9 +904,6 @@ lib/Amaya/doc/images/SVGLibrary.gif
 lib/Amaya/doc/images/SaveAs-fr.gif
 lib/Amaya/doc/images/SaveAs.gif
 lib/Amaya/doc/images/Strong.gif
-lib/Amaya/doc/images/TemplatesMenu-fr.gif
-lib/Amaya/doc/images/TemplatesMenu.gif
-lib/Amaya/doc/images/View.png
 lib/Amaya/doc/images/align-de.png
 lib/Amaya/doc/images/alternateview-de.jpg
 lib/Amaya/doc/images/alternateview.jpg
@@ -773,19 +927,10 @@ lib/Amaya/doc/images/bmmenu.png
 lib/Amaya/doc/images/bmtprop.png
 lib/Amaya/doc/images/bmview1.png
 lib/Amaya/doc/images/bmview2.png
-lib/Amaya/doc/images/browser_preferences-de.png
-lib/Amaya/doc/images/browsing_preferences-es.png
-lib/Amaya/doc/images/browsing_preferences.png
-lib/Amaya/doc/images/cache_preferences-de.png
-lib/Amaya/doc/images/cache_preferences-es.png
-lib/Amaya/doc/images/cache_preferences.png
 lib/Amaya/doc/images/check.gif
 lib/Amaya/doc/images/closed.png
 lib/Amaya/doc/images/code.gif
 lib/Amaya/doc/images/color-de.png
-lib/Amaya/doc/images/color_preferences-de.png
-lib/Amaya/doc/images/color_preferences-es.png
-lib/Amaya/doc/images/color_preferences.png
 lib/Amaya/doc/images/configuration_for_annotations-de.png
 lib/Amaya/doc/images/configuration_for_annotations-es.png
 lib/Amaya/doc/images/configuration_for_annotations.png
@@ -805,12 +950,6 @@ lib/Amaya/doc/images/floppy.gif
 lib/Amaya/doc/images/font-de.png
 lib/Amaya/doc/images/formattedview-de.jpg
 lib/Amaya/doc/images/formattedview.jpg
-lib/Amaya/doc/images/general_preferences-de.png
-lib/Amaya/doc/images/general_preferences-es.png
-lib/Amaya/doc/images/general_preferences.png
-lib/Amaya/doc/images/geometry_preferences-de.png
-lib/Amaya/doc/images/geometry_preferences-es.png
-lib/Amaya/doc/images/geometry_preferences.png
 lib/Amaya/doc/images/graphics_palette-de.png
 lib/Amaya/doc/images/home.gif
 lib/Amaya/doc/images/image_button.gif
@@ -829,15 +968,6 @@ lib/Amaya/doc/images/math_palette-de.png
 lib/Amaya/doc/images/not_well_formed-fr.png
 lib/Amaya/doc/images/open.png
 lib/Amaya/doc/images/printoptions_w32-de.png
-lib/Amaya/doc/images/profiles_preferences-de.png
-lib/Amaya/doc/images/profiles_preferences-es.png
-lib/Amaya/doc/images/profiles_preferences.png
-lib/Amaya/doc/images/proxy_preferences-de.png
-lib/Amaya/doc/images/proxy_preferences-es.png
-lib/Amaya/doc/images/proxy_preferences.png
-lib/Amaya/doc/images/publishing_preferences-de.png
-lib/Amaya/doc/images/publishing_preferences-es.png
-lib/Amaya/doc/images/publishing_preferences.png
 lib/Amaya/doc/images/put.gif
 lib/Amaya/doc/images/right.gif
 lib/Amaya/doc/images/scenario_graphique.png
@@ -852,24 +982,158 @@ lib/Amaya/doc/images/structureview-de.jpg
 lib/Amaya/doc/images/structureview.jpg
 lib/Amaya/doc/images/table.gif
 lib/Amaya/doc/images/target.gif
-lib/Amaya/doc/images/templates_preferences-de.png
-lib/Amaya/doc/images/templates_preferences-es.png
-lib/Amaya/doc/images/templates_preferences.png
 lib/Amaya/doc/images/threads-de.png
 lib/Amaya/doc/images/threads.png
+lib/Amaya/doc/images/timeline_view.png
 lib/Amaya/doc/images/tocview-de.jpg
 lib/Amaya/doc/images/tocview.jpg
 lib/Amaya/doc/images/up.gif
 lib/Amaya/doc/images/w3c_home
+lib/Amaya/fonts/ESSTIX10.TTF
+lib/Amaya/fonts/ESSTIX11.TTF
+lib/Amaya/fonts/ESSTIX12.TTF
+lib/Amaya/fonts/ESSTIX13.TTF
+lib/Amaya/fonts/ESSTIX14.TTF
+lib/Amaya/fonts/ESSTIX15.TTF
+lib/Amaya/fonts/ESSTIX16.TTF
+lib/Amaya/fonts/ESSTIX17.TTF
+lib/Amaya/fonts/ESSTIX1_.TTF
+lib/Amaya/fonts/ESSTIX2_.TTF
+lib/Amaya/fonts/ESSTIX3_.TTF
+lib/Amaya/fonts/ESSTIX4_.TTF
+lib/Amaya/fonts/ESSTIX5_.TTF
+lib/Amaya/fonts/ESSTIX6_.TTF
+lib/Amaya/fonts/ESSTIX7_.TTF
+lib/Amaya/fonts/ESSTIX8_.TTF
+lib/Amaya/fonts/ESSTIX9_.TTF
 lib/Amaya/fonts/Families.list
+lib/Amaya/fonts/FreeMono.ttf
+lib/Amaya/fonts/FreeMonoBold.ttf
+lib/Amaya/fonts/FreeMonoBoldOblique.ttf
+lib/Amaya/fonts/FreeMonoOblique.ttf
+lib/Amaya/fonts/FreeSans.ttf
+lib/Amaya/fonts/FreeSansBold.ttf
+lib/Amaya/fonts/FreeSansBoldOblique.ttf
+lib/Amaya/fonts/FreeSansOblique.ttf
+lib/Amaya/fonts/FreeSerif.ttf
+lib/Amaya/fonts/FreeSerifBold.ttf
+lib/Amaya/fonts/FreeSerifBoldItalic.ttf
+lib/Amaya/fonts/FreeSerifItalic.ttf
 lib/Amaya/fonts/fonts.dir
 lib/Amaya/fonts/icones.ff
 lib/Amaya/fonts/icones.pcf
 lib/Amaya/fonts/icones1.fb
 lib/Amaya/fonts/icones11.fb
+lib/Amaya/gtk/bin/amaya
+lib/Amaya/gtk/bin/print
+lib/Amaya/resources/icons/BG_norepeat.png
+lib/Amaya/resources/icons/BG_repeat.png
+lib/Amaya/resources/icons/BG_repeat_x.png
+lib/Amaya/resources/icons/BG_repeat_y.png
+lib/Amaya/resources/icons/MATHML_Bmath.png
+lib/Amaya/resources/icons/MATHML_F_divers.png
+lib/Amaya/resources/icons/MATHML_F_fleches.png
+lib/Amaya/resources/icons/MATHML_F_greek.png
+lib/Amaya/resources/icons/MATHML_F_greek_maj.png
+lib/Amaya/resources/icons/MATHML_F_maths.png
+lib/Amaya/resources/icons/MATHML_F_operateurs.png
+lib/Amaya/resources/icons/MATHML_F_relations_binaires.png
+lib/Amaya/resources/icons/MATHML_F_relations_negation.png
+lib/Amaya/resources/icons/MATHML_fence.png
+lib/Amaya/resources/icons/MATHML_frac.png
+lib/Amaya/resources/icons/MATHML_greek.png
+lib/Amaya/resources/icons/MATHML_insert.png
+lib/Amaya/resources/icons/MATHML_matrix.png
+lib/Amaya/resources/icons/MATHML_mscript.png
+lib/Amaya/resources/icons/MATHML_over.png
+lib/Amaya/resources/icons/MATHML_overunder.png
+lib/Amaya/resources/icons/MATHML_root.png
+lib/Amaya/resources/icons/MATHML_sqrt.png
+lib/Amaya/resources/icons/MATHML_sub.png
+lib/Amaya/resources/icons/MATHML_subsup.png
+lib/Amaya/resources/icons/MATHML_sup.png
+lib/Amaya/resources/icons/MATHML_under.png
+lib/Amaya/resources/icons/XHTML_B.png
+lib/Amaya/resources/icons/XHTML_Bullet.png
+lib/Amaya/resources/icons/XHTML_DL.png
+lib/Amaya/resources/icons/XHTML_H1.png
+lib/Amaya/resources/icons/XHTML_H2.png
+lib/Amaya/resources/icons/XHTML_H3.png
+lib/Amaya/resources/icons/XHTML_I.png
+lib/Amaya/resources/icons/XHTML_Image.png
+lib/Amaya/resources/icons/XHTML_Link.png
+lib/Amaya/resources/icons/XHTML_Num.png
+lib/Amaya/resources/icons/XHTML_T.png
+lib/Amaya/resources/icons/XHTML_Table.png
+lib/Amaya/resources/icons/back.png
+lib/Amaya/resources/icons/black_white.png
+lib/Amaya/resources/icons/cancel.png
+lib/Amaya/resources/icons/colorize.png
+lib/Amaya/resources/icons/default.png
+lib/Amaya/resources/icons/default_document.png
+lib/Amaya/resources/icons/detach.png
+lib/Amaya/resources/icons/detach_floating.png
+lib/Amaya/resources/icons/empty.png
+lib/Amaya/resources/icons/expand_off.png
+lib/Amaya/resources/icons/expand_on.png
+lib/Amaya/resources/icons/find.png
+lib/Amaya/resources/icons/format_center.png
+lib/Amaya/resources/icons/format_justify.png
+lib/Amaya/resources/icons/format_left.png
+lib/Amaya/resources/icons/format_right.png
+lib/Amaya/resources/icons/forward.png
+lib/Amaya/resources/icons/home.png
+lib/Amaya/resources/icons/logo.png
+lib/Amaya/resources/icons/ok.png
+lib/Amaya/resources/icons/print.png
+lib/Amaya/resources/icons/redo.png
+lib/Amaya/resources/icons/refresh.png
+lib/Amaya/resources/icons/reload.png
+lib/Amaya/resources/icons/save.png
+lib/Amaya/resources/icons/stop.png
+lib/Amaya/resources/icons/switch_colors.png
+lib/Amaya/resources/icons/trash.png
+lib/Amaya/resources/icons/undo.png
+lib/Amaya/resources/xrc/AuthentDlgWX.xrc
+lib/Amaya/resources/xrc/BgImageDlgWX.xrc
+lib/Amaya/resources/xrc/CheckedListDlgWX.xrc
+lib/Amaya/resources/xrc/CreateTableDlgWX.xrc
+lib/Amaya/resources/xrc/DocInfoDlgWX.xrc
+lib/Amaya/resources/xrc/EnumListDlgWX.xrc
+lib/Amaya/resources/xrc/HRefDlgWX.xrc
+lib/Amaya/resources/xrc/ImageDlgWX.xrc
 lib/Amaya/resources/xrc/InitConfirmDlgWX.xrc
+lib/Amaya/resources/xrc/ListDlgWX.xrc
+lib/Amaya/resources/xrc/ListEditDlgWX.xrc
+lib/Amaya/resources/xrc/NumDlgWX.xrc
+lib/Amaya/resources/xrc/ObjectDlgWX.xrc
+lib/Amaya/resources/xrc/OpenDocDlgWX.xrc
+lib/Amaya/resources/xrc/Panel_ApplyClass.xrc
+lib/Amaya/resources/xrc/Panel_Attribute.xrc
+lib/Amaya/resources/xrc/Panel_Attribute_Enum.xrc
+lib/Amaya/resources/xrc/Panel_Attribute_Lang.xrc
+lib/Amaya/resources/xrc/Panel_Attribute_Num.xrc
+lib/Amaya/resources/xrc/Panel_Attribute_Text.xrc
+lib/Amaya/resources/xrc/Panel_CharStyle.xrc
+lib/Amaya/resources/xrc/Panel_Colors.xrc
+lib/Amaya/resources/xrc/Panel_Format.xrc
+lib/Amaya/resources/xrc/Panel_MathML.xrc
+lib/Amaya/resources/xrc/Panel_SpeChar.xrc
+lib/Amaya/resources/xrc/Panel_XHTML.xrc
+lib/Amaya/resources/xrc/Panel_XML.xrc
+lib/Amaya/resources/xrc/PreferenceDlgWX.xrc
+lib/Amaya/resources/xrc/PrintDlgWX.xrc
+lib/Amaya/resources/xrc/SaveAsDlgWX.xrc
+lib/Amaya/resources/xrc/SearchDlgWX.xrc
+lib/Amaya/resources/xrc/SpellCheckDlgWX.xrc
+lib/Amaya/resources/xrc/TextDlgWX.xrc
+lib/Amaya/resources/xrc/TitleDlgWX.xrc
+lib/Amaya/resources/xrc/TitlePanel.xrc
 @dirrm lib/Amaya/resources/xrc
+@dirrm lib/Amaya/resources/icons
 @dirrm lib/Amaya/resources
+@dirrm lib/Amaya/gtk/bin
+@dirrm lib/Amaya/gtk
 @dirrm lib/Amaya/fonts
 @dirrm lib/Amaya/doc/images
 @dirrm lib/Amaya/doc/html/viewing
@@ -883,7 +1147,6 @@ lib/Amaya/resources/xrc/InitConfirmDlgWX.xrc
 @dirrm lib/Amaya/doc/html/searching_and_replacing_text
 @dirrm lib/Amaya/doc/html/saving_and_publishing_documents
 @dirrm lib/Amaya/doc/html/printing
-@dirrm lib/Amaya/doc/html/numbering_sections
 @dirrm lib/Amaya/doc/html/linking
 @dirrm lib/Amaya/doc/html/elements
 @dirrm lib/Amaya/doc/html/editing_tables
@@ -903,8 +1166,6 @@ lib/Amaya/resources/xrc/InitConfirmDlgWX.xrc
 @dirrm lib/Amaya/davlib
 @dirrm lib/Amaya/config/libconfig
 @dirrm lib/Amaya/config
-@dirrm lib/Amaya/applis/bin
-@dirrm lib/Amaya/applis
 @dirrm lib/Amaya/annotlib
 @dirrm lib/Amaya/amaya
 @dirrm lib/Amaya
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index edd18f794a1..1b0f7b5a955 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.12 2004/06/12 14:23:10 cube Exp $
+$NetBSD: distinfo,v 1.13 2005/01/18 16:35:18 adam Exp $
 
-SHA1 (amaya-src-8.5.tgz) = 58d9cc29328883f788c962f623f9c345828cfee6
-Size (amaya-src-8.5.tgz) = 9713795 bytes
+SHA1 (amaya-fullsrc-9.0.tgz) = 1ad9a0bec8667c42f1c142d3b27c7864e814c25c
+Size (amaya-fullsrc-9.0.tgz) = 22913923 bytes
 SHA1 (patch-aa) = daa3b4ad4e00d6e6ca855bb638cc8ec8d2565791
-SHA1 (patch-ab) = 7a3dbdff2acc18202cd31b7516b1f645a1bc0f68
+SHA1 (patch-ab) = 1b86f6d5a6ab785ec3a700ae7f8db5f9a4e3c997
 SHA1 (patch-ac) = 5d9df3fc894f06c981b26d82f216ff223a821954
-SHA1 (patch-ad) = 19a895425342fa5379ed24953cf0c0ce2eda0760
-SHA1 (patch-ah) = 1f164968815f70c9f8b2dbe0516fcc26c6bce776
+SHA1 (patch-ah) = e256bd54229967d95b25dcc3859882e000914d34
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
index 43fedbceaa4..e3c18d1eb10 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2003/12/03 01:36:12 xtraeme Exp $
+$NetBSD: patch-ab,v 1.10 2005/01/18 16:35:18 adam Exp $
 
---- ../configure.orig	Tue Nov  4 09:01:02 2003
+--- ../configure.orig	2004-11-04 16:11:59.000000000 +0000
 +++ ../configure
-@@ -5577,7 +5577,7 @@
+@@ -4941,7 +4941,7 @@ done
  
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.9 2003/12/03 01:36:12 xtraeme Exp $
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -14772,6 +14772,8 @@
+@@ -14776,6 +14776,8 @@ fi
  if test "$with_dav" = "yes" ; then
  
      dav_frag=$srcdir/davlib/Makefile.dav
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
deleted file mode 100644
index a8f32e8f9b7..00000000000
--- a/www/amaya/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2004/05/13 03:47:29 xtraeme Exp $
-
---- ../tools/mkdep/mkdep.c.orig	2004-05-13 05:34:59.000000000 +0200
-+++ ../tools/mkdep/mkdep.c	2004-05-13 05:35:12.000000000 +0200
-@@ -385,7 +385,7 @@
- 	res = munmap(mmap_map, (size_t) mmap_mapsize);
-         if (res < 0) perror("unmap failed");
- #else
--        mmap_map = malloc(mmap_mapsize);
-+        mmap_map = (char *)malloc(mmap_mapsize);
- 	if (mmap_map == NULL) {
- 	    perror("malloc failed");
- 	    exit(1);
diff --git a/www/amaya/patches/patch-ah b/www/amaya/patches/patch-ah
index 57c701096b0..cb6b1280dc6 100644
--- a/www/amaya/patches/patch-ah
+++ b/www/amaya/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/06/12 14:23:10 cube Exp $
+$NetBSD: patch-ah,v 1.2 2005/01/18 16:35:18 adam Exp $
 
---- ../thotlib/presentation/presvariables.c.orig	2004-01-29 17:06:46.000000000 +0100
+--- ../thotlib/presentation/presvariables.c.orig	2004-09-30 12:24:44.000000000 +0000
 +++ ../thotlib/presentation/presvariables.c
-@@ -909,8 +909,8 @@ ThotBool NewVariable (int varNum, PtrSSc
+@@ -1113,8 +1113,8 @@ ThotBool NewVariable (int varNum, PtrSSc
  {
     int                 f, l;
     int                 i;