diff -urN F:\FGCVS\tidy\build\msvc\tidy.dsp tidycvs6\build\msvc\tidy.dsp
--- F:\FGCVS\tidy\build\msvc\tidy.dsp    Thu Apr 17 17:48:03 2003
+++ tidycvs6\build\msvc\tidy.dsp   Mon Sep 25 19:58:44 2006
@@ -42,7 +42,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /YX /FD /c
+# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /D "TIDY_STORE_ORIGINAL_TEXT" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D TIDYDLL_EXPORT=__declspec(dllimport) /D "TIDY_STORE_ORIGINAL_TEXT" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff -urN F:\FGCVS\tidy\build\msvc\tidydll.dsp tidycvs6\build\msvc\tidydll.dsp
--- F:\FGCVS\tidy\build\msvc\tidydll.dsp Tue Sep 19 15:45:44 2006
+++ tidycvs6\build\msvc\tidydll.dsp Mon Sep 25 19:58:44 2006
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIDYDLL_EXPORTS" /D SUPPORT_UTF16_ENCODINGS=1 /D SUPPORT_ASIAN_ENCODINGS=1 /D SUPPORT_ACCESSIBILITY_CHECKS=1 /D "TIDY_STORE_ORIGINAL_TEXT" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -137,6 +137,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\iso639.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\istack.c
 # End Source File
 # Begin Source File
@@ -183,7 +187,7 @@
 
 SOURCE=..\..\src\utf8.c
 # End Source File
-# End Group
+# Begin Source File
 
 SOURCE=..\..\src\win32tc.c
 # End Source File
diff -urN F:\FGCVS\tidy\build\msvc\tidylib.dsp tidycvs6\build\msvc\tidylib.dsp
--- F:\FGCVS\tidy\build\msvc\tidylib.dsp Tue Sep 19 15:45:44 2006
+++ tidycvs6\build\msvc\tidylib.dsp Mon Sep 25 19:58:44 2006
@@ -41,7 +41,7 @@
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W4 /GX /O2 /I "../../include" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SUPPORT_UTF16_ENCODINGS" /D "SUPPORT_ASIAN_ENCODINGS" /D "SUPPORT_ACCESSIBILITY_CHECKS" /FD /c
+# ADD CPP /nologo /MT /W4 /GX /O2 /I "../../include" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SUPPORT_UTF16_ENCODINGS" /D "SUPPORT_ASIAN_ENCODINGS" /D "SUPPORT_ACCESSIBILITY_CHECKS" /D "TIDY_STORE_ORIGINAL_TEXT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /Za /W4 /Gm /ZI /Od /I "../../include" /D "_DEBUG" /D "_WIN32" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SUPPORT_UTF16_ENCODINGS" /D "SUPPORT_ASIAN_ENCODINGS" /D "SUPPORT_ACCESSIBILITY_CHECKS" /U "WINDOWS" /FD /GZ /c
+# ADD CPP /nologo /MTd /Za /W4 /Gm /ZI /Od /I "../../include" /D "_DEBUG" /D "_WIN32" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SUPPORT_UTF16_ENCODINGS" /D "SUPPORT_ASIAN_ENCODINGS" /D "SUPPORT_ACCESSIBILITY_CHECKS" /D "TIDY_STORE_ORIGINAL_TEXT" /U "WINDOWS" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -131,6 +131,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\iso639.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\istack.c
 # End Source File
 # Begin Source File
@@ -142,7 +146,7 @@
 SOURCE=..\..\src\localize.c
 # End Source File
 # Begin Source File
- 
+
 SOURCE=..\..\src\mappedio.c
 
 !IF  "$(CFG)" == "tidylib - Win32 Release"
@@ -173,6 +177,19 @@
 # Begin Source File
 
 SOURCE=..\..\src\tags.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tidydebug.c
+
+!IF  "$(CFG)" == "tidylib - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "tidylib - Win32 Debug"
+
+# ADD CPP /Ze
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
diff -urN F:\FGCVS\tidy\console\tidy.c tidycvs6\console\tidy.c
--- F:\FGCVS\tidy\console\tidy.c   Tue Feb 14 12:09:21 2006
+++ tidycvs6\console\tidy.c  Sun Sep 24 13:24:47 2006
@@ -1271,9 +1271,11 @@
         errout == stderr && !contentErrors)
         fprintf(errout, "\n");
 
-    if (contentErrors + contentWarnings > 0 && 
-         !tidyOptGetBool(tdoc, TidyQuiet))
-        tidyErrorSummary(tdoc);
+    if ( !tidyOptGetBool(tdoc, TidyQuiet) &&
+       (contentErrors + contentWarnings + accessWarnings > 0) )
+    {
+       tidyErrorSummary(tdoc);
+    }
 
     if (!tidyOptGetBool(tdoc, TidyQuiet))
         tidyGeneralInfo(tdoc);
diff -urN F:\FGCVS\tidy\src\access.c tidycvs6\src\access.c
--- F:\FGCVS\tidy\src\access.c     Sat Sep 16 11:39:23 2006
+++ tidycvs6\src\access.c    Mon Sep 25 19:50:46 2006
@@ -43,7 +43,6 @@
 #include "attrs.h"
 #include "tmbstr.h"
 
-
 /* 
     The accessibility checks to perform depending on user's desire.
 
@@ -157,6 +156,61 @@
 static void CheckEmbed( TidyDocImpl* doc, Node* node );
 static void CheckListUsage( TidyDocImpl* doc, Node* node );
 
+#ifdef TIDY_STORE_ORIGINAL_TEXT
+/*****************************************************
+* OriginalIsWhite
+*
+* See if the ORIGINAL text was ALL WHITE
+*****************************************************/
+uint OriginalIsWhite( TidyDocImpl* doc, Node* node, tmbstr srch )
+{
+   uint iswhite = no;
+   uint ulen = TY_(tmbstrlen)(srch);
+   tmbstr fnd = NULL;
+   if (node && node->otext && ulen)
+   {
+      tmbstr item = node->otext;
+      /* fnd = strstr(item, srch); */
+      if ( !fnd )
+      {
+         while( *item && (TY_(tmbstrlen)(item) > ulen) )
+         {
+            if ( TY_(tmbstrncasecmp)( item, srch, ulen ) == 0 )
+            {
+               fnd = item;
+               break;
+            }
+            item++;
+         }
+      }
+      if ( fnd )
+      {
+         fnd += TY_(tmbstrlen)(srch);
+         if ((*fnd == '"')||(*fnd == '\''))
+         {
+            tmbchar chr = *fnd; /* extract the character */
+            fnd++; /* proceed until the end, checking */
+            ulen = 0;   /* start counter of white */
+            while ( *fnd && (*fnd != chr) &&
+                   TY_(IsWhite)( *fnd ))
+            {
+               fnd++;
+               ulen++;
+            }
+            if (ulen && ( *fnd == chr ) )
+               iswhite = yes; /* all white space */
+         }
+         else
+         {
+            /* what to do if NO quote, or double quote delimiter? */
+         }
+      }
+   }
+   return iswhite;
+}
+
+#endif /* #ifdef TIDY_STORE_ORIGINAL_TEXT */
+
 /*
     GetFileExtension takes a path and returns the extension
     portion of the path (if any).
@@ -682,6 +736,8 @@
     Bool HasValidWidthBullet = no;
     Bool HasValidWidthHR = no; 
     Bool HasTriggeredMissingLongDesc = no;
+    int width = 0;
+    int height = 0;
 
     AttVal* av;
                 
@@ -746,7 +802,7 @@
                 /* Longdesc attribute needed if width attribute is not present. */
                 if ( hasValue(av) )
                 {
-                    int width = atoi( av->value );
+                    width = atoi( av->value );
                     if ( width < 30 )
                         HasValidWidthBullet = yes;
 
@@ -765,8 +821,12 @@
             else if ( attrIsHEIGHT(av) )
             {
                 /* Longdesc attribute needed if height attribute not present. */
-                if ( hasValue(av) && atoi(av->value) < 30 )
-                    HasValidHeight = yes;
+                if ( hasValue(av) )
+                {
+                   height = atoi(av->value);
+                   if ( height < 30 )
+                     HasValidHeight = yes;
+                }
             }
 
             /* 
@@ -860,12 +920,14 @@
             (HasValidWidthBullet == yes)&&
             (HasValidHeight == yes))
         {
+            TY_(ReportAccessError)( doc, node, IMG_MISSING_ALT_BULLET);
         }
 
         if ((HasAlt == no)&&
             (HasValidWidthHR == yes)&&
             (HasValidHeight == yes))
         {
+            TY_(ReportAccessError)( doc, node, IMG_MISSING_ALT_H_RULE);
         }
 
         if (HasAlt == no)
@@ -1277,15 +1339,19 @@
             if ((word != NULL)&&
                 (IsWhitespace (word) == no))
             {
-                if (TY_(tmbstrcmp) (word, "more") == 0)
+                if (TY_(tmbstrcasecmp) (word, "more") == 0)
                 {
                     HasTriggeredLink = yes;
-                }
-
-                if (TY_(tmbstrcmp) (word, "click here") == 0)
+                    TY_(ReportAccessWarning)( doc, node, LINK_TEXT_NOT_MEANINGFUL_MORE);
+                } 
+                else if (TY_(tmbstrcasecmp) (word, "click here") == 0)
                 {
                     TY_(ReportAccessWarning)( doc, node, LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE);
                 }
+                else if (TY_(tmbstrcasecmp) (word, "follow this") == 0)
+                {
+                    TY_(ReportAccessWarning)( doc, node, LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS);
+                }
 
                 if (HasTriggeredLink == no)
                 {
@@ -1430,6 +1496,17 @@
                         numValidTH++;
                 }
             }
+            else if ( node->content && nodeIsTH( node->content ) )
+            {
+               Node * tmp = node->content;
+               doc->access.HasTH = yes;
+               if ( tmp->content && TY_(nodeIsText)(tmp->content) )
+               {
+                   ctmbstr word = textFromOneNode( doc, tmp->content);
+                   if ( !IsWhitespace(word) )
+                        numValidTH++;
+               }
+            }
         }
         
         node = node->next;
@@ -1495,7 +1572,6 @@
         doc->access.HasInvalidColumnHeader = yes;
 }
 
-
 /*****************************************************
 * CheckTH
 *
@@ -1528,7 +1604,18 @@
                     (TY_(tmbstrlen)(av->value) == 0))
                 {
                     HasAbbr = yes;
+#ifdef TIDY_STORE_ORIGINAL_TEXT
+                    {
+                       tmbstr srch = "abbr=";
+                       uint iswhite = OriginalIsWhite( doc, node, srch );
+                       if (iswhite)
+                          TY_(ReportAccessWarning)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES);
+                       else
+                          TY_(ReportAccessWarning)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR_NULL);
+                    }
+#else /* !#ifdef TIDY_STORE_ORIGINAL_TEXT */
                     TY_(ReportAccessWarning)( doc, node, TABLE_MAY_REQUIRE_HEADER_ABBR_NULL);
+#endif
                 }
                 
                 if ((IsWhitespace (av->value) == yes)&&
@@ -1660,7 +1747,6 @@
     }
 }
 
-
 /****************************************************
 * CheckTable
 *
@@ -1703,7 +1789,18 @@
                 if ( av->value == NULL || TY_(tmbstrlen)(av->value) == 0 )
                 {
                     HasSummary = yes;
+#ifdef TIDY_STORE_ORIGINAL_TEXT
+                    {
+                       tmbstr srch = "summary=";
+                       uint iswhite = OriginalIsWhite( doc, node, srch );
+                       if (iswhite)
+                          TY_(ReportAccessError)( doc, node, TABLE_SUMMARY_INVALID_SPACES );
+                       else
+                          TY_(ReportAccessError)( doc, node, TABLE_SUMMARY_INVALID_NULL );
+                    }
+#else /* !#ifdef TIDY_STORE_ORIGINAL_TEXT  */
                     TY_(ReportAccessError)( doc, node, TABLE_SUMMARY_INVALID_NULL );
+#endif
                 }
                 else if ( IsWhitespace(av->value) && TY_(tmbstrlen)(av->value) > 0 )
                 {
@@ -2068,7 +2165,6 @@
     }
 }
 
-
 /***************************************************************
 * CheckInputAttributes 
 *
@@ -2080,6 +2176,8 @@
 {
     Bool HasAlt = no;
     Bool MustHaveAlt = no;
+    Bool HasValue = no;
+    Bool WithValue = no;
     AttVal* av;
 
     /* Checks attributes within the INPUT element */
@@ -2102,6 +2200,15 @@
         {
             HasAlt = yes;
         }
+
+        if ( attrIsVALUE(av) )
+        {
+           HasValue = yes;
+           if ( hasValue(av) )
+           {
+              WithValue = yes;
+           }
+        }
     }
 
     if ( MustHaveAlt && !HasAlt )
@@ -2109,6 +2216,30 @@
         TY_(ReportAccessError)( doc, node, IMG_BUTTON_MISSING_ALT );
     }
 
+    if (Level3_Enabled( doc ))
+    {
+       if ( HasValue )
+       {
+          if ( !WithValue )
+          {
+#ifdef TIDY_STORE_ORIGINAL_TEXT
+             /* now we can differentiate by checking the ORIGINAL */
+             tmbstr srch = "value=";
+             uint iswhite = OriginalIsWhite( doc, node, srch );
+             if (iswhite)
+                TY_(ReportAccessWarning)( doc, node, FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES);
+             else
+                TY_(ReportAccessWarning)( doc, node, FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL);
+#else /* !#ifdef TIDY_STORE_ORIGINAL_TEXT */
+              TY_(ReportAccessError)( doc, node, FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL );
+#endif /* #ifdef TIDY_STORE_ORIGINAL_TEXT */
+          }
+       }
+       else
+       {
+           TY_(ReportAccessError)( doc, node, FORM_CONTROL_REQUIRES_DEFAULT_TEXT );
+       }
+    }
 }
 
 
@@ -2128,6 +2259,11 @@
 
     if (Level1_Enabled( doc ))
     {
+        if ( doc->badAccess & ACC_NOFRAMES_INVALID_LINK )
+        {
+           TY_(ReportAccessError)( doc, node, NOFRAMES_INVALID_LINK);
+           doc->badAccess &= ~(ACC_NOFRAMES_INVALID_LINK); /* emit only once */
+        }
         if (node->content != NULL)
         {
             temp = node->content;
@@ -2863,6 +2999,9 @@
     {
         Node* DTnode = TY_(FindDocType)(doc);
 
+        if (DTnode && DTnode->implicit) /* this has been added by tidy, so */
+           DTnode = NULL;  /* the document had NO doctype */
+
         /* If the doctype has been added by tidy, DTnode->end will be 0. */
         if (DTnode && DTnode->end != 0)
         {
@@ -3000,8 +3139,11 @@
 
     if ( msgcode )
     {
-        if ( !nodeIsLI(node->content) )
+       if ( !nodeIsLI(node->content) ) {
             TY_(ReportAccessWarning)( doc, node, msgcode );
+       } else if ( node->implicit ) {  /* if a tidy added node */
+            TY_(ReportAccessWarning)( doc, node, LIST_USAGE_INVALID_LI );
+       }
     }
     else if ( nodeIsLI(node) )
     {
@@ -3013,10 +3155,90 @@
              ( !nodeIsOL(node->parent) && !nodeIsUL(node->parent) ) )
         {
             TY_(ReportAccessWarning)( doc, node, LIST_USAGE_INVALID_LI );
+        } else if ( node->implicit && node->parent &&
+            ( nodeIsOL(node->parent) || nodeIsUL(node->parent) ) ) {
+           /* if a tidy added LI node, then */
+           if ( nodeIsUL(node->parent) )
+              TY_(ReportAccessWarning)( doc, node, LIST_USAGE_INVALID_UL );
+           else
+              TY_(ReportAccessWarning)( doc, node, LIST_USAGE_INVALID_OL );
+
         }
     }
 }
 
+typedef struct tagFORMORDER {
+   uint order;
+   uint ordlabel;
+   uint ordinput;
+   uint ordtext;
+} FORMORDER, * PFORMORDER;
+
+static void CheckFORMOrder(TidyDocImpl* doc, Node* node, PFORMORDER pfo)
+{
+   if ( pfo->ordlabel && pfo->ordinput && pfo->ordtext )
+   {
+      if ( (pfo->ordlabel < pfo->ordtext) && (pfo->ordtext < pfo->ordinput) )
+      {
+         /* some TEXT occurs between LABEL and INPUT */
+         TY_(ReportAccessError)( doc, node, LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT );
+         pfo->ordtext = 0;
+      }
+      else if ( (pfo->ordinput < pfo->ordtext) && (pfo->ordtext < pfo->ordlabel) )
+      {
+         /* some TEXT occurs between INPUT and LABEL */
+         TY_(ReportAccessError)( doc, node, LABEL_NEEDS_REPOSITIONING_AFTER_INPUT );
+         pfo->ordtext = 0;
+      }
+   }
+}
+
+static void SetFORMOrder(TidyDocImpl* doc, Node* node, PFORMORDER pfo)
+{
+   if ( nodeIsLABEL(node) )
+   {
+      pfo->ordlabel = pfo->order;
+   }
+   else if ( nodeIsINPUT( node ) )
+   {
+      pfo->ordinput = pfo->order;
+   }
+   else if ( TY_(nodeIsText)(node) )
+   {
+      ctmbstr word = textFromOneNode( doc, node );
+      if ( word != NULL && !IsWhitespace(word) )
+         pfo->ordtext = pfo->order;
+   }
+}
+
+/******************************************************
+* CheckFORM
+*
+* Ensures that text is not between any label and input,
+* and not between input and label ...
+******************************************************/
+static void CheckFORM( TidyDocImpl* doc, Node* node )
+{
+   if (Level2_Enabled( doc ))
+   {
+      Node* child;
+      static FORMORDER _s_fo;
+      PFORMORDER pfo = &_s_fo;
+      pfo->order = 0;
+      pfo->ordlabel = 0;
+      pfo->ordinput = 0;
+      pfo->ordtext = 0;
+      /* check all children of FORM */
+      for ( child = node->content; child != NULL; child = child->next )
+      {
+         pfo->order++;
+         SetFORMOrder( doc, child, pfo );
+         CheckFORMOrder( doc, child, pfo );
+      }
+   }
+}
+
+
 /************************************************************
 * InitAccessibilityChecks
 *
@@ -3263,6 +3485,12 @@
     {
         CheckListUsage( doc, node );
     }
+    /* Check 'FORM' */
+    else if ( nodeIsFORM(node) )
+    {
+        CheckFORM( doc, node );
+    }
+
 
     /* Recursively check all child nodes.
     */
@@ -3323,6 +3551,7 @@
     /* Cleanup */
     FreeAccessibilityChecks( doc );
 }
+
 
 #endif
 
diff -urN F:\FGCVS\tidy\src\iso639.c tidycvs6\src\iso639.c
--- F:\FGCVS\tidy\src\iso639.c     Thu Jan 01 01:00:00 1970
+++ tidycvs6\src\iso639.c    Mon Sep 25 19:50:34 2006
@@ -0,0 +1,85 @@
+
+/* iso639.c -- carry out language check
+
+  Copyright University of Toronto
+  Portions (c) 1998-2006 (W3C) MIT, ERCIM, Keio University
+  See tidy.h for the copyright notice.
+  
+*/
+
+#include "tidy-int.h"
+
+#if SUPPORT_ACCESSIBILITY_CHECKS
+
+#include "tmbstr.h"
+
+tmbstr ISO639_2[] = {
+"aar", "abk", "ace", "ach", "ada", "ady", "afa", "afh", "afr", "ain", "aka", 
+"akk", "alb", "ale", "alg", "alt", "amh", "ang", "anp", "apa", "ara", "arc", 
+"arg", "arm", "arn", "arp", "art", "arw", "asm", "ast", "ath", "aus", "ava", 
+"ave", "awa", "aym", "aze", "bad", "bai", "bak", "bal", "bam", "ban", "baq", 
+"bas", "bat", "bej", "bel", "bem", "ben", "ber", "bho", "bih", "bik", "bin", 
+"bis", "bla", "bnt", "bod", "bos", "bra", "bre", "btk", "bua", "bug", "bul", 
+"bur", "byn", "cad", "cai", "car", "cat", "cau", "ceb", "cel", "ces", "cha", 
+"chb", "che", "chg", "chi", "chk", "chm", "chn", "cho", "chp", "chr", "chu", 
+"chv", "chy", "cmc", "cop", "cor", "cos", "cpe", "cpf", "cpp", "cre", "crh", 
+"crp", "csb", "cus", "cym", "cze", "dak", "dan", "dar", "day", "del", "den", 
+"deu", "dgr", "din", "div", "doi", "dra", "dsb", "dua", "dum", "dut", "dyu", 
+"dzo", "efi", "egy", "eka", "ell", "elx", "eng", "enm", "epo", "est", "eus", 
+"ewe", "ewo", "fan", "fao", "fas", "fat", "fij", "fil", "fin", "fiu", "fon", 
+"fra", "fre", "frm", "fro", "frr", "frs", "fry", "ful", "fur", "gaa", "gay", 
+"gba", "gem", "geo", "ger", "gez", "gil", "gla", "gle", "glg", "glv", "gmh", 
+"goh", "gon", "gor", "got", "grb", "grc", "gre", "grn", "gsw", "guj", "gwi", 
+"hai", "hat", "hau", "haw", "heb", "her", "hil", "him", "hin", "hit", "hmn", 
+"hmo", "hrv", "hsb", "hun", "hup", "hye", "iba", "ibo", "ice", "ido", "iii", 
+"ijo", "iku", "ile", "ilo", "ina", "inc", "ind", "ine", "inh", "ipk", "ira", 
+"iro", "isl", "ita", "jav", "jbo", "jpn", "jpr", "jrb", "kaa", "kab", "kac", 
+"kal", "kam", "kan", "kar", "kas", "kat", "kau", "kaw", "kaz", "kbd", "kha", 
+"khi", "khm", "kho", "kik", "kin", "kir", "kmb", "kok", "kom", "kon", "kor", 
+"kos", "kpe", "krc", "krl", "kro", "kru", "kua", "kum", "kur", "kut", "lad", 
+"lah", "lam", "lao", "lat", "lav", "lez", "lim", "lin", "lit", "lol", "loz", 
+"ltz", "lua", "lub", "lug", "lui", "lun", "luo", "lus", "mac", "mad", "mag", 
+"mah", "mai", "mak", "mal", "man", "mao", "map", "mar", "mas", "may", "mdf", 
+"mdr", "men", "mga", "mic", "min", "mis", "mkd", "mkh", "mlg", "mlt", "mnc", 
+"mni", "mno", "moh", "mol", "mon", "mos", "mri", "msa", "mul", "mun", "mus", 
+"mwl", "mwr", "mya", "myn", "myv", "nah", "nai", "nap", "nau", "nav", "nbl", 
+"nde", "ndo", "nds", "nep", "new", "nia", "nic", "niu", "nld", "nno", "nob", 
+"nog", "non", "nor", "nqo", "nso", "nub", "nwc", "nya", "nym", "nyn", "nyo", 
+"nzi", "oci", "oji", "ori", "orm", "osa", "oss", "ota", "oto", "paa", "pag", 
+"pal", "pam", "pan", "pap", "pau", "peo", "per", "phi", "phn", "pli", "pol", 
+"pon", "por", "pra", "pro", "pus", "qaa-qtz", "que", "raj", "rap", "rar", "roa", 
+"roh", "rom", "ron", "rum", "run", "rup", "rus", "sad", "sag", "sah", "sai", 
+"sal", "sam", "san", "sas", "sat", "scc", "scn", "sco", "scr", "sel", "sem", 
+"sga", "sgn", "shn", "sid", "sin", "sio", "sit", "sla", "slk", "slo", "slv", 
+"sma", "sme", "smi", "smj", "smn", "smo", "sms", "sna", "snd", "snk", "sog", 
+"som", "son", "sot", "spa", "sqi", "srd", "srn", "srp", "srr", "ssa", "ssw", 
+"suk", "sun", "sus", "sux", "swa", "swe", "syr", "tah", "tai", "tam", "tat", 
+"tel", "tem", "ter", "tet", "tgk", "tgl", "tha", "tib", "tig", "tir", "tiv", 
+"tkl", "tlh", "tli", "tmh", "tog", "ton", "tpi", "tsi", "tsn", "tso", "tuk", 
+"tum", "tup", "tur", "tut", "tvl", "twi", "tyv", "udm", "uga", "uig", "ukr", 
+"umb", "und", "urd", "uzb", "vai", "ven", "vie", "vol", "vot", "wak", "wal", 
+"war", "was", "wel", "wen", "wln", "wol", "xal", "xho", "yao", "yap", "yid", 
+"yor", "ypk", "zap", "zen", "zha", "zho", "znd", "zul", "zun", "zxx", 
+ 0 };
+
+tmbstr ISO639_1[] = {
+"aa", "ab", "ae", "af", "ak", "am", "an", "ar", "as", "av", "ay", "az", "ba", 
+"be", "bg", "bh", "bi", "bm", "bn", "bo", "br", "bs", "ca", "ce", "ch", "co", 
+"cr", "cs", "cu", "cv", "cy", "da", "de", "dv", "dz", "ee", "el", "en", "eo", 
+"es", "et", "eu", "fa", "ff", "fi", "fj", "fo", "fr", "fy", "ga", "gd", "gl", 
+"gn", "gu", "gv", "ha", "he", "hi", "ho", "hr", "ht", "hu", "hy", "hz", "ia", 
+"id", "ie", "ig", "ii", "ik", "io", "is", "it", "iu", "ja", "jv", "ka", "kg", 
+"ki", "kj", "kk", "kl", "km", "kn", "ko", "kr", "ks", "ku", "kv", "kw", "ky", 
+"la", "lb", "lg", "li", "ln", "lo", "lt", "lu", "lv", "mg", "mh", "mi", "mk", 
+"ml", "mn", "mo", "mr", "ms", "mt", "my", "na", "nb", "nd", "ne", "ng", "nl", 
+"nn", "no", "nr", "nv", "ny", "oc", "oj", "om", "or", "os", "pa", "pi", "pl", 
+"ps", "pt", "qu", "rm", "rn", "ro", "ru", "rw", "sa", "sc", "sd", "se", "sg", 
+"si", "sk", "sl", "sm", "sn", "so", "sq", "sr", "ss", "st", "su", "sv", "sw", 
+"ta", "te", "tg", "th", "ti", "tk", "tl", "tn", "to", "tr", "ts", "tt", "tw", 
+"ty", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "wo", "xh", "yi", "yo", 
+"za", "zh", "zu", 
+ 0 };
+
+#endif /* #if SUPPORT_ACCESSIBILITY_CHECKS */
+
+/* eof - iso639.c */
diff -urN F:\FGCVS\tidy\src\lexer.c tidycvs6\src\lexer.c
--- F:\FGCVS\tidy\src\lexer.c Sat Sep 16 11:39:25 2006
+++ tidycvs6\src\lexer.c     Fri Sep 22 11:21:18 2006
@@ -1648,6 +1648,7 @@
     else
     {
         doctype = NewDocTypeNode(doc);
+        doctype->implicit = 1;   /* Tidy added this doctype! */
         doctype->element = TY_(tmbstrdup)("html");
     }
 
diff -urN F:\FGCVS\tidy\src\localize.c tidycvs6\src\localize.c
--- F:\FGCVS\tidy\src\localize.c   Sat Sep 16 11:39:25 2006
+++ tidycvs6\src\localize.c  Sun Sep 24 14:46:50 2006
@@ -168,6 +168,8 @@
   { IMG_ALT_SUSPICIOUS_FILE_SIZE,                  "[1.1.1.3]: suspicious 'alt' text (file size)."                            }, /* Access */
   { IMG_ALT_SUSPICIOUS_PLACEHOLDER,                "[1.1.1.4]: suspicious 'alt' text (placeholder)."                          }, /* Access */
   { IMG_ALT_SUSPICIOUS_TOO_LONG,                   "[1.1.1.10]: suspicious 'alt' text (too long)."                            }, /* Access */
+  { IMG_MISSING_ALT_BULLET,                        "[1.1.1.11]: <img> missing 'alt' text (bullet)."                           }, /* Access */
+  { IMG_MISSING_ALT_H_RULE,                        "[1.1.1.12]: <img> missing 'alt' text (horizontal rule)."                  }, /* Access */
   { IMG_MISSING_LONGDESC_DLINK,                    "[1.1.2.1]: <img> missing 'longdesc' and d-link."                          }, /* Access */
   { IMG_MISSING_DLINK,                             "[1.1.2.2]: <img> missing d-link."                                         }, /* Access */
   { IMG_MISSING_LONGDESC,                          "[1.1.2.3]: <img> missing 'longdesc'."                                     }, /* Access */
@@ -260,6 +262,8 @@
   { SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE,  "[9.3.1.6]: <script> not keyboard accessible (onMouseMove)."               }, /* Access */
   { NEW_WINDOWS_REQUIRE_WARNING_NEW,               "[10.1.1.1]: new windows require warning (_new)."                          }, /* Access */
   { NEW_WINDOWS_REQUIRE_WARNING_BLANK,             "[10.1.1.2]: new windows require warning (_blank)."                        }, /* Access */
+  { LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT,        "[10.2.1.1]: <label> needs repositioning (<label> before <input>)."        }, /* Access */
+  { LABEL_NEEDS_REPOSITIONING_AFTER_INPUT,         "[10.2.1.2]: <label> needs repositioning (<label> after <input>)."         }, /* Access */
   { FORM_CONTROL_REQUIRES_DEFAULT_TEXT,            "[10.4.1.1]: form control requires default text."                          }, /* Access */
   { FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL,        "[10.4.1.2]: form control default text invalid (null)."                    }, /* Access */
   { FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES,      "[10.4.1.3]: form control default text invalid (spaces)."                  }, /* Access */
@@ -283,6 +287,8 @@
   { LINK_TEXT_MISSING,                             "[13.1.1.2]: link text missing."                                           }, /* Access */
   { LINK_TEXT_TOO_LONG,                            "[13.1.1.3]: link text too long."                                          }, /* Access */
   { LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE,           "[13.1.1.4]: link text not meaningful (click here)."                       }, /* Access */
+  { LINK_TEXT_NOT_MEANINGFUL_MORE,                 "[13.1.1.5]: link text not meaningful (more)."                             }, /* Access */
+  { LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS,          "[13.1.1.6]: link text not meaningful (follow this)."                      }, /* Access */
   { METADATA_MISSING,                              "[13.2.1.1]: Metadata missing."                                            }, /* Access */
   { METADATA_MISSING_LINK,                         "[13.2.1.2]: Metadata missing (link element)."                             }, /* Access */
   { METADATA_MISSING_REDIRECT_AUTOREFRESH,         "[13.2.1.3]: Metadata missing (redirect/auto-refresh)."                    }, /* Access */
@@ -1324,14 +1330,14 @@
 void TY_(ReportAccessWarning)( TidyDocImpl* doc, Node* node, uint code )
 {
     ctmbstr fmt = GetFormatFromCode(code);
-    doc->badAccess = yes;
+    doc->badAccess |= ACCESSIBILITY_FLAW;
     messageNode( doc, TidyAccess, node, fmt );
 }
 
 void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code )
 {
     ctmbstr fmt = GetFormatFromCode(code);
-    doc->badAccess = yes;
+    doc->badAccess |= ACCESSIBILITY_FLAW;
     messageNode( doc, TidyAccess, node, fmt );
 }
 
@@ -1615,7 +1621,7 @@
       {
         tidy_out(doc, "For further advice on how to make your pages accessible, see\n");
         tidy_out(doc, "%s", ACCESS_URL );
-        tidy_out(doc, "and\n" );
+        tidy_out(doc, " and\n" );
         tidy_out(doc, "%s", ATRC_ACCESS_URL );
         tidy_out(doc, ".\n" );
         tidy_out(doc, "You may also want to try \"http://www.cast.org/bobby/\" which is a free Web-based\n");
@@ -1744,7 +1750,15 @@
 void TY_(AccessibilityHelloMessage)( TidyDocImpl* doc )
 {
     tidy_out( doc, "\n" );
-    tidy_out( doc, "Accessibility Checks: Version 0.1\n" );
+    tidy_out( doc, "Accessibility Checks: Version 0.1 " );
+    if( doc->access.PRIORITYCHK == 3 )
+       tidy_out( doc, " Level 3\n" );
+    else if(doc->access.PRIORITYCHK == 2)
+       tidy_out( doc, " Level 2\n" );
+    else if(doc->access.PRIORITYCHK == 1)
+       tidy_out( doc, " Level 1\n" );
+    else
+       tidy_out( doc, " Level ?\n" );
     tidy_out( doc, "\n" );
 }
 
diff -urN F:\FGCVS\tidy\src\mappedio.c tidycvs6\src\mappedio.c
--- F:\FGCVS\tidy\src\mappedio.c   Tue Sep 19 15:45:47 2006
+++ tidycvs6\src\mappedio.c  Thu Sep 21 13:43:41 2006
@@ -89,6 +89,9 @@
 
 
 #if defined(_WIN32)
+#if _MSC_VER < 1300  /* less than msvc++ 7.0 */
+#pragma warning(disable:4115) /* named type definition in parentheses */
+#endif /* #if _MSC_VER < 1300 - less than msvc++ 7.0 */
 #include "streamio.h"
 #include "tidy-int.h"
 #include "message.h"
diff -urN F:\FGCVS\tidy\src\message.h tidycvs6\src\message.h
--- F:\FGCVS\tidy\src\message.h    Sat Sep 16 11:39:25 2006
+++ tidycvs6\src\message.h   Sat Sep 23 11:31:38 2006
@@ -171,13 +171,14 @@
 #define INVALID_NCR                  82
 
 /* accessibility flaws */
-
+#define ACCESSIBILITY_FLAW      2147483648   /* highest bit 0x80000000 */
 #define MISSING_IMAGE_ALT       1
 #define MISSING_LINK_ALT        2
 #define MISSING_SUMMARY         4
 #define MISSING_IMAGE_MAP       8
 #define USING_FRAMES            16
 #define USING_NOFRAMES          32
+#define ACC_NOFRAMES_INVALID_LINK   64    /* link is discard in parse.c */  
 
 /* presentation flaws */
 
diff -urN F:\FGCVS\tidy\src\parser.c tidycvs6\src\parser.c
--- F:\FGCVS\tidy\src\parser.c     Sat Sep 16 11:39:25 2006
+++ tidycvs6\src\parser.c    Mon Sep 25 12:39:38 2006
@@ -3636,6 +3636,10 @@
         }
 
         /* discard unexpected tags */
+        if ( nodeIsA(node) )
+        {
+           doc->badAccess |= ACC_NOFRAMES_INVALID_LINK; /* link is being discard */
+        }
         TY_(ReportError)(doc, frameset, node, DISCARDING_UNEXPECTED);
         TY_(FreeNode)( doc, node);
     }
@@ -3871,11 +3875,14 @@
     ParseTag(doc, node, mode);
 }
 
+#if   (!defined( SUPPORT_ACCESSIBILITY_CHECKS )||(SUPPORT_ACCESSIBILITY_CHECKS == 0))
 static Bool nodeCMIsOnlyInline( Node* node )
 {
     return TY_(nodeHasCM)( node, CM_INLINE ) && !TY_(nodeHasCM)( node, CM_BLOCK );
 }
+#endif /* SUPPORT_ACCESSIBILITY_CHECKS moved block to clean and repair */
 
+#if   (!defined( SUPPORT_ACCESSIBILITY_CHECKS )||(SUPPORT_ACCESSIBILITY_CHECKS == 0))
 static void EncloseBodyText(TidyDocImpl* doc)
 {
     Node* node;
@@ -3906,7 +3913,9 @@
         node = node->next;
     }
 }
+#endif /* SUPPORT_ACCESSIBILITY_CHECKS moved block to clean and repair */
 
+#if   (!defined( SUPPORT_ACCESSIBILITY_CHECKS )||(SUPPORT_ACCESSIBILITY_CHECKS == 0))
 /* <form>, <blockquote> and <noscript> do not allow #PCDATA in
    HTML 4.01 Strict (%block; model instead of %flow;).
   When requested, text nodes in these elements are wrapped in <p>. */
@@ -3952,7 +3961,9 @@
         node = next;
     }
 }
+#endif /* SUPPORT_ACCESSIBILITY_CHECKS moved block to clean and repair */
 
+#if   (!defined( SUPPORT_ACCESSIBILITY_CHECKS )||(SUPPORT_ACCESSIBILITY_CHECKS == 0))
 static void ReplaceObsoleteElements(TidyDocImpl* doc, Node* node)
 {
     Node *next;
@@ -3974,7 +3985,9 @@
         node = next;
     }
 }
+#endif /* SUPPORT_ACCESSIBILITY_CHECKS moved block to clean and repair */
 
+#if   (!defined( SUPPORT_ACCESSIBILITY_CHECKS )||(SUPPORT_ACCESSIBILITY_CHECKS == 0))
 static void AttributeChecks(TidyDocImpl* doc, Node* node)
 {
     Node *next;
@@ -3997,6 +4010,7 @@
         node = next;
     }
 }
+#endif /* SUPPORT_ACCESSIBILITY_CHECKS moved block to clean and repair */
 
 /*
   HTML is the top level element
@@ -4101,6 +4115,7 @@
         break;
     }
 
+#if   (!defined( SUPPORT_ACCESSIBILITY_CHECKS )||(SUPPORT_ACCESSIBILITY_CHECKS == 0))
     if (!TY_(FindHTML)(doc))
     {
         /* a later check should complain if <body> is empty */
@@ -4125,6 +4140,8 @@
         EncloseBodyText(doc);
     if (cfgBool(doc, TidyEncloseBlockText))
         EncloseBlockText(doc, &doc->root);
+#endif /* moved block to clean and repair */
+
 }
 
 Bool TY_(XMLPreserveWhiteSpace)( TidyDocImpl* doc, Node *element)
diff -urN F:\FGCVS\tidy\src\streamio.c tidycvs6\src\streamio.c
--- F:\FGCVS\tidy\src\streamio.c   Tue Sep 19 15:45:47 2006
+++ tidycvs6\src\streamio.c  Mon Sep 25 14:00:58 2006
@@ -241,35 +241,43 @@
 #ifdef TIDY_STORE_ORIGINAL_TEXT
 void TY_(AddByteToOriginalText)(StreamIn *in, tmbchar c)
 {
-    if (in->otextlen + 1 >= in->otextsize)
+    if ( in->doc->storeText )
     {
-        size_t size = in->otextsize ? 1 : 2;
-        in->otextbuf = MemRealloc(in->otextbuf, in->otextsize + size);
-        in->otextsize += size;
+       if (in->otextlen + 1 >= in->otextsize)
+       {
+           size_t size = in->otextsize ? 1 : 2;
+           in->otextbuf = MemRealloc(in->otextbuf, in->otextsize + size);
+           in->otextsize += size;
+       }
+       in->otextbuf[in->otextlen++] = c;
+       in->otextbuf[in->otextlen  ] = 0;
     }
-    in->otextbuf[in->otextlen++] = c;
-    in->otextbuf[in->otextlen  ] = 0;
 }
 
 void TY_(AddCharToOriginalText)(StreamIn *in, tchar c)
 {
     int i, err, count = 0;
     tmbchar buf[10] = {0};
-    
-    err = TY_(EncodeCharToUTF8Bytes)(c, buf, NULL, &count);
 
-    if (err)
+    if ( in->doc->storeText )
     {
-        /* replacement character 0xFFFD encoded as UTF-8 */
-        buf[0] = (byte) 0xEF;
-        buf[1] = (byte) 0xBF;
-        buf[2] = (byte) 0xBD;
-        count = 3;
-    }
     
-    for (i = 0; i < count; ++i)
-        AddByteToOriginalText(in, buf[i]);
+       err = TY_(EncodeCharToUTF8Bytes)(c, buf, NULL, &count);
+
+       if (err)
+       {
+           /* replacement character 0xFFFD encoded as UTF-8 */
+           buf[0] = (byte) 0xEF;
+           buf[1] = (byte) 0xBF;
+           buf[2] = (byte) 0xBD;
+           count = 3;
+       }
+    
+       for (i = 0; i < count; ++i)
+           TY_(AddByteToOriginalText)(in, buf[i]);
+    }
 }
+
 #endif
 
 
@@ -304,7 +312,7 @@
         {
 #ifdef TIDY_STORE_ORIGINAL_TEXT
             added = yes;
-            AddCharToOriginalText(in, (tchar)c);
+            TY_(AddCharToOriginalText)(in, (tchar)c);
 #endif
             in->curcol = 1;
             in->curline++;
@@ -315,7 +323,7 @@
         {
 #ifdef TIDY_STORE_ORIGINAL_TEXT
             added = yes;
-            AddCharToOriginalText(in, (tchar)c);
+            TY_(AddCharToOriginalText)(in, (tchar)c);
 #endif
             in->tabs = tabsize > 0 ?
                 tabsize - ((in->curcol - 1) % tabsize) - 1
@@ -330,7 +338,7 @@
         {
 #ifdef TIDY_STORE_ORIGINAL_TEXT
             added = yes;
-            AddCharToOriginalText(in, (tchar)c);
+            TY_(AddCharToOriginalText)(in, (tchar)c);
 #endif
             c = ReadCharFromStream(in);
             if (c != '\n')
@@ -341,7 +349,7 @@
             else
             {
 #ifdef TIDY_STORE_ORIGINAL_TEXT
-                AddCharToOriginalText(in, (tchar)c);
+                TY_(AddCharToOriginalText)(in, (tchar)c);
 #endif
             }
             in->curcol = 1;
@@ -472,7 +480,7 @@
 
 #ifdef TIDY_STORE_ORIGINAL_TEXT
     if (!added)
-        AddCharToOriginalText(in, (tchar)c);
+        TY_(AddCharToOriginalText)(in, (tchar)c);
 #endif
 
     return c;
@@ -492,10 +500,14 @@
         {
             in->curcol = 1;
             in->curline++;
-            return c;
+        } else { /* FIX20060213 fixes of TIDY_STORE_ORIGINAL_TEXT */
+           in->curcol++;
         }
-        in->curcol++;
     }
+/* FIX20060213 fixes of TIDY_STORE_ORIGINAL_TEXT */
+#ifdef TIDY_STORE_ORIGINAL_TEXT
+    TY_(AddCharToOriginalText)(in, (tchar)c);
+#endif /* #ifdef TIDY_STORE_ORIGINAL_TEXT */
     return c;
 }
 
@@ -517,9 +529,16 @@
     if (c == '\n')
         --(in->curline);
 
+    /* FIX20060213 fixes of TIDY_STORE_ORIGINAL_TEXT */
+#ifdef TIDY_STORE_ORIGINAL_TEXT
+    if( in->otextlen && in->otextbuf ) { /* if there is LENGTH and a buffer */
+       in->otextlen--; /* reduce the length */
+       in->otextbuf[in->otextlen] = 0; /* kill char */
+    }
+#endif /* #ifdef TIDY_STORE_ORIGINAL_TEXT */
+
     in->curcol = in->lastcol;
 }
-
 
 
 /************************
diff -urN F:\FGCVS\tidy\src\tidydebug.c tidycvs6\src\tidydebug.c
--- F:\FGCVS\tidy\src\tidydebug.c  Thu Jan 01 01:00:00 1970
+++ tidycvs6\src\tidydebug.c Mon Sep 25 19:39:46 2006
@@ -0,0 +1,417 @@
+
+/* tidydebug.c */
+
+#pragma warning(disable:4115)
+#include <windows.h>
+#include <errno.h>
+
+#include "tidy-int.h"
+#include "parser.h"
+#include "clean.h"
+#include "config.h"
+#include "message.h"
+#include "pprint.h"
+#include "entities.h"
+#include "tmbstr.h"
+#include "utf8.h"
+#include "mappedio.h"
+
+#ifdef TIDY_WIN32_MLANG_SUPPORT
+#include "win32tc.h"
+#endif
+
+#ifdef   ADD_TIDY_DEBUG_MODULE
+
+extern TidyDocImpl * g_impl;
+
+static char _s_tmp2[1024];
+#define  MXIO  256
+int gbCheckCrLf = 0;
+
+char * logfile = { "templog.txt" };
+HANDLE loghand = 0;
+
+#define  VFH(a)   (a && ( a != INVALID_HANDLE_VALUE ))
+
+void create_log( void )
+{
+   loghand = CreateFile(
+      logfile,                      // file name
+      GENERIC_READ | GENERIC_WRITE, // access mode
+      FILE_SHARE_READ,              // share mode
+      NULL,                         // SD
+      CREATE_ALWAYS,                // how to create
+      FILE_ATTRIBUTE_ARCHIVE,       // file attributes
+      0 );
+   if ( !VFH(loghand) )
+      loghand = INVALID_HANDLE_VALUE;
+}
+
+void oi( char * ps )
+{
+   size_t len = strlen(ps);
+   if ( len > 0 )
+   {
+      if (loghand == 0)
+      {
+         create_log();
+      }
+      if ( VFH(loghand) )
+      {
+         DWORD wtn;
+         WriteFile( loghand, ps, len, &wtn, NULL );
+         if ( wtn != len )
+         {
+            CloseHandle(loghand);
+            loghand = INVALID_HANDLE_VALUE;
+         }
+      }
+//      printf(ps);
+   }
+}
+
+void prt( LPSTR lps )
+{
+     char  buf[MXIO + 4];
+     LPSTR lpb;
+     int         i, j, k;
+     char  c, d;
+
+   i = strlen(lps);
+     if(i)
+     {
+           k = 0;
+           d = 0;
+           lpb = &buf[0];
+           for( j = 0; j < i; j++ )
+           {
+                 c = lps[j];
+                 if( c == 0x0d )
+                 {
+                       if( (j+1) < i )
+                       {
+                            if( lps[j+1] != 0x0a )
+                            {
+                                  lpb[k++] = c;
+                                  c = 0x0a;
+                            }
+                       }
+                       else
+                       {
+                            lpb[k++] = c;
+                            c = 0x0a;
+                       }
+                 }
+                 else if( c == 0x0a )
+                 {
+                       if( d != 0x0d )
+                       {
+                            lpb[k++] = 0x0d;
+                       }
+                 }
+                 lpb[k++] = c;
+                 d = c;
+                 if( k >= MXIO )
+                 {
+                       lpb[k] = 0;
+                       oi( lpb );
+                       k = 0;
+                 }
+           }     /* for length of string */
+           if( k )
+           {
+                 if( ( gbCheckCrLf ) &&
+                       ( d != 0x0a ) )
+                 {
+                       /* add Cr/Lf pair */
+                       lpb[k++] = 0x0d;
+                       lpb[k++] = 0x0a;
+                       lpb[k] = 0;
+                 }
+                 lpb[k] = 0;
+                 oi( lpb );
+           }
+     }
+}
+
+/* int _cdecl sprtf( LPTSTR lpf, ... ) */
+int sprtf( char * lpf, ... )
+{
+   int   i;
+   static char _s_sprtfbuf[1024];
+   char * lpb = &_s_sprtfbuf[0];
+   va_list arglist;
+   va_start(arglist, lpf);
+   i = vsprintf( lpb, lpf, arglist );
+   va_end(arglist);
+   prt(lpb);
+   return i;
+}
+
+#define MAX_EL_STR   1024
+tmbstr get_element_str( TidyDocImpl* doc, Node * node )
+{
+   static tmbchar _s_es[MAX_EL_STR+32];
+   tmbstr s = _s_es;
+   *s = 0;
+   /* s = (node ? ((node->element && *node->element) ? tmbstrdup(node->element) : tmbstrdup("null")) : tmbstrdup("NULL")); */
+   if ( node ) {
+      AttVal* av;
+      uint ix, io, il, c;
+      il = 0;
+      if ( node->type == TextNode ) {
+         if (doc && doc->lexer) {
+            Lexer* lexer = doc->lexer;
+            io = TY_(tmbstrcpy)(s, "text=[");
+            for ( ix = node->start; ix < node->end; ++ix ) {
+               c = lexer->lexbuf[ix];
+               if( c < ' ' ) {
+                  s[io++] = '^';
+                  c += '@';
+               }
+               s[io++] = (tmbchar)c; 
+               if( io >= (MAX_EL_STR-4) )
+               {
+                  s[io++] = '.'; 
+                  s[io++] = '.'; 
+                  s[io++] = '.'; 
+                  break;
+               }
+            }
+            s[io] = 0;
+            /* we could ADD the attributes */
+            for ( av = node->attributes; av; av = av->next ) {
+               tmbstr name = av->attribute;
+               /* if( !name )
+                  print av->asp;
+                  or print av->php; */
+               if(name) {
+                  s[io++] = ' ';
+                  il++;
+                  while(*name) {
+                     s[io++] = *name;
+                     name++;
+                     il++;
+                  }
+                  name = av->value;
+                  if(name && *name) {
+                     tmbchar tc = (tmbchar)av->delim;
+                     if( tc == 0 )
+                        tc = '"';
+                     s[io++] = '=';
+                     il++;
+                     s[io++] = tc;
+                     il++;
+                    while(*name) {
+                        s[io++] = *name;
+                        name++;
+                        il++;
+                     }
+                     s[io++] = tc;
+                     il++;
+                  }
+               }
+               if( il >= MAX_EL_STR )
+                  break;
+            }
+            s[io] = 0;
+            strcat(s,"]");
+         } else {
+            TY_(tmbstrcpy)(s, "text");
+         }
+      } else if ( node->type == RootNode ) {
+         TY_(tmbstrcpy)(s, "root");
+      } else {
+         if ( node->element ) {
+            if ( TY_(tmbstrlen)( node->element ) < MAX_EL_STR ) {
+               TY_(tmbstrcpy)(s, node->element);
+            } else {
+               TY_(tmbstrncpy)(s, node->element, MAX_EL_STR);
+            }
+            io = TY_(tmbstrlen)(s);
+            /* we could ADD the attributes */
+            for ( av = node->attributes; av; av = av->next ) {
+               tmbstr name = av->attribute;
+               tmbchar tc = (tmbchar)av->delim;
+               if( tc == 0 )
+                  tc = '"';
+               /* if( !name )
+                  print av->asp;
+                  or print av->php; */
+               if(name) {
+                  s[io++] = ' ';
+                  il++;
+                  while(*name) {
+                     s[io++] = *name;
+                     name++;
+                     il++;
+                  }
+                  name = av->value;
+                  if(name && *name)
+                  {
+                     //tmbchar tc = (tmbchar)av->delim;
+                     //if( tc == 0 )
+                     //   tc = '"';
+                     s[io++] = '=';
+                     il++;
+                     s[io++] = tc;
+                     il++;
+                    while(*name) {
+                        s[io++] = *name;
+                        name++;
+                        il++;
+                     }
+                     s[io++] = tc;
+                     il++;
+                  }
+                  else
+                  {
+                     // we have a BLANK, but original may NOT be blank
+                     // can be ALL SPACES, eaten by tidy
+                     s[io++] = '=';
+                     il++;
+                     s[io++] = tc;
+                     il++;
+                     s[io++] = tc;
+                     il++;
+                  }
+               }
+               if( il >= MAX_EL_STR )
+                  break;
+            }
+            s[io] = 0;
+
+         } else {
+            TY_(tmbstrcpy)(s, "null");
+         }
+      }
+   } else {
+      TY_(tmbstrcpy)(s,"NULL");
+   }
+   return s;
+}
+
+
+
+void ShowANode( Node* node )
+{
+   static char _s_tmp[1024];
+   char * ptmp = _s_tmp;
+   tmbstr pes = get_element_str( g_impl, node );
+   Node* DTnode = TY_(FindDocType)(g_impl);
+   Node* parent = node ? node->parent : 0;
+   Node* child = node ? node->content : 0;
+   int   icnt = 1;
+   //if ( *pes == 'f' ) {
+   //   pes = get_element_str( g_impl, node );
+   //}
+   if (DTnode == node)
+   {
+      sprtf( "<!DOCTYPE %s> at[%08X] ", pes, node );
+   }
+   else
+   {
+      sprtf( "<%s> at[%08X] ", pes, node );
+   }
+
+   if (child)
+   {
+      icnt = 1;
+      pes = get_element_str( g_impl, child );
+      sprtf( " c%d=<%s> at[%08X] ", icnt, pes, child );
+      child = child->next;
+      while (child)
+      {
+         icnt++;
+         pes = get_element_str( g_impl, child );
+         sprtf( " c%d=<%s> at[%08X] ", icnt, pes, child );
+         child = child->next;
+      }
+
+
+   }
+
+   if (parent)
+   {
+      icnt = 1;
+      pes = get_element_str( g_impl, parent );
+      sprtf( " p%d=<%s> at[%08X] ", icnt, pes, parent );
+      parent = parent->parent;
+      while (parent)
+      {
+         icnt++;
+         pes = get_element_str( g_impl, parent );
+         sprtf( " p%d=<%s> at[%08X] ", icnt, pes, parent );
+         parent = parent->parent;
+      }
+   }
+
+   if (node->otext)
+   {
+      char * pot = node->otext;
+      size_t len = strlen(pot);
+      if (len > 0)
+      {
+         size_t i, off;
+         int c;
+         strcpy( ptmp, "\notext=[" );
+         off = strlen(ptmp);
+         for (i = 0; i < len; i++)
+         {
+            c = pot[i];
+            if ( c < 0x20 )
+            {
+               ptmp[off++] = '^';
+               c += '@';
+            }
+            ptmp[off++] = (char)c;
+         }
+         ptmp[off] = 0;
+         strcat(ptmp,"]");
+         sprtf(ptmp);
+      }
+      else
+      {
+         sprtf( " otext=(0 len)" );
+      }
+   }
+   else
+   {
+      sprtf( " otext=(null)" );
+
+   }
+}
+
+void  ShowInsertAt(Node *element, Node *node, tmbstr desc)
+{
+   char * ptmp = _s_tmp2;
+   //sprintf(ptmp, "\n%s:elem: ", desc );
+   //sprtf(ptmp);
+   //ShowANode( element );
+   sprtf("\n");
+   sprintf(ptmp, "%s:node: ", desc );
+   sprtf(ptmp);
+   ShowANode( node );
+   sprtf("\n");
+}
+
+void tidyShowNode( Node * node )
+{
+   char * ptmp = _s_tmp2;
+   sprtf("\nSN ");
+   ShowANode( node );
+   sprtf("\n");
+}
+
+void  ShowInsertAtStart(Node *element, Node *node)
+{
+   ShowInsertAt(element, node, "ShowInsertAtStart");
+}
+void  ShowInsertAtEnd(Node *element, Node *node)
+{
+   ShowInsertAt(element, node, "ShowInsertAtEnd");
+}
+
+#endif /* #ifdef   ADD_TIDY_DEBUG_MODULE */
+
+// eof - tidydebug.c
diff -urN F:\FGCVS\tidy\src\tidylib.c tidycvs6\src\tidylib.c
--- F:\FGCVS\tidy\src\tidylib.c    Tue Sep 19 15:45:47 2006
+++ tidycvs6\src\tidylib.c   Mon Sep 25 14:09:38 2006
@@ -1137,6 +1137,13 @@
     doc->root.column = doc->lexer->columns;
     doc->inputHadBOM = no;
 
+#ifdef TIDY_STORE_ORIGINAL_TEXT
+    doc->storeText = no;  /* set to NO, no store */
+    if ( cfg( doc, TidyAccessibilityCheckLevel ) > 0 ) {
+        doc->storeText = yes;  /* set to YES, to store original text */
+    }
+#endif /* #ifdef TIDY_STORE_ORIGINAL_TEXT */
+
     bomEnc = TY_(ReadBOMEncoding)(in);
 
     if (bomEnc != -1)
@@ -1189,7 +1196,7 @@
     if ( doc->errors > 0 && !force )
         TY_(NeedsAuthorIntervention)( doc );
 
-#if SUPPORT_ACCESSIBILITY_CHECKS
+#if SUPPORT_ACCESSIBILITY_CHECKS_OLD
      if ( acclvl > 0 )
          TY_(AccessibilityChecks)( doc );
 #endif
@@ -1197,6 +1204,399 @@
      return tidyDocStatus( doc );
 }
 
+
+#if SUPPORT_ACCESSIBILITY_CHECKS
+
+/*
+  This maps 
+       <em>hello </em><strong>world</strong>
+  to
+       <em>hello</em> <strong>world</strong>
+
+  If last child of element is a text node
+  then trim trailing white space character
+  moving it to after element's end tag.
+*/
+static void TrimTrailingSpace( TidyDocImpl* doc, Node *element, Node *last )
+{
+    Lexer* lexer = doc->lexer;
+    byte c;
+
+    if (TY_(nodeIsText)(last))
+    {
+        if (last->end > last->start)
+        {
+            c = (byte) lexer->lexbuf[ last->end - 1 ];
+
+            if (   c == ' '
+#ifdef COMMENT_NBSP_FIX
+                || c == 160
+#endif
+               )
+            {
+#ifdef COMMENT_NBSP_FIX
+                /* take care with <td>&nbsp;</td> */
+                if ( c == 160 && 
+                     ( element->tag == doc->tags.tag_td || 
+                       element->tag == doc->tags.tag_th )
+                   )
+                {
+                    if (last->end > last->start + 1)
+                        last->end -= 1;
+                }
+                else
+#endif
+                {
+                    last->end -= 1;
+                    if ( (element->tag->model & CM_INLINE) &&
+                         !(element->tag->model & CM_FIELD) )
+                        lexer->insertspace = yes;
+                }
+            }
+        }
+    }
+}
+
+
+/*
+  This maps 
+       <p>hello<em> world</em>
+  to
+       <p>hello <em>world</em>
+
+  Trims initial space, by moving it before the
+  start tag, or if this element is the first in
+  parent's content, then by discarding the space
+*/
+static void TrimInitialSpace( TidyDocImpl* doc, Node *element, Node *text )
+{
+    Lexer* lexer = doc->lexer;
+    Node *prev, *node;
+
+    if ( TY_(nodeIsText)(text) && 
+         lexer->lexbuf[text->start] == ' ' && 
+         text->start < text->end )
+    {
+        if ( (element->tag->model & CM_INLINE) &&
+             !(element->tag->model & CM_FIELD) )
+        {
+            prev = element->prev;
+
+            if (TY_(nodeIsText)(prev))
+            {
+                if (prev->end == 0 || lexer->lexbuf[prev->end - 1] != ' ')
+                    lexer->lexbuf[(prev->end)++] = ' ';
+
+                ++(element->start);
+            }
+            else /* create new node */
+            {
+                node = TY_(NewNode)(lexer);
+                node->start = (element->start)++;
+                node->end = element->start;
+                lexer->lexbuf[node->start] = ' ';
+                TY_(InsertNodeBeforeElement)(element ,node);
+            }
+        }
+
+        /* discard the space in current node */
+        ++(text->start);
+    }
+}
+
+static Bool IsPreDescendant(Node* node)
+{
+    Node *parent = node->parent;
+
+    while (parent)
+    {
+        if (parent->tag && parent->tag->parser == TY_(ParsePre))
+            return yes;
+
+        parent = parent->parent;
+    }
+
+    return no;
+}
+
+static Bool CleanTrailingWhitespace(TidyDocImpl* doc, Node* node)
+{
+    Node* next;
+
+    if (!TY_(nodeIsText)(node))
+        return no;
+
+    if (node->parent->type == DocTypeTag)
+        return no;
+
+    if (IsPreDescendant(node))
+        return no;
+
+    if (node->parent->tag && node->parent->tag->parser == TY_(ParseScript))
+        return no;
+
+    next = node->next;
+
+    /* <p>... </p> */
+    if (!next && !TY_(nodeHasCM)(node->parent, CM_INLINE))
+        return yes;
+
+    /* <div><small>... </small><h3>...</h3></div> */
+    if (!next && node->parent->next && !TY_(nodeHasCM)(node->parent->next, CM_INLINE))
+        return yes;
+
+    if (!next)
+        return no;
+
+    if (nodeIsBR(next))
+        return yes;
+
+    if (TY_(nodeHasCM)(next, CM_INLINE))
+        return no;
+
+    /* <a href='/'>...</a> <p>...</p> */
+    if (next->type == StartTag)
+        return yes;
+
+    /* <strong>...</strong> <hr /> */
+    if (next->type == StartEndTag)
+        return yes;
+
+    /* evil adjacent text nodes, Tidy should not generate these :-( */
+    if (TY_(nodeIsText)(next) && next->start < next->end
+        && TY_(IsWhite)(doc->lexer->lexbuf[next->start]))
+        return yes;
+
+    return no;
+}
+
+
+
+static Bool CleanLeadingWhitespace(TidyDocImpl* ARG_UNUSED(doc), Node* node)
+{
+    if (!TY_(nodeIsText)(node))
+        return no;
+
+    if (node->parent->type == DocTypeTag)
+        return no;
+
+    if (IsPreDescendant(node))
+        return no;
+
+    if (node->parent->tag && node->parent->tag->parser == TY_(ParseScript))
+        return no;
+
+    /* <p>...<br> <em>...</em>...</p> */
+    if (nodeIsBR(node->prev))
+        return yes;
+
+    /* <p> ...</p> */
+    if (node->prev == NULL && !TY_(nodeHasCM)(node->parent, CM_INLINE))
+        return yes;
+
+    /* <h4>...</h4> <em>...</em> */
+    if (node->prev && !TY_(nodeHasCM)(node->prev, CM_INLINE) &&
+        TY_(nodeIsElement)(node->prev))
+        return yes;
+
+    /* <p><span> ...</span></p> */
+    if (!node->prev && !node->parent->prev && !TY_(nodeHasCM)(node->parent->parent, CM_INLINE))
+        return yes;
+
+    return no;
+}
+
+
+static void CleanSpaces(TidyDocImpl* doc, Node* node)
+{
+    Node* next;
+
+    while (node)
+    {
+        next = node->next;
+
+        if (TY_(nodeIsText)(node) && CleanLeadingWhitespace(doc, node))
+            while (node->start < node->end && TY_(IsWhite)(doc->lexer->lexbuf[node->start]))
+                ++(node->start);
+
+        if (TY_(nodeIsText)(node) && CleanTrailingWhitespace(doc, node))
+            while (node->end > node->start && TY_(IsWhite)(doc->lexer->lexbuf[node->end - 1]))
+                --(node->end);
+
+        if (TY_(nodeIsText)(node) && !(node->start < node->end))
+        {
+            TY_(RemoveNode)(node);
+            TY_(FreeNode)(doc, node);
+            node = next;
+
+            continue;
+        }
+
+        if (node->content)
+            CleanSpaces(doc, node->content);
+
+        node = next;
+    }
+}
+
+/* 
+  Move initial and trailing space out.
+  This routine maps:
+
+       hello<em> world</em>
+  to
+       hello <em>world</em>
+  and
+       <em>hello </em><strong>world</strong>
+  to
+       <em>hello</em> <strong>world</strong>
+*/
+static void TrimSpaces( TidyDocImpl* doc, Node *element)
+{
+    Node* text = element->content;
+
+    if (nodeIsPRE(element) || IsPreDescendant(element))
+        return;
+
+    if (TY_(nodeIsText)(text))
+        TrimInitialSpace(doc, element, text);
+
+    text = element->last;
+
+    if (TY_(nodeIsText)(text))
+        TrimTrailingSpace(doc, element, text);
+}
+
+static Bool nodeCMIsOnlyInline( Node* node )
+{
+    return TY_(nodeHasCM)( node, CM_INLINE ) && !TY_(nodeHasCM)( node, CM_BLOCK );
+}
+
+static void EncloseBodyText(TidyDocImpl* doc)
+{
+    Node* node;
+    Node* body = TY_(FindBody)(doc);
+
+    if (!body)
+        return;
+
+    node = body->content;
+
+    while (node)
+    {
+        if ((TY_(nodeIsText)(node) && !TY_(IsBlank)(doc->lexer, node)) ||
+            (TY_(nodeIsElement)(node) && nodeCMIsOnlyInline(node)))
+        {
+            Node* p = TY_(InferredTag)(doc, TidyTag_P);
+            TY_(InsertNodeBeforeElement)(node, p);
+            while (node && (!TY_(nodeIsElement)(node) || nodeCMIsOnlyInline(node)))
+            {
+                Node* next = node->next;
+                TY_(RemoveNode)(node);
+                TY_(InsertNodeAtEnd)(p, node);
+                node = next;
+            }
+            TrimSpaces(doc, p);
+            continue;
+        }
+        node = node->next;
+    }
+}
+
+
+/* <form>, <blockquote> and <noscript> do not allow #PCDATA in
+   HTML 4.01 Strict (%block; model instead of %flow;).
+  When requested, text nodes in these elements are wrapped in <p>. */
+static void EncloseBlockText(TidyDocImpl* doc, Node* node)
+{
+    Node *next;
+    Node *block;
+
+    while (node)
+    {
+        next = node->next;
+
+        if (node->content)
+            EncloseBlockText(doc, node->content);
+
+        if (!(nodeIsFORM(node) || nodeIsNOSCRIPT(node) ||
+              nodeIsBLOCKQUOTE(node))
+            || !node->content)
+        {
+            node = next;
+            continue;
+        }
+
+        block = node->content;
+
+        if ((TY_(nodeIsText)(block) && !TY_(IsBlank)(doc->lexer, block)) ||
+            (TY_(nodeIsElement)(block) && nodeCMIsOnlyInline(block)))
+        {
+            Node* p = TY_(InferredTag)(doc, TidyTag_P);
+            TY_(InsertNodeBeforeElement)(block, p);
+            while (block &&
+                   (!TY_(nodeIsElement)(block) || nodeCMIsOnlyInline(block)))
+            {
+                Node* tempNext = block->next;
+                TY_(RemoveNode)(block);
+                TY_(InsertNodeAtEnd)(p, block);
+                block = tempNext;
+            }
+            TrimSpaces(doc, p);
+            continue;
+        }
+
+        node = next;
+    }
+}
+
+static void ReplaceObsoleteElements(TidyDocImpl* doc, Node* node)
+{
+    Node *next;
+
+    while (node)
+    {
+        next = node->next;
+
+        if (nodeIsDIR(node) || nodeIsMENU(node))
+            TY_(CoerceNode)(doc, node, TidyTag_UL, yes, yes);
+
+        if (nodeIsXMP(node) || nodeIsLISTING(node) ||
+            (node->tag && node->tag->id == TidyTag_PLAINTEXT))
+            TY_(CoerceNode)(doc, node, TidyTag_PRE, yes, yes);
+
+        if (node->content)
+            ReplaceObsoleteElements(doc, node->content);
+
+        node = next;
+    }
+}
+
+static void AttributeChecks(TidyDocImpl* doc, Node* node)
+{
+    Node *next;
+
+    while (node)
+    {
+        next = node->next;
+
+        if (TY_(nodeIsElement)(node))
+        {
+            if (node->tag->chkattrs)
+                node->tag->chkattrs(doc, node);
+            else
+                TY_(CheckAttributes)(doc, node);
+        }
+
+        if (node->content)
+            AttributeChecks(doc, node->content);
+
+        node = next;
+    }
+}
+
+#endif /* #if SUPPORT_ACCESSIBILITY_CHECKS */
+
 int         tidyDocCleanAndRepair( TidyDocImpl* doc )
 {
     Bool word2K   = cfgBool( doc, TidyWord2000 );
@@ -1210,6 +1610,40 @@
     Bool tidyMark = cfgBool( doc, TidyMark );
     Bool tidyXmlTags = cfgBool( doc, TidyXmlTags );
     Node* node;
+
+#if SUPPORT_ACCESSIBILITY_CHECKS
+    if ( cfg( doc, TidyAccessibilityCheckLevel ) > 0 ) {
+         TY_(AccessibilityChecks)( doc );
+        /* return tidyDocStatus( doc ); */
+   }
+
+    if (!TY_(FindHTML)(doc))
+    {
+        /* a later check should complain if <body> is empty */
+        Node* html = TY_(InferredTag)(doc, TidyTag_HTML);
+        TY_(InsertNodeAtEnd)( &doc->root, html);
+        TY_(ParseHTML)(doc, html, IgnoreWhitespace);
+    }
+
+    if (!TY_(FindTITLE)(doc))
+    {
+        Node* head = TY_(FindHEAD)(doc);
+        TY_(ReportError)(doc, head, NULL, MISSING_TITLE_ELEMENT);
+        TY_(InsertNodeAtEnd)(head, TY_(InferredTag)(doc, TidyTag_TITLE));
+    }
+
+    AttributeChecks(doc, &doc->root);
+    ReplaceObsoleteElements(doc, &doc->root);
+    TY_(DropEmptyElements)(doc, &doc->root);
+    CleanSpaces(doc, &doc->root);
+
+    if (cfgBool(doc, TidyEncloseBodyText))
+        EncloseBodyText(doc);
+    if (cfgBool(doc, TidyEncloseBlockText))
+        EncloseBlockText(doc, &doc->root);
+
+#endif
+
 
     if (tidyXmlTags)
        return tidyDocStatus( doc );
diff -urN F:\FGCVS\tidy\test\accesscases.txt tidycvs6\test\accesscases.txt
--- F:\FGCVS\tidy\test\accesscases.txt   Tue Apr 12 14:43:56 2005
+++ tidycvs6\test\accesscases.txt  Sun Sep 24 14:24:54 2006
@@ -1,9 +1,10 @@
-FILE       TEST_EXPECTED  LEVEL
 1-1-1-1    1.1.1.1        2
 1-1-1-2    1.1.1.2        1
 1-1-1-3    1.1.1.3        1
 1-1-1-4    1.1.1.4        1
 1-1-1-10   1.1.1.10       1
+1-1-1-11   1.1.1.11       1
+1-1-1-12   1.1.1.12       1
 1-1-2-1    1.1.2.1        1
 1-1-2-2    1.1.2.2        1
 1-1-2-3    1.1.2.3        1
@@ -28,37 +29,36 @@
 2-1-1-3    2.1.1.3        1
 2-1-1-4    2.1.1.4        1
 2-1-1-5    2.1.1.5        1
-2-2-1-1    2.2.1.1        1
-2-2-1-2    2.2.1.2        1
-2-2-1-3    2.2.1.3        1
-2-2-1-4    2.2.1.4        1
+2-2-1-1    2.2.1.1        3
+2-2-1-2    2.2.1.2        3
+2-2-1-3    2.2.1.3        3
+2-2-1-4    2.2.1.4        3
 3-2-1-1    3.2.1.1        2
 3-3-1-1    3.3.1.1        1
 3-5-1-1    3.5.1.1        2
-3-5-2-1    3.5.2.1        1
-3-5-2-2    3.5.2.2        1
-3-5-2-3    3.5.2.3        1
-3-6-1-1    3.6.1.1        1
-3-6-1-2    3.6.1.2        1
-3-6-1-4    3.6.1.4        1
-4-1-1-1    4.1.1.1        2
-4-3-1-1    4.3.1.1        2
-4-3-1-2    4.3.1.2        2
+3-5-2-1    3.5.2.1        2
+3-5-2-2    3.5.2.2        2
+3-5-2-3    3.5.2.3        2
+3-6-1-1    3.6.1.1        2
+3-6-1-2    3.6.1.2        2
+3-6-1-4    3.6.1.4        2
+4-3-1-1    4.3.1.1        3
+4-3-1-2    4.3.1.2        3
 5-1-2-1    5.1.2.1        2
 5-1-2-2    5.1.2.2        2
 5-1-2-3    5.1.2.3        2
 5-2-1-1    5.2.1.1        1
 5-2-1-2    5.2.1.2        1
-5-3-1-1    5.3.1.1        1
-5-4-1-1    5.4.1.1        1
-5-5-1-1    5.5.1.1        2
-5-5-1-2    5.5.1.2        2
-5-5-1-3    5.5.1.3        2
-5-5-1-6    5.5.1.6        2
+5-3-1-1    5.3.1.1        2
+5-4-1-1    5.4.1.1        2
+5-5-1-1    5.5.1.1        3
+5-5-1-2    5.5.1.2        3
+5-5-1-3    5.5.1.3        3
+5-5-1-6    5.5.1.6        3
 5-5-2-1    5.5.2.1        2
-5-6-1-1    5.6.1.1        1
-5-6-1-2    5.6.1.2        1
-5-6-1-3    5.6.1.3        1
+5-6-1-1    5.6.1.1        3
+5-6-1-2    5.6.1.2        3
+5-6-1-3    5.6.1.3        3
 6-1-1-1    6.1.1.1        1
 6-1-1-2    6.1.1.2        1
 6-1-1-3    6.1.1.3        1
@@ -79,9 +79,9 @@
 7-1-1-3    7.1.1.3        1
 7-1-1-4    7.1.1.4        1
 7-1-1-5    7.1.1.5        1
-7-2-1-1    7.2.1.1        1
-7-4-1-1    7.4.1.1        1
-7-5-1-1    7.5.1.1        1
+7-2-1-1    7.2.1.1        2
+7-4-1-1    7.4.1.1        2
+7-5-1-1    7.5.1.1        2
 8-1-1-1    8.1.1.1        1
 8-1-1-2    8.1.1.2        1
 8-1-1-3    8.1.1.3        1
@@ -93,9 +93,14 @@
 9-3-1-4    9.3.1.4        2
 9-3-1-5    9.3.1.5        2
 9-3-1-6    9.3.1.6        2
-10-1-1-1   10.1.1.1       1
-10-1-1-2   10.1.1.2       1
-11-2-1-1   11.2.1.1       1
+10-1-1-1   10.1.1.1       2
+10-1-1-2   10.1.1.2       2
+10-2-1-1   10.2.1.1       2
+10-2-1-2   10.2.1.2       2
+10-4-1-1   10.4.1.1       3
+10-4-1-2   10.4.1.2       3
+10-4-1-3   10.4.1.3       3
+11-2-1-1   11.2.1.1       2
 11-2-1-2   11.2.1.2       2
 11-2-1-3   11.2.1.3       2
 11-2-1-4   11.2.1.4       2
@@ -115,6 +120,8 @@
 13-1-1-2   13.1.1.2       2
 13-1-1-3   13.1.1.3       2
 13-1-1-4   13.1.1.4       2
+13-1-1-5   13.1.1.5       2
+13-1-1-6   13.1.1.6       2
 13-2-1-1   13.2.1.1       2
 13-2-1-2   13.2.1.2       2
 13-2-1-3   13.2.1.3       2
diff -urN F:\FGCVS\tidy\test\accessTest\1-1-1-11.html tidycvs6\test\accessTest\1-1-1-11.html
--- F:\FGCVS\tidy\test\accessTest\1-1-1-11.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\1-1-1-11.html     Sun Sep 24 17:40:41 2006
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/1.1.1</title>
+</head>
+<body>
+<img src="star.jpg" width="5" height="5"/>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\1-1-1-12.html tidycvs6\test\accessTest\1-1-1-12.html
--- F:\FGCVS\tidy\test\accessTest\1-1-1-12.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\1-1-1-12.html     Sun Sep 24 14:24:28 2006
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/1.1.1</title>
+</head>
+<body>
+<img src="bar.gif" width="200" height="5"/>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\10-2-1-1.html tidycvs6\test\accessTest\10-2-1-1.html
--- F:\FGCVS\tidy\test\accessTest\10-2-1-1.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\10-2-1-1.html     Sat Sep 23 15:17:04 2006
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/10.2.1</title>
+</head>
+<body>
+<form action="">
+<label for="control1">Some text:</label>
+Text between control and label.
+<input id="control1" type="text" />
+</form>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\10-2-1-2.html tidycvs6\test\accessTest\10-2-1-2.html
--- F:\FGCVS\tidy\test\accessTest\10-2-1-2.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\10-2-1-2.html     Sat Sep 23 15:16:56 2006
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/10.2.1</title>
+</head>
+<body>
+<form action="">
+<input id="control1" type="text" />
+Text between control and label.
+<label for="control1">Some text:</label>
+</form>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\10-4-1-1.html tidycvs6\test\accessTest\10-4-1-1.html
--- F:\FGCVS\tidy\test\accessTest\10-4-1-1.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\10-4-1-1.html     Sat Sep 23 15:16:45 2006
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/13.1.1</title>
+</head>
+<body>
+<form action="">
+<label for="control1">Some text:</label>
+<input id="control1" type="text" />
+</form>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\10-4-1-2.html tidycvs6\test\accessTest\10-4-1-2.html
--- F:\FGCVS\tidy\test\accessTest\10-4-1-2.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\10-4-1-2.html     Sat Sep 23 15:07:32 2006
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/13.1.1</title>
+</head>
+<body>
+<form action="">
+<label for="control1">Some text:</label>
+<input id="control1" value="" type="text" />
+</form>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\10-4-1-3.html tidycvs6\test\accessTest\10-4-1-3.html
--- F:\FGCVS\tidy\test\accessTest\10-4-1-3.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\10-4-1-3.html     Sat Sep 23 15:08:37 2006
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/13.1.1</title>
+</head>
+<body>
+<form action="">
+<label for="control1">Some text:</label>
+<input id="control1" value="        " type="text" />
+</form>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\13-1-1-5.html tidycvs6\test\accessTest\13-1-1-5.html
--- F:\FGCVS\tidy\test\accessTest\13-1-1-5.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\13-1-1-5.html     Sun Sep 24 13:41:29 2006
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/13.1.1</title>
+</head>
+<body>
+<a href="animals.htm">more</a>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\13-1-1-6.html tidycvs6\test\accessTest\13-1-1-6.html
--- F:\FGCVS\tidy\test\accessTest\13-1-1-6.html      Thu Jan 01 01:00:00 1970
+++ tidycvs6\test\accessTest\13-1-1-6.html     Sun Sep 24 13:51:56 2006
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en">
+<head>
+<title>aert1.0/13.1.1</title>
+</head>
+<body>
+<a href="animals.htm">follow this</a>
+</body>
+</html>
diff -urN F:\FGCVS\tidy\test\accessTest\4-3-1-2.html tidycvs6\test\accessTest\4-3-1-2.html
--- F:\FGCVS\tidy\test\accessTest\4-3-1-2.html Wed Mar 23 13:57:21 2005
+++ tidycvs6\test\accessTest\4-3-1-2.html      Fri Sep 22 15:06:59 2006
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html lang="blah">
+<html lang="">
 <head>
 <title>aert1.0/4.3.1 - The HTML element does not contain a valid lang attribute</title>
 </head>
diff -urN F:\FGCVS\tidy\test\accessTest\6-3-1-4.html tidycvs6\test\accessTest\6-3-1-4.html
--- F:\FGCVS\tidy\test\accessTest\6-3-1-4.html Wed Mar 23 13:57:28 2005
+++ tidycvs6\test\accessTest\6-3-1-4.html      Fri Sep 22 19:51:47 2006
@@ -5,7 +5,7 @@
 </head>
 <body>
 
-<script><!-- the script --></script>
+<applet><!-- the applet --></applet>
 
 </body>
 </html>