[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#444383: kdelibs4c2a: please include small "onscroll" fix for khtml



Package: kdelibs4c2a
Version: 4:3.5.7.dfsg.1-7
Severity: minor
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

The enclosed patch from upstream svn (commit 633569) fixes display of
youtube thumbnails.  It applies cleanly to 4:3.5.7.dfsg.1-7 and works
just fine.  And, as we all know, youtube is the central source for
everybody's entertainment^Wserious information.

(And don't ask me what any of this does ...)

greetings
- -- vbi


- --- trunk/KDE/kdelibs/khtml/misc/loader.cpp	(revision 633568)
+++ kdelibs/khtml/misc/loader.cpp	(revision 633569)
@@ -540,7 +540,8 @@
 
         if ( src == oldbg )
             delete oldbg;
- -    }
+    } else if (src && !bg)
+        bg = new QPixmap(*src);
 
     if (bg)
         return *bg;
Index: kdelibs/khtml/misc/htmlattrs.in
===================================================================
- --- trunk/KDE/kdelibs/khtml/misc/htmlattrs.in	(revision 633568)
+++ kdelibs/khtml/misc/htmlattrs.in	(revision 633569)
@@ -143,6 +143,7 @@
 onmouseup
 onreset
 onselect
+onscroll
 onsubmit
 onunload
 profile
Index: kdelibs/khtml/misc/htmlattrs.c
===================================================================
- --- trunk/KDE/kdelibs/khtml/misc/htmlattrs.c	(revision 633568)
+++ kdelibs/khtml/misc/htmlattrs.c	(revision 633569)
@@ -40,14 +40,14 @@
 };
 enum
   {
- -    TOTAL_KEYWORDS = 151,
+    TOTAL_KEYWORDS = 152,
     MIN_WORD_LENGTH = 2,
     MAX_WORD_LENGTH = 15,
     MIN_HASH_VALUE = 3,
- -    MAX_HASH_VALUE = 502
+    MAX_HASH_VALUE = 576
   };
 
- -/* maximum key range = 500, duplicates = 0 */
+/* maximum key range = 574, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -61,32 +61,32 @@
 {
   static const unsigned short asso_values[] =
     {
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503,   0,   5, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503,  35,  10,   0,
- -        5,   5,  20,  40, 110,  50, 140, 100,   0,  25,
- -       50,   0,   5,  10,   0,   0,   0,  35,  25, 125,
- -       50, 145,  15, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503, 503, 503, 503,
- -      503, 503, 503, 503, 503, 503, 503
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577,   5,   5, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577,  30,  10,   0,
+       10,   5,  10,  15, 165,  40, 140,  80,   0,  25,
+       70,   0,   5,   5,   0,   0,  10,  55,  70, 180,
+        5,  90,  45, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577, 577, 577, 577,
+      577, 577, 577, 577, 577, 577, 577
     };
   register int hval = len;
 
@@ -144,672 +144,683 @@
 struct spool_attr_t
   {
     char spool_attr_str0[sizeof("src")];
- -    char spool_attr_str1[sizeof("cols")];
- -    char spool_attr_str2[sizeof("color")];
- -    char spool_attr_str3[sizeof("onerror")];
- -    char spool_attr_str4[sizeof("top")];
- -    char spool_attr_str5[sizeof("loop")];
- -    char spool_attr_str6[sizeof("coords")];
- -    char spool_attr_str7[sizeof("onreset")];
- -    char spool_attr_str8[sizeof("onselect")];
- -    char spool_attr_str9[sizeof("code")];
- -    char spool_attr_str10[sizeof("scope")];
- -    char spool_attr_str11[sizeof("rel")];
- -    char spool_attr_str12[sizeof("for")];
- -    char spool_attr_str13[sizeof("type")];
- -    char spool_attr_str14[sizeof("label")];
- -    char spool_attr_str15[sizeof("border")];
- -    char spool_attr_str16[sizeof("rules")];
- -    char spool_attr_str17[sizeof("bordercolor")];
- -    char spool_attr_str18[sizeof("face")];
- -    char spool_attr_str19[sizeof("prompt")];
- -    char spool_attr_str20[sizeof("selected")];
- -    char spool_attr_str21[sizeof("left")];
- -    char spool_attr_str22[sizeof("onload")];
- -    char spool_attr_str23[sizeof("rev")];
- -    char spool_attr_str24[sizeof("abbr")];
- -    char spool_attr_str25[sizeof("onblur")];
- -    char spool_attr_str26[sizeof("onabort")];
- -    char spool_attr_str27[sizeof("data")];
- -    char spool_attr_str28[sizeof("defer")];
- -    char spool_attr_str29[sizeof("accept")];
- -    char spool_attr_str30[sizeof("id")];
- -    char spool_attr_str31[sizeof("target")];
- -    char spool_attr_str32[sizeof("onfocus")];
- -    char spool_attr_str33[sizeof("alt")];
- -    char spool_attr_str34[sizeof("class")];
- -    char spool_attr_str35[sizeof("truespeed")];
- -    char spool_attr_str36[sizeof("clear")];
- -    char spool_attr_str37[sizeof("declare")];
- -    char spool_attr_str38[sizeof("codebase")];
- -    char spool_attr_str39[sizeof("text")];
- -    char spool_attr_str40[sizeof("start")];
- -    char spool_attr_str41[sizeof("vspace")];
- -    char spool_attr_str42[sizeof("compact")];
- -    char spool_attr_str43[sizeof("value")];
- -    char spool_attr_str44[sizeof("onresize")];
- -    char spool_attr_str45[sizeof("profile")];
- -    char spool_attr_str46[sizeof("char")];
- -    char spool_attr_str47[sizeof("frame")];
- -    char spool_attr_str48[sizeof("name")];
- -    char spool_attr_str49[sizeof("charset")];
- -    char spool_attr_str50[sizeof("span")];
- -    char spool_attr_str51[sizeof("shape")];
- -    char spool_attr_str52[sizeof("colspan")];
- -    char spool_attr_str53[sizeof("lang")];
- -    char spool_attr_str54[sizeof("onmouseover")];
- -    char spool_attr_str55[sizeof("datetime")];
- -    char spool_attr_str56[sizeof("onmouseout")];
- -    char spool_attr_str57[sizeof("usemap")];
- -    char spool_attr_str58[sizeof("autocomplete")];
- -    char spool_attr_str59[sizeof("longdesc")];
- -    char spool_attr_str60[sizeof("onmouseup")];
- -    char spool_attr_str61[sizeof("pagex")];
- -    char spool_attr_str62[sizeof("frameborder")];
- -    char spool_attr_str63[sizeof("content")];
- -    char spool_attr_str64[sizeof("multiple")];
- -    char spool_attr_str65[sizeof("ismap")];
- -    char spool_attr_str66[sizeof("classid")];
- -    char spool_attr_str67[sizeof("nosave")];
- -    char spool_attr_str68[sizeof("bgcolor")];
- -    char spool_attr_str69[sizeof("onsubmit")];
- -    char spool_attr_str70[sizeof("onmousemove")];
- -    char spool_attr_str71[sizeof("charoff")];
- -    char spool_attr_str72[sizeof("onunload")];
- -    char spool_attr_str73[sizeof("rows")];
- -    char spool_attr_str74[sizeof("oversrc")];
- -    char spool_attr_str75[sizeof("noresize")];
- -    char spool_attr_str76[sizeof("href")];
- -    char spool_attr_str77[sizeof("media")];
- -    char spool_attr_str78[sizeof("action")];
- -    char spool_attr_str79[sizeof("dir")];
- -    char spool_attr_str80[sizeof("cite")];
- -    char spool_attr_str81[sizeof("title")];
- -    char spool_attr_str82[sizeof("object")];
- -    char spool_attr_str83[sizeof("version")];
- -    char spool_attr_str84[sizeof("scrolling")];
- -    char spool_attr_str85[sizeof("scheme")];
- -    char spool_attr_str86[sizeof("onclick")];
- -    char spool_attr_str87[sizeof("hspace")];
- -    char spool_attr_str88[sizeof("scrollamount")];
- -    char spool_attr_str89[sizeof("size")];
- -    char spool_attr_str90[sizeof("method")];
- -    char spool_attr_str91[sizeof("enctype")];
- -    char spool_attr_str92[sizeof("wrap")];
- -    char spool_attr_str93[sizeof("plain")];
- -    char spool_attr_str94[sizeof("checked")];
- -    char spool_attr_str95[sizeof("html")];
- -    char spool_attr_str96[sizeof("ondblclick")];
- -    char spool_attr_str97[sizeof("codetype")];
- -    char spool_attr_str98[sizeof("valign")];
- -    char spool_attr_str99[sizeof("headers")];
- -    char spool_attr_str100[sizeof("z-index")];
- -    char spool_attr_str101[sizeof("tabindex")];
- -    char spool_attr_str102[sizeof("style")];
- -    char spool_attr_str103[sizeof("challenge")];
- -    char spool_attr_str104[sizeof("nohref")];
- -    char spool_attr_str105[sizeof("bgproperties")];
- -    char spool_attr_str106[sizeof("align")];
- -    char spool_attr_str107[sizeof("scrolldelay")];
+    char spool_attr_str1[sizeof("onscroll")];
+    char spool_attr_str2[sizeof("cols")];
+    char spool_attr_str3[sizeof("color")];
+    char spool_attr_str4[sizeof("onerror")];
+    char spool_attr_str5[sizeof("rel")];
+    char spool_attr_str6[sizeof("loop")];
+    char spool_attr_str7[sizeof("for")];
+    char spool_attr_str8[sizeof("coords")];
+    char spool_attr_str9[sizeof("top")];
+    char spool_attr_str10[sizeof("code")];
+    char spool_attr_str11[sizeof("scope")];
+    char spool_attr_str12[sizeof("onreset")];
+    char spool_attr_str13[sizeof("onselect")];
+    char spool_attr_str14[sizeof("face")];
+    char spool_attr_str15[sizeof("label")];
+    char spool_attr_str16[sizeof("left")];
+    char spool_attr_str17[sizeof("border")];
+    char spool_attr_str18[sizeof("text")];
+    char spool_attr_str19[sizeof("defer")];
+    char spool_attr_str20[sizeof("bordercolor")];
+    char spool_attr_str21[sizeof("abbr")];
+    char spool_attr_str22[sizeof("pagex")];
+    char spool_attr_str23[sizeof("onload")];
+    char spool_attr_str24[sizeof("id")];
+    char spool_attr_str25[sizeof("selected")];
+    char spool_attr_str26[sizeof("prompt")];
+    char spool_attr_str27[sizeof("target")];
+    char spool_attr_str28[sizeof("onabort")];
+    char spool_attr_str29[sizeof("class")];
+    char spool_attr_str30[sizeof("declare")];
+    char spool_attr_str31[sizeof("data")];
+    char spool_attr_str32[sizeof("clear")];
+    char spool_attr_str33[sizeof("accept")];
+    char spool_attr_str34[sizeof("profile")];
+    char spool_attr_str35[sizeof("alt")];
+    char spool_attr_str36[sizeof("type")];
+    char spool_attr_str37[sizeof("onblur")];
+    char spool_attr_str38[sizeof("onfocus")];
+    char spool_attr_str39[sizeof("codebase")];
+    char spool_attr_str40[sizeof("char")];
+    char spool_attr_str41[sizeof("frame")];
+    char spool_attr_str42[sizeof("rules")];
+    char spool_attr_str43[sizeof("compact")];
+    char spool_attr_str44[sizeof("rev")];
+    char spool_attr_str45[sizeof("shape")];
+    char spool_attr_str46[sizeof("charset")];
+    char spool_attr_str47[sizeof("charoff")];
+    char spool_attr_str48[sizeof("lang")];
+    char spool_attr_str49[sizeof("start")];
+    char spool_attr_str50[sizeof("onresize")];
+    char spool_attr_str51[sizeof("truespeed")];
+    char spool_attr_str52[sizeof("frameborder")];
+    char spool_attr_str53[sizeof("span")];
+    char spool_attr_str54[sizeof("classid")];
+    char spool_attr_str55[sizeof("longdesc")];
+    char spool_attr_str56[sizeof("name")];
+    char spool_attr_str57[sizeof("ismap")];
+    char spool_attr_str58[sizeof("colspan")];
+    char spool_attr_str59[sizeof("media")];
+    char spool_attr_str60[sizeof("enctype")];
+    char spool_attr_str61[sizeof("datetime")];
+    char spool_attr_str62[sizeof("vspace")];
+    char spool_attr_str63[sizeof("onclick")];
+    char spool_attr_str64[sizeof("pagey")];
+    char spool_attr_str65[sizeof("usemap")];
+    char spool_attr_str66[sizeof("codetype")];
+    char spool_attr_str67[sizeof("scrolling")];
+    char spool_attr_str68[sizeof("value")];
+    char spool_attr_str69[sizeof("checked")];
+    char spool_attr_str70[sizeof("onsubmit")];
+    char spool_attr_str71[sizeof("ondblclick")];
+    char spool_attr_str72[sizeof("dir")];
+    char spool_attr_str73[sizeof("onmouseup")];
+    char spool_attr_str74[sizeof("style")];
+    char spool_attr_str75[sizeof("scrolldelay")];
+    char spool_attr_str76[sizeof("cite")];
+    char spool_attr_str77[sizeof("onmouseout")];
+    char spool_attr_str78[sizeof("object")];
+    char spool_attr_str79[sizeof("multiple")];
+    char spool_attr_str80[sizeof("axis")];
+    char spool_attr_str81[sizeof("action")];
+    char spool_attr_str82[sizeof("tabindex")];
+    char spool_attr_str83[sizeof("title")];
+    char spool_attr_str84[sizeof("onmouseover")];
+    char spool_attr_str85[sizeof("autocomplete")];
+    char spool_attr_str86[sizeof("onunload")];
+    char spool_attr_str87[sizeof("challenge")];
+    char spool_attr_str88[sizeof("plain")];
+    char spool_attr_str89[sizeof("content")];
+    char spool_attr_str90[sizeof("noresize")];
+    char spool_attr_str91[sizeof("cellspacing")];
+    char spool_attr_str92[sizeof("bgcolor")];
+    char spool_attr_str93[sizeof("href")];
+    char spool_attr_str94[sizeof("align")];
+    char spool_attr_str95[sizeof("nosave")];
+    char spool_attr_str96[sizeof("z-index")];
+    char spool_attr_str97[sizeof("rows")];
+    char spool_attr_str98[sizeof("oversrc")];
+    char spool_attr_str99[sizeof("size")];
+    char spool_attr_str100[sizeof("onkeypress")];
+    char spool_attr_str101[sizeof("onmousemove")];
+    char spool_attr_str102[sizeof("version")];
+    char spool_attr_str103[sizeof("cellpadding")];
+    char spool_attr_str104[sizeof("language")];
+    char spool_attr_str105[sizeof("topmargin")];
+    char spool_attr_str106[sizeof("valign")];
+    char spool_attr_str107[sizeof("scrollamount")];
     char spool_attr_str108[sizeof("disabled")];
- -    char spool_attr_str109[sizeof("pagey")];
- -    char spool_attr_str110[sizeof("cellspacing")];
- -    char spool_attr_str111[sizeof("accept-charset")];
- -    char spool_attr_str112[sizeof("noshade")];
- -    char spool_attr_str113[sizeof("topmargin")];
- -    char spool_attr_str114[sizeof("cellpadding")];
- -    char spool_attr_str115[sizeof("language")];
- -    char spool_attr_str116[sizeof("nowrap")];
- -    char spool_attr_str117[sizeof("rowspan")];
- -    char spool_attr_str118[sizeof("archive")];
- -    char spool_attr_str119[sizeof("axis")];
- -    char spool_attr_str120[sizeof("contenteditable")];
- -    char spool_attr_str121[sizeof("valuetype")];
- -    char spool_attr_str122[sizeof("onchange")];
- -    char spool_attr_str123[sizeof("pluginurl")];
- -    char spool_attr_str124[sizeof("leftmargin")];
- -    char spool_attr_str125[sizeof("vlink")];
- -    char spool_attr_str126[sizeof("onmousedown")];
- -    char spool_attr_str127[sizeof("behavior")];
- -    char spool_attr_str128[sizeof("direction")];
- -    char spool_attr_str129[sizeof("background")];
- -    char spool_attr_str130[sizeof("summary")];
- -    char spool_attr_str131[sizeof("readonly")];
- -    char spool_attr_str132[sizeof("alink")];
- -    char spool_attr_str133[sizeof("hreflang")];
- -    char spool_attr_str134[sizeof("onkeypress")];
- -    char spool_attr_str135[sizeof("http-equiv")];
- -    char spool_attr_str136[sizeof("standby")];
- -    char spool_attr_str137[sizeof("link")];
- -    char spool_attr_str138[sizeof("onkeyup")];
+    char spool_attr_str109[sizeof("scheme")];
+    char spool_attr_str110[sizeof("readonly")];
+    char spool_attr_str111[sizeof("wrap")];
+    char spool_attr_str112[sizeof("leftmargin")];
+    char spool_attr_str113[sizeof("hspace")];
+    char spool_attr_str114[sizeof("method")];
+    char spool_attr_str115[sizeof("headers")];
+    char spool_attr_str116[sizeof("accesskey")];
+    char spool_attr_str117[sizeof("onkeyup")];
+    char spool_attr_str118[sizeof("summary")];
+    char spool_attr_str119[sizeof("html")];
+    char spool_attr_str120[sizeof("alink")];
+    char spool_attr_str121[sizeof("bgproperties")];
+    char spool_attr_str122[sizeof("valuetype")];
+    char spool_attr_str123[sizeof("background")];
+    char spool_attr_str124[sizeof("nohref")];
+    char spool_attr_str125[sizeof("standby")];
+    char spool_attr_str126[sizeof("pluginurl")];
+    char spool_attr_str127[sizeof("pluginpage")];
+    char spool_attr_str128[sizeof("pluginspage")];
+    char spool_attr_str129[sizeof("direction")];
+    char spool_attr_str130[sizeof("accept-charset")];
+    char spool_attr_str131[sizeof("vlink")];
+    char spool_attr_str132[sizeof("noshade")];
+    char spool_attr_str133[sizeof("onchange")];
+    char spool_attr_str134[sizeof("link")];
+    char spool_attr_str135[sizeof("contenteditable")];
+    char spool_attr_str136[sizeof("nowrap")];
+    char spool_attr_str137[sizeof("rowspan")];
+    char spool_attr_str138[sizeof("hreflang")];
     char spool_attr_str139[sizeof("maxlength")];
- -    char spool_attr_str140[sizeof("pluginpage")];
- -    char spool_attr_str141[sizeof("pluginspage")];
- -    char spool_attr_str142[sizeof("accesskey")];
+    char spool_attr_str140[sizeof("archive")];
+    char spool_attr_str141[sizeof("behavior")];
+    char spool_attr_str142[sizeof("onmousedown")];
     char spool_attr_str143[sizeof("hidden")];
     char spool_attr_str144[sizeof("height")];
- -    char spool_attr_str145[sizeof("unknown")];
- -    char spool_attr_str146[sizeof("width")];
- -    char spool_attr_str147[sizeof("onkeydown")];
- -    char spool_attr_str148[sizeof("marginwidth")];
- -    char spool_attr_str149[sizeof("visibility")];
+    char spool_attr_str145[sizeof("http-equiv")];
+    char spool_attr_str146[sizeof("onkeydown")];
+    char spool_attr_str147[sizeof("visibility")];
+    char spool_attr_str148[sizeof("unknown")];
+    char spool_attr_str149[sizeof("width")];
     char spool_attr_str150[sizeof("marginheight")];
+    char spool_attr_str151[sizeof("marginwidth")];
   };
 static const struct spool_attr_t spool_attr_contents =
   {
     "src",
+    "onscroll",
     "cols",
     "color",
     "onerror",
- -    "top",
+    "rel",
     "loop",
+    "for",
     "coords",
+    "top",
+    "code",
+    "scope",
     "onreset",
     "onselect",
- -    "code",
- -    "scope",
- -    "rel",
- -    "for",
- -    "type",
+    "face",
     "label",
+    "left",
     "border",
- -    "rules",
+    "text",
+    "defer",
     "bordercolor",
- -    "face",
+    "abbr",
+    "pagex",
+    "onload",
+    "id",
+    "selected",
     "prompt",
- -    "selected",
- -    "left",
- -    "onload",
- -    "rev",
- -    "abbr",
- -    "onblur",
+    "target",
     "onabort",
+    "class",
+    "declare",
     "data",
- -    "defer",
+    "clear",
     "accept",
- -    "id",
- -    "target",
+    "profile",
+    "alt",
+    "type",
+    "onblur",
     "onfocus",
- -    "alt",
- -    "class",
- -    "truespeed",
- -    "clear",
- -    "declare",
     "codebase",
- -    "text",
- -    "start",
- -    "vspace",
- -    "compact",
- -    "value",
- -    "onresize",
- -    "profile",
     "char",
     "frame",
- -    "name",
+    "rules",
+    "compact",
+    "rev",
+    "shape",
     "charset",
+    "charoff",
+    "lang",
+    "start",
+    "onresize",
+    "truespeed",
+    "frameborder",
     "span",
- -    "shape",
+    "classid",
+    "longdesc",
+    "name",
+    "ismap",
     "colspan",
- -    "lang",
- -    "onmouseover",
+    "media",
+    "enctype",
     "datetime",
+    "vspace",
+    "onclick",
+    "pagey",
+    "usemap",
+    "codetype",
+    "scrolling",
+    "value",
+    "checked",
+    "onsubmit",
+    "ondblclick",
+    "dir",
+    "onmouseup",
+    "style",
+    "scrolldelay",
+    "cite",
     "onmouseout",
- -    "usemap",
+    "object",
+    "multiple",
+    "axis",
+    "action",
+    "tabindex",
+    "title",
+    "onmouseover",
     "autocomplete",
- -    "longdesc",
- -    "onmouseup",
- -    "pagex",
- -    "frameborder",
+    "onunload",
+    "challenge",
+    "plain",
     "content",
- -    "multiple",
- -    "ismap",
- -    "classid",
+    "noresize",
+    "cellspacing",
+    "bgcolor",
+    "href",
+    "align",
     "nosave",
- -    "bgcolor",
- -    "onsubmit",
- -    "onmousemove",
- -    "charoff",
- -    "onunload",
+    "z-index",
     "rows",
     "oversrc",
- -    "noresize",
- -    "href",
- -    "media",
- -    "action",
- -    "dir",
- -    "cite",
- -    "title",
- -    "object",
+    "size",
+    "onkeypress",
+    "onmousemove",
     "version",
- -    "scrolling",
+    "cellpadding",
+    "language",
+    "topmargin",
+    "valign",
+    "scrollamount",
+    "disabled",
     "scheme",
- -    "onclick",
+    "readonly",
+    "wrap",
+    "leftmargin",
     "hspace",
- -    "scrollamount",
- -    "size",
     "method",
- -    "enctype",
- -    "wrap",
- -    "plain",
- -    "checked",
+    "headers",
+    "accesskey",
+    "onkeyup",
+    "summary",
     "html",
- -    "ondblclick",
- -    "codetype",
- -    "valign",
- -    "headers",
- -    "z-index",
- -    "tabindex",
- -    "style",
- -    "challenge",
+    "alink",
+    "bgproperties",
+    "valuetype",
+    "background",
     "nohref",
- -    "bgproperties",
- -    "align",
- -    "scrolldelay",
- -    "disabled",
- -    "pagey",
- -    "cellspacing",
+    "standby",
+    "pluginurl",
+    "pluginpage",
+    "pluginspage",
+    "direction",
     "accept-charset",
+    "vlink",
     "noshade",
- -    "topmargin",
- -    "cellpadding",
- -    "language",
+    "onchange",
+    "link",
+    "contenteditable",
     "nowrap",
     "rowspan",
+    "hreflang",
+    "maxlength",
     "archive",
- -    "axis",
- -    "contenteditable",
- -    "valuetype",
- -    "onchange",
- -    "pluginurl",
- -    "leftmargin",
- -    "vlink",
+    "behavior",
     "onmousedown",
- -    "behavior",
- -    "direction",
- -    "background",
- -    "summary",
- -    "readonly",
- -    "alink",
- -    "hreflang",
- -    "onkeypress",
- -    "http-equiv",
- -    "standby",
- -    "link",
- -    "onkeyup",
- -    "maxlength",
- -    "pluginpage",
- -    "pluginspage",
- -    "accesskey",
     "hidden",
     "height",
+    "http-equiv",
+    "onkeydown",
+    "visibility",
     "unknown",
     "width",
- -    "onkeydown",
- -    "marginwidth",
- -    "visibility",
- -    "marginheight"
+    "marginheight",
+    "marginwidth"
   };
 #define spool_attr ((const char *) &spool_attr_contents)
 
 static const struct attrs wordlist_attr[] =
   {
- -#line 156 "htmlattrs.gperf"
+#line 157 "htmlattrs.gperf"
     {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str0, ATTR_SRC},
+#line 151 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str1, ATTR_ONSCROLL},
 #line 33 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str1, ATTR_COLS},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str2, ATTR_COLS},
 #line 32 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str2, ATTR_COLOR},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str3, ATTR_COLOR},
 #line 72 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str3, ATTR_ONERROR},
- -#line 100 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str4, ATTR_TOP},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str4, ATTR_ONERROR},
+#line 82 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str5, ATTR_REL},
 #line 59 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str5, ATTR_LOOP},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str6, ATTR_LOOP},
+#line 127 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str7, ATTR_FOR},
 #line 37 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str6, ATTR_COORDS},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str8, ATTR_COORDS},
+#line 100 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str9, ATTR_TOP},
+#line 122 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str10, ATTR_CODE},
+#line 87 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str11, ATTR_SCOPE},
 #line 149 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str7, ATTR_ONRESET},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str12, ATTR_ONRESET},
 #line 150 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str8, ATTR_ONSELECT},
- -#line 122 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str9, ATTR_CODE},
- -#line 87 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str10, ATTR_SCOPE},
- -#line 82 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str11, ATTR_REL},
- -#line 127 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str12, ATTR_FOR},
- -#line 103 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str13, ATTR_TYPE},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str13, ATTR_ONSELECT},
+#line 44 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str14, ATTR_FACE},
 #line 131 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str14, ATTR_LABEL},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str15, ATTR_LABEL},
+#line 56 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str16, ATTR_LEFT},
 #line 21 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str15, ATTR_BORDER},
- -#line 86 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str16, ATTR_RULES},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str17, ATTR_BORDER},
+#line 99 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str18, ATTR_TEXT},
+#line 39 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str19, ATTR_DEFER},
 #line 22 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str17, ATTR_BORDERCOLOR},
- -#line 44 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str18, ATTR_FACE},
- -#line 154 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str19, ATTR_PROMPT},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str20, ATTR_BORDERCOLOR},
+#line 114 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str21, ATTR_ABBR},
+#line 75 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str22, ATTR_PAGEX},
+#line 143 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str23, ATTR_ONLOAD},
+#line 130 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str24, ATTR_ID},
 #line 91 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str20, ATTR_SELECTED},
- -#line 56 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str21, ATTR_LEFT},
- -#line 143 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str22, ATTR_ONLOAD},
- -#line 83 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str23, ATTR_REV},
- -#line 114 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str24, ATTR_ABBR},
- -#line 135 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str25, ATTR_ONBLUR},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str25, ATTR_SELECTED},
+#line 155 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str26, ATTR_PROMPT},
+#line 98 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str27, ATTR_TARGET},
 #line 71 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str26, ATTR_ONABORT},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str28, ATTR_ONABORT},
+#line 120 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str29, ATTR_CLASS},
+#line 38 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str30, ATTR_DECLARE},
 #line 125 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str27, ATTR_DATA},
- -#line 39 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str28, ATTR_DEFER},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str31, ATTR_DATA},
+#line 30 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str32, ATTR_CLEAR},
 #line 12 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str29, ATTR_ACCEPT},
- -#line 130 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str30, ATTR_ID},
- -#line 98 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str31, ATTR_TARGET},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str33, ATTR_ACCEPT},
+#line 154 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str34, ATTR_PROFILE},
+#line 116 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str35, ATTR_ALT},
+#line 103 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str36, ATTR_TYPE},
+#line 135 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str37, ATTR_ONBLUR},
 #line 139 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str32, ATTR_ONFOCUS},
- -#line 116 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str33, ATTR_ALT},
- -#line 120 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str34, ATTR_CLASS},
- -#line 102 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str35, ATTR_TRUESPEED},
- -#line 30 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str36, ATTR_CLEAR},
- -#line 38 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str37, ATTR_DECLARE},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str38, ATTR_ONFOCUS},
 #line 123 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str38, ATTR_CODEBASE},
- -#line 99 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str39, ATTR_TEXT},
- -#line 95 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str40, ATTR_START},
- -#line 110 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str41, ATTR_VSPACE},
- -#line 35 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str42, ATTR_COMPACT},
- -#line 161 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str43, ATTR_VALUE},
- -#line 73 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str44, ATTR_ONRESIZE},
- -#line 153 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str45, ATTR_PROFILE},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str39, ATTR_CODEBASE},
 #line 25 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str46, ATTR_CHAR},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str40, ATTR_CHAR},
 #line 45 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str47, ATTR_FRAME},
- -#line 133 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str48, ATTR_NAME},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str41, ATTR_FRAME},
+#line 86 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str42, ATTR_RULES},
+#line 35 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str43, ATTR_COMPACT},
+#line 83 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str44, ATTR_REV},
+#line 92 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str45, ATTR_SHAPE},
 #line 28 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str49, ATTR_CHARSET},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str46, ATTR_CHARSET},
+#line 27 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str47, ATTR_CHAROFF},
+#line 54 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str48, ATTR_LANG},
+#line 95 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str49, ATTR_START},
+#line 73 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str50, ATTR_ONRESIZE},
+#line 102 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str51, ATTR_TRUESPEED},
+#line 46 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str52, ATTR_FRAMEBORDER},
 #line 94 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str50, ATTR_SPAN},
- -#line 92 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str51, ATTR_SHAPE},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str53, ATTR_SPAN},
+#line 121 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str54, ATTR_CLASSID},
+#line 132 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str55, ATTR_LONGDESC},
+#line 133 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str56, ATTR_NAME},
+#line 53 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str57, ATTR_ISMAP},
 #line 34 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str52, ATTR_COLSPAN},
- -#line 54 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str53, ATTR_LANG},
- -#line 147 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str54, ATTR_ONMOUSEOVER},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str58, ATTR_COLSPAN},
+#line 63 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str59, ATTR_MEDIA},
+#line 43 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str60, ATTR_ENCTYPE},
 #line 126 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str55, ATTR_DATETIME},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str61, ATTR_DATETIME},
+#line 110 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str62, ATTR_VSPACE},
+#line 137 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str63, ATTR_ONCLICK},
+#line 76 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str64, ATTR_PAGEY},
+#line 161 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str65, ATTR_USEMAP},
+#line 31 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str66, ATTR_CODETYPE},
+#line 90 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str67, ATTR_SCROLLING},
+#line 162 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str68, ATTR_VALUE},
+#line 29 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str69, ATTR_CHECKED},
+#line 152 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str70, ATTR_ONSUBMIT},
+#line 138 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str71, ATTR_ONDBLCLICK},
+#line 40 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str72, ATTR_DIR},
+#line 148 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str73, ATTR_ONMOUSEUP},
+#line 96 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str74, ATTR_STYLE},
+#line 89 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str75, ATTR_SCROLLDELAY},
+#line 119 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str76, ATTR_CITE},
 #line 146 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str56, ATTR_ONMOUSEOUT},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str77, ATTR_ONMOUSEOUT},
+#line 134 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str78, ATTR_OBJECT},
+#line 65 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str79, ATTR_MULTIPLE},
+#line 17 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str80, ATTR_AXIS},
+#line 115 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str81, ATTR_ACTION},
+#line 97 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str82, ATTR_TABINDEX},
 #line 160 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str57, ATTR_USEMAP},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str83, ATTR_TITLE},
+#line 147 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str84, ATTR_ONMOUSEOVER},
 #line 16 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str58, ATTR_AUTOCOMPLETE},
- -#line 132 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str59, ATTR_LONGDESC},
- -#line 148 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str60, ATTR_ONMOUSEUP},
- -#line 75 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str61, ATTR_PAGEX},
- -#line 46 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str62, ATTR_FRAMEBORDER},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str85, ATTR_AUTOCOMPLETE},
+#line 153 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str86, ATTR_ONUNLOAD},
+#line 26 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str87, ATTR_CHALLENGE},
+#line 77 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str88, ATTR_PLAIN},
 #line 124 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str63, ATTR_CONTENT},
- -#line 65 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str64, ATTR_MULTIPLE},
- -#line 53 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str65, ATTR_ISMAP},
- -#line 121 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str66, ATTR_CLASSID},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str89, ATTR_CONTENT},
+#line 67 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str90, ATTR_NORESIZE},
+#line 24 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str91, ATTR_CELLSPACING},
+#line 19 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str92, ATTR_BGCOLOR},
+#line 129 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str93, ATTR_HREF},
+#line 14 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str94, ATTR_ALIGN},
 #line 68 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str67, ATTR_NOSAVE},
- -#line 19 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str68, ATTR_BGCOLOR},
- -#line 151 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str69, ATTR_ONSUBMIT},
- -#line 145 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str70, ATTR_ONMOUSEMOVE},
- -#line 27 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str71, ATTR_CHAROFF},
- -#line 152 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str72, ATTR_ONUNLOAD},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str95, ATTR_NOSAVE},
+#line 113 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str96, ATTR_Z_INDEX},
 #line 84 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str73, ATTR_ROWS},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str97, ATTR_ROWS},
 #line 74 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str74, ATTR_OVERSRC},
- -#line 67 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str75, ATTR_NORESIZE},
- -#line 129 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str76, ATTR_HREF},
- -#line 63 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str77, ATTR_MEDIA},
- -#line 115 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str78, ATTR_ACTION},
- -#line 40 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str79, ATTR_DIR},
- -#line 119 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str80, ATTR_CITE},
- -#line 159 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str81, ATTR_TITLE},
- -#line 134 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str82, ATTR_OBJECT},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str98, ATTR_OVERSRC},
+#line 93 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str99, ATTR_SIZE},
+#line 141 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str100, ATTR_ONKEYPRESS},
+#line 145 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str101, ATTR_ONMOUSEMOVE},
 #line 107 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str83, ATTR_VERSION},
- -#line 90 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str84, ATTR_SCROLLING},
- -#line 155 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str85, ATTR_SCHEME},
- -#line 137 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str86, ATTR_ONCLICK},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str102, ATTR_VERSION},
+#line 23 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str103, ATTR_CELLPADDING},
+#line 55 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str104, ATTR_LANGUAGE},
+#line 101 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str105, ATTR_TOPMARGIN},
+#line 105 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str106, ATTR_VALIGN},
+#line 88 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str107, ATTR_SCROLLAMOUNT},
+#line 42 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str108, ATTR_DISABLED},
+#line 156 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str109, ATTR_SCHEME},
+#line 81 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str110, ATTR_READONLY},
+#line 112 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str111, ATTR_WRAP},
+#line 57 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str112, ATTR_LEFTMARGIN},
 #line 50 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str87, ATTR_HSPACE},
- -#line 88 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str88, ATTR_SCROLLAMOUNT},
- -#line 93 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str89, ATTR_SIZE},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str113, ATTR_HSPACE},
 #line 64 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str90, ATTR_METHOD},
- -#line 43 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str91, ATTR_ENCTYPE},
- -#line 112 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str92, ATTR_WRAP},
- -#line 77 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str93, ATTR_PLAIN},
- -#line 29 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str94, ATTR_CHECKED},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str114, ATTR_METHOD},
+#line 128 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str115, ATTR_HEADERS},
+#line 13 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str116, ATTR_ACCESSKEY},
+#line 142 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str117, ATTR_ONKEYUP},
+#line 159 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str118, ATTR_SUMMARY},
 #line 51 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str95, ATTR_HTML},
- -#line 138 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str96, ATTR_ONDBLCLICK},
- -#line 31 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str97, ATTR_CODETYPE},
- -#line 105 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str98, ATTR_VALIGN},
- -#line 128 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str99, ATTR_HEADERS},
- -#line 113 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str100, ATTR_Z_INDEX},
- -#line 97 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str101, ATTR_TABINDEX},
- -#line 96 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str102, ATTR_STYLE},
- -#line 26 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str103, ATTR_CHALLENGE},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str119, ATTR_HTML},
+#line 15 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str120, ATTR_ALINK},
+#line 20 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str121, ATTR_BGPROPERTIES},
+#line 106 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str122, ATTR_VALUETYPE},
+#line 118 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str123, ATTR_BACKGROUND},
 #line 66 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str104, ATTR_NOHREF},
- -#line 20 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str105, ATTR_BGPROPERTIES},
- -#line 14 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str106, ATTR_ALIGN},
- -#line 89 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str107, ATTR_SCROLLDELAY},
- -#line 42 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str108, ATTR_DISABLED},
- -#line 76 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str109, ATTR_PAGEY},
- -#line 24 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str110, ATTR_CELLSPACING},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str124, ATTR_NOHREF},
+#line 158 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str125, ATTR_STANDBY},
+#line 80 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str126, ATTR_PLUGINURL},
+#line 78 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str127, ATTR_PLUGINPAGE},
+#line 79 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str128, ATTR_PLUGINSPAGE},
+#line 41 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str129, ATTR_DIRECTION},
 #line 11 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str111, ATTR_ACCEPT_CHARSET},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str130, ATTR_ACCEPT_CHARSET},
+#line 109 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str131, ATTR_VLINK},
 #line 69 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str112, ATTR_NOSHADE},
- -#line 101 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str113, ATTR_TOPMARGIN},
- -#line 23 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str114, ATTR_CELLPADDING},
- -#line 55 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str115, ATTR_LANGUAGE},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str132, ATTR_NOSHADE},
+#line 136 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str133, ATTR_ONCHANGE},
+#line 58 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str134, ATTR_LINK},
+#line 36 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str135, ATTR_CONTENTEDITABLE},
 #line 70 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str116, ATTR_NOWRAP},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str136, ATTR_NOWRAP},
 #line 85 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str117, ATTR_ROWSPAN},
- -#line 117 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str118, ATTR_ARCHIVE},
- -#line 17 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str119, ATTR_AXIS},
- -#line 36 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str120, ATTR_CONTENTEDITABLE},
- -#line 106 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str121, ATTR_VALUETYPE},
- -#line 136 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str122, ATTR_ONCHANGE},
- -#line 80 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str123, ATTR_PLUGINURL},
- -#line 57 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str124, ATTR_LEFTMARGIN},
- -#line 109 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str125, ATTR_VLINK},
- -#line 144 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str126, ATTR_ONMOUSEDOWN},
- -#line 18 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str127, ATTR_BEHAVIOR},
- -#line 41 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str128, ATTR_DIRECTION},
- -#line 118 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str129, ATTR_BACKGROUND},
- -#line 158 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str130, ATTR_SUMMARY},
- -#line 81 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str131, ATTR_READONLY},
- -#line 15 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str132, ATTR_ALINK},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str137, ATTR_ROWSPAN},
 #line 49 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str133, ATTR_HREFLANG},
- -#line 141 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str134, ATTR_ONKEYPRESS},
- -#line 52 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str135, ATTR_HTTP_EQUIV},
- -#line 157 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str136, ATTR_STANDBY},
- -#line 58 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str137, ATTR_LINK},
- -#line 142 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str138, ATTR_ONKEYUP},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str138, ATTR_HREFLANG},
 #line 62 "htmlattrs.gperf"
     {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str139, ATTR_MAXLENGTH},
- -#line 78 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str140, ATTR_PLUGINPAGE},
- -#line 79 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str141, ATTR_PLUGINSPAGE},
- -#line 13 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str142, ATTR_ACCESSKEY},
+#line 117 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str140, ATTR_ARCHIVE},
+#line 18 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str141, ATTR_BEHAVIOR},
+#line 144 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str142, ATTR_ONMOUSEDOWN},
 #line 48 "htmlattrs.gperf"
     {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str143, ATTR_HIDDEN},
 #line 47 "htmlattrs.gperf"
     {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str144, ATTR_HEIGHT},
+#line 52 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str145, ATTR_HTTP_EQUIV},
+#line 140 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str146, ATTR_ONKEYDOWN},
+#line 108 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str147, ATTR_VISIBILITY},
 #line 104 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str145, ATTR_UNKNOWN},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str148, ATTR_UNKNOWN},
 #line 111 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str146, ATTR_WIDTH},
- -#line 140 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str147, ATTR_ONKEYDOWN},
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str149, ATTR_WIDTH},
+#line 60 "htmlattrs.gperf"
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str150, ATTR_MARGINHEIGHT},
 #line 61 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str148, ATTR_MARGINWIDTH},
- -#line 108 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str149, ATTR_VISIBILITY},
- -#line 60 "htmlattrs.gperf"
- -    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str150, ATTR_MARGINHEIGHT}
+    {(int)(long)&((struct spool_attr_t *)0)->spool_attr_str151, ATTR_MARGINWIDTH}
   };
 
 static const short lookup[] =
   {
- -     -1,  -1,  -1,   0,  -1,  -1,  -1,  -1,  -1,   1,
- -      2,  -1,   3,   4,   5,  -1,   6,   7,   8,   9,
- -     10,  -1,  -1,  11,  -1,  -1,  -1,  -1,  12,  13,
- -     14,  15,  -1,  -1,  -1,  16,  17,  -1,  -1,  18,
- -     -1,  19,  -1,  20,  21,  -1,  22,  -1,  23,  24,
- -     -1,  25,  26,  -1,  27,  28,  29,  30,  -1,  -1,
- -     -1,  31,  32,  33,  -1,  34,  -1,  -1,  -1,  35,
- -     36,  -1,  37,  38,  39,  40,  41,  42,  -1,  -1,
- -     43,  -1,  -1,  44,  -1,  -1,  -1,  45,  -1,  46,
- -     47,  -1,  -1,  -1,  48,  -1,  -1,  49,  -1,  50,
- -     51,  -1,  52,  -1,  53,  -1,  54,  -1,  55,  -1,
- -     56,  57,  58,  59,  60,  61,  62,  63,  64,  -1,
- -     65,  -1,  66,  -1,  -1,  -1,  67,  68,  69,  -1,
- -     -1,  70,  71,  72,  73,  -1,  -1,  74,  75,  76,
- -     77,  -1,  -1,  -1,  -1,  -1,  78,  -1,  79,  80,
- -     81,  82,  83,  -1,  84,  -1,  85,  86,  -1,  -1,
- -     -1,  87,  88,  -1,  89,  -1,  90,  91,  -1,  92,
- -     93,  -1,  94,  -1,  95,  96,  -1,  -1,  97,  -1,
- -     -1,  98,  99,  -1,  -1,  -1,  -1, 100, 101,  -1,
- -    102,  -1,  -1,  -1, 103,  -1, 104,  -1,  -1,  -1,
- -     -1,  -1, 105,  -1,  -1, 106, 107,  -1, 108,  -1,
- -    109, 110,  -1,  -1, 111,  -1,  -1, 112,  -1, 113,
- -     -1, 114,  -1, 115,  -1,  -1, 116, 117,  -1,  -1,
- -     -1,  -1, 118,  -1, 119, 120,  -1,  -1,  -1, 121,
- -     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 122, 123,
- -    124,  -1,  -1,  -1,  -1, 125, 126,  -1, 127, 128,
- -    129,  -1, 130, 131,  -1, 132,  -1,  -1, 133,  -1,
- -    134,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
- -     -1,  -1,  -1,  -1,  -1, 135,  -1, 136,  -1,  -1,
- -     -1,  -1,  -1,  -1, 137,  -1,  -1, 138,  -1, 139,
- -    140, 141,  -1,  -1, 142,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1,  -1,   0,  -1,  -1,  -1,  -1,   1,   2,
+      3,  -1,   4,   5,   6,  -1,  -1,  -1,   7,  -1,
+     -1,   8,  -1,   9,  10,  11,  -1,  12,  13,  14,
+     15,  -1,  -1,  -1,  16,  -1,  17,  -1,  -1,  18,
+     19,  20,  -1,  -1,  21,  22,  23,  24,  25,  -1,
+     -1,  26,  -1,  -1,  -1,  -1,  27,  28,  -1,  -1,
+     29,  -1,  30,  -1,  31,  32,  33,  34,  35,  36,
+     -1,  37,  38,  39,  40,  41,  -1,  -1,  -1,  -1,
+     42,  -1,  43,  44,  -1,  45,  -1,  -1,  -1,  -1,
+     -1,  -1,  46,  -1,  -1,  -1,  -1,  47,  -1,  48,
+     49,  -1,  -1,  50,  51,  -1,  52,  -1,  -1,  53,
+     -1,  -1,  54,  55,  56,  57,  -1,  58,  -1,  -1,
+     59,  -1,  60,  61,  -1,  -1,  62,  63,  -1,  -1,
+     64,  -1,  -1,  -1,  -1,  -1,  65,  -1,  66,  -1,
+     -1,  -1,  -1,  -1,  67,  68,  -1,  69,  70,  -1,
+     71,  -1,  -1,  72,  73,  74,  75,  -1,  -1,  76,
+     77,  78,  -1,  79,  80,  -1,  81,  -1,  82,  -1,
+     83,  84,  85,  86,  87,  88,  -1,  89,  90,  -1,
+     -1,  91,  92,  -1,  93,  94,  95,  96,  -1,  97,
+     -1,  -1,  98,  -1,  99, 100, 101, 102,  -1,  -1,
+     -1, 103,  -1,  -1,  -1,  -1,  -1,  -1, 104, 105,
+     -1, 106, 107, 108,  -1,  -1, 109,  -1, 110, 111,
+    112, 113,  -1,  -1,  -1,  -1, 114, 115,  -1, 116,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
- -     -1, 143,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
- -     -1,  -1,  -1,  -1,  -1,  -1, 144,  -1,  -1,  -1,
+     -1,  -1, 117,  -1,  -1,  -1,  -1, 118,  -1, 119,
+    120,  -1,  -1,  -1,  -1,  -1,  -1, 121,  -1, 122,
+    123, 124,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1, 125,  -1, 126, 127, 128,  -1,  -1,  -1,
+     -1,  -1,  -1,  -1, 129,  -1,  -1,  -1,  -1, 130,
+    131,  -1, 132, 133, 134, 135, 136, 137,  -1,  -1,
+     -1,  -1,  -1, 138,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1,  -1,  -1, 139,  -1,  -1, 140,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1,  -1, 141,  -1,  -1,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
- -     -1,  -1,  -1,  -1,  -1,  -1,  -1, 145,  -1,  -1,
+     -1,  -1,  -1,  -1,  -1,  -1, 142,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
- -     -1,  -1,  -1,  -1,  -1, 146,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1,  -1,  -1,  -1,  -1, 143,  -1,  -1,  -1,
+     -1, 144,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1,  -1,  -1,  -1, 145,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
- -     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 147,
+     -1,  -1,  -1,  -1, 146,  -1,  -1,  -1,  -1,  -1,
+    147,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1, 148,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
- -     -1,  -1,  -1,  -1,  -1,  -1, 148,  -1,  -1,  -1,
+     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
     149,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
- -     -1,  -1, 150
+     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+     -1,  -1, 150,  -1,  -1,  -1, 151
   };
 
 #ifdef __GNUC__
@@ -837,163 +848,164 @@
     }
   return 0;
 }
- -#line 162 "htmlattrs.gperf"
+#line 163 "htmlattrs.gperf"
 
 
 
 static const unsigned short attrList[] = {
     65535,
- -    135,
- -    29,
- -    142,
- -    106,
- -    132,
- -    58,
- -    119,
- -    127,
- -    68,
- -    105,
- -    15,
+    145,
+    33,
+    116,
+    94,
+    120,
+    85,
+    80,
+    141,
+    92,
+    121,
     17,
- -    114,
- -    110,
+    20,
+    103,
+    91,
+    40,
+    87,
+    47,
     46,
- -    103,
- -    71,
- -    49,
- -    94,
- -    36,
- -    97,
+    69,
+    32,
+    66,
+    3,
     2,
- -    1,
+    58,
+    43,
+    135,
+    8,
+    30,
+    19,
+    72,
+    129,
+    108,
+    60,
+    14,
+    41,
     52,
- -    42,
- -    120,
- -    6,
- -    37,
- -    28,
- -    79,
- -    128,
- -    108,
- -    91,
- -    18,
- -    47,
- -    62,
     144,
     143,
- -    133,
- -    87,
- -    95,
- -    135,
- -    65,
- -    53,
- -    115,
- -    21,
- -    124,
- -    137,
- -    5,
+    138,
+    113,
+    119,
+    145,
+    57,
+    48,
+    104,
+    16,
+    112,
+    134,
+    6,
     150,
- -    148,
+    151,
     139,
- -    77,
+    59,
+    114,
+    79,
+    124,
     90,
+    95,
+    132,
+    136,
+    28,
+    4,
+    50,
+    98,
+    22,
     64,
- -    104,
+    88,
+    127,
+    128,
+    126,
+    110,
+    5,
+    44,
+    97,
+    137,
+    42,
+    11,
+    107,
     75,
     67,
- -    112,
- -    116,
- -    26,
- -    3,
- -    44,
+    25,
+    45,
+    99,
+    53,
+    49,
     74,
- -    61,
- -    109,
- -    93,
+    82,
+    27,
+    18,
+    9,
+    105,
+    51,
+    36,
+    148,
+    106,
+    122,
+    102,
+    147,
+    131,
+    62,
+    149,
+    111,
+    145,
+    21,
+    81,
+    35,
     140,
- -    141,
     123,
- -    131,
- -    11,
- -    23,
- -    73,
- -    117,
- -    16,
+    76,
+    29,
+    54,
     10,
- -    88,
- -    107,
- -    84,
- -    20,
- -    51,
+    39,
     89,
- -    50,
- -    40,
- -    102,
- -    101,
     31,
- -    39,
- -    4,
- -    113,
- -    35,
- -    13,
- -    145,
- -    98,
- -    121,
- -    83,
- -    149,
- -    125,
- -    41,
- -    146,
- -    92,
- -    135,
+    61,
+    7,
+    115,
+    93,
     24,
+    15,
+    55,
+    56,
     78,
- -    33,
- -    118,
- -    129,
- -    80,
- -    34,
- -    66,
- -    9,
+    37,
+    133,
+    63,
+    71,
     38,
- -    63,
- -    27,
- -    55,
+    146,
+    100,
+    117,
+    23,
+    142,
+    101,
+    77,
+    84,
+    73,
     12,
- -    99,
- -    76,
- -    30,
- -    14,
- -    59,
- -    48,
- -    82,
- -    25,
- -    122,
+    13,
+    1,
+    70,
     86,
- -    96,
- -    32,
- -    147,
- -    134,
- -    138,
- -    22,
- -    126,
- -    70,
- -    56,
- -    54,
- -    60,
- -    7,
- -    8,
- -    69,
- -    72,
- -    45,
- -    19,
- -    85,
+    34,
+    26,
+    109,
     0,
- -    136,
- -    130,
- -    81,
- -    57,
- -    43,
+    125,
+    118,
+    83,
+    65,
+    68,
     65535
 };
 
Index: kdelibs/khtml/misc/htmlattrs.h
===================================================================
- --- trunk/KDE/kdelibs/khtml/misc/htmlattrs.h	(revision 633568)
+++ kdelibs/khtml/misc/htmlattrs.h	(revision 633569)
@@ -149,18 +149,19 @@
 #define ATTR_ONMOUSEUP 138
 #define ATTR_ONRESET 139
 #define ATTR_ONSELECT 140
- -#define ATTR_ONSUBMIT 141
- -#define ATTR_ONUNLOAD 142
- -#define ATTR_PROFILE 143
- -#define ATTR_PROMPT 144
- -#define ATTR_SCHEME 145
- -#define ATTR_SRC 146
- -#define ATTR_STANDBY 147
- -#define ATTR_SUMMARY 148
- -#define ATTR_TITLE 149
- -#define ATTR_USEMAP 150
- -#define ATTR_VALUE 151
- -#define ATTR_LAST_ATTR 151
+#define ATTR_ONSCROLL 141
+#define ATTR_ONSUBMIT 142
+#define ATTR_ONUNLOAD 143
+#define ATTR_PROFILE 144
+#define ATTR_PROMPT 145
+#define ATTR_SCHEME 146
+#define ATTR_SRC 147
+#define ATTR_STANDBY 148
+#define ATTR_SUMMARY 149
+#define ATTR_TITLE 150
+#define ATTR_USEMAP 151
+#define ATTR_VALUE 152
+#define ATTR_LAST_ATTR 152
 #define ATTR_LAST_CI_ATTR 103
 const char* getAttrName(unsigned short id) KDE_NO_EXPORT;
 
Index: kdelibs/khtml/html/html_baseimpl.cpp
===================================================================
- --- trunk/KDE/kdelibs/khtml/html/html_baseimpl.cpp	(revision 633568)
+++ kdelibs/khtml/html/html_baseimpl.cpp	(revision 633569)
@@ -170,6 +170,10 @@
         getDocument()->setHTMLWindowEventListener(EventImpl::KEYPRESS_EVENT,
 	    getDocument()->createHTMLEventListener(attr->value().string(), "onkeypress", NULL));
         break;
+    case ATTR_ONSCROLL:
+        getDocument()->setHTMLWindowEventListener(EventImpl::SCROLL_EVENT,
+            getDocument()->createHTMLEventListener(attr->value().string(), "onscroll", NULL));
+        break;
     case ATTR_NOSAVE:
 	break;
     default:
Index: kdelibs/khtml/html/html_elementimpl.cpp
===================================================================
- --- trunk/KDE/kdelibs/khtml/html/html_elementimpl.cpp	(revision 633568)
+++ kdelibs/khtml/html/html_elementimpl.cpp	(revision 633569)
@@ -259,6 +259,10 @@
         setHTMLEventListener(EventImpl::BLUR_EVENT,
             getDocument()->createHTMLEventListener(attr->value().string(), "onblur", this));
         break;
+    case ATTR_ONSCROLL:
+        setHTMLEventListener(EventImpl::SCROLL_EVENT,
+            getDocument()->createHTMLEventListener(attr->value().string(), "onscroll", this));
+        break;
 // other misc attributes
     default:
 #ifdef UNSUPPORTED_ATTR


- -- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (800, 'stable'), (700, 'testing'), (600, 'unstable'), (199, 'oldstable'), (60, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.22-2-686
Locale: LANG=de_CH.UTF-8, LC_CTYPE=de_CH.UTF-8 (charmap=UTF-8)

Versions of packages kdelibs4c2a depends on:
ii  kdelibs- 4:3.5.7.dfsg.1-7vbi1            core shared data for all KDE appli
ii  libacl1  2.2.41-1                        Access control list shared library
ii  libart-2 2.3.19-3                        Library of functions for 2D graphi
ii  libarts1 1.5.5-1                         aRts sound system core components
ii  libasoun 1.0.14a-2                       ALSA library
ii  libaspel 0.60.4-4                        GNU Aspell spell-checker runtime l
ii  libattr1 2.4.32-1                        Extended attribute shared library
ii  libaudio 1.9-2+b1                        The Network Audio System (NAS). (s
ii  libavahi 0.6.16-3etch1                   Avahi client library
ii  libavahi 0.6.16-3etch1                   Avahi common library
ii  libavahi 0.6.16-3etch1                   Avahi Qt3 integration library
ii  libbz2-1 1.0.3-6                         high-quality block-sorting file co
ii  libc6    2.6.1-1+b1                      GNU C Library: Shared libraries
ii  libcomer 1.39+1.40-WIP-2006.11.14+dfsg-2 common error description library
ii  libcupsy 1.3.2-1                         Common UNIX Printing System(tm) - 
ii  libfontc 2.4.2-1.2                       generic font configuration library
ii  libfreet 2.3.5-1+b1                      FreeType 2 font engine, shared lib
ii  libgamin 0.1.8-2                         Client library for the gamin file 
ii  libgcc1  1:4.2.1-4                       GCC support library
ii  libgnutl 1.7.19-1                        the GNU TLS library - runtime libr
ii  libice6  1:1.0.1-2                       X11 Inter-Client Exchange library
ii  libidn11 0.6.5-1                         GNU libidn library, implementation
ii  libjaspe 1.900.1-3                       The JasPer JPEG-2000 runtime libra
ii  libjpeg6 6b-13                           The Independent JPEG Group's JPEG 
ii  libkrb53 1.6.dfsg.1-7                    MIT Kerberos runtime libraries
ii  liblua50 5.0.3-2                         Main interpreter library for the L
ii  libluali 5.0.3-2                         Extension library for the Lua 5.0 
ii  libopene 1.2.2-4.4                       runtime files for the OpenEXR imag
ii  libpcre3 6.7-1                           Perl 5 Compatible Regular Expressi
ii  libpng12 1.2.15~beta5-1                  PNG library - runtime
ii  libqt3-m 3:3.3.7-8                       Qt GUI Library (Threaded runtime v
ii  libsm6   1:1.0.1-3                       X11 Session Management library
ii  libstdc+ 4.2.1-4                         The GNU Standard C++ Library v3
ii  libtiff4 3.8.2-7                         Tag Image File Format (TIFF) libra
ii  libx11-6 2:1.0.3-7                       X11 client-side library
ii  libxcurs 1.1.7-4                         X cursor management library
ii  libxext6 1:1.0.1-2                       X11 miscellaneous extension librar
ii  libxft2  2.1.8.2-8                       FreeType-based font drawing librar
ii  libxi6   1:1.0.1-4                       X11 Input extension library
ii  libxiner 1:1.0.1-4.1                     X11 Xinerama extension library
ii  libxml2  2.6.30.dfsg-2                   GNOME XML library
ii  libxrand 2:1.2.2-1                       X11 RandR extension library
ii  libxrend 1:0.9.1-3                       X Rendering Extension client libra
ii  libxslt1 1.1.19-1                        XSLT processing library - runtime 
ii  libxt6   1:1.0.2-2                       X11 toolkit intrinsics library
ii  menu-xdg 0.2.3                           freedesktop.org menu compliant win
ii  perl     5.8.8-7                         Larry Wall's Practical Extraction 
ii  xbase-cl 1:7.1.ds1-2                     miscellaneous X clients
ii  zlib1g   1:1.2.3.3.dfsg-5                compression library - runtime

kdelibs4c2a recommends no packages.

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: get my key from http://fortytwo.ch/gpg/92082481

iEYEARECAAYFAkb8qlAACgkQi6Qxi+Wn99ZEsQCeICdhz5dgIaWjMUie5oe+X7Wf
XWwAoLUR5DkP+DyAIjrBol//Wk4u/SeC
=987b
-----END PGP SIGNATURE-----




Reply to: