kdewebdev4: remove, successor kimagemapeditor

8 files changed, 1 insertions, 584 deletions

diff --git a/www/Makefile b/www/Makefile
index 2c77729a008..b5d01f31e20 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1417 2019/11/26 18:10:54 ng0 Exp $
+# $NetBSD: Makefile,v 1.1418 2019/11/30 22:10:52 markd Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -164,7 +164,6 @@ SUBDIR+=	jetty7
 SUBDIR+=	jetty9
 SUBDIR+=	kahua
 SUBDIR+=	kannel
-SUBDIR+=	kdewebdev4
 SUBDIR+=	kdewebkit
 SUBDIR+=	khtml
 SUBDIR+=	kimagemapeditor
diff --git a/www/kdewebdev4/DESCR b/www/kdewebdev4/DESCR
deleted file mode 100644
index 16533ccc9a2..00000000000
--- a/www/kdewebdev4/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-The kdewebdev package is the web development package for the K Desktop
-Environment.
-
-It contains Quanta Plus and other applications, which are useful for web
-development. They are runtime dependencies of Quanta Plus, and it is
-highly recommended that you install them.
-
-The extra applications are:
-
-Kommander: a GUI script builder and executor tool. Needed for some Quanta
-   functionality.
-KFileReplace: powerful search and replace in multiple files
-KXSLDbg: XSL debugger
-KImageMapEditor: image map editor
-KLinkStatus: link checker
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
deleted file mode 100644
index c7c0e75eaba..00000000000
--- a/www/kdewebdev4/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.75 2019/08/22 12:23:52 ryoon Exp $
-
-DISTNAME=	kdewebdev-16.08.0
-PKGNAME=	${DISTNAME:S/-1/4-1/}
-PKGREVISION=	12
-CATEGORIES=	www
-COMMENT=	HTML editor and tools suitable for experienced web developers
-MASTER_SITES=	${MASTER_SITE_KDE:=applications/16.08.0/src/}
-
-.include "../../meta-pkgs/kde4/Makefile.kde4"
-
-# BUILD_MAKE_FLAGS+= VERBOSE=1
-
-.include "../../meta-pkgs/kde4/kde4.mk"
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../misc/kdepimlibs4/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../www/tidy/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kde-runtime4/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/kdewebdev4/PLIST b/www/kdewebdev4/PLIST
deleted file mode 100644
index 136fd8b8fab..00000000000
--- a/www/kdewebdev4/PLIST
+++ /dev/null
@@ -1,122 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2013/11/07 13:20:40 markd Exp $
-bin/kfilereplace
-bin/kimagemapeditor
-bin/klinkstatus
-bin/kommander
-include/kommandercore_export.h
-include/kommanderplugin.h
-include/kommanderwidget.h
-include/specials.h
-lib/kde4/automationklinkstatus.so
-lib/kde4/klinkstatuspart.so
-lib/kde4/krossmoduleklinkstatus.so
-lib/kde4/libkfilereplacepart.so
-lib/kde4/libkimagemapeditor.so
-lib/libklinkstatuscommon.so
-lib/libklinkstatuscommon.so.4
-lib/libklinkstatuscommon.so.4.0.0
-lib/libkommandercore.so
-lib/libkommandercore.so.4
-lib/libkommandercore.so.4.2.0
-lib/libkommanderwidgets.so
-lib/libkommanderwidgets.so.4
-lib/libkommanderwidgets.so.4.2.0
-share/applications/kde4/kfilereplace.desktop
-share/applications/kde4/kimagemapeditor.desktop
-share/applications/kde4/klinkstatus.desktop
-share/applnk/.hidden/kommander.desktop
-share/dbus-1/interfaces/org.kde.kdewebdev.klinkstatus.SearchManager.xml
-share/dbus-1/interfaces/org.kde.kfilereplace.xml
-share/doc/kde/HTML/en/kfilereplace/addstringsdialog_window.png
-share/doc/kde/HTML/en/kfilereplace/backup_option.png
-share/doc/kde/HTML/en/kfilereplace/casesensitive_option.png
-share/doc/kde/HTML/en/kfilereplace/command_option.png
-share/doc/kde/HTML/en/kfilereplace/common
-share/doc/kde/HTML/en/kfilereplace/edit.png
-share/doc/kde/HTML/en/kfilereplace/edit_add.png
-share/doc/kde/HTML/en/kfilereplace/edit_remove.png
-share/doc/kde/HTML/en/kfilereplace/eraser.png
-share/doc/kde/HTML/en/kfilereplace/filereplace.png
-share/doc/kde/HTML/en/kfilereplace/filesearch.png
-share/doc/kde/HTML/en/kfilereplace/filesimulate.png
-share/doc/kde/HTML/en/kfilereplace/index.cache.bz2
-share/doc/kde/HTML/en/kfilereplace/index.docbook
-share/doc/kde/HTML/en/kfilereplace/invert.png
-share/doc/kde/HTML/en/kfilereplace/kfr_standalone_main_window_1.png
-share/doc/kde/HTML/en/kfilereplace/optionsdialog_main_window_1.png
-share/doc/kde/HTML/en/kfilereplace/optionsdialog_main_window_2.png
-share/doc/kde/HTML/en/kfilereplace/project.png
-share/doc/kde/HTML/en/kfilereplace/projectdialog_main_window_1.png
-share/doc/kde/HTML/en/kfilereplace/projectdialog_main_window_2.png
-share/doc/kde/HTML/en/kfilereplace/recursive_option.png
-share/doc/kde/HTML/en/kfilereplace/regularexpression_option.png
-share/doc/kde/HTML/en/kfilereplace/report_example.png
-share/doc/kde/HTML/en/kfilereplace/results_view.png
-share/doc/kde/HTML/en/kfilereplace/stop.png
-share/doc/kde/HTML/en/kfilereplace/strings_view.png
-share/doc/kde/HTML/en/kfilereplace/toolbar.png
-share/doc/kde/HTML/en/kfilereplace/unsortedList.png
-share/doc/kde/HTML/en/kimagemapeditor/common
-share/doc/kde/HTML/en/kimagemapeditor/configure.png
-share/doc/kde/HTML/en/kimagemapeditor/index.cache.bz2
-share/doc/kde/HTML/en/kimagemapeditor/index.docbook
-share/doc/kde/HTML/en/kimagemapeditor/mainwindow.png
-share/doc/kde/HTML/en/klinkstatus/check-settings.png
-share/doc/kde/HTML/en/klinkstatus/common
-share/doc/kde/HTML/en/klinkstatus/identification-settings.png
-share/doc/kde/HTML/en/klinkstatus/index.cache.bz2
-share/doc/kde/HTML/en/klinkstatus/index.docbook
-share/doc/kde/HTML/en/klinkstatus/login-dialog.png
-share/doc/kde/HTML/en/klinkstatus/mail-transport-settings.png
-share/doc/kde/HTML/en/klinkstatus/results-settings.png
-share/doc/kde/HTML/en/klinkstatus/screenshot.png
-share/icons/hicolor/128x128/apps/klinkstatus.png
-share/icons/hicolor/16x16/apps/kimagemapeditor.png
-share/icons/hicolor/16x16/apps/klinkstatus.png
-share/icons/hicolor/22x22/actions/addpoint.png
-share/icons/hicolor/22x22/actions/arrow.png
-share/icons/hicolor/22x22/actions/circle.png
-share/icons/hicolor/22x22/actions/circle2.png
-share/icons/hicolor/22x22/actions/freehand.png
-share/icons/hicolor/22x22/actions/lower.png
-share/icons/hicolor/22x22/actions/polygon.png
-share/icons/hicolor/22x22/actions/raise.png
-share/icons/hicolor/22x22/actions/rectangle.png
-share/icons/hicolor/22x22/actions/removepoint.png
-share/icons/hicolor/22x22/apps/kfilereplace.png
-share/icons/hicolor/22x22/apps/klinkstatus.png
-share/icons/hicolor/32x32/apps/kfilereplace.png
-share/icons/hicolor/32x32/apps/kimagemapeditor.png
-share/icons/hicolor/32x32/apps/klinkstatus.png
-share/icons/hicolor/48x48/apps/kfilereplace.png
-share/icons/hicolor/48x48/apps/kimagemapeditor.png
-share/icons/hicolor/48x48/apps/klinkstatus.png
-share/icons/hicolor/64x64/apps/klinkstatus.png
-share/kde/apps/kfilereplace/kfilereplaceui.rc
-share/kde/apps/kfilereplacepart/icons/hicolor/22x22/actions/backup_option.png
-share/kde/apps/kfilereplacepart/icons/hicolor/22x22/actions/casesensitive_option.png
-share/kde/apps/kfilereplacepart/icons/hicolor/22x22/actions/command_option.png
-share/kde/apps/kfilereplacepart/icons/hicolor/22x22/actions/filesimulate.png
-share/kde/apps/kfilereplacepart/icons/hicolor/22x22/actions/invert.png
-share/kde/apps/kfilereplacepart/icons/hicolor/22x22/actions/recursive_option.png
-share/kde/apps/kfilereplacepart/icons/hicolor/22x22/actions/regularexpression_option.png
-share/kde/apps/kfilereplacepart/kfilereplacepartui.rc
-share/kde/apps/kimagemapeditor/addpointcursor.png
-share/kde/apps/kimagemapeditor/freehandcursor.png
-share/kde/apps/kimagemapeditor/kimagemapeditorpartui.rc
-share/kde/apps/kimagemapeditor/kimagemapeditorui.rc
-share/kde/apps/kimagemapeditor/polygoncursor.png
-share/kde/apps/kimagemapeditor/removepointcursor.png
-share/kde/apps/klinkstatus/klinkstatus_shell.rc
-share/kde/apps/klinkstatus/scripts/scripts.rc
-share/kde/apps/klinkstatus/styles/results_stylesheet.xsl
-share/kde/apps/klinkstatuspart/klinkstatus_part.rc
-share/kde/apps/klinkstatuspart/kpartplugins/klinkstatus_automation.rc
-share/kde/apps/klinkstatuspart/kpartplugins/scripting.rc
-share/kde/apps/klinkstatuspart/pics/304.png
-share/kde/config/klinkstatus.knsrc
-share/kde4/services/kfilereplacepart.desktop
-share/kde4/services/kimagemapeditorpart.desktop
-share/kde4/services/klinkstatus_automation.desktop
-share/kde4/services/klinkstatus_part.desktop
-share/kde4/services/krossmoduleklinkstatus.desktop
diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo
deleted file mode 100644
index 6e37fbf3f5a..00000000000
--- a/www/kdewebdev4/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.27 2018/02/04 00:23:08 markd Exp $
-
-SHA1 (kdewebdev-16.08.0.tar.xz) = 416ef3b58cf0d3bfe8a71a212c8b64329b3b2b2f
-RMD160 (kdewebdev-16.08.0.tar.xz) = 1938d42a25a02b1f531c92b0456d4647d533f619
-SHA512 (kdewebdev-16.08.0.tar.xz) = 7fe5ac57786372a0dd5d880dc131c278f36fc01f0f1c31f98e833aaf90a5cb5fb53a6360956d21102e29ffe3ea37f0fdafd478988afc15bef6700af077829162
-Size (kdewebdev-16.08.0.tar.xz) = 2536044 bytes
-SHA1 (patch-klinkstatus_src_CMakeLists.txt) = b3698f7edde82552e0395a27df980d0e58ce0994
-SHA1 (patch-klinkstatus_src_plugins_scripting_scripts_CMakeLists.txt) = aaf22196a55da6f8bd8ab43c8be444b65fed3502
-SHA1 (patch-klinkstatus_src_tidy_tidyx.h) = 92716621b129e938a33078b131655cbeb0771dce
diff --git a/www/kdewebdev4/patches/patch-klinkstatus_src_CMakeLists.txt b/www/kdewebdev4/patches/patch-klinkstatus_src_CMakeLists.txt
deleted file mode 100644
index 711f6d5b6cd..00000000000
--- a/www/kdewebdev4/patches/patch-klinkstatus_src_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-klinkstatus_src_CMakeLists.txt,v 1.1 2012/03/19 20:01:10 markd Exp $
-
---- klinkstatus/src/CMakeLists.txt.orig	2011-09-26 11:26:04.000000000 +0000
-+++ klinkstatus/src/CMakeLists.txt
-@@ -3,6 +3,8 @@ add_subdirectory(plugins)
- set(GENERIC_KLINKSTATUS_LIB_VERSION "4.0.0")
- set(GENERIC_KLINKSTATUS_LIB_SOVERSION "4")
- 
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- configure_file(config-tidy.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-tidy.h )
- 
- 
diff --git a/www/kdewebdev4/patches/patch-klinkstatus_src_plugins_scripting_scripts_CMakeLists.txt b/www/kdewebdev4/patches/patch-klinkstatus_src_plugins_scripting_scripts_CMakeLists.txt
deleted file mode 100644
index ef9738ee5f5..00000000000
--- a/www/kdewebdev4/patches/patch-klinkstatus_src_plugins_scripting_scripts_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-klinkstatus_src_plugins_scripting_scripts_CMakeLists.txt,v 1.1 2016/04/15 14:25:49 jperkin Exp $
-
-Explicitly disable optional ruby scripts, to avoid PLIST failures
-if ruby happens to be installed.
-
---- klinkstatus/src/plugins/scripting/scripts/CMakeLists.txt.orig	2008-12-21 17:55:20.000000000 +0000
-+++ klinkstatus/src/plugins/scripting/scripts/CMakeLists.txt
-@@ -5,7 +5,7 @@ install(FILES
- macro_optional_find_package(RUBY)
- macro_log_feature(RUBY_FOUND "Ruby" "An Interpreted object-oriented scripting language" "http://www.ruby-lang.org" FALSE "" "For KLinkStatus example ruby scripts")
- 
--if(RUBY_FOUND)
-+if(notRUBY_FOUND)
-     
-     include_directories(${RUBY_INCLUDE_PATH})
- 
diff --git a/www/kdewebdev4/patches/patch-klinkstatus_src_tidy_tidyx.h b/www/kdewebdev4/patches/patch-klinkstatus_src_tidy_tidyx.h
deleted file mode 100644
index a6463bf0027..00000000000
--- a/www/kdewebdev4/patches/patch-klinkstatus_src_tidy_tidyx.h
+++ /dev/null
@@ -1,384 +0,0 @@
-$NetBSD: patch-klinkstatus_src_tidy_tidyx.h,v 1.2 2018/02/04 00:23:08 markd Exp $
-
-tidy-5.x compatibility.
-
---- klinkstatus/src/tidy/tidyx.h.orig	2008-07-28 16:04:32.000000000 +0000
-+++ klinkstatus/src/tidy/tidyx.h
-@@ -49,7 +49,7 @@
- */
- 
- #include <tidy.h>
--#include <buffio.h>
-+#include <tidybuffio.h>
- 
- #include <config-tidy.h>
-     
-@@ -303,6 +303,8 @@ public:
-     ctmbstr NsUri()      { return tidyNodeNsUri( tnod() ); }
-     */
- 
-+#define return_(a) return((a) ? yes : no)
-+
-     /* Iterate over attribute values */
-     AttrVal* FirstAttr() { return (AttrVal*) tidyAttrFirst( tnod() ); }
- 
-@@ -312,134 +314,134 @@ public:
- 
-     TagId Id()           { return tidyNodeGetId( tnod() ); }
- 
--    Bool IsHTML()        { return tidyNodeIsHTML( tnod() ); }
--    Bool IsHEAD()        { return tidyNodeIsHEAD( tnod() ); }
--    Bool IsTITLE()       { return tidyNodeIsTITLE( tnod() ); }
--    Bool IsBASE()        { return tidyNodeIsBASE( tnod() ); }
--    Bool IsMETA()        { return tidyNodeIsMETA( tnod() ); }
--    Bool IsBODY()        { return tidyNodeIsBODY( tnod() ); }
--    Bool IsFRAMESET()    { return tidyNodeIsFRAMESET( tnod() ); }
--    Bool IsFRAME()       { return tidyNodeIsFRAME( tnod() ); }
--    Bool IsIFRAME()      { return tidyNodeIsIFRAME( tnod() ); }
--    Bool IsNOFRAMES()    { return tidyNodeIsNOFRAMES( tnod() ); }
--    Bool IsHR()          { return tidyNodeIsHR( tnod() ); }
--    Bool IsH1()          { return tidyNodeIsH1( tnod() ); }
--    Bool IsH2()          { return tidyNodeIsH2( tnod() ); }
--    Bool IsPRE()         { return tidyNodeIsPRE( tnod() ); }
--    Bool IsLISTING()     { return tidyNodeIsLISTING( tnod() ); }
--    Bool IsP()           { return tidyNodeIsP( tnod() ); }
--    Bool IsUL()          { return tidyNodeIsUL( tnod() ); }
--    Bool IsOL()          { return tidyNodeIsOL( tnod() ); }
--    Bool IsDL()          { return tidyNodeIsDL( tnod() ); }
--    Bool IsDIR()         { return tidyNodeIsDIR( tnod() ); }
--    Bool IsLI()          { return tidyNodeIsLI( tnod() ); }
--    Bool IsDT()          { return tidyNodeIsDT( tnod() ); }
--    Bool IsDD()          { return tidyNodeIsDD( tnod() ); }
--    Bool IsTABLE()       { return tidyNodeIsTABLE( tnod() ); }
--    Bool IsCAPTION()     { return tidyNodeIsCAPTION( tnod() ); }
--    Bool IsTD()          { return tidyNodeIsTD( tnod() ); }
--    Bool IsTH()          { return tidyNodeIsTH( tnod() ); }
--    Bool IsTR()          { return tidyNodeIsTR( tnod() ); }
--    Bool IsCOL()         { return tidyNodeIsCOL( tnod() ); }
--    Bool IsCOLGROUP()    { return tidyNodeIsCOLGROUP( tnod() ); }
--    Bool IsBR()          { return tidyNodeIsBR( tnod() ); }
--    Bool IsA()           { return tidyNodeIsA( tnod() ); }
--    Bool IsLINK()        { return tidyNodeIsLINK( tnod() ); }
--    Bool IsB()           { return tidyNodeIsB( tnod() ); }
--    Bool IsI()           { return tidyNodeIsI( tnod() ); }
--    Bool IsSTRONG()      { return tidyNodeIsSTRONG( tnod() ); }
--    Bool IsEM()          { return tidyNodeIsEM( tnod() ); }
--    Bool IsBIG()         { return tidyNodeIsBIG( tnod() ); }
--    Bool IsSMALL()       { return tidyNodeIsSMALL( tnod() ); }
--    Bool IsPARAM()       { return tidyNodeIsPARAM( tnod() ); }
--    Bool IsOPTION()      { return tidyNodeIsOPTION( tnod() ); }
--    Bool IsOPTGROUP()    { return tidyNodeIsOPTGROUP( tnod() ); }
--    Bool IsIMG()         { return tidyNodeIsIMG( tnod() ); }
--    Bool IsMAP()         { return tidyNodeIsMAP( tnod() ); }
--    Bool IsAREA()        { return tidyNodeIsAREA( tnod() ); }
--    Bool IsNOBR()        { return tidyNodeIsNOBR( tnod() ); }
--    Bool IsWBR()         { return tidyNodeIsWBR( tnod() ); }
--    Bool IsFONT()        { return tidyNodeIsFONT( tnod() ); }
--    Bool IsLAYER()       { return tidyNodeIsLAYER( tnod() ); }
--    Bool IsSPACER()      { return tidyNodeIsSPACER( tnod() ); }
--    Bool IsCENTER()      { return tidyNodeIsCENTER( tnod() ); }
--    Bool IsSTYLE()       { return tidyNodeIsSTYLE( tnod() ); }
--    Bool IsSCRIPT()      { return tidyNodeIsSCRIPT( tnod() ); }
--    Bool IsNOSCRIPT()    { return tidyNodeIsNOSCRIPT( tnod() ); }
--    Bool IsFORM()        { return tidyNodeIsFORM( tnod() ); }
--    Bool IsTEXTAREA()    { return tidyNodeIsTEXTAREA( tnod() ); }
--    Bool IsBLOCKQUOTE()  { return tidyNodeIsBLOCKQUOTE( tnod() ); }
--    Bool IsAPPLET()      { return tidyNodeIsAPPLET( tnod() ); }
--    Bool IsOBJECT()      { return tidyNodeIsOBJECT( tnod() ); }
--    Bool IsDIV()         { return tidyNodeIsDIV( tnod() ); }
--    Bool IsSPAN()        { return tidyNodeIsSPAN( tnod() ); }
--    Bool IsINPUT()       { return tidyNodeIsINPUT( tnod() ); }
--    Bool IsQ()           { return tidyNodeIsQ( tnod() ); }
--    Bool IsLABEL()       { return tidyNodeIsLABEL( tnod() ); }
--    Bool IsH3()          { return tidyNodeIsH3( tnod() ); }
--    Bool IsH4()          { return tidyNodeIsH4( tnod() ); }
--    Bool IsH5()          { return tidyNodeIsH5( tnod() ); }
--    Bool IsH6()          { return tidyNodeIsH6( tnod() ); }
--    Bool IsADDRESS()     { return tidyNodeIsADDRESS( tnod() ); }
--    Bool IsXMP()         { return tidyNodeIsXMP( tnod() ); }
--    Bool IsSELECT()      { return tidyNodeIsSELECT( tnod() ); }
--    Bool IsBLINK()       { return tidyNodeIsBLINK( tnod() ); }
--    Bool IsMARQUEE()     { return tidyNodeIsMARQUEE( tnod() ); }
--    Bool IsEMBED()       { return tidyNodeIsEMBED( tnod() ); }
--    Bool IsBASEFONT()    { return tidyNodeIsBASEFONT( tnod() ); }
--    Bool IsISINDEX()     { return tidyNodeIsISINDEX( tnod() ); }
--    Bool IsS()           { return tidyNodeIsS( tnod() ); }
--    Bool IsSTRIKE()      { return tidyNodeIsSTRIKE( tnod() ); }
--    Bool IsU()           { return tidyNodeIsU( tnod() ); }
--    Bool IsMENU()        { return tidyNodeIsMENU( tnod() ); }
-+    Bool IsHTML()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_HTML); }
-+    Bool IsHEAD()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_HEAD); }
-+    Bool IsTITLE()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_TITLE); }
-+    Bool IsBASE()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_BASE); }
-+    Bool IsMETA()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_META); }
-+    Bool IsBODY()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_BODY); }
-+    Bool IsFRAMESET()    { return_ (tidyNodeGetId( tnod() ) == TidyTag_FRAMESET); }
-+    Bool IsFRAME()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_FRAME); }
-+    Bool IsIFRAME()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_IFRAME); }
-+    Bool IsNOFRAMES()    { return_ (tidyNodeGetId( tnod() ) == TidyTag_NOFRAMES); }
-+    Bool IsHR()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_HR); }
-+    Bool IsH1()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_H1); }
-+    Bool IsH2()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_H2); }
-+    Bool IsPRE()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_PRE); }
-+    Bool IsLISTING()     { return_ (tidyNodeGetId( tnod() ) == TidyTag_LISTING); }
-+    Bool IsP()           { return_ (tidyNodeGetId( tnod() ) == TidyTag_P); }
-+    Bool IsUL()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_UL); }
-+    Bool IsOL()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_OL); }
-+    Bool IsDL()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_DL); }
-+    Bool IsDIR()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_DIR); }
-+    Bool IsLI()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_LI); }
-+    Bool IsDT()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_DT); }
-+    Bool IsDD()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_DD); }
-+    Bool IsTABLE()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_TABLE); }
-+    Bool IsCAPTION()     { return_ (tidyNodeGetId( tnod() ) == TidyTag_CAPTION); }
-+    Bool IsTD()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_TD); }
-+    Bool IsTH()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_TH); }
-+    Bool IsTR()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_TR); }
-+    Bool IsCOL()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_COL); }
-+    Bool IsCOLGROUP()    { return_ (tidyNodeGetId( tnod() ) == TidyTag_COLGROUP); }
-+    Bool IsBR()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_BR); }
-+    Bool IsA()           { return_ (tidyNodeGetId( tnod() ) == TidyTag_A); }
-+    Bool IsLINK()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_LINK); }
-+    Bool IsB()           { return_ (tidyNodeGetId( tnod() ) == TidyTag_B); }
-+    Bool IsI()           { return_ (tidyNodeGetId( tnod() ) == TidyTag_I); }
-+    Bool IsSTRONG()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_STRONG); }
-+    Bool IsEM()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_EM); }
-+    Bool IsBIG()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_BIG); }
-+    Bool IsSMALL()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_SMALL); }
-+    Bool IsPARAM()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_PARAM); }
-+    Bool IsOPTION()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_OPTION); }
-+    Bool IsOPTGROUP()    { return_ (tidyNodeGetId( tnod() ) == TidyTag_OPTGROUP); }
-+    Bool IsIMG()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_IMG); }
-+    Bool IsMAP()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_MAP); }
-+    Bool IsAREA()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_AREA); }
-+    Bool IsNOBR()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_NOBR); }
-+    Bool IsWBR()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_WBR); }
-+    Bool IsFONT()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_FONT); }
-+    Bool IsLAYER()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_LAYER); }
-+    Bool IsSPACER()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_SPACER); }
-+    Bool IsCENTER()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_CENTER); }
-+    Bool IsSTYLE()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_STYLE); }
-+    Bool IsSCRIPT()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_SCRIPT); }
-+    Bool IsNOSCRIPT()    { return_ (tidyNodeGetId( tnod() ) == TidyTag_NOSCRIPT); }
-+    Bool IsFORM()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_FORM); }
-+    Bool IsTEXTAREA()    { return_ (tidyNodeGetId( tnod() ) == TidyTag_TEXTAREA); }
-+    Bool IsBLOCKQUOTE()  { return_ (tidyNodeGetId( tnod() ) == TidyTag_BLOCKQUOTE); }
-+    Bool IsAPPLET()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_APPLET); }
-+    Bool IsOBJECT()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_OBJECT); }
-+    Bool IsDIV()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_DIV); }
-+    Bool IsSPAN()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_SPAN); }
-+    Bool IsINPUT()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_INPUT); }
-+    Bool IsQ()           { return_ (tidyNodeGetId( tnod() ) == TidyTag_Q); }
-+    Bool IsLABEL()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_LABEL); }
-+    Bool IsH3()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_H3); }
-+    Bool IsH4()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_H4); }
-+    Bool IsH5()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_H5); }
-+    Bool IsH6()          { return_ (tidyNodeGetId( tnod() ) == TidyTag_H6); }
-+    Bool IsADDRESS()     { return_ (tidyNodeGetId( tnod() ) == TidyTag_ADDRESS); }
-+    Bool IsXMP()         { return_ (tidyNodeGetId( tnod() ) == TidyTag_XMP); }
-+    Bool IsSELECT()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_SELECT); }
-+    Bool IsBLINK()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_BLINK); }
-+    Bool IsMARQUEE()     { return_ (tidyNodeGetId( tnod() ) == TidyTag_MARQUEE); }
-+    Bool IsEMBED()       { return_ (tidyNodeGetId( tnod() ) == TidyTag_EMBED); }
-+    Bool IsBASEFONT()    { return_ (tidyNodeGetId( tnod() ) == TidyTag_BASEFONT); }
-+    Bool IsISINDEX()     { return_ (tidyNodeGetId( tnod() ) == TidyTag_ISINDEX); }
-+    Bool IsS()           { return_ (tidyNodeGetId( tnod() ) == TidyTag_S); }
-+    Bool IsSTRIKE()      { return_ (tidyNodeGetId( tnod() ) == TidyTag_STRIKE); }
-+    Bool IsU()           { return_ (tidyNodeGetId( tnod() ) == TidyTag_U); }
-+    Bool IsMENU()        { return_ (tidyNodeGetId( tnod() ) == TidyTag_MENU); }
- 
-     /* Attribute retrieval
-     */
--    AttrVal* GetHREF()        { return attr(tidyAttrGetHREF( tnod() )); }
--    AttrVal* GetSRC()         { return attr(tidyAttrGetSRC( tnod() )); }
--    AttrVal* GetID()          { return attr(tidyAttrGetID( tnod() )); }
--    AttrVal* GetNAME()        { return attr(tidyAttrGetNAME( tnod() )); }
--    AttrVal* GetSUMMARY()     { return attr(tidyAttrGetSUMMARY( tnod() )); }
--    AttrVal* GetALT()         { return attr(tidyAttrGetALT( tnod() )); }
--    AttrVal* GetLONGDESC()    { return attr(tidyAttrGetLONGDESC( tnod() )); }
--    AttrVal* GetUSEMAP()      { return attr(tidyAttrGetUSEMAP( tnod() )); }
--    AttrVal* GetISMAP()       { return attr(tidyAttrGetISMAP( tnod() )); }
--    AttrVal* GetLANGUAGE()    { return attr(tidyAttrGetLANGUAGE( tnod() )); }
--    AttrVal* GetTYPE()        { return attr(tidyAttrGetTYPE( tnod() )); }
--    AttrVal* GetVALUE()       { return attr(tidyAttrGetVALUE( tnod() )); }
--    AttrVal* GetCONTENT()     { return attr(tidyAttrGetCONTENT( tnod() )); }
--    AttrVal* GetTITLE()       { return attr(tidyAttrGetTITLE( tnod() )); }
--    AttrVal* GetXMLNS()       { return attr(tidyAttrGetXMLNS( tnod() )); }
--    AttrVal* GetDATAFLD()     { return attr(tidyAttrGetDATAFLD( tnod() )); }
--    AttrVal* GetWIDTH()       { return attr(tidyAttrGetWIDTH( tnod() )); }
--    AttrVal* GetHEIGHT()      { return attr(tidyAttrGetHEIGHT( tnod() )); }
--    AttrVal* GetFOR()         { return attr(tidyAttrGetFOR( tnod() )); }
--    AttrVal* GetSELECTED()    { return attr(tidyAttrGetSELECTED( tnod() )); }
--    AttrVal* GetCHECKED()     { return attr(tidyAttrGetCHECKED( tnod() )); }
--    AttrVal* GetLANG()        { return attr(tidyAttrGetLANG( tnod() )); }
--    AttrVal* GetTARGET()      { return attr(tidyAttrGetTARGET( tnod() )); }
--    AttrVal* GetHTTP_EQUIV()  { return attr(tidyAttrGetHTTP_EQUIV(tnod())); }
--    AttrVal* GetREL()         { return attr(tidyAttrGetREL( tnod() )); }
--    AttrVal* GetOnMOUSEMOVE() { return attr(tidyAttrGetOnMOUSEMOVE(tnod())); }
--    AttrVal* GetOnMOUSEDOWN() { return attr(tidyAttrGetOnMOUSEDOWN(tnod())); }
--    AttrVal* GetOnMOUSEUP()   { return attr(tidyAttrGetOnMOUSEUP( tnod() )); }
--    AttrVal* GetOnCLICK()     { return attr(tidyAttrGetOnCLICK( tnod() )); }
--    AttrVal* GetOnMOUSEOVER() { return attr(tidyAttrGetOnMOUSEOVER(tnod())); }
--    AttrVal* GetOnMOUSEOUT()  { return attr(tidyAttrGetOnMOUSEOUT(tnod())); }
--    AttrVal* GetOnKEYDOWN()   { return attr(tidyAttrGetOnKEYDOWN( tnod() )); }
--    AttrVal* GetOnKEYUP()     { return attr(tidyAttrGetOnKEYUP( tnod() )); }
--    AttrVal* GetOnKEYPRESS()  { return attr(tidyAttrGetOnKEYPRESS(tnod())); }
--    AttrVal* GetOnFOCUS()     { return attr(tidyAttrGetOnFOCUS( tnod() )); }
--    AttrVal* GetOnBLUR()      { return attr(tidyAttrGetOnBLUR( tnod() )); }
--    AttrVal* GetBGCOLOR()     { return attr(tidyAttrGetBGCOLOR( tnod() )); }
--    AttrVal* GetLINK()        { return attr(tidyAttrGetLINK( tnod() )); }
--    AttrVal* GetALINK()       { return attr(tidyAttrGetALINK( tnod() )); }
--    AttrVal* GetVLINK()       { return attr(tidyAttrGetVLINK( tnod() )); }
--    AttrVal* GetTEXT()        { return attr(tidyAttrGetTEXT( tnod() )); }
--    AttrVal* GetSTYLE()       { return attr(tidyAttrGetSTYLE( tnod() )); }
--    AttrVal* GetABBR()        { return attr(tidyAttrGetABBR( tnod() )); }
--    AttrVal* GetCOLSPAN()     { return attr(tidyAttrGetCOLSPAN( tnod() )); }
--    AttrVal* GetROWSPAN()     { return attr(tidyAttrGetROWSPAN( tnod() )); }
-+    AttrVal* GetHREF()        { return attr(tidyAttrGetById( tnod(), TidyAttr_HREF )); }
-+    AttrVal* GetSRC()         { return attr(tidyAttrGetById( tnod(), TidyAttr_SRC)); }
-+    AttrVal* GetID()          { return attr(tidyAttrGetById( tnod(), TidyAttr_ID )); }
-+    AttrVal* GetNAME()        { return attr(tidyAttrGetById( tnod(), TidyAttr_NAME )); }
-+    AttrVal* GetSUMMARY()     { return attr(tidyAttrGetById( tnod(), TidyAttr_SUMMARY )); }
-+    AttrVal* GetALT()         { return attr(tidyAttrGetById( tnod(), TidyAttr_ALT )); }
-+    AttrVal* GetLONGDESC()    { return attr(tidyAttrGetById( tnod(), TidyAttr_LONGDESC )); }
-+    AttrVal* GetUSEMAP()      { return attr(tidyAttrGetById( tnod(), TidyAttr_USEMAP )); }
-+    AttrVal* GetISMAP()       { return attr(tidyAttrGetById( tnod(), TidyAttr_ISMAP )); }
-+    AttrVal* GetLANGUAGE()    { return attr(tidyAttrGetById( tnod(), TidyAttr_LANGUAGE )); }
-+    AttrVal* GetTYPE()        { return attr(tidyAttrGetById( tnod(), TidyAttr_TYPE )); }
-+    AttrVal* GetVALUE()       { return attr(tidyAttrGetById( tnod(), TidyAttr_VALUE )); }
-+    AttrVal* GetCONTENT()     { return attr(tidyAttrGetById( tnod(), TidyAttr_CONTENT )); }
-+    AttrVal* GetTITLE()       { return attr(tidyAttrGetById( tnod(), TidyAttr_TITLE )); }
-+    AttrVal* GetXMLNS()       { return attr(tidyAttrGetById( tnod(), TidyAttr_XMLNS )); }
-+    AttrVal* GetDATAFLD()     { return attr(tidyAttrGetById( tnod(), TidyAttr_DATAFLD )); }
-+    AttrVal* GetWIDTH()       { return attr(tidyAttrGetById( tnod(), TidyAttr_WIDTH )); }
-+    AttrVal* GetHEIGHT()      { return attr(tidyAttrGetById( tnod(), TidyAttr_HEIGHT )); }
-+    AttrVal* GetFOR()         { return attr(tidyAttrGetById( tnod(), TidyAttr_FOR )); }
-+    AttrVal* GetSELECTED()    { return attr(tidyAttrGetById( tnod(), TidyAttr_SELECTED )); }
-+    AttrVal* GetCHECKED()     { return attr(tidyAttrGetById( tnod(), TidyAttr_CHECKED )); }
-+    AttrVal* GetLANG()        { return attr(tidyAttrGetById( tnod(), TidyAttr_LANG )); }
-+    AttrVal* GetTARGET()      { return attr(tidyAttrGetById( tnod(), TidyAttr_TARGET )); }
-+    AttrVal* GetHTTP_EQUIV()  { return attr(tidyAttrGetById(tnod(), TidyAttr_HTTP_EQUIV)); }
-+    AttrVal* GetREL()         { return attr(tidyAttrGetById( tnod(), TidyAttr_REL )); }
-+    AttrVal* GetOnMOUSEMOVE() { return attr(tidyAttrGetById(tnod(), TidyAttr_OnMOUSEMOVE)); }
-+    AttrVal* GetOnMOUSEDOWN() { return attr(tidyAttrGetById(tnod(), TidyAttr_OnMOUSEDOWN)); }
-+    AttrVal* GetOnMOUSEUP()   { return attr(tidyAttrGetById( tnod(), TidyAttr_OnMOUSEUP )); }
-+    AttrVal* GetOnCLICK()     { return attr(tidyAttrGetById( tnod(), TidyAttr_OnCLICK )); }
-+    AttrVal* GetOnMOUSEOVER() { return attr(tidyAttrGetById(tnod(), TidyAttr_OnMOUSEOVER)); }
-+    AttrVal* GetOnMOUSEOUT()  { return attr(tidyAttrGetById(tnod(), TidyAttr_OnMOUSEOUT)); }
-+    AttrVal* GetOnKEYDOWN()   { return attr(tidyAttrGetById( tnod(), TidyAttr_OnKEYDOWN )); }
-+    AttrVal* GetOnKEYUP()     { return attr(tidyAttrGetById( tnod(), TidyAttr_OnKEYUP )); }
-+    AttrVal* GetOnKEYPRESS()  { return attr(tidyAttrGetById(tnod(), TidyAttr_OnKEYPRESS)); }
-+    AttrVal* GetOnFOCUS()     { return attr(tidyAttrGetById( tnod(), TidyAttr_OnFOCUS )); }
-+    AttrVal* GetOnBLUR()      { return attr(tidyAttrGetById( tnod(), TidyAttr_OnBLUR )); }
-+    AttrVal* GetBGCOLOR()     { return attr(tidyAttrGetById( tnod(), TidyAttr_BGCOLOR )); }
-+    AttrVal* GetLINK()        { return attr(tidyAttrGetById( tnod(), TidyAttr_LINK )); }
-+    AttrVal* GetALINK()       { return attr(tidyAttrGetById( tnod(), TidyAttr_ALINK )); }
-+    AttrVal* GetVLINK()       { return attr(tidyAttrGetById( tnod(), TidyAttr_VLINK )); }
-+    AttrVal* GetTEXT()        { return attr(tidyAttrGetById( tnod(), TidyAttr_TEXT )); }
-+    AttrVal* GetSTYLE()       { return attr(tidyAttrGetById( tnod(), TidyAttr_STYLE )); }
-+    AttrVal* GetABBR()        { return attr(tidyAttrGetById( tnod(), TidyAttr_ABBR )); }
-+    AttrVal* GetCOLSPAN()     { return attr(tidyAttrGetById( tnod(), TidyAttr_COLSPAN )); }
-+    AttrVal* GetROWSPAN()     { return attr(tidyAttrGetById( tnod(), TidyAttr_ROWSPAN)); }
- 
- protected:
-     AttrVal* attr( TidyAttr tattr )
-@@ -472,53 +474,53 @@ public:
- 
-     AttrId Id()            { return tidyAttrGetId( tattr() ); }
-     Bool IsEvent()         { return tidyAttrIsEvent( tattr() ); }
--    Bool IsProp()          { return tidyAttrIsProp( tattr() ); }
-+    Bool IsProp()          { return_(tidyAttrGetId( tattr() ) == TidyAttr_PROPERTY); }
- 
--    Bool IsHREF()          { return tidyAttrIsHREF( tattr() ); }
--    Bool IsSRC()           { return tidyAttrIsSRC( tattr() ); }
--    Bool IsID()            { return tidyAttrIsID( tattr() ); }
--    Bool IsNAME()          { return tidyAttrIsNAME( tattr() ); }
--    Bool IsSUMMARY()       { return tidyAttrIsSUMMARY( tattr() ); }
--    Bool IsALT()           { return tidyAttrIsALT( tattr() ); }
--    Bool IsLONGDESC()      { return tidyAttrIsLONGDESC( tattr() ); }
--    Bool IsUSEMAP()        { return tidyAttrIsUSEMAP( tattr() ); }
--    Bool IsISMAP()         { return tidyAttrIsISMAP( tattr() ); }
--    Bool IsLANGUAGE()      { return tidyAttrIsLANGUAGE( tattr() ); }
--    Bool IsTYPE()          { return tidyAttrIsTYPE( tattr() ); }
--    Bool IsVALUE()         { return tidyAttrIsVALUE( tattr() ); }
--    Bool IsCONTENT()       { return tidyAttrIsCONTENT( tattr() ); }
--    Bool IsTITLE()         { return tidyAttrIsTITLE( tattr() ); }
--    Bool IsXMLNS()         { return tidyAttrIsXMLNS( tattr() ); }
--    Bool IsDATAFLD()       { return tidyAttrIsDATAFLD( tattr() ); }
--    Bool IsWIDTH()         { return tidyAttrIsWIDTH( tattr() ); }
--    Bool IsHEIGHT()        { return tidyAttrIsHEIGHT( tattr() ); }
--    Bool IsFOR()           { return tidyAttrIsFOR( tattr() ); }
--    Bool IsSELECTED()      { return tidyAttrIsSELECTED( tattr() ); }
--    Bool IsCHECKED()       { return tidyAttrIsCHECKED( tattr() ); }
--    Bool IsLANG()          { return tidyAttrIsLANG( tattr() ); }
--    Bool IsTARGET()        { return tidyAttrIsTARGET( tattr() ); }
--    Bool IsHTTP_EQUIV()    { return tidyAttrIsHTTP_EQUIV( tattr() ); }
--    Bool IsREL()           { return tidyAttrIsREL( tattr() ); }
--    Bool IsOnMouseMove()   { return tidyAttrIsOnMOUSEMOVE( tattr() ); }
--    Bool IsOnMouseDown()   { return tidyAttrIsOnMOUSEDOWN( tattr() ); }
--    Bool IsOnMouseUp()     { return tidyAttrIsOnMOUSEUP( tattr() ); }
--    Bool IsOnClick()       { return tidyAttrIsOnCLICK( tattr() ); }
--    Bool IsOnMouseOver()   { return tidyAttrIsOnMOUSEOVER( tattr() ); }
--    Bool IsOnMouseOut()    { return tidyAttrIsOnMOUSEOUT( tattr() ); }
--    Bool IsOnKeyDown()     { return tidyAttrIsOnKEYDOWN( tattr() ); }
--    Bool IsOnKeyUp()       { return tidyAttrIsOnKEYUP( tattr() ); }
--    Bool IsOnKeyPress()    { return tidyAttrIsOnKEYPRESS( tattr() ); }
--    Bool IsOnFOCUS()       { return tidyAttrIsOnFOCUS( tattr() ); }
--    Bool IsOnBLUR()        { return tidyAttrIsOnBLUR( tattr() ); }
--    Bool IsBGCOLOR()       { return tidyAttrIsBGCOLOR( tattr() ); }
--    Bool IsLINK()          { return tidyAttrIsLINK( tattr() ); }
--    Bool IsALINK()         { return tidyAttrIsALINK( tattr() ); }
--    Bool IsVLINK()         { return tidyAttrIsVLINK( tattr() ); }
--    Bool IsTEXT()          { return tidyAttrIsTEXT( tattr() ); }
--    Bool IsSTYLE()         { return tidyAttrIsSTYLE( tattr() ); }
--    Bool IsABBR()          { return tidyAttrIsABBR( tattr() ); }
--    Bool IsCOLSPAN()       { return tidyAttrIsCOLSPAN( tattr() ); }
--    Bool IsROWSPAN()       { return tidyAttrIsROWSPAN( tattr() ); }
-+    Bool IsHREF()          { return_(tidyAttrGetId( tattr() ) == TidyAttr_HREF); }
-+    Bool IsSRC()           { return_(tidyAttrGetId( tattr() ) == TidyAttr_SRC); }
-+    Bool IsID()            { return_(tidyAttrGetId( tattr() ) == TidyAttr_ID); }
-+    Bool IsNAME()          { return_(tidyAttrGetId( tattr() ) == TidyAttr_NAME); }
-+    Bool IsSUMMARY()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_SUMMARY); }
-+    Bool IsALT()           { return_(tidyAttrGetId( tattr() ) == TidyAttr_ALT); }
-+    Bool IsLONGDESC()      { return_(tidyAttrGetId( tattr() ) == TidyAttr_LONGDESC); }
-+    Bool IsUSEMAP()        { return_(tidyAttrGetId( tattr() ) == TidyAttr_USEMAP); }
-+    Bool IsISMAP()         { return_(tidyAttrGetId( tattr() ) == TidyAttr_ISMAP); }
-+    Bool IsLANGUAGE()      { return_(tidyAttrGetId( tattr() ) == TidyAttr_LANGUAGE); }
-+    Bool IsTYPE()          { return_(tidyAttrGetId( tattr() ) == TidyAttr_TYPE); }
-+    Bool IsVALUE()         { return_(tidyAttrGetId( tattr() ) == TidyAttr_VALUE); }
-+    Bool IsCONTENT()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_CONTENT); }
-+    Bool IsTITLE()         { return_(tidyAttrGetId( tattr() ) == TidyAttr_TITLE); }
-+    Bool IsXMLNS()         { return_(tidyAttrGetId( tattr() ) == TidyAttr_XMLNS); }
-+    Bool IsDATAFLD()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_DATAFLD); }
-+    Bool IsWIDTH()         { return_(tidyAttrGetId( tattr() ) == TidyAttr_WIDTH); }
-+    Bool IsHEIGHT()        { return_(tidyAttrGetId( tattr() ) == TidyAttr_HEIGHT); }
-+    Bool IsFOR()           { return_(tidyAttrGetId( tattr() ) == TidyAttr_FOR); }
-+    Bool IsSELECTED()      { return_(tidyAttrGetId( tattr() ) == TidyAttr_SELECTED); }
-+    Bool IsCHECKED()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_CHECKED); }
-+    Bool IsLANG()          { return_(tidyAttrGetId( tattr() ) == TidyAttr_LANG); }
-+    Bool IsTARGET()        { return_(tidyAttrGetId( tattr() ) == TidyAttr_TARGET); }
-+    Bool IsHTTP_EQUIV()    { return_(tidyAttrGetId( tattr() ) == TidyAttr_HTTP_EQUIV); }
-+    Bool IsREL()           { return_(tidyAttrGetId( tattr() ) == TidyAttr_REL); }
-+    Bool IsOnMouseMove()   { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnMOUSEMOVE); }
-+    Bool IsOnMouseDown()   { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnMOUSEDOWN); }
-+    Bool IsOnMouseUp()     { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnMOUSEUP); }
-+    Bool IsOnClick()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnCLICK); }
-+    Bool IsOnMouseOver()   { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnMOUSEOVER); }
-+    Bool IsOnMouseOut()    { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnMOUSEOUT); }
-+    Bool IsOnKeyDown()     { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnKEYDOWN); }
-+    Bool IsOnKeyUp()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnKEYUP); }
-+    Bool IsOnKeyPress()    { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnKEYPRESS); }
-+    Bool IsOnFOCUS()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnFOCUS); }
-+    Bool IsOnBLUR()        { return_(tidyAttrGetId( tattr() ) == TidyAttr_OnBLUR); }
-+    Bool IsBGCOLOR()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_BGCOLOR); }
-+    Bool IsLINK()          { return_(tidyAttrGetId( tattr() ) == TidyAttr_LINK); }
-+    Bool IsALINK()         { return_(tidyAttrGetId( tattr() ) == TidyAttr_ALINK); }
-+    Bool IsVLINK()         { return_(tidyAttrGetId( tattr() ) == TidyAttr_VLINK); }
-+    Bool IsTEXT()          { return_(tidyAttrGetId( tattr() ) == TidyAttr_TEXT); }
-+    Bool IsSTYLE()         { return_(tidyAttrGetId( tattr() ) == TidyAttr_STYLE); }
-+    Bool IsABBR()          { return_(tidyAttrGetId( tattr() ) == TidyAttr_ABBR); }
-+    Bool IsCOLSPAN()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_COLSPAN); }
-+    Bool IsROWSPAN()       { return_(tidyAttrGetId( tattr() ) == TidyAttr_ROWSPAN); }
- 
- protected:
-     TidyAttr tattr()