** 0 -> SUCCESS -** >0 -> WARNING -** <0 -> ERROR +** >0 -> 1 == TIDY WARNING, 2 == TIDY ERROR +** <0 -> SEVERE ERROR +**** +The following is a short example program. + +
+#include <tidy.h>
+#include <buffio.h>
+#include <stdio.h>
+#include <errno.h>
+
+
+int main(int argc, char **argv )
+{
+ const char* input = "<title>Foo</title><p>Foo!";
+ TidyBuffer output = {0};
+ TidyBuffer errbuf = {0};
+ int rc = -1;
+ Bool ok;
+
+ TidyDoc tdoc = tidyCreate(); // Initialize "document"
+ printf( "Tidying:\t\%s\\n", input );
+
+ ok = tidyOptSetBool( tdoc, TidyXhtmlOut, yes ); // Convert to XHTML
+ if ( ok )
+ rc = tidySetErrorBuffer( tdoc, &errbuf ); // Capture diagnostics
+ if ( rc >= 0 )
+ rc = tidyParseString( tdoc, input ); // Parse the input
+ if ( rc >= 0 )
+ rc = tidyCleanAndRepair( tdoc ); // Tidy it up!
+ if ( rc >= 0 )
+ rc = tidyRunDiagnostics( tdoc ); // Kvetch
+ if ( rc > 1 ) // If error, force output.
+ rc = ( tidyOptSetBool(tdoc, TidyForceOutput, yes) ? rc : -1 );
+ if ( rc >= 0 )
+ rc = tidySaveBuffer( tdoc, &output ); // Pretty Print
+
+ if ( rc >= 0 )
+ {
+ if ( rc > 0 )
+ printf( "\\nDiagnostics:\\n\\n\%s", errbuf.bp );
+ printf( "\\nAnd here is the result:\\n\\n\%s", output.bp );
+ }
+ else
+ printf( "A severe error (\%d) occurred.\\n", rc );
+
+ tidyBufFree( &output );
+ tidyBufFree( &errbuf );
+ tidyRelease( tdoc );
+ return rc;
+}
+
+** @{
*/
TIDY_EXPORT TidyDoc tidyCreate();
TIDY_EXPORT void tidyRelease( TidyDoc tdoc );
-/* Let application store a chunk of data w/ each Tidy instance.
-** Useful for callbacks.
+/** Let application store a chunk of data w/ each Tidy instance.
+** Useful for callbacks.
*/
TIDY_EXPORT void tidySetAppData( TidyDoc tdoc, uint appData );
+
+/** Get application data set previously */
TIDY_EXPORT uint tidyGetAppData( TidyDoc tdoc );
+/** Get release date (version) for current library */
TIDY_EXPORT ctmbstr tidyReleaseDate();
-/* Diagnostics and Repair */
+/* Diagnostics and Repair
+*/
+
+/** Get status of current document. */
TIDY_EXPORT int tidyStatus( TidyDoc tdoc );
-TIDY_EXPORT int tidyDetectedHtmlVersion( TidyDoc tdoc ); /* 0, 2, 3 or 4 */
+
+/** Detected HTML version: 0, 2, 3 or 4 */
+TIDY_EXPORT int tidyDetectedHtmlVersion( TidyDoc tdoc );
+
+/** Input is XHTML? */
TIDY_EXPORT Bool tidyDetectedXhtml( TidyDoc tdoc );
+
+/** Input is generic XML (not HTML or XHTML)? */
TIDY_EXPORT Bool tidyDetectedGenericXml( TidyDoc tdoc );
+/** Number of Tidy errors encountered. If > 0, output is suppressed
+** unless TidyForceOutput is set.
+*/
TIDY_EXPORT uint tidyErrorCount( TidyDoc tdoc );
+
+/** Number of Tidy warnings encountered. */
TIDY_EXPORT uint tidyWarningCount( TidyDoc tdoc );
+
+/** Number of Tidy accessibility warnings encountered. */
TIDY_EXPORT uint tidyAccessWarningCount( TidyDoc tdoc );
+
+/** Number of Tidy configuration errors encountered. */
TIDY_EXPORT uint tidyConfigErrorCount( TidyDoc tdoc );
/* Get/Set configuration options
*/
+/** Load an ASCII Tidy configuration file */
TIDY_EXPORT int tidyLoadConfig( TidyDoc tdoc, ctmbstr configFile );
-TIDY_EXPORT int tidyLoadConfigEnc( TidyDoc tdoc,
- ctmbstr configFile, ctmbstr charenc );
+/** Load a Tidy configuration file with the specified character encoding */
+TIDY_EXPORT int tidyLoadConfigEnc( TidyDoc tdoc, ctmbstr configFile,
+ ctmbstr charenc );
+
+/** Set the input/output character encoding for parsing markup.
+** Values include: ascii, latin1, raw, utf8, iso2022, mac,
+** win1252, utf16le, utf16be, utf16, big5 and shiftjis. Case in-sensitive.
+*/
TIDY_EXPORT int tidySetCharEncoding( TidyDoc tdoc, ctmbstr encnam );
-/* Enumerate configuration options
+/** @} end Basic group */
+
+
+/** @defgroup Configuration Configuration Options
+**
+** Functions for getting and setting Tidy configuration options.
+** @{
*/
+/** Applications using TidyLib may want to augment command-line and
+** configuration file options. Setting this callback allows an application
+** developer to examine command-line and configuration file options after
+** TidyLib has examined them and failed to recognize them.
+**/
+
+typedef Bool (*TidyOptCallback)( ctmbstr option, ctmbstr value );
+
+TIDY_EXPORT Bool tidySetOptionCallback( TidyDoc tdoc, TidyOptCallback pOptCallback );
+
+/** Get option ID by name */
TIDY_EXPORT TidyOptionId tidyOptGetIdForName( ctmbstr optnam );
+/** Get iterator for list of option */
+/**
+Example:
+
+TidyIterator itOpt = tidyGetOptionList( tdoc );
+while ( itOpt )
+{
+ TidyOption opt = tidyGetNextOption( tdoc, &itOpt );
+ .. get/set option values ..
+}
+
+*/
+
TIDY_EXPORT TidyIterator tidyGetOptionList( TidyDoc tdoc );
+/** Get next Option */
TIDY_EXPORT TidyOption tidyGetNextOption( TidyDoc tdoc, TidyIterator* pos );
+/** Lookup option by ID */
TIDY_EXPORT TidyOption tidyGetOption( TidyDoc tdoc, TidyOptionId optId );
+/** Lookup option by name */
TIDY_EXPORT TidyOption tidyGetOptionByName( TidyDoc tdoc, ctmbstr optnam );
+/** Get ID of given Option */
TIDY_EXPORT TidyOptionId tidyOptGetId( TidyOption opt );
+
+/** Get name of given Option */
TIDY_EXPORT ctmbstr tidyOptGetName( TidyOption opt );
+
+/** Get datatype of given Option */
TIDY_EXPORT TidyOptionType tidyOptGetType( TidyOption opt );
+
+/** Is Option read-only? */
TIDY_EXPORT Bool tidyOptIsReadOnly( TidyOption opt );
+
+/** Get category of given Option */
TIDY_EXPORT TidyConfigCategory tidyOptGetCategory( TidyOption opt );
+
+/** Get default value of given Option as a string */
TIDY_EXPORT ctmbstr tidyOptGetDefault( TidyOption opt );
+
+/** Get default value of given Option as an unsigned integer */
TIDY_EXPORT uint tidyOptGetDefaultInt( TidyOption opt );
+
+/** Get default value of given Option as a Boolean value */
TIDY_EXPORT Bool tidyOptGetDefaultBool( TidyOption opt );
+/** Iterate over Option "pick list" */
TIDY_EXPORT TidyIterator tidyOptGetPickList( TidyOption opt );
+/** Get next string value of Option "pick list" */
TIDY_EXPORT ctmbstr tidyOptGetNextPick( TidyOption opt, TidyIterator* pos );
+/** Get current Option value as a string */
TIDY_EXPORT ctmbstr tidyOptGetValue( TidyDoc tdoc, TidyOptionId optId );
+/** Set Option value as a string */
TIDY_EXPORT Bool tidyOptSetValue( TidyDoc tdoc, TidyOptionId optId, ctmbstr val );
+/** Set named Option value as a string. Good if not sure of type. */
TIDY_EXPORT Bool tidyOptParseValue( TidyDoc tdoc, ctmbstr optnam, ctmbstr val );
+/** Get current Option value as an integer */
TIDY_EXPORT uint tidyOptGetInt( TidyDoc tdoc, TidyOptionId optId );
+/** Set Option value as an integer */
TIDY_EXPORT Bool tidyOptSetInt( TidyDoc tdoc, TidyOptionId optId, uint val );
+/** Get current Option value as a Boolean flag */
TIDY_EXPORT Bool tidyOptGetBool( TidyDoc tdoc, TidyOptionId optId );
+/** Set Option value as a Boolean flag */
TIDY_EXPORT Bool tidyOptSetBool( TidyDoc tdoc, TidyOptionId optId, Bool val );
+/** Reset option to default value by ID */
TIDY_EXPORT Bool tidyOptResetToDefault( TidyDoc tdoc, TidyOptionId opt );
+/** Reset all options to their default values */
TIDY_EXPORT Bool tidyOptResetAllToDefault( TidyDoc tdoc );
-/* reset to config (after document processing) */
+/** Take a snapshot of current config settings */
TIDY_EXPORT Bool tidyOptSnapshot( TidyDoc tdoc );
+/** Reset config settings to snapshot (after document processing) */
TIDY_EXPORT Bool tidyOptResetToSnapshot( TidyDoc tdoc );
+/** Any settings different than default? */
TIDY_EXPORT Bool tidyOptDiffThanDefault( TidyDoc tdoc );
+/** Any settings different than snapshot? */
TIDY_EXPORT Bool tidyOptDiffThanSnapshot( TidyDoc tdoc );
+/** Copy current configuration settings from one document to another */
TIDY_EXPORT Bool tidyOptCopyConfig( TidyDoc tdocTo, TidyDoc tdocFrom );
+/** Get character encoding name. Used with TidyCharEncoding,
+** TidyOutCharEncoding, TidyInCharEncoding */
TIDY_EXPORT ctmbstr tidyOptGetEncName( TidyDoc tdoc, TidyOptionId optId );
+
+/** Get current pick list value for option by ID. Useful for enum types. */
TIDY_EXPORT ctmbstr tidyOptGetCurrPick( TidyDoc tdoc, TidyOptionId optId);
+/** Iterate over user declared tags */
TIDY_EXPORT TidyIterator tidyOptGetDeclTagList( TidyDoc tdoc );
+/** Get next declared tag of specified type: TidyInlineTags, TidyBlockTags,
+** TidyEmptyTags, TidyPreTags */
TIDY_EXPORT ctmbstr tidyOptGetNextDeclTag( TidyDoc tdoc,
TidyOptionId optId,
TidyIterator* iter );
+/** @} end Configuration group */
-/* I/O and Message handling interface
+/** @defgroup IO I/O and Messages
**
** By default, Tidy will define, create and use
** instances of input and output handlers for
@@ -189,32 +363,42 @@ TIDY_EXPORT ctmbstr tidyOptGetNextDeclTag( TidyDoc tdoc,
** respectively. A FILE* cfgFile input handler
** will be used for config files. Command line
** options will just be set directly.
+**
+** @{
*/
/*****************
Input Source
*****************/
+/** Input Callback: get next byte of input */
typedef int (*TidyGetByteFunc)( uint sourceData );
+
+/** Input Callback: unget a byte of input */
typedef void (*TidyUngetByteFunc)( uint sourceData, byte bt );
+
+/** Input Callback: is end of input? */
typedef Bool (*TidyEOFFunc)( uint sourceData );
+/** End of input "character" */
#define EndOfStream (~0u)
+/** TidyInputSource - Delivers raw bytes of input
+*/
TIDY_STRUCT
typedef struct _TidyInputSource
{
/* Instance data */
- uint sourceData;
+ uint sourceData; /**< Input context. Passed to callbacks */
/* Methods */
- TidyGetByteFunc getByte;
- TidyUngetByteFunc ungetByte;
- TidyEOFFunc eof;
+ TidyGetByteFunc getByte; /**< Pointer to "get byte" callback */
+ TidyUngetByteFunc ungetByte; /**< Pointer to "unget" callback */
+ TidyEOFFunc eof; /**< Pointer to "eof" callback */
} TidyInputSource;
-/* Facilitates user defined source by providing
-** an entry point to marshal pointers-to-functions.
-** Needed by .NET and possibly other language bindings.
+/** Facilitates user defined source by providing
+** an entry point to marshal pointers-to-functions.
+** Needed by .NET and possibly other language bindings.
*/
TIDY_EXPORT Bool tidyInitSource( TidyInputSource* source,
void* srcData,
@@ -222,54 +406,72 @@ TIDY_EXPORT Bool tidyInitSource( TidyInputSource* source,
TidyUngetByteFunc ugbFunc,
TidyEOFFunc endFunc );
+/** Helper: get next byte from input source */
TIDY_EXPORT uint tidyGetByte( TidyInputSource* source );
+
+/** Helper: unget byte back to input source */
TIDY_EXPORT void tidyUngetByte( TidyInputSource* source, uint byteValue );
+
+/** Helper: check if input source at end */
TIDY_EXPORT Bool tidyIsEOF( TidyInputSource* source );
/****************
Output Sink
****************/
+/** Output callback: send a byte to output */
typedef void (*TidyPutByteFunc)( uint sinkData, byte bt );
+
+/** TidyOutputSink - accepts raw bytes of output
+*/
TIDY_STRUCT
typedef struct _TidyOutputSink
{
/* Instance data */
- uint sinkData;
+ uint sinkData; /**< Output context. Passed to callbacks */
/* Methods */
- TidyPutByteFunc putByte;
+ TidyPutByteFunc putByte; /**< Pointer to "put byte" callback */
} TidyOutputSink;
-/* Facilitates user defined sinks by providing
-** an entry point to marshal pointers-to-functions.
-** Needed by .NET and possibly other language bindings.
+/** Facilitates user defined sinks by providing
+** an entry point to marshal pointers-to-functions.
+** Needed by .NET and possibly other language bindings.
*/
TIDY_EXPORT Bool tidyInitSink( TidyOutputSink* sink,
void* snkData,
TidyPutByteFunc pbFunc );
+
+/** Helper: send a byte to output */
TIDY_EXPORT void tidyPutByte( TidyOutputSink* sink, uint byteValue );
-/* Use TidyReportFilter to filter messages by diagnostic level:
-** info, warning, etc. Just set diagnostic output
-** handler to redirect all diagnostics output. Return true
-** to proceed with output, false to cancel.
+/** Callback to filter messages by diagnostic level:
+** info, warning, etc. Just set diagnostic output
+** handler to redirect all diagnostics output. Return true
+** to proceed with output, false to cancel.
*/
-typedef Bool (*TidyReportFilter)( TidyDoc tdoc,
- TidyReportLevel lvl, uint line, uint col, ctmbstr mssg );
+typedef Bool (*TidyReportFilter)( TidyDoc tdoc, TidyReportLevel lvl,
+ uint line, uint col, ctmbstr mssg );
+/** Give Tidy a filter callback to use */
TIDY_EXPORT Bool tidySetReportFilter( TidyDoc tdoc,
TidyReportFilter filtCallback );
-
+/** Set error sink to named file */
TIDY_EXPORT FILE* tidySetErrorFile( TidyDoc tdoc, ctmbstr errfilnam );
+/** Set error sink to given buffer */
TIDY_EXPORT int tidySetErrorBuffer( TidyDoc tdoc, TidyBuffer* errbuf );
+/** Set error sink to given generic sink */
TIDY_EXPORT int tidySetErrorSink( TidyDoc tdoc, TidyOutputSink* sink );
+/** @} end IO group */
-/* By default, Tidy will use its own wrappers
+
+/** @defgroup Memory Memory Allocation
+**
+** By default, Tidy will use its own wrappers
** around standard C malloc/free calls.
** These wrappers will abort upon any failures.
** If any are set, all must be set.
@@ -277,61 +479,189 @@ TIDY_EXPORT int tidySetErrorSink( TidyDoc tdoc, TidyOutputSink* sink );
**
** May be used to set environment-specific allocators
** such as used by web server plugins, etc.
+**
+** @{
*/
+
+/** Callback for "malloc" replacement */
typedef void* (*TidyMalloc)( size_t len );
+/** Callback for "realloc" replacement */
typedef void* (*TidyRealloc)( void* buf, size_t len );
+/** Callback for "free" replacement */
typedef void (*TidyFree)( void* buf );
+/** Callback for "out of memory" panic state */
typedef void (*TidyPanic)( ctmbstr mssg );
+/** Give Tidy a malloc() replacement */
TIDY_EXPORT Bool tidySetMallocCall( TidyMalloc fmalloc );
+/** Give Tidy a realloc() replacement */
TIDY_EXPORT Bool tidySetReallocCall( TidyRealloc frealloc );
+/** Give Tidy a free() replacement */
TIDY_EXPORT Bool tidySetFreeCall( TidyFree ffree );
+/** Give Tidy an "out of memory" handler */
TIDY_EXPORT Bool tidySetPanicCall( TidyPanic fpanic );
+/** @} end Memory group */
+
/* TODO: Catalog all messages for easy translation
TIDY_EXPORT ctmbstr tidyLookupMessage( int errorNo );
*/
-/* Parse/load Functions
+/** @defgroup Parse Document Parse
**
-** HTML/XHTML version determined from input.
+** Parse markup from a given input source. String and filename
+** functions added for convenience. HTML/XHTML version determined
+** from input.
+** @{
*/
+/** Parse markup in named file */
TIDY_EXPORT int tidyParseFile( TidyDoc tdoc, ctmbstr filename );
+
+/** Parse markup from the standard input */
TIDY_EXPORT int tidyParseStdin( TidyDoc tdoc );
+
+/** Parse markup in given string */
TIDY_EXPORT int tidyParseString( TidyDoc tdoc, ctmbstr content );
+
+/** Parse markup in given buffer */
TIDY_EXPORT int tidyParseBuffer( TidyDoc tdoc, TidyBuffer* buf );
-TIDY_EXPORT int tidyParseSource( TidyDoc tdoc, TidyInputSource* source );
-/* Diagnostics and Repair */
+/** Parse markup in given generic input source */
+TIDY_EXPORT int tidyParseSource( TidyDoc tdoc, TidyInputSource* source);
+
+/** @} End Parse group */
+
+
+/** @defgroup Clean Diagnostics and Repair
+**
+** @{
+*/
+/** Execute configured cleanup and repair operations on parsed markup */
TIDY_EXPORT int tidyCleanAndRepair( TidyDoc tdoc );
+
+/** Run configured diagnostics on parsed and repaired markup.
+** Must call tidyCleanAndRepair() first.
+*/
TIDY_EXPORT int tidyRunDiagnostics( TidyDoc tdoc );
-/* Document save Functions
+/** @} end Clean group */
+
+
+/** @defgroup Save Document Save Functions
**
-** If buffer is not big enough, ENOMEM will be returned and
-** the necessary buffer size will be placed in *buflen.
+** Save currently parsed document to the given output sink. File name
+** and string/buffer functions provided for convenience.
+** @{
*/
+
+/** Save to named file */
TIDY_EXPORT int tidySaveFile( TidyDoc tdoc, ctmbstr filename );
+
+/** Save to standard output (FILE*) */
TIDY_EXPORT int tidySaveStdout( TidyDoc tdoc );
+
+/** Save to given TidyBuffer object */
TIDY_EXPORT int tidySaveBuffer( TidyDoc tdoc, TidyBuffer* buf );
-TIDY_EXPORT int tidySaveString( TidyDoc tdoc, tmbstr buffer, uint* buflen );
+
+/** Save document to application buffer. If buffer is not big enough,
+** ENOMEM will be returned and the necessary buffer size will be placed
+** in *buflen.
+*/
+TIDY_EXPORT int tidySaveString( TidyDoc tdoc,
+ tmbstr buffer, uint* buflen );
+
+/** Save to given generic output sink */
TIDY_EXPORT int tidySaveSink( TidyDoc tdoc, TidyOutputSink* sink );
-/* Save Config
+/** @} end Save group */
+
+
+/** @addtogroup Basic
+** @{
*/
+/** Save current settings to named file.
+ Only non-default values are written. */
TIDY_EXPORT int tidyOptSaveFile( TidyDoc tdoc, ctmbstr cfgfil );
+
+/** Save current settings to given output sink.
+ Only non-default values are written. */
TIDY_EXPORT int tidyOptSaveSink( TidyDoc tdoc, TidyOutputSink* sink );
+
/* Error reporting functions
*/
+
+/** Write more complete information about errors to current error sink. */
TIDY_EXPORT void tidyErrorSummary( TidyDoc tdoc );
+
+/** Write more general information about markup to current error sink. */
TIDY_EXPORT void tidyGeneralInfo( TidyDoc tdoc );
+/** @} end Basic group (again) */
+
+
+/** @defgroup Tree Document Tree
+**
+** A parsed and, optionally, repaired document is
+** represented by Tidy as a Tree, much like a W3C DOM.
+** This tree may be traversed using these functions.
+** The following snippet gives a basic idea how these
+** functions can be used.
+**
+
+void dumpNode( TidyNode tnod, int indent )
+{
+ TidyNode child;
+
+ for ( child = tidyGetChild(tnod); child; child = tidyGetNext(child) )
+ {
+ ctmbstr name = tidyNodeGetName( child );
+ if ( !name )
+ {
+ switch ( tidyNodeGetType(child) )
+ {
+ case TidyNode_Root: name = "Root"; break;
+ case TidyNode_DocType: name = "DOCTYPE"; break;
+ case TidyNode_Comment: name = "Comment"; break;
+ case TidyNode_ProcIns: name = "Processing Instruction"; break;
+ case TidyNode_Text: name = "Text"; break;
+ case TidyNode_CDATA: name = "CDATA"; break;
+ case TidyNode_Section: name = "XML Section"; break;
+ case TidyNode_Asp: name = "ASP"; break;
+ case TidyNode_Jste: name = "JSTE"; break;
+ case TidyNode_Php: name = "PHP"; break;
+ case TidyNode_XmlDecl: name = "XML Declaration"; break;
+
+ case TidyNode_Start:
+ case TidyNode_End:
+ case TidyNode_StartEnd:
+ default:
+ assert( name != NULL ); // Shouldn't get here
+ break;
+ }
+ }
+ assert( name != NULL );
+ printf( "\%*.*sNode: \%s\\n", indent, indent, tidy );
+ dumpNode( child, indent + 4 );
+ }
+}
+
+void dumpDoc( TidyDoc tdoc )
+{
+ dumpNode( tidyGetRoot(tdoc), 0 );
+}
+
+void dumpBody( TidyDoc tdoc )
+{
+ dumpNode( tidyGetBody(tdoc), 0 );
+}
+
+
+@{
-/* Document tree traversal functions
*/
TIDY_EXPORT TidyNode tidyGetRoot( TidyDoc tdoc );
@@ -347,10 +677,6 @@ TIDY_EXPORT TidyNode tidyGetChild( TidyNode tnod );
TIDY_EXPORT TidyNode tidyGetNext( TidyNode tnod );
TIDY_EXPORT TidyNode tidyGetPrev( TidyNode tnod );
-/* Node info */
-TIDY_EXPORT TidyNodeType tidyNodeGetType( TidyNode tnod );
-TIDY_EXPORT ctmbstr tidyNodeGetName( TidyNode tnod );
-
/* Null for non-element nodes and all pure HTML
TIDY_EXPORT ctmbstr tidyNodeNsLocal( TidyNode tnod );
TIDY_EXPORT ctmbstr tidyNodeNsPrefix( TidyNode tnod );
@@ -370,11 +696,19 @@ TIDY_EXPORT ctmbstr tidyAttrNsPrefix( TidyAttr tattr );
TIDY_EXPORT ctmbstr tidyAttrNsUri( TidyAttr tattr );
*/
+/** @} end Tree group */
-/* Node interrogation
+/** @defgroup NodeAsk Node Interrogation
+**
+** Get information about any givent node.
+** @{
*/
+/* Node info */
+TIDY_EXPORT TidyNodeType tidyNodeGetType( TidyNode tnod );
+TIDY_EXPORT ctmbstr tidyNodeGetName( TidyNode tnod );
+
TIDY_EXPORT Bool tidyNodeIsText( TidyNode tnod );
TIDY_EXPORT Bool tidyNodeIsProp( TidyDoc tdoc, TidyNode tnod );
TIDY_EXPORT Bool tidyNodeIsHeader( TidyNode tnod ); /* h1, h2, ... */
@@ -465,8 +799,13 @@ TIDY_EXPORT Bool tidyNodeIsSTRIKE( TidyNode tnod );
TIDY_EXPORT Bool tidyNodeIsU( TidyNode tnod );
TIDY_EXPORT Bool tidyNodeIsMENU( TidyNode tnod );
+/** @} End NodeAsk group */
+
-/* Attribute interrogation
+/** @defgroup Attribute Attribute Interrogation
+**
+** Get information about any given attribute.
+** @{
*/
TIDY_EXPORT TidyAttrId tidyAttrGetId( TidyAttr tattr );
@@ -519,9 +858,16 @@ TIDY_EXPORT Bool tidyAttrIsABBR( TidyAttr tattr );
TIDY_EXPORT Bool tidyAttrIsCOLSPAN( TidyAttr tattr );
TIDY_EXPORT Bool tidyAttrIsROWSPAN( TidyAttr tattr );
-/* Attribute retrieval
+/** @} end AttrAsk group */
+
+
+/** @defgroup AttrGet Attribute Retrieval
+**
+** Lookup an attribute from a given node
+** @{
*/
+
TIDY_EXPORT TidyAttr tidyAttrGetHREF( TidyNode tnod );
TIDY_EXPORT TidyAttr tidyAttrGetSRC( TidyNode tnod );
TIDY_EXPORT TidyAttr tidyAttrGetID( TidyNode tnod );
@@ -568,6 +914,9 @@ TIDY_EXPORT TidyAttr tidyAttrGetABBR( TidyNode tnod );
TIDY_EXPORT TidyAttr tidyAttrGetCOLSPAN( TidyNode tnod );
TIDY_EXPORT TidyAttr tidyAttrGetROWSPAN( TidyNode tnod );
+
+/** @} end AttrGet group */
+
#ifdef __cplusplus
} /* extern "C" */
#endif
diff --git a/tidylib-src/include/tidyenum.h b/tidylib-src/include/tidyenum.h
old mode 100755
new mode 100644
index 8a81e524..fc2f6a1c
--- a/tidylib-src/include/tidyenum.h
+++ b/tidylib-src/include/tidyenum.h
@@ -14,8 +14,8 @@
CVS Info :
$Author: creitzel $
- $Date: 2002/10/15 19:46:52 $
- $Revision: 1.1.2.1 $
+ $Date: 2003/02/16 19:33:09 $
+ $Revision: 1.2 $
Contributing Author(s):
@@ -59,7 +59,9 @@
Created 2001-05-20 by Charles Reitzel
Updated 2002-07-01 by Charles Reitzel - 1st Implementation
+*/
+/** @file tidyenum.h - Enumerations defined for use with TidyLib.
*/
#ifdef __cplusplus
@@ -69,150 +71,164 @@ extern "C" {
/* Enumerate configuration options
*/
+/** Categories of Tidy configuration options
+*/
typedef enum
{
- TidyMarkup,
- TidyDiagnostics,
- TidyPrettyPrint,
- TidyEncoding,
- TidyMiscellaneous
+ TidyMarkup, /**< Markup options: (X)HTML version, etc */
+ TidyDiagnostics, /**< Diagnostics */
+ TidyPrettyPrint, /**< Output layout */
+ TidyEncoding, /**< Character encodings */
+ TidyMiscellaneous /**< File handling, message format, etc. */
} TidyConfigCategory;
-/* Option IDs
-**
-** Used to get/set option values.
+/** Option IDs Used to get/set option values.
*/
-
typedef enum
{
- TidyUnknownOption, /* Unknown! */
- TidyIndentSpaces, /* indentation n spaces */
- TidyWrapLen, /* wrap margin */
- TidyTabSize, /* expand tabs to n spaces */
-
- TidyCharEncoding, /* in/out character encoding */
- TidyInCharEncoding, /* input character encoding (if different) */
- TidyOutCharEncoding, /* output character encoding (if different) */
-
- TidyDoctypeMode, /* see doctype property */
- TidyDoctype, /* user specified doctype */
-
- TidyDuplicateAttrs, /* Keep first or last duplicate attribute */
- TidyAltText, /* default text for alt attribute */
- TidySlideStyle, /* style sheet for slides: not used for anything yet */
- TidyErrFile, /* file name to write errors to */
- TidyWriteBack, /* if true then output tidied markup */
- TidyShowMarkup, /* if false, normal output is suppressed */
- TidyShowWarnings, /* however errors are always shown */
- TidyQuiet, /* no 'Parsing X', guessed DTD or summary */
- TidyIndentContent, /* indent content of appropriate tags */
- /* "auto" does text/block level content indentation */
- TidyHideEndTags, /* suppress optional end tags */
- TidyXmlTags, /* treat input as XML */
- TidyXmlOut, /* create output as XML */
- TidyXhtmlOut, /* output extensible HTML */
- TidyHtmlOut, /* output plain HTML, even for XHTML input.
- Yes means set explicitly. */
- TidyXmlDecl, /* add for XML docs */
- TidyUpperCaseTags, /* output tags in upper not lower case */
- TidyUpperCaseAttrs, /* output attributes in upper not lower case */
- TidyMakeBare, /* Make bare HTML: remove Microsoft cruft */
- TidyMakeClean, /* replace presentational clutter by style rules */
- TidyLogicalEmphasis, /* replace i by em and b by strong */
- TidyDropPropAttrs, /* discard proprietary attributes */
- TidyDropFontTags, /* discard presentation tags */
- TidyDropEmptyParas, /* discard empty p elements */
- TidyFixComments, /* fix comments with adjacent hyphens */
- TidyBreakBeforeBR, /* o/p newline before or not? */ - TidyBurstSlides, /* create slides on each h2 element */ - TidyNumEntities, /* use numeric entities */ - TidyQuoteMarks, /* output " marks as " */ - TidyQuoteNbsp, /* output non-breaking space as entity */ - TidyQuoteAmpersand, /* output naked ampersand as & */ - TidyWrapAttVals, /* wrap within attribute values */ - TidyWrapScriptlets, /* wrap within JavaScript string literals */ - TidyWrapSection, /* wrap within section tags */ - TidyWrapAsp, /* wrap within ASP pseudo elements */ - TidyWrapJste, /* wrap within JSTE pseudo elements */ - TidyWrapPhp, /* wrap within PHP pseudo elements */ - TidyFixBackslash, /* fix URLs by replacing \ with / */ - TidyIndentAttributes,/* newline+indent before each attribute */ - TidyXmlPIs, /* if set to yes PIs must end with ?> */ - TidyXmlSpace, /* if set to yes adds xml:space attr as needed */ - TidyEncloseBodyText, /* if yes text at body is wrapped in
's */ - TidyEncloseBlockText,/* if yes text in blocks is wrapped in
's */
- TidyKeepFileTimes, /* if yes last modied time is preserved */
- TidyWord2000, /* draconian cleaning for Word2000 */
- TidyMark, /* add meta element indicating tidied doc */
- TidyEmacs, /* if true format error output for GNU Emacs */
- TidyEmacsFile, /* Name of current Emacs file */
- TidyLiteralAttribs, /* if true attributes may use newlines */
- TidyBodyOnly, /* output BODY content only */
- TidyFixUri, /* applies URI encoding if necessary */
- TidyLowerLiterals, /* folds known attribute values to lower case */
- TidyHideComments, /* hides all (real) comments in output */
- TidyIndentCdata, /* indent section */
- TidyForceOutput, /* output document even if errors were found */
- TidyShowErrors, /* number of errors to put out */
- TidyAsciiChars, /* convert quotes and dashes to nearest ASCII char */
- TidyJoinClasses, /* join multiple class attributes */
- TidyJoinStyles, /* join multiple style attributes */
- TidyEscapeCdata, /* replace sections with escaped text */
+ TidyUnknownOption, /**< Unknown option! */
+ TidyIndentSpaces, /**< Indentation n spaces */
+ TidyWrapLen, /**< Wrap margin */
+ TidyTabSize, /**< Expand tabs to n spaces */
+
+ TidyCharEncoding, /**< In/out character encoding */
+ TidyInCharEncoding, /**< Input character encoding (if different) */
+ TidyOutCharEncoding, /**< Output character encoding (if different) */
+ TidyNewline, /**< Output line ending (default to platform) */
+
+ TidyDoctypeMode, /**< See doctype property */
+ TidyDoctype, /**< User specified doctype */
+
+ TidyDuplicateAttrs, /**< Keep first or last duplicate attribute */
+ TidyAltText, /**< Default text for alt attribute */
+ TidySlideStyle, /**< Style sheet for slides: not used for anything yet */
+ TidyErrFile, /**< File name to write errors to */
+ TidyOutFile, /**< File name to write markup to */
+ TidyWriteBack, /**< If true then output tidied markup */
+ TidyShowMarkup, /**< If false, normal output is suppressed */
+ TidyShowWarnings, /**< However errors are always shown */
+ TidyQuiet, /**< No 'Parsing X', guessed DTD or summary */
+ TidyIndentContent, /**< Indent content of appropriate tags */
+ /**< "auto" does text/block level content indentation */
+ TidyHideEndTags, /**< Suppress optional end tags */
+ TidyXmlTags, /**< Treat input as XML */
+ TidyXmlOut, /**< Create output as XML */
+ TidyXhtmlOut, /**< Output extensible HTML */
+ TidyHtmlOut, /**< Output plain HTML, even for XHTML input.
+ Yes means set explicitly. */
+ TidyXmlDecl, /**< Add for XML docs */
+ TidyUpperCaseTags, /**< Output tags in upper not lower case */
+ TidyUpperCaseAttrs, /**< Output attributes in upper not lower case */
+ TidyMakeBare, /**< Make bare HTML: remove Microsoft cruft */
+ TidyMakeClean, /**< Replace presentational clutter by style rules */
+ TidyLogicalEmphasis, /**< Replace i by em and b by strong */
+ TidyDropPropAttrs, /**< Discard proprietary attributes */
+ TidyDropFontTags, /**< Discard presentation tags */
+ TidyDropEmptyParas, /**< Discard empty p elements */
+ TidyFixComments, /**< Fix comments with adjacent hyphens */
+ TidyBreakBeforeBR, /**< Output newline before
or not? */
+ TidyBurstSlides, /**< Create slides on each h2 element */
+ TidyNumEntities, /**< Use numeric entities */
+ TidyQuoteMarks, /**< Output " marks as " */
+ TidyQuoteNbsp, /**< Output non-breaking space as entity */
+ TidyQuoteAmpersand, /**< Output naked ampersand as & */
+ TidyWrapAttVals, /**< Wrap within attribute values */
+ TidyWrapScriptlets, /**< Wrap within JavaScript string literals */
+ TidyWrapSection, /**< Wrap within section tags */
+ TidyWrapAsp, /**< Wrap within ASP pseudo elements */
+ TidyWrapJste, /**< Wrap within JSTE pseudo elements */
+ TidyWrapPhp, /**< Wrap within PHP pseudo elements */
+ TidyFixBackslash, /**< Fix URLs by replacing \ with / */
+ TidyIndentAttributes,/**< Newline+indent before each attribute */
+ TidyXmlPIs, /**< If set to yes PIs must end with ?> */
+ TidyXmlSpace, /**< If set to yes adds xml:space attr as needed */
+ TidyEncloseBodyText, /**< If yes text at body is wrapped in P's */
+ TidyEncloseBlockText,/**< If yes text in blocks is wrapped in P's */
+ TidyKeepFileTimes, /**< If yes last modied time is preserved */
+ TidyWord2000, /**< Draconian cleaning for Word2000 */
+ TidyMark, /**< Add meta element indicating tidied doc */
+ TidyEmacs, /**< If true format error output for GNU Emacs */
+ TidyEmacsFile, /**< Name of current Emacs file */
+ TidyLiteralAttribs, /**< If true attributes may use newlines */
+ TidyBodyOnly, /**< Output BODY content only */
+ TidyFixUri, /**< Applies URI encoding if necessary */
+ TidyLowerLiterals, /**< Folds known attribute values to lower case */
+ TidyHideComments, /**< Hides all (real) comments in output */
+ TidyIndentCdata, /**< Indent section */
+ TidyForceOutput, /**< Output document even if errors were found */
+ TidyShowErrors, /**< Number of errors to put out */
+ TidyAsciiChars, /**< Convert quotes and dashes to nearest ASCII char */
+ TidyJoinClasses, /**< Join multiple class attributes */
+ TidyJoinStyles, /**< Join multiple style attributes */
+ TidyEscapeCdata, /**< Replace sections with escaped text */
#if SUPPORT_ASIAN_ENCODINGS
- TidyLanguage, /* language property: not used for anything yet */
- TidyNCR, /* allow numeric character references */
+ TidyLanguage, /**< Language property: not used for anything yet */
+ TidyNCR, /**< Allow numeric character references */
#endif
#if SUPPORT_UTF16_ENCODINGS
- TidyOutputBOM, /* output a Byte Order Mark (BOM) for UTF-16 encodings */
- /* auto: if input stream has BOM, we output a BOM */
+ TidyOutputBOM, /**< Output a Byte Order Mark (BOM) for UTF-16 encodings */
+ /**< auto: if input stream has BOM, we output a BOM */
#endif
- TidyReplaceColor, /* replace hex color attribute values with names */
- TidyCSSPrefix, /* CSS class naming for -clean option */
+ TidyReplaceColor, /**< Replace hex color attribute values with names */
+ TidyCSSPrefix, /**< CSS class naming for -clean option */
- TidyInlineTags, /* Declared inline tags */
- TidyBlockTags, /* Declared block tags */
- TidyEmptyTags, /* Declared empty tags */
- TidyPreTags, /* Declared pre tags */
+ TidyInlineTags, /**< Declared inline tags */
+ TidyBlockTags, /**< Declared block tags */
+ TidyEmptyTags, /**< Declared empty tags */
+ TidyPreTags, /**< Declared pre tags */
- TidyAccessibilityCheckLevel, /* Accessibility check level
- 0 (old style), or 1, 2, 3 */
+ TidyAccessibilityCheckLevel, /**< Accessibility check level
+ 0 (old style), or 1, 2, 3 */
- N_TIDY_OPTIONS /* Must be last */
+ N_TIDY_OPTIONS /**< Must be last */
} TidyOptionId;
-
+/** Option data types
+*/
typedef enum
{
- TidyString,
- TidyInteger,
- TidyBoolean
+ TidyString, /**< String */
+ TidyInteger, /**< Integer or enumeration */
+ TidyBoolean /**< Boolean flag */
} TidyOptionType;
-/* used by ParseBool, ParseTriState, ParseIndent, ParseBOM */
+/** AutoBool values used by ParseBool, ParseTriState, ParseIndent, ParseBOM
+*/
typedef enum
{
- TidyNoState, /* maps to 'no' */
- TidyYesState, /* maps to 'yes' */
- TidyAutoState
+ TidyNoState, /**< maps to 'no' */
+ TidyYesState, /**< maps to 'yes' */
+ TidyAutoState /**< Automatic */
} TidyTriState;
+/** TidyNewline option values to control output line endings.
+*/
+typedef enum
+{
+ TidyLF, /**< Use Unix style: LF */
+ TidyCRLF, /**< Use DOS/Windows style: CR+LF */
+ TidyCR /**< Use Macintosh style: CR */
+} TidyLineEnding;
+
-/* mode controlling treatment of doctype */
+/** Mode controlling treatment of doctype
+*/
typedef enum
{
- TidyDoctypeOmit,
- TidyDoctypeAuto,
- TidyDoctypeStrict,
- TidyDoctypeLoose,
- TidyDoctypeUser
+ TidyDoctypeOmit, /**< Omit DOCTYPE altogether */
+ TidyDoctypeAuto, /**< Keep DOCTYPE in input. Set version to content */
+ TidyDoctypeStrict, /**< Convert document to HTML 4 strict content model */
+ TidyDoctypeLoose, /**< Convert document to HTML 4 transitional
+ content model */
+ TidyDoctypeUser /**< Set DOCTYPE FPI explicitly */
} TidyDoctypeModes;
-/* mode controlling treatment of duplicate Attributes */
-
+/** Mode controlling treatment of duplicate Attributes
+*/
typedef enum
{
TidyKeepFirst,
@@ -232,339 +248,333 @@ typedef enum
** options will just be set directly.
*/
+/** Message severity level
+*/
typedef enum
{
- TidyInfo,
- TidyWarning,
- TidyConfig,
- TidyAccess,
- TidyError,
- TidyBadDocument,
- TidyFatal
+ TidyInfo, /**< Information about markup usage */
+ TidyWarning, /**< Warning message */
+ TidyConfig, /**< Configuration error */
+ TidyAccess, /**< Accessibility message */
+ TidyError, /**< Error message - output suppressed */
+ TidyBadDocument, /**< I/O or file system error */
+ TidyFatal /**< Crash! */
} TidyReportLevel;
-typedef enum
-{
- TidyContentInput,
- TidyConfigInput
-} TidyInputType;
-
-typedef enum
-{
- TidyContentOutput,
- TidyDiagnosticOutput
-} TidyOutputType;
-
/* Document tree traversal functions
*/
+/** Node types
+*/
typedef enum
{
- TidyNode_Root,
- TidyNode_DocType,
- TidyNode_Comment,
- TidyNode_ProcIns,
- TidyNode_Text,
- TidyNode_Start,
- TidyNode_End,
- TidyNode_StartEnd,
- TidyNode_CDATA,
- TidyNode_Section,
- TidyNode_Asp,
- TidyNode_Jste,
- TidyNode_Php,
- TidyNode_XmlDecl
+ TidyNode_Root, /**< Root */
+ TidyNode_DocType, /**< DOCTYPE */
+ TidyNode_Comment, /**< Comment */
+ TidyNode_ProcIns, /**< Processing Instruction */
+ TidyNode_Text, /**< Text */
+ TidyNode_Start, /**< Start Tag */
+ TidyNode_End, /**< End Tag */
+ TidyNode_StartEnd, /**< Start/End (empty) Tag */
+ TidyNode_CDATA, /**< Unparsed Text */
+ TidyNode_Section, /**< XML Section */
+ TidyNode_Asp, /**< ASP Source */
+ TidyNode_Jste, /**< JSTE Source */
+ TidyNode_Php, /**< PHP Source */
+ TidyNode_XmlDecl /**< XML Declaration */
} TidyNodeType;
-/* Node interrogation
-*/
+/** Known HTML element types
+*/
typedef enum
{
- TidyTag_UNKNOWN,
- TidyTag_A,
- TidyTag_ABBR,
- TidyTag_ACRONYM,
- TidyTag_ADDRESS,
- TidyTag_ALIGN,
- TidyTag_APPLET,
- TidyTag_AREA,
- TidyTag_B,
- TidyTag_BASE,
- TidyTag_BASEFONT,
- TidyTag_BDO,
- TidyTag_BGSOUND,
- TidyTag_BIG,
- TidyTag_BLINK,
- TidyTag_BLOCKQUOTE,
- TidyTag_BODY,
- TidyTag_BR,
- TidyTag_BUTTON,
- TidyTag_CAPTION,
- TidyTag_CENTER,
- TidyTag_CITE,
- TidyTag_CODE,
- TidyTag_COL,
- TidyTag_COLGROUP,
- TidyTag_COMMENT,
- TidyTag_DD,
- TidyTag_DEL,
- TidyTag_DFN,
- TidyTag_DIR,
- TidyTag_DIV,
- TidyTag_DL,
- TidyTag_DT,
- TidyTag_EM,
- TidyTag_EMBED,
- TidyTag_FIELDSET,
- TidyTag_FONT,
- TidyTag_FORM,
- TidyTag_FRAME,
- TidyTag_FRAMESET,
- TidyTag_H1,
- TidyTag_H2,
- TidyTag_H3,
- TidyTag_H4,
- TidyTag_H5,
- TidyTag_H6,
- TidyTag_HEAD,
- TidyTag_HR,
- TidyTag_HTML,
- TidyTag_I,
- TidyTag_IFRAME,
- TidyTag_ILAYER,
- TidyTag_IMG,
- TidyTag_INPUT,
- TidyTag_INS,
- TidyTag_ISINDEX,
- TidyTag_KBD,
- TidyTag_KEYGEN,
- TidyTag_LABEL,
- TidyTag_LAYER,
- TidyTag_LEGEND,
- TidyTag_LI,
- TidyTag_LINK,
- TidyTag_LISTING,
- TidyTag_MAP,
- TidyTag_MARQUEE,
- TidyTag_MENU,
- TidyTag_META,
- TidyTag_MULTICOL,
- TidyTag_NOBR,
- TidyTag_NOEMBED,
- TidyTag_NOFRAMES,
- TidyTag_NOLAYER,
- TidyTag_NOSAVE,
- TidyTag_NOSCRIPT,
- TidyTag_OBJECT,
- TidyTag_OL,
- TidyTag_OPTGROUP,
- TidyTag_OPTION,
- TidyTag_P,
- TidyTag_PARAM,
- TidyTag_PLAINTEXT,
- TidyTag_PRE,
- TidyTag_Q,
- TidyTag_RB,
- TidyTag_RBC,
- TidyTag_RP,
- TidyTag_RT,
- TidyTag_RTC,
- TidyTag_RUBY,
- TidyTag_S,
- TidyTag_SAMP,
- TidyTag_SCRIPT,
- TidyTag_SELECT,
- TidyTag_SERVER,
- TidyTag_SERVLET,
- TidyTag_SMALL,
- TidyTag_SPACER,
- TidyTag_SPAN,
- TidyTag_STRIKE,
- TidyTag_STRONG,
- TidyTag_STYLE,
- TidyTag_SUB,
- TidyTag_SUP,
- TidyTag_TABLE,
- TidyTag_TBODY,
- TidyTag_TD,
- TidyTag_TEXTAREA,
- TidyTag_TFOOT,
- TidyTag_TH,
- TidyTag_THEAD,
- TidyTag_TITLE,
- TidyTag_TR,
- TidyTag_TT,
- TidyTag_U,
- TidyTag_UL,
- TidyTag_VAR,
- TidyTag_WBR,
- TidyTag_XMP,
- N_TIDY_TAGS /* Must be last */
+ TidyTag_UNKNOWN, /**< Unknown tag! */
+ TidyTag_A, /**< A */
+ TidyTag_ABBR, /**< ABBR */
+ TidyTag_ACRONYM, /**< ACRONYM */
+ TidyTag_ADDRESS, /**< ADDRESS */
+ TidyTag_ALIGN, /**< ALIGN */
+ TidyTag_APPLET, /**< APPLET */
+ TidyTag_AREA, /**< AREA */
+ TidyTag_B, /**< B */
+ TidyTag_BASE, /**< BASE */
+ TidyTag_BASEFONT, /**< BASEFONT */
+ TidyTag_BDO, /**< BDO */
+ TidyTag_BGSOUND, /**< BGSOUND */
+ TidyTag_BIG, /**< BIG */
+ TidyTag_BLINK, /**< BLINK */
+ TidyTag_BLOCKQUOTE, /**< BLOCKQUOTE */
+ TidyTag_BODY, /**< BODY */
+ TidyTag_BR, /**< BR */
+ TidyTag_BUTTON, /**< BUTTON */
+ TidyTag_CAPTION, /**< CAPTION */
+ TidyTag_CENTER, /**< CENTER */
+ TidyTag_CITE, /**< CITE */
+ TidyTag_CODE, /**< CODE */
+ TidyTag_COL, /**< COL */
+ TidyTag_COLGROUP, /**< COLGROUP */
+ TidyTag_COMMENT, /**< COMMENT */
+ TidyTag_DD, /**< DD */
+ TidyTag_DEL, /**< DEL */
+ TidyTag_DFN, /**< DFN */
+ TidyTag_DIR, /**< DIR */
+ TidyTag_DIV, /**< DIF */
+ TidyTag_DL, /**< DL */
+ TidyTag_DT, /**< DT */
+ TidyTag_EM, /**< EM */
+ TidyTag_EMBED, /**< EMBED */
+ TidyTag_FIELDSET, /**< FIELDSET */
+ TidyTag_FONT, /**< FONT */
+ TidyTag_FORM, /**< FORM */
+ TidyTag_FRAME, /**< FRAME */
+ TidyTag_FRAMESET, /**< FRAMESET */
+ TidyTag_H1, /**< H1 */
+ TidyTag_H2, /**< H2 */
+ TidyTag_H3, /**< H3 */
+ TidyTag_H4, /**< H4 */
+ TidyTag_H5, /**< H5 */
+ TidyTag_H6, /**< H6 */
+ TidyTag_HEAD, /**< HEAD */
+ TidyTag_HR, /**< HR */
+ TidyTag_HTML, /**< HTML */
+ TidyTag_I, /**< I */
+ TidyTag_IFRAME, /**< IFRAME */
+ TidyTag_ILAYER, /**< ILAYER */
+ TidyTag_IMG, /**< IMG */
+ TidyTag_INPUT, /**< INPUT */
+ TidyTag_INS, /**< INS */
+ TidyTag_ISINDEX, /**< ISINDEX */
+ TidyTag_KBD, /**< KBD */
+ TidyTag_KEYGEN, /**< KEYGEN */
+ TidyTag_LABEL, /**< LABEL */
+ TidyTag_LAYER, /**< LAYER */
+ TidyTag_LEGEND, /**< LEGEND */
+ TidyTag_LI, /**< LI */
+ TidyTag_LINK, /**< LINK */
+ TidyTag_LISTING, /**< LISTING */
+ TidyTag_MAP, /**< MAP */
+ TidyTag_MARQUEE, /**< MARQUEE */
+ TidyTag_MENU, /**< MENU */
+ TidyTag_META, /**< META */
+ TidyTag_MULTICOL, /**< MULTICOL */
+ TidyTag_NOBR, /**< NOBR */
+ TidyTag_NOEMBED, /**< NOEMBED */
+ TidyTag_NOFRAMES, /**< NOFRAMES */
+ TidyTag_NOLAYER, /**< NOLAYER */
+ TidyTag_NOSAVE, /**< NOSAVE */
+ TidyTag_NOSCRIPT, /**< NOSCRIPT */
+ TidyTag_OBJECT, /**< OBJECT */
+ TidyTag_OL, /**< OL */
+ TidyTag_OPTGROUP, /**< OPTGROUP */
+ TidyTag_OPTION, /**< OPTION */
+ TidyTag_P, /**< P */
+ TidyTag_PARAM, /**< PARAM */
+ TidyTag_PLAINTEXT, /**< PLAINTEXT */
+ TidyTag_PRE, /**< PRE */
+ TidyTag_Q, /**< Q */
+ TidyTag_RB, /**< RB */
+ TidyTag_RBC, /**< RBC */
+ TidyTag_RP, /**< RP */
+ TidyTag_RT, /**< RT */
+ TidyTag_RTC, /**< RTC */
+ TidyTag_RUBY, /**< RUBY */
+ TidyTag_S, /**< S */
+ TidyTag_SAMP, /**< SAMP */
+ TidyTag_SCRIPT, /**< SCRIPT */
+ TidyTag_SELECT, /**< SELECT */
+ TidyTag_SERVER, /**< SERVER */
+ TidyTag_SERVLET, /**< SERVLET */
+ TidyTag_SMALL, /**< SMALL */
+ TidyTag_SPACER, /**< SPACER */
+ TidyTag_SPAN, /**< SPAN */
+ TidyTag_STRIKE, /**< STRIKE */
+ TidyTag_STRONG, /**< STRONG */
+ TidyTag_STYLE, /**< STYLE */
+ TidyTag_SUB, /**< SUB */
+ TidyTag_SUP, /**< SUP */
+ TidyTag_TABLE, /**< TABLE */
+ TidyTag_TBODY, /**< TBODY */
+ TidyTag_TD, /**< TD */
+ TidyTag_TEXTAREA, /**< TEXTAREA */
+ TidyTag_TFOOT, /**< TFOOT */
+ TidyTag_TH, /**< TH */
+ TidyTag_THEAD, /**< THEAD */
+ TidyTag_TITLE, /**< TITLE */
+ TidyTag_TR, /**< TR */
+ TidyTag_TT, /**< TT */
+ TidyTag_U, /**< U */
+ TidyTag_UL, /**< UL */
+ TidyTag_VAR, /**< VAR */
+ TidyTag_WBR, /**< WBR */
+ TidyTag_XMP, /**< XMP */
+ N_TIDY_TAGS /**< Must be last */
} TidyTagId;
/* Attribute interrogation
*/
+/** Known HTML attributes
+*/
typedef enum
{
- TidyAttr_UNKNOWN,
- TidyAttr_ABBR,
- TidyAttr_ACCEPT,
- TidyAttr_ACCEPT_CHARSET,
- TidyAttr_ACCESSKEY,
- TidyAttr_ACTION,
- TidyAttr_ADD_DATE,
- TidyAttr_ALIGN,
- TidyAttr_ALINK,
- TidyAttr_ALT,
- TidyAttr_ARCHIVE,
- TidyAttr_AXIS,
- TidyAttr_BACKGROUND,
- TidyAttr_BGCOLOR,
- TidyAttr_BGPROPERTIES,
- TidyAttr_BORDER,
- TidyAttr_BORDERCOLOR,
- TidyAttr_BOTTOMMARGIN,
- TidyAttr_CELLPADDING,
- TidyAttr_CELLSPACING,
- TidyAttr_CHAR,
- TidyAttr_CHAROFF,
- TidyAttr_CHARSET,
- TidyAttr_CHECKED,
- TidyAttr_CITE,
- TidyAttr_CLASS,
- TidyAttr_CLASSID,
- TidyAttr_CLEAR,
- TidyAttr_CODE,
- TidyAttr_CODEBASE,
- TidyAttr_CODETYPE,
- TidyAttr_COLOR,
- TidyAttr_COLS,
- TidyAttr_COLSPAN,
- TidyAttr_COMPACT,
- TidyAttr_CONTENT,
- TidyAttr_COORDS,
- TidyAttr_DATA,
- TidyAttr_DATAFLD,
- TidyAttr_DATAFORMATAS,
- TidyAttr_DATAPAGESIZE,
- TidyAttr_DATASRC,
- TidyAttr_DATETIME,
- TidyAttr_DECLARE,
- TidyAttr_DEFER,
- TidyAttr_DIR,
- TidyAttr_DISABLED,
- TidyAttr_ENCODING,
- TidyAttr_ENCTYPE,
- TidyAttr_FACE,
- TidyAttr_FOR,
- TidyAttr_FRAME,
- TidyAttr_FRAMEBORDER,
- TidyAttr_FRAMESPACING,
- TidyAttr_GRIDX,
- TidyAttr_GRIDY,
- TidyAttr_HEADERS,
- TidyAttr_HEIGHT,
- TidyAttr_HREF,
- TidyAttr_HREFLANG,
- TidyAttr_HSPACE,
- TidyAttr_HTTP_EQUIV,
- TidyAttr_ID,
- TidyAttr_ISMAP,
- TidyAttr_LABEL,
- TidyAttr_LANG,
- TidyAttr_LANGUAGE,
- TidyAttr_LAST_MODIFIED,
- TidyAttr_LAST_VISIT,
- TidyAttr_LEFTMARGIN,
- TidyAttr_LINK,
- TidyAttr_LONGDESC,
- TidyAttr_LOWSRC,
- TidyAttr_MARGINHEIGHT,
- TidyAttr_MARGINWIDTH,
- TidyAttr_MAXLENGTH,
- TidyAttr_MEDIA,
- TidyAttr_METHOD,
- TidyAttr_MULTIPLE,
- TidyAttr_NAME,
- TidyAttr_NOHREF,
- TidyAttr_NORESIZE,
- TidyAttr_NOSHADE,
- TidyAttr_NOWRAP,
- TidyAttr_OBJECT,
- TidyAttr_OnAFTERUPDATE,
- TidyAttr_OnBEFOREUNLOAD,
- TidyAttr_OnBEFOREUPDATE,
- TidyAttr_OnBLUR,
- TidyAttr_OnCHANGE,
- TidyAttr_OnCLICK,
- TidyAttr_OnDATAAVAILABLE,
- TidyAttr_OnDATASETCHANGED,
- TidyAttr_OnDATASETCOMPLETE,
- TidyAttr_OnDBLCLICK,
- TidyAttr_OnERRORUPDATE,
- TidyAttr_OnFOCUS,
- TidyAttr_OnKEYDOWN,
- TidyAttr_OnKEYPRESS,
- TidyAttr_OnKEYUP,
- TidyAttr_OnLOAD,
- TidyAttr_OnMOUSEDOWN,
- TidyAttr_OnMOUSEMOVE,
- TidyAttr_OnMOUSEOUT,
- TidyAttr_OnMOUSEOVER,
- TidyAttr_OnMOUSEUP,
- TidyAttr_OnRESET,
- TidyAttr_OnROWENTER,
- TidyAttr_OnROWEXIT,
- TidyAttr_OnSELECT,
- TidyAttr_OnSUBMIT,
- TidyAttr_OnUNLOAD,
- TidyAttr_PROFILE,
- TidyAttr_PROMPT,
- TidyAttr_RBSPAN,
- TidyAttr_READONLY,
- TidyAttr_REL,
- TidyAttr_REV,
- TidyAttr_RIGHTMARGIN,
- TidyAttr_ROWS,
- TidyAttr_ROWSPAN,
- TidyAttr_RULES,
- TidyAttr_SCHEME,
- TidyAttr_SCOPE,
- TidyAttr_SCROLLING,
- TidyAttr_SELECTED,
- TidyAttr_SHAPE,
- TidyAttr_SHOWGRID,
- TidyAttr_SHOWGRIDX,
- TidyAttr_SHOWGRIDY,
- TidyAttr_SIZE,
- TidyAttr_SPAN,
- TidyAttr_SRC,
- TidyAttr_STANDBY,
- TidyAttr_START,
- TidyAttr_STYLE,
- TidyAttr_SUMMARY,
- TidyAttr_TABINDEX,
- TidyAttr_TARGET,
- TidyAttr_TEXT,
- TidyAttr_TITLE,
- TidyAttr_TOPMARGIN,
- TidyAttr_TYPE,
- TidyAttr_USEMAP,
- TidyAttr_VALIGN,
- TidyAttr_VALUE,
- TidyAttr_VALUETYPE,
- TidyAttr_VERSION,
- TidyAttr_VLINK,
- TidyAttr_VSPACE,
- TidyAttr_WIDTH,
- TidyAttr_WRAP,
- TidyAttr_XML_LANG,
- TidyAttr_XML_SPACE,
- TidyAttr_XMLNS,
- N_TIDY_ATTRIBS /* Must be last */
+ TidyAttr_UNKNOWN, /**< UNKNOWN= */
+ TidyAttr_ABBR, /**< ABBR= */
+ TidyAttr_ACCEPT, /**< ACCEPT= */
+ TidyAttr_ACCEPT_CHARSET, /**< ACCEPT_CHARSET= */
+ TidyAttr_ACCESSKEY, /**< ACCESSKEY= */
+ TidyAttr_ACTION, /**< ACTION= */
+ TidyAttr_ADD_DATE, /**< ADD_DATE= */
+ TidyAttr_ALIGN, /**< ALIGN= */
+ TidyAttr_ALINK, /**< ALINK= */
+ TidyAttr_ALT, /**< ALT= */
+ TidyAttr_ARCHIVE, /**< ARCHIVE= */
+ TidyAttr_AXIS, /**< AXIS= */
+ TidyAttr_BACKGROUND, /**< BACKGROUND= */
+ TidyAttr_BGCOLOR, /**< BGCOLOR= */
+ TidyAttr_BGPROPERTIES, /**< BGPROPERTIES= */
+ TidyAttr_BORDER, /**< BORDER= */
+ TidyAttr_BORDERCOLOR, /**< BORDERCOLOR= */
+ TidyAttr_BOTTOMMARGIN, /**< BOTTOMMARGIN= */
+ TidyAttr_CELLPADDING, /**< CELLPADDING= */
+ TidyAttr_CELLSPACING, /**< CELLSPACING= */
+ TidyAttr_CHAR, /**< CHAR= */
+ TidyAttr_CHAROFF, /**< CHAROFF= */
+ TidyAttr_CHARSET, /**< CHARSET= */
+ TidyAttr_CHECKED, /**< CHECKED= */
+ TidyAttr_CITE, /**< CITE= */
+ TidyAttr_CLASS, /**< CLASS= */
+ TidyAttr_CLASSID, /**< CLASSID= */
+ TidyAttr_CLEAR, /**< CLEAR= */
+ TidyAttr_CODE, /**< CODE= */
+ TidyAttr_CODEBASE, /**< CODEBASE= */
+ TidyAttr_CODETYPE, /**< CODETYPE= */
+ TidyAttr_COLOR, /**< COLOR= */
+ TidyAttr_COLS, /**< COLS= */
+ TidyAttr_COLSPAN, /**< COLSPAN= */
+ TidyAttr_COMPACT, /**< COMPACT= */
+ TidyAttr_CONTENT, /**< CONTENT= */
+ TidyAttr_COORDS, /**< COORDS= */
+ TidyAttr_DATA, /**< DATA= */
+ TidyAttr_DATAFLD, /**< DATAFLD= */
+ TidyAttr_DATAFORMATAS, /**< DATAFORMATAS= */
+ TidyAttr_DATAPAGESIZE, /**< DATAPAGESIZE= */
+ TidyAttr_DATASRC, /**< DATASRC= */
+ TidyAttr_DATETIME, /**< DATETIME= */
+ TidyAttr_DECLARE, /**< DECLARE= */
+ TidyAttr_DEFER, /**< DEFER= */
+ TidyAttr_DIR, /**< DIR= */
+ TidyAttr_DISABLED, /**< DISABLED= */
+ TidyAttr_ENCODING, /**< ENCODING= */
+ TidyAttr_ENCTYPE, /**< ENCTYPE= */
+ TidyAttr_FACE, /**< FACE= */
+ TidyAttr_FOR, /**< FOR= */
+ TidyAttr_FRAME, /**< FRAME= */
+ TidyAttr_FRAMEBORDER, /**< FRAMEBORDER= */
+ TidyAttr_FRAMESPACING, /**< FRAMESPACING= */
+ TidyAttr_GRIDX, /**< GRIDX= */
+ TidyAttr_GRIDY, /**< GRIDY= */
+ TidyAttr_HEADERS, /**< HEADERS= */
+ TidyAttr_HEIGHT, /**< HEIGHT= */
+ TidyAttr_HREF, /**< HREF= */
+ TidyAttr_HREFLANG, /**< HREFLANG= */
+ TidyAttr_HSPACE, /**< HSPACE= */
+ TidyAttr_HTTP_EQUIV, /**< HTTP_EQUIV= */
+ TidyAttr_ID, /**< ID= */
+ TidyAttr_ISMAP, /**< ISMAP= */
+ TidyAttr_LABEL, /**< LABEL= */
+ TidyAttr_LANG, /**< LANG= */
+ TidyAttr_LANGUAGE, /**< LANGUAGE= */
+ TidyAttr_LAST_MODIFIED, /**< LAST_MODIFIED= */
+ TidyAttr_LAST_VISIT, /**< LAST_VISIT= */
+ TidyAttr_LEFTMARGIN, /**< LEFTMARGIN= */
+ TidyAttr_LINK, /**< LINK= */
+ TidyAttr_LONGDESC, /**< LONGDESC= */
+ TidyAttr_LOWSRC, /**< LOWSRC= */
+ TidyAttr_MARGINHEIGHT, /**< MARGINHEIGHT= */
+ TidyAttr_MARGINWIDTH, /**< MARGINWIDTH= */
+ TidyAttr_MAXLENGTH, /**< MAXLENGTH= */
+ TidyAttr_MEDIA, /**< MEDIA= */
+ TidyAttr_METHOD, /**< METHOD= */
+ TidyAttr_MULTIPLE, /**< MULTIPLE= */
+ TidyAttr_NAME, /**< NAME= */
+ TidyAttr_NOHREF, /**< NOHREF= */
+ TidyAttr_NORESIZE, /**< NORESIZE= */
+ TidyAttr_NOSHADE, /**< NOSHADE= */
+ TidyAttr_NOWRAP, /**< NOWRAP= */
+ TidyAttr_OBJECT, /**< OBJECT= */
+ TidyAttr_OnAFTERUPDATE, /**< OnAFTERUPDATE= */
+ TidyAttr_OnBEFOREUNLOAD, /**< OnBEFOREUNLOAD= */
+ TidyAttr_OnBEFOREUPDATE, /**< OnBEFOREUPDATE= */
+ TidyAttr_OnBLUR, /**< OnBLUR= */
+ TidyAttr_OnCHANGE, /**< OnCHANGE= */
+ TidyAttr_OnCLICK, /**< OnCLICK= */
+ TidyAttr_OnDATAAVAILABLE, /**< OnDATAAVAILABLE= */
+ TidyAttr_OnDATASETCHANGED, /**< OnDATASETCHANGED= */
+ TidyAttr_OnDATASETCOMPLETE, /**< OnDATASETCOMPLETE= */
+ TidyAttr_OnDBLCLICK, /**< OnDBLCLICK= */
+ TidyAttr_OnERRORUPDATE, /**< OnERRORUPDATE= */
+ TidyAttr_OnFOCUS, /**< OnFOCUS= */
+ TidyAttr_OnKEYDOWN, /**< OnKEYDOWN= */
+ TidyAttr_OnKEYPRESS, /**< OnKEYPRESS= */
+ TidyAttr_OnKEYUP, /**< OnKEYUP= */
+ TidyAttr_OnLOAD, /**< OnLOAD= */
+ TidyAttr_OnMOUSEDOWN, /**< OnMOUSEDOWN= */
+ TidyAttr_OnMOUSEMOVE, /**< OnMOUSEMOVE= */
+ TidyAttr_OnMOUSEOUT, /**< OnMOUSEOUT= */
+ TidyAttr_OnMOUSEOVER, /**< OnMOUSEOVER= */
+ TidyAttr_OnMOUSEUP, /**< OnMOUSEUP= */
+ TidyAttr_OnRESET, /**< OnRESET= */
+ TidyAttr_OnROWENTER, /**< OnROWENTER= */
+ TidyAttr_OnROWEXIT, /**< OnROWEXIT= */
+ TidyAttr_OnSELECT, /**< OnSELECT= */
+ TidyAttr_OnSUBMIT, /**< OnSUBMIT= */
+ TidyAttr_OnUNLOAD, /**< OnUNLOAD= */
+ TidyAttr_PROFILE, /**< PROFILE= */
+ TidyAttr_PROMPT, /**< PROMPT= */
+ TidyAttr_RBSPAN, /**< RBSPAN= */
+ TidyAttr_READONLY, /**< READONLY= */
+ TidyAttr_REL, /**< REL= */
+ TidyAttr_REV, /**< REV= */
+ TidyAttr_RIGHTMARGIN, /**< RIGHTMARGIN= */
+ TidyAttr_ROWS, /**< ROWS= */
+ TidyAttr_ROWSPAN, /**< ROWSPAN= */
+ TidyAttr_RULES, /**< RULES= */
+ TidyAttr_SCHEME, /**< SCHEME= */
+ TidyAttr_SCOPE, /**< SCOPE= */
+ TidyAttr_SCROLLING, /**< SCROLLING= */
+ TidyAttr_SELECTED, /**< SELECTED= */
+ TidyAttr_SHAPE, /**< SHAPE= */
+ TidyAttr_SHOWGRID, /**< SHOWGRID= */
+ TidyAttr_SHOWGRIDX, /**< SHOWGRIDX= */
+ TidyAttr_SHOWGRIDY, /**< SHOWGRIDY= */
+ TidyAttr_SIZE, /**< SIZE= */
+ TidyAttr_SPAN, /**< SPAN= */
+ TidyAttr_SRC, /**< SRC= */
+ TidyAttr_STANDBY, /**< STANDBY= */
+ TidyAttr_START, /**< START= */
+ TidyAttr_STYLE, /**< STYLE= */
+ TidyAttr_SUMMARY, /**< SUMMARY= */
+ TidyAttr_TABINDEX, /**< TABINDEX= */
+ TidyAttr_TARGET, /**< TARGET= */
+ TidyAttr_TEXT, /**< TEXT= */
+ TidyAttr_TITLE, /**< TITLE= */
+ TidyAttr_TOPMARGIN, /**< TOPMARGIN= */
+ TidyAttr_TYPE, /**< TYPE= */
+ TidyAttr_USEMAP, /**< USEMAP= */
+ TidyAttr_VALIGN, /**< VALIGN= */
+ TidyAttr_VALUE, /**< VALUE= */
+ TidyAttr_VALUETYPE, /**< VALUETYPE= */
+ TidyAttr_VERSION, /**< VERSION= */
+ TidyAttr_VLINK, /**< VLINK= */
+ TidyAttr_VSPACE, /**< VSPACE= */
+ TidyAttr_WIDTH, /**< WIDTH= */
+ TidyAttr_WRAP, /**< WRAP= */
+ TidyAttr_XML_LANG, /**< XML_LANG= */
+ TidyAttr_XML_SPACE, /**< XML_SPACE= */
+ TidyAttr_XMLNS, /**< XMLNS= */
+ N_TIDY_ATTRIBS /**< Must be last */
} TidyAttrId;
#ifdef __cplusplus
diff --git a/tidylib-src/src/access.c b/tidylib-src/src/access.c
old mode 100755
new mode 100644
index bc4d0ab4..04fe3c56
--- a/tidylib-src/src/access.c
+++ b/tidylib-src/src/access.c
@@ -1,14 +1,14 @@
/* access.c -- carry out accessibility checks
Copyright University of Toronto
- Portions (c) 1998-2002 (W3C) MIT, INRIA, Keio University
+ Portions (c) 1998-2003 (W3C) MIT, INRIA, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: creitzel $
- $Date: 2002/08/08 21:43:22 $
- $Revision: 1.3.2.6 $
+ $Date: 2003/02/16 19:33:09 $
+ $Revision: 1.4 $
*/
@@ -53,17 +53,17 @@
*/
/* List of possible image types */
-static ctmbstr imageExtensions[] =
+static const ctmbstr imageExtensions[] =
{".jpg", ".gif", ".tif", ".pct", ".pic", ".iff", ".dib",
".tga", ".pcx", ".png", ".jpeg", ".tiff", ".bmp"};
#define N_IMAGE_EXTS (sizeof(imageExtensions)/sizeof(ctmbstr))
/* List of possible sound file types */
-static ctmbstr soundExtensions[] =
+static const ctmbstr soundExtensions[] =
{".wav", ".au", ".aiff", ".snd", ".ra", ".rm"};
-static int soundExtErrCodes[] =
+static const int soundExtErrCodes[] =
{
AUDIO_MISSING_TEXT_WAV,
AUDIO_MISSING_TEXT_AU,
@@ -76,7 +76,7 @@ static int soundExtErrCodes[] =
#define N_AUDIO_EXTS (sizeof(soundExtensions)/sizeof(ctmbstr))
/* List of possible media extensions */
-static ctmbstr mediaExtensions[] =
+static const ctmbstr mediaExtensions[] =
{".mpg", ".mov", ".asx", ".avi", ".ivf", ".m1v", ".mmm", ".mp2v",
".mpa", ".mpe", ".mpeg", ".ram", ".smi", ".smil", ".swf",
".wm", ".wma", ".wmv"};
@@ -84,14 +84,14 @@ static ctmbstr mediaExtensions[] =
#define N_MEDIA_EXTS (sizeof(mediaExtensions)/sizeof(ctmbstr))
/* List of possible frame sources */
-static ctmbstr frameExtensions[] =
+static const ctmbstr frameExtensions[] =
{".htm", ".html", ".shtm", ".shtml", ".cfm", ".cfml",
".asp", ".cgi", ".pl", ".smil"};
#define N_FRAME_EXTS (sizeof(frameExtensions)/sizeof(ctmbstr))
/* List of possible colour values */
-static int colorValues[][3] =
+static const int colorValues[][3] =
{
{ 0, 0, 0},
{128,128,128},
@@ -114,7 +114,7 @@ static int colorValues[][3] =
#define N_COLOR_VALS (sizeof(colorValues)/(sizeof(int[3]))
/* These arrays are used to convert color names to their RGB values */
-static ctmbstr colorNames[] =
+static const ctmbstr colorNames[] =
{
"black",
"silver",
@@ -142,7 +142,7 @@ static ctmbstr colorNames[] =
List of error/warning messages. The error code corresponds to
the check that is listed in the AERT (HTML specifications).
*/
-static ctmbstr errorMsgs[] =
+static const ctmbstr errorMsgs[] =
{
"[1.1.1.1]: missing 'alt' text.",
"[1.1.1.2]: suspicious 'alt' text (filename).",
@@ -290,14 +290,16 @@ static Bool CompareColors( int rgbBG[3], int rgbFG[3] );
static int ctox( tmbchar ch );
static void DisplayHTMLTableAlgorithm( TidyDocImpl* doc);
+/*
static void CheckMapAccess( TidyDocImpl* doc, Node* node, Node* front);
static void GetMapLinks( TidyDocImpl* doc, Node* node, Node* front);
static void CompareAnchorLinks( TidyDocImpl* doc, Node* front, int counter);
static void FindMissingLinks( TidyDocImpl* doc, Node* node, int counter);
+*/
static void CheckFormControls( TidyDocImpl* doc, Node* node );
static void MetaDataPresent( TidyDocImpl* doc, Node* node );
static void CheckEmbed( TidyDocImpl* doc, Node* node );
-/* static void CheckListUsage( TidyDocImpl* doc, Node* node ); */
+static void CheckListUsage( TidyDocImpl* doc, Node* node );
/*
GetFileExtension takes a path and returns the extension
diff --git a/tidylib-src/src/access.h b/tidylib-src/src/access.h
old mode 100755
new mode 100644
index 362fbe03..1d790b9d
--- a/tidylib-src/src/access.h
+++ b/tidylib-src/src/access.h
@@ -9,9 +9,9 @@
CVS Info :
- $Author: terry_teague $
- $Date: 2002/07/08 07:37:27 $
- $Revision: 1.1.2.3 $
+ $Author: creitzel $
+ $Date: 2003/02/16 19:33:09 $
+ $Revision: 1.2 $
*/
diff --git a/tidylib-src/src/alloc.c b/tidylib-src/src/alloc.c
old mode 100755
new mode 100644
index de5e968b..ce7adbb9
--- a/tidylib-src/src/alloc.c
+++ b/tidylib-src/src/alloc.c
@@ -6,8 +6,8 @@
CVS Info :
$Author: creitzel $
- $Date: 2002/07/28 18:10:15 $
- $Revision: 1.1.2.3 $
+ $Date: 2003/02/16 19:33:09 $
+ $Revision: 1.2 $
*/
diff --git a/tidylib-src/src/attrask.c b/tidylib-src/src/attrask.c
old mode 100755
new mode 100644
index 97325e46..ad5907ca
--- a/tidylib-src/src/attrask.c
+++ b/tidylib-src/src/attrask.c
@@ -5,8 +5,8 @@
CVS Info:
$Author: creitzel $
- $Date: 2002/07/08 18:03:18 $
- $Revision: 1.1.2.3 $
+ $Date: 2003/02/16 19:33:09 $
+ $Revision: 1.2 $
*/
diff --git a/tidylib-src/src/attrget.c b/tidylib-src/src/attrget.c
old mode 100755
new mode 100644
index 0259c91c..cbc63f02
--- a/tidylib-src/src/attrget.c
+++ b/tidylib-src/src/attrget.c
@@ -5,8 +5,8 @@
CVS Info:
$Author: creitzel $
- $Date: 2002/07/08 18:03:18 $
- $Revision: 1.1.2.3 $
+ $Date: 2003/02/16 19:33:09 $
+ $Revision: 1.2 $
*/
diff --git a/tidylib-src/src/attrs.c b/tidylib-src/src/attrs.c
old mode 100755
new mode 100644
index b313d3b6..a6ab4f3e
--- a/tidylib-src/src/attrs.c
+++ b/tidylib-src/src/attrs.c
@@ -6,8 +6,8 @@
CVS Info :
$Author: creitzel $
- $Date: 2002/08/08 21:45:37 $
- $Revision: 1.53.2.6 $
+ $Date: 2003/02/16 19:33:10 $
+ $Revision: 1.54 $
*/
@@ -55,7 +55,7 @@
/*
*/
-static Attribute attribute_defs [] =
+static const Attribute attribute_defs [] =
{
{TidyAttr_UNKNOWN, "unknown!", VERS_PROPRIETARY, null},
{TidyAttr_ABBR, "abbr", VERS_HTML40, TEXT},
@@ -224,7 +224,7 @@ struct _colors
ctmbstr hex;
};
-static struct _colors colors[] =
+static const struct _colors colors[] =
{
{"black", "#000000"},
{"green", "#008000"},
@@ -245,7 +245,7 @@ static struct _colors colors[] =
{null, null}
};
-static struct _colors fancy_colors[] =
+static const struct _colors fancy_colors[] =
{
{ "darkgreen", "#006400" },
{ "antiquewhite", "#FAEBD7" },
@@ -391,11 +391,11 @@ static struct _colors fancy_colors[] =
};
-static Attribute* lookup( ctmbstr atnam )
+static const Attribute* lookup( ctmbstr atnam )
{
if ( atnam )
{
- Attribute *np = attribute_defs;
+ const Attribute *np = attribute_defs;
for ( /**/; np && np->name; ++np )
if ( tmbstrcmp(atnam, np->name) == 0 )
return np;
@@ -419,7 +419,7 @@ AttVal* AttrGetById( Node* node, TidyAttrId id )
}
/* public method for finding attribute definition by name */
-Attribute* FindAttribute( TidyDocImpl* doc, AttVal *attval )
+const Attribute* FindAttribute( TidyDocImpl* doc, AttVal *attval )
{
if ( attval )
return lookup( attval->attribute );
@@ -461,7 +461,7 @@ AttVal* AddAttribute( TidyDocImpl* doc,
static Bool CheckAttrType( TidyDocImpl* doc,
ctmbstr attrname, AttrCheck type )
{
- Attribute* np = lookup( attrname );
+ const Attribute* np = lookup( attrname );
return (Bool)( np && np->attrchk == type );
}
@@ -482,7 +482,7 @@ Bool IsScript( TidyDocImpl* doc, ctmbstr attrname )
Bool IsLiteralAttribute( TidyDocImpl* doc, ctmbstr attrname )
{
- Attribute* np = lookup( attrname );
+ const Attribute* np = lookup( attrname );
return (Bool)( np && np->literal );
}
@@ -654,7 +654,7 @@ void InitAttrs( TidyDocImpl* doc )
TidyAttrId id;
for ( id=1; id < N_TIDY_ATTRIBS; ++id )
{
- Attribute* dict = &attribute_defs[ id ];
+ const Attribute* dict = &attribute_defs[ id ];
assert( dict->id == id );
if ( prev )
assert( tmbstrcmp( prev, dict->name ) < 0 );
@@ -662,70 +662,6 @@ void InitAttrs( TidyDocImpl* doc )
}
}
#endif
-
-
-#if 0
- for( ap = attrlist; ap->name != null; ++ap )
- install( attribs, ap->name, ap->versions, ap->attrchk );
-
- attribs->attr_href = lookup( attribs, "href" );
- attribs->attr_src = lookup( attribs, "src" );
- attribs->attr_id = lookup( attribs, "id" );
- attribs->attr_name = lookup( attribs, "name" );
- attribs->attr_summary = lookup( attribs, "summary" );
- attribs->attr_alt = lookup( attribs, "alt" );
- attribs->attr_longdesc = lookup( attribs, "longdesc" );
- attribs->attr_usemap = lookup( attribs, "usemap" );
- attribs->attr_ismap = lookup( attribs, "ismap" );
- attribs->attr_language = lookup( attribs, "language" );
- attribs->attr_type = lookup( attribs, "type" );
- attribs->attr_title = lookup( attribs, "title" );
- attribs->attr_xmlns = lookup( attribs, "xmlns" );
- attribs->attr_datafld = lookup( attribs, "datafld" );
- attribs->attr_value = lookup( attribs, "value" );
- attribs->attr_content = lookup( attribs, "content" );
- attribs->attr_width = lookup( attribs, "width" );
- attribs->attr_height = lookup( attribs, "height" );
-
-/* TRT/Mike Lam */
-#if SUPPORT_ACCESSIBILITY_CHECKS
-
- attribs->attr_for = lookup( attribs, "for" );
- attribs->attr_selected = lookup( attribs, "selected" );
- attribs->attr_checked = lookup( attribs, "checked" );
- attribs->attr_lang = lookup( attribs, "lang" );
- attribs->attr_target = lookup( attribs, "target" );
- attribs->attr_httpEquiv = lookup( attribs, "http-equiv" );
- attribs->attr_rel = lookup( attribs, "rel" );
- attribs->attr_onMouseMove = lookup( attribs, "onmousemove" );
- attribs->attr_onMouseDown = lookup( attribs, "onmousedown" );
- attribs->attr_onMouseUp = lookup( attribs, "onmouseup" );
- attribs->attr_onClick = lookup( attribs, "onclick" );
- attribs->attr_onMouseOver = lookup( attribs, "onmouseover" );
- attribs->attr_onMouseOut = lookup( attribs, "onmouseout" );
- attribs->attr_onKeyDown = lookup( attribs, "onkeydown" );
- attribs->attr_onKeyUp = lookup( attribs, "onkeyup" );
- attribs->attr_onKeyPress = lookup( attribs, "onkeypress" );
- attribs->attr_onFocus = lookup( attribs, "onfocus" );
- attribs->attr_onBlur = lookup( attribs, "onblur" );
- attribs->attr_bgcolor = lookup( attribs, "bgcolor" );
- attribs->attr_text = lookup( attribs, "text" );
- attribs->attr_link = lookup( attribs, "link" );
- attribs->attr_alink = lookup( attribs, "alink" );
- attribs->attr_vlink = lookup( attribs, "vlink" );
- attribs->attr_style = lookup( attribs, "style" );
- attribs->attr_abbr = lookup( attribs, "abbr" );
- attribs->attr_colspan = lookup( attribs, "colspan" );
- attribs->attr_font = lookup( attribs, "font" );
- attribs->attr_basefont = lookup( attribs, "basefont" );
- attribs->attr_rowspan = lookup( attribs, "rowspan" );
-
-#endif
-
- SetNoWrap( attribute_defs[ TidyAttr_ALT ] );
- SetNoWrap( attribute_defs[ TidyAttr_VALUE ] );
- SetNoWrap( attribute_defs[ TidyAttr_CONTENT ] );
-#endif /* 0 */
}
/*
@@ -734,14 +670,14 @@ using embed with script attributes where
newlines are signficant. These need to be
declared and handled specially!
*/
-static void DeclareAttribute( TidyDocImpl* doc,
- ctmbstr name, uint versions, Bool nowrap, Bool isliteral )
+static void DeclareAttribute( TidyDocImpl* doc, ctmbstr name,
+ uint versions, Bool nowrap, Bool isliteral )
{
- TidyAttribImpl* attribs = &doc->attribs;
- Attribute *dict = lookup( name );
- if ( dict == null )
+ const Attribute *exist = lookup( name );
+ if ( exist == null )
{
- dict = (Attribute*) MemAlloc( sizeof(Attribute) );
+ TidyAttribImpl* attribs = &doc->attribs;
+ Attribute* dict = (Attribute*) MemAlloc( sizeof(Attribute) );
ClearMemory( dict, sizeof(Attribute) );
dict->name = tmbstrdup( name );
@@ -770,32 +706,11 @@ static void FreeDeclaredAttributes( TidyDocImpl* doc )
void DeclareLiteralAttrib( TidyDocImpl* doc, ctmbstr name )
{
- DeclareAttribute( doc, name, VERS_PROPRIETARY, no, yes );
+ DeclareAttribute( doc, name, VERS_PROPRIETARY, no, yes );
}
void FreeAttrTable( TidyDocImpl* doc )
{
-#if 0
- TidyAttribImpl* attribs = &doc->attribs;
- Attribute *attdef, *next;
- int i;
-
- for (i = 0; i < ATTRIB_HASHSIZE; ++i)
- {
- attdef = attribs->hashtab[i];
-
- while(attdef)
- {
- next = attdef->next;
- MemFree(attdef->name);
- MemFree(attdef);
- attdef = next;
- }
-
- attribs->hashtab[i] = null;
- }
-#endif
-
FreeAnchors( doc );
FreeDeclaredAttributes( doc );
}
@@ -934,9 +849,9 @@ void RepairDuplicateAttributes( TidyDocImpl* doc, Node *node)
/* ignore unknown attributes for proprietary elements */
-Attribute* CheckAttribute( TidyDocImpl* doc, Node *node, AttVal *attval )
+const Attribute* CheckAttribute( TidyDocImpl* doc, Node *node, AttVal *attval )
{
- Attribute* attribute = attval->dict;
+ const Attribute* attribute = attval->dict;
if ( attribute != null )
{
@@ -970,14 +885,9 @@ Attribute* CheckAttribute( TidyDocImpl* doc, Node *node, AttVal *attval )
Bool IsBoolAttribute(AttVal *attval)
{
- Attribute *attribute;
-
- if ((attribute = attval->dict) != null)
- {
- if (attribute->attrchk == CheckBool)
- return yes;
- }
-
+ const Attribute *attribute = ( attval ? attval->dict : null );
+ if ( attribute && attribute->attrchk == CheckBool )
+ return yes;
return no;
}
@@ -1432,7 +1342,7 @@ void CheckColor( TidyDocImpl* doc, Node *node, AttVal *attval)
Bool invalid = no;
Bool found = no;
tmbstr given;
- struct _colors *color;
+ const struct _colors *color;
uint i = 0;
if (attval == null || attval->value == null)
diff --git a/tidylib-src/src/attrs.h b/tidylib-src/src/attrs.h
old mode 100755
new mode 100644
index 1745faee..cb3fd920
--- a/tidylib-src/src/attrs.h
+++ b/tidylib-src/src/attrs.h
@@ -9,8 +9,8 @@
CVS Info :
$Author: creitzel $
- $Date: 2002/08/08 21:45:37 $
- $Revision: 1.1.2.7 $
+ $Date: 2003/02/16 19:33:10 $
+ $Revision: 1.2 $
*/
@@ -19,9 +19,6 @@
/* declaration for methods that check attribute values */
typedef void (AttrCheck)(TidyDocImpl* doc, Node *node, AttVal *attval);
-/* each tag/attribute helps to constrain the version of HTML */
-void ConstrainVersion(TidyDocImpl* doc, uint vers);
-
struct _Attribute
{
TidyAttrId id;
@@ -140,9 +137,9 @@ AttrCheck CheckLang;
/* public method for finding attribute definition by name */
-Attribute* CheckAttribute( TidyDocImpl* doc, Node *node, AttVal *attval );
+const Attribute* CheckAttribute( TidyDocImpl* doc, Node *node, AttVal *attval );
-Attribute* FindAttribute( TidyDocImpl* doc, AttVal *attval );
+const Attribute* FindAttribute( TidyDocImpl* doc, AttVal *attval );
AttVal* GetAttrByName( Node *node, ctmbstr name );
@@ -214,9 +211,17 @@ Bool attrIsEvent( AttVal* attval );
AttVal* AttrGetById( Node* node, TidyAttrId id );
/* 0 == TidyAttr_UNKNOWN */
-#define AttrId(av) ((av) ? ((av)->dict ? (av)->dict->id : 0) : 0)
+#define AttrId(av) ((av) && (av)->dict ? (av)->dict->id : TidyAttr_UNKNOWN)
#define AttrIsId(av, atid) ((av) && (av)->dict && ((av)->dict->id == atid))
+#define AttrHasValue(attr) ((attr) && (attr)->value)
+#define AttrMatches(attr, val) (AttrHasValue(attr) && \
+ tmbstrcasecmp((attr)->value, val) == 0)
+#define AttrContains(attr, val) (AttrHasValue(attr) && \
+ tmbsubstr((attr)->value, val) != null)
+#define AttrVersions(attr) ((attr) && (attr)->dict ? (attr)->dict->versions : VERS_PROPRIETARY)
+
+
#define attrIsABBR(av) AttrIsId( av, TidyAttr_ABBR )
#define attrIsACCEPT(av) AttrIsId( av, TidyAttr_ACCEPT )
#define attrIsACCEPT_CHARSET(av) AttrIsId( av, TidyAttr_ACCEPT_CHARSET )
diff --git a/tidylib-src/src/buffio.c b/tidylib-src/src/buffio.c
old mode 100755
new mode 100644
index e58dd3de..39ec2758
--- a/tidylib-src/src/buffio.c
+++ b/tidylib-src/src/buffio.c
@@ -6,8 +6,8 @@
CVS Info :
$Author: creitzel $
- $Date: 2002/07/28 18:10:15 $
- $Revision: 1.1.2.4 $
+ $Date: 2003/02/16 19:33:10 $
+ $Revision: 1.2 $
Requires buffer to automatically grow as bytes are added.
Must keep track of current read and write points.
@@ -160,7 +160,7 @@ int tidyBufPopByte( TidyBuffer* buf )
int bv = EOF;
assert( buf != null );
if ( buf->size > 0 )
- bv = buf->bp[ buf->size-- ];
+ bv = buf->bp[ --buf->size ];
return bv;
}
diff --git a/tidylib-src/src/clean.c b/tidylib-src/src/clean.c
old mode 100755
new mode 100644
index 81798fac..0917b8c4
--- a/tidylib-src/src/clean.c
+++ b/tidylib-src/src/clean.c
@@ -7,8 +7,8 @@
CVS Info :
$Author: creitzel $
- $Date: 2002/08/08 21:49:02 $
- $Revision: 1.18.2.7 $
+ $Date: 2003/02/16 19:33:10 $
+ $Revision: 1.20 $
Filters from other formats such as Microsoft Word
often make excessive use of presentation markup such
@@ -59,9 +59,9 @@
#include "tmbstr.h"
#include "utf8.h"
-static void RenameElem( Node* node, TidyTagId tid )
+void RenameElem( Node* node, TidyTagId tid )
{
- Dict* dict = LookupTagDef( tid );
+ const Dict* dict = LookupTagDef( tid );
MemFree( node->element );
node->element = tmbstrdup( dict->name );
node->tag = dict;
@@ -217,7 +217,8 @@ static tmbstr CreatePropString(StyleProp *props)
for (len = 0, prop = props; prop; prop = prop->next)
{
len += tmbstrlen(prop->name) + 2;
- len += tmbstrlen(prop->value) + 2;
+ if (prop->value)
+ len += tmbstrlen(prop->value) + 2;
}
style = (tmbstr) MemAlloc(len+1);
@@ -228,13 +229,15 @@ static tmbstr CreatePropString(StyleProp *props)
while((*p++ = *s++));
- *--p = ':';
- *++p = ' ';
- ++p;
-
- s = prop->value;
- while((*p++ = *s++));
+ if (prop->value)
+ {
+ *--p = ':';
+ *++p = ' ';
+ ++p;
+ s = prop->value;
+ while((*p++ = *s++));
+ }
if (prop->next == null)
break;
@@ -248,7 +251,6 @@ static tmbstr CreatePropString(StyleProp *props)
/*
create string with merged properties
-*/
static tmbstr AddProperty( ctmbstr style, ctmbstr property )
{
tmbstr line;
@@ -260,6 +262,7 @@ static tmbstr AddProperty( ctmbstr style, ctmbstr property )
FreeStyleProps(prop);
return line;
}
+*/
void FreeStyles( TidyDocImpl* doc )
{
@@ -646,6 +649,27 @@ static void DiscardContainer( TidyDocImpl* doc, Node *element, Node **pnode)
FreeNode(doc, element);
}
+/*
+ Create new string that consists of the
+ combined style properties in s1 and s2
+
+ To merge property lists, we build a linked
+ list of property/values and insert properties
+ into the list in order, merging values for
+ the same property name.
+*/
+static tmbstr MergeProperties( ctmbstr s1, ctmbstr s2 )
+{
+ tmbstr s;
+ StyleProp *prop;
+
+ prop = CreateProps(null, s1);
+ prop = CreateProps(prop, s2);
+ s = CreatePropString(prop);
+ FreeStyleProps(prop);
+ return s;
+}
+
/*
Add style property to element, creating style
attribute as needed and adding ; delimiter
@@ -659,7 +683,7 @@ static void AddStyleProperty(TidyDocImpl* doc, Node *node, ctmbstr property )
if ( av )
{
- tmbstr s = AddProperty( av->value, property );
+ tmbstr s = MergeProperties( av->value, property );
MemFree( av->value );
av->value = s;
}
@@ -675,27 +699,6 @@ static void AddStyleProperty(TidyDocImpl* doc, Node *node, ctmbstr property )
}
}
-/*
- Create new string that consists of the
- combined style properties in s1 and s2
-
- To merge property lists, we build a linked
- list of property/values and insert properties
- into the list in order, merging values for
- the same property name.
-*/
-static tmbstr MergeProperties( ctmbstr s1, ctmbstr s2 )
-{
- tmbstr s;
- StyleProp *prop;
-
- prop = CreateProps(null, s1);
- prop = CreateProps(prop, s2);
- s = CreatePropString(prop);
- FreeStyleProps(prop);
- return s;
-}
-
static void MergeClasses(TidyDocImpl* doc, Node *node, Node *child)
{
AttVal *av;
@@ -799,7 +802,7 @@ static void MergeStyles(TidyDocImpl* doc, Node *node, Node *child)
static ctmbstr FontSize2Name( ctmbstr size, tmbstr buf )
{
- static ctmbstr sizes[7] =
+ static const ctmbstr sizes[7] =
{
"60%", "70%", "80%", null,
"120%", "150%", "200%"
@@ -1776,15 +1779,14 @@ Bool NoMargins(Node *node)
{
AttVal *attval = GetAttrByName(node, "style");
- if (attval == null)
+ if ( !AttrHasValue(attval) )
return no;
/* search for substring "margin-top: 0" */
-
if (!tmbsubstr(attval->value, "margin-top: 0"))
return no;
- /* search for substring "margin-top: 0" */
+ /* search for substring "margin-bottom: 0" */
if (!tmbsubstr(attval->value, "margin-bottom: 0"))
return no;
@@ -1914,9 +1916,11 @@ void CleanWord2000( TidyDocImpl* doc, Node *node)
}
/* discard empty paragraphs */
+
if ( node->content == null && nodeIsP(node) )
{
- node = DiscardElement( doc, node );
+ /* Use the existing function to ensure consistency */
+ node = TrimEmptyElement( doc, node );
continue;
}
@@ -1933,10 +1937,9 @@ void CleanWord2000( TidyDocImpl* doc, Node *node)
*/
/* map sequence of
to
- ...
to
- ...
, move it to my last peer */ + if ( nodeCMIsBlock( pParent )) + { + for ( pNode = pParent->last; + NULL != pNode && nodeIsBR( pNode ); + pNode = pParent->last ) + { + if ( NULL == pNode->attributes && no == bBRDeleted ) + { + DiscardElement( pDoc, pNode ); + bBRDeleted = yes; + } + else + { + RemoveNode( pNode ); + InsertNodeAfterElement( pParent, pNode ); + } + } + TrimEmptyElement( pDoc, pParent ); + } +} + +void VerifyHTTPEquiv( TidyDocImpl* pDoc, Node *pHead ) +{ + if (!nodeIsHEAD( pHead )) + pHead = FindHEAD( pDoc ); + if (NULL != pHead) + { + /* Find any meta tag which has an http-equiv tag + where value is content-type */ + Node *pNode; + + for (pNode = pHead->content; NULL != pNode; pNode = pNode->next) + { + if (nodeIsMETA( pNode )) + { + AttVal *pAttVal; + if (NULL != (pAttVal = GetAttrByName( pNode, "http-equiv" ))) + { + if (0 != tmbstrcasecmp( pAttVal->value, "CONTENT-TYPE" )) + continue; + if (NULL != (pAttVal = GetAttrByName( pNode, "content" ))) + { + StyleProp *pFirstProp = null, *pLastProp = null, *prop = null; + tmbstr s, pszBegin, pszEnd; + + pszBegin = s = tmbstrdup( pAttVal->value ); + while ('\0' != *pszBegin) + { + while (isspace( *pszBegin )) + pszBegin++; + pszEnd = pszBegin; + while ('\0' != *pszEnd && ';' != *pszEnd) + pszEnd++; + if (';' == *pszEnd ) + *(pszEnd++) = '\0'; + if (pszEnd > pszBegin) + { + prop = (StyleProp *)MemAlloc(sizeof(StyleProp)); + prop->name = tmbstrdup( pszBegin ); + prop->value = null; + prop->next = null; + + if (null != pLastProp) + pLastProp->next = prop; + else + pFirstProp = prop; + pLastProp = prop; + pszBegin = pszEnd; + } + } + MemFree( s ); + + /* find the charset property */ + for (prop = pFirstProp; null != prop; prop = prop->next) + { + if (0 == tmbstrncasecmp( prop->name, "charset", 7 )) + { + ctmbstr enc = null; + + MemFree( prop->name ); + prop->name = MemAlloc( 32 ); + switch ( cfg( pDoc, TidyOutCharEncoding) ) + { + case RAW: enc = "raw"; break; + case ASCII: enc = "us-ascii"; break; + case LATIN1: enc = "iso-8859-1"; break; + case UTF8: enc = "UTF8"; break; + case ISO2022: enc = "iso-2022"; break; + case MACROMAN: enc = "mac"; break; + case WIN1252: enc = "windows-1252"; break; +#if SUPPORT_UTF16_ENCODINGS + case UTF16LE: enc = "UTF-16LE"; break; + case UTF16BE: enc = "UTF-16BE"; break; + case UTF16: enc = "UTF-16"; break; +#endif +#if SUPPORT_ASIAN_ENCODINGS + case BIG5: enc = "big5"; break; + case SHIFTJIS: enc = "shiftjis"; break; +#endif + } + sprintf( prop->name, "charset=%s", enc ); + s = CreatePropString( pFirstProp ); + MemFree( pAttVal->value ); + pAttVal->value = s; + FreeStyleProps(prop); + break; + } + } + } + } + } + } + } +} + +#define MissingVersion(ver, verWanted) (!(ver & verWanted) && !(ver & VERS_PROPRIETARY)) + +static Bool AttrCompliance( TidyDocImpl* doc, Node* node, uint versWanted ) +{ + Bool compliant = yes; + AttVal* attr = node->attributes; + for ( /**/; attr; attr = attr->next ) + { + uint attrVer = AttrVersions( attr ); + if ( MissingVersion(attrVer, versWanted) ) + { + ReportNonCompliantAttr( doc, node, attr, versWanted ); + compliant = no; + } + + /* No align, except on:
does not preserve formatting. - ** Moving Lee Passey's fix over to TidyLib branch. */ char onesixty[2] = { '\240', 0 }; InsertNodeAtStart( element, NewLiteralTextNode(doc->lexer, onesixty) ); } + return element; } /* @@ -298,7 +301,7 @@ static void TrimEmptyElement( TidyDocImpl* doc, Node *element ) static void BadForm( TidyDocImpl* doc ) { doc->badForm = yes; - doc->errors++; + /* doc->errors++; */ } /* @@ -501,8 +504,32 @@ static Bool InsertMisc(Node *element, Node *node) node->type == SectionTag || node->type == AspTag || node->type == JsteTag || - node->type == PhpTag || - node->type == XmlDecl) + node->type == PhpTag ) + { + InsertNodeAtEnd(element, node); + return yes; + } + + if ( node->type == XmlDecl ) + { + Node* root = element; + while ( root && root->parent ) + root = root->parent; + if ( root ) + { + InsertNodeAtStart( root, node ); + return yes; + } + } + + /* Declared empty tags seem to be slipping through + ** the cracks. This is an experiment to figure out + ** a decent place to pick them up. + */ + if ( node->tag && + (node->type == StartTag || node->type == StartEndTag) && + nodeCMIsEmpty(node) && TagId(node) == TidyTag_UNKNOWN && + (node->tag->versions & VERS_PROPRIETARY) != 0 ) { InsertNodeAtEnd(element, node); return yes; @@ -1919,7 +1946,7 @@ static void FixEmptyRow(TidyDocImpl* doc, Node *row) void ParseRow(TidyDocImpl* doc, Node *row, uint mode) { Lexer* lexer = doc->lexer; - Node *node, *parent; + Node *node; Bool exclude_state; if (row->tag->model & CM_EMPTY) @@ -1937,6 +1964,7 @@ void ParseRow(TidyDocImpl* doc, Node *row, uint mode) return; } + /* New row start implies end of current row */ UngetToken( doc ); FixEmptyRow( doc, row); return; @@ -1948,6 +1976,13 @@ void ParseRow(TidyDocImpl* doc, Node *row, uint mode) */ if ( node->type == EndTag ) { + if ( DescendantOf(row, TagId(node)) ) + { + UngetToken( doc ); + TrimEmptyElement( doc, row); + return; + } + if ( nodeIsFORM(node) || nodeHasCM(node, CM_BLOCK|CM_INLINE) ) { if ( nodeIsFORM(node) ) @@ -1964,17 +1999,6 @@ void ParseRow(TidyDocImpl* doc, Node *row, uint mode) FreeNode( doc, node); continue; } - - for (parent = row->parent; - parent != null; parent = parent->parent) - { - if (node->tag == parent->tag) - { - UngetToken( doc ); - TrimEmptyElement( doc, row); - return; - } - } } /* deal with comments etc. */ @@ -2427,8 +2451,8 @@ void ParseTableTag(TidyDocImpl* doc, Node *table, uint mode) /* acceptable content for pre elements */ Bool PreContent( TidyDocImpl* doc, Node* node ) { - /* p is coerced to br's */ - if ( nodeIsP(node) ) + /* p is coerced to br's, Text OK too */ + if ( nodeIsP(node) || nodeIsText(node) ) return yes; if ( node->tag == null || @@ -2454,9 +2478,16 @@ void ParsePre( TidyDocImpl* doc, Node *pre, uint mode ) while ((node = GetToken(doc, Preformatted)) != null) { - if (node->tag == pre->tag && node->type == EndTag) + if ( node->type == EndTag && + (node->tag == pre->tag || DescendantOf(pre, TagId(node))) ) { - FreeNode( doc, node); + if ( node->tag == pre->tag ) + FreeNode( doc, node); + else + { + ReportWarning( doc, pre, node, MISSING_ENDTAG_BEFORE ); + UngetToken( doc ); + } TrimSpaces(doc, pre); pre->closed = yes; TrimEmptyElement(doc, pre); diff --git a/tidylib-src/src/parser.h b/tidylib-src/src/parser.h old mode 100755 new mode 100644 index 1d340b25..bfa2e241 --- a/tidylib-src/src/parser.h +++ b/tidylib-src/src/parser.h @@ -9,8 +9,8 @@ CVS Info : $Author: creitzel $ - $Date: 2002/07/08 18:03:19 $ - $Revision: 1.1.2.4 $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ */ @@ -29,7 +29,7 @@ Bool IsNewNode(Node *node); void CoerceNode( TidyDocImpl* doc, Node *node, TidyTagId tid ); /* extract a node and its children from a markup tree */ -void RemoveNode(Node *node); +Node *RemoveNode(Node *node); /* remove node from markup tree and discard it */ Node *DiscardElement( TidyDocImpl* doc, Node *element); @@ -40,14 +40,16 @@ void InsertNodeAtStart(Node *element, Node *node); /* insert node into markup tree */ void InsertNodeAtEnd(Node *element, Node *node); - - /* insert node into markup tree before element */ void InsertNodeBeforeElement(Node *element, Node *node); /* insert node into markup tree after element */ void InsertNodeAfterElement(Node *element, Node *node); +Node *TrimEmptyElement( TidyDocImpl* doc, Node *element ); + + + /* assumes node is a text node */ Bool IsBlank(Lexer *lexer, Node *node); diff --git a/tidylib-src/src/pprint.c b/tidylib-src/src/pprint.c old mode 100755 new mode 100644 index 552bb788..2d1568a5 --- a/tidylib-src/src/pprint.c +++ b/tidylib-src/src/pprint.c @@ -6,9 +6,9 @@ CVS Info : - $Author: lpassey $ - $Date: 2002/10/29 23:53:51 $ - $Revision: 1.45.2.8 $ + $Author: creitzel $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.50 $ */ @@ -1103,7 +1103,7 @@ static void PPrintAttrs( TidyDocImpl* doc, uint indent, Node *node ) { if ( av->attribute != null ) { - Attribute *dict = av->dict; + const Attribute *dict = av->dict; if ( !cfgBool(doc, TidyDropPropAttrs) || ( dict != null && !(dict->versions & VERS_PROPRIETARY) ) ) PPrintAttribute( doc, indent, node, av ); @@ -1327,13 +1327,23 @@ static void PPrintPI( TidyDocImpl* doc, uint indent, Node *node ) static void PPrintXmlDecl( TidyDocImpl* doc, uint indent, Node *node ) { + AttVal* att; uint saveWrap; TidyPrintImpl* pprint = &doc->pprint; SetWrap( doc, indent ); saveWrap = WrapOff( doc ); AddString( pprint, "end <= 0 || doc->lexer->lexbuf[node->end - 1] != '?' ) AddChar( pprint, '?' ); AddChar( pprint, '>' ); @@ -1437,6 +1447,7 @@ static void PPrintSection( TidyDocImpl* doc, uint indent, Node *node ) #if 0 /* ** Print script and style elements. For XHTML, wrap the content as follows: +** ** JavaScript: ** // ** CSS: -** /**/ +** / *]]>* / ** other: ** content && nodeHasCM(node, CM_NO_INDENT) ) @@ -1847,13 +1861,16 @@ void PPrintTree( TidyDocImpl* doc, uint mode, uint indent, Node *node ) if ( node->type == StartEndTag ) node->type = StartTag; - if ( node->tag && node->tag->parser == ParsePre ) + if ( node->tag && + (node->tag->parser == ParsePre || nodeIsTEXTAREA(node)) ) { + uint indprev = indent; PCondFlushLine( doc, indent ); - indent = 0; PCondFlushLine( doc, indent ); PPrintTag( doc, mode, indent, node ); + + indent = 0; PFlushLine( doc, indent); for ( content = node->content; content; content = content->next ) @@ -1861,9 +1878,9 @@ void PPrintTree( TidyDocImpl* doc, uint mode, uint indent, Node *node ) PPrintTree( doc, (mode | PREFORMATTED | NOWRAP), indent, content ); } + indent = indprev; PCondFlushLine( doc, indent ); PPrintEndTag( doc, mode, indent, node ); - PFlushLine( doc, indent ); if ( !cfg(doc, TidyIndentContent) && node->next != null ) PFlushLine( doc, indent ); diff --git a/tidylib-src/src/pprint.h b/tidylib-src/src/pprint.h old mode 100755 new mode 100644 index c2f1fce9..96318346 --- a/tidylib-src/src/pprint.h +++ b/tidylib-src/src/pprint.h @@ -8,8 +8,8 @@ CVS Info: $Author: creitzel $ - $Date: 2002/08/08 21:58:19 $ - $Revision: 1.1.2.3 $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ */ diff --git a/tidylib-src/src/streamio.c b/tidylib-src/src/streamio.c old mode 100755 new mode 100644 index 4a0c343e..4b4fa6a4 --- a/tidylib-src/src/streamio.c +++ b/tidylib-src/src/streamio.c @@ -6,8 +6,8 @@ CVS Info : $Author: creitzel $ - $Date: 2002/10/20 18:59:40 $ - $Revision: 1.1.2.9 $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ Wrapper around Tidy input source and output sink that calls appropriate interfaces, and applies @@ -37,8 +37,10 @@ void UngetByte( StreamIn* in, uint byteValue ); void PutByte( uint byteValue, StreamOut* out ); -extern uint Mac2Unicode[]; -extern uint Win2Unicode[]; +void EncodeWin1252( uint c, StreamOut* out ); +void EncodeMacRoman( uint c, StreamOut* out ); +void EncodeIbm858( uint c, StreamOut* out ); +void EncodeLatin0( uint c, StreamOut* out ); void outcUTF8Bytes( StreamOut *out, byte* buf, int* count ); void outBOM( StreamOut *out ); @@ -51,6 +53,7 @@ static StreamOut stderrStreamOut = { ASCII, FSM_ASCII, + DEFAULT_NL_CONFIG, FileIO, { 0, filesink_putByte } }; @@ -59,6 +62,7 @@ static StreamOut stdoutStreamOut = { ASCII, FSM_ASCII, + DEFAULT_NL_CONFIG, FileIO, { 0, filesink_putByte } }; @@ -197,7 +201,7 @@ uint ReadChar( StreamIn *in ) if ( c == '\015' && !cfgBool(in->doc, TidyXmlTags) ) break; - if (0 <= c && c < 32) + if ( c < 32 ) continue; /* discard control char */ /* watch out for chars that have already been decoded such as */ @@ -252,8 +256,18 @@ uint ReadChar( StreamIn *in ) #endif /* Do first: acts on range 128 - 255 */ - if ( in->encoding == MACROMAN ) + switch ( in->encoding ) + { + case MACROMAN: c = DecodeMacRoman( c ); + break; + case IBM858: + c = DecodeIbm850( c ); + break; + case LATIN0: + c = DecodeLatin0( c ); + break; + } /* produced e.g. as a side-effect of smart quotes in Word */ /* but can't happen if using MACROMAN encoding */ @@ -346,32 +360,33 @@ void UngetChar( uint c, StreamIn *in ) ** Sink ************************/ -static StreamOut* initStreamOut( int encoding ) +static StreamOut* initStreamOut( int encoding, uint nl ) { StreamOut* out = (StreamOut*) MemAlloc( sizeof(StreamOut) ); ClearMemory( out, sizeof(StreamOut) ); out->encoding = encoding; out->state = FSM_ASCII; + out->nl = nl; return out; } -StreamOut* FileOutput( FILE* fp, int encoding ) +StreamOut* FileOutput( FILE* fp, int encoding, uint nl ) { - StreamOut* out = initStreamOut( encoding ); + StreamOut* out = initStreamOut( encoding, nl ); initFileSink( &out->sink, fp ); out->iotype = FileIO; return out; } -StreamOut* BufferOutput( TidyBuffer* buf, int encoding ) +StreamOut* BufferOutput( TidyBuffer* buf, int encoding, uint nl ) { - StreamOut* out = initStreamOut( encoding ); + StreamOut* out = initStreamOut( encoding, nl ); initOutputBuffer( &out->sink, buf ); out->iotype = BufferIO; return out; } -StreamOut* UserOutput( TidyOutputSink* sink, int encoding ) +StreamOut* UserOutput( TidyOutputSink* sink, int encoding, uint nl ) { - StreamOut* out = initStreamOut( encoding ); + StreamOut* out = initStreamOut( encoding, nl ); memcpy( &out->sink, sink, sizeof(TidyOutputSink) ); out->iotype = UserIO; return out; @@ -379,52 +394,40 @@ StreamOut* UserOutput( TidyOutputSink* sink, int encoding ) void WriteChar( uint c, StreamOut* out ) { + /* Translate outgoing newlines */ + if ( LF == c ) + { + if ( out->nl == TidyCRLF ) + WriteChar( CR, out ); + else if ( out->nl == TidyCR ) + c = CR; + } + if (out->encoding == MACROMAN) { - if (c < 128) - PutByte(c, out); - else - { - /* For mac users, map Unicode back to MacRoman. */ - int i; - for (i = 128; i < 256; i++) - { - if (Mac2Unicode[i - 128] == c) - { - PutByte(i, out); - break; - } - } - } + EncodeMacRoman( c, out ); } - else - - if (out->encoding == WIN1252) + else if (out->encoding == WIN1252) { - if (c < 128 || (c > 159 && c < 256)) - PutByte(c, out); - else - { - int i; - - for (i = 128; i < 160; i++) - if (Win2Unicode[i - 128] == c) - { - PutByte(i, out); - break; - } - } + EncodeWin1252( c, out ); } - else - - if (out->encoding == UTF8) + else if (out->encoding == IBM858) + { + EncodeIbm858( c, out ); + } + else if (out->encoding == LATIN0) + { + EncodeLatin0( c, out ); + } + + else if (out->encoding == UTF8) { int count = 0; EncodeCharToUTF8Bytes( c, null, &out->sink, &count ); if (count <= 0) { - /* ReportEncodingError(in->lexer, INVALID_UTF8 | REPLACED_CHAR, c); */ + /* ReportEncodingError(in->lexer, INVALID_UTF8 | REPLACED_CHAR, c); */ /* replacement char 0xFFFD encoded as UTF-8 */ PutByte(0xEF, out); PutByte(0xBF, out); PutByte(0xBF, out); } @@ -471,7 +474,9 @@ void WriteChar( uint c, StreamOut* out ) } #if SUPPORT_UTF16_ENCODINGS - else if (out->encoding == UTF16LE || out->encoding == UTF16BE || out->encoding == UTF16) + else if ( out->encoding == UTF16LE || + out->encoding == UTF16BE || + out->encoding == UTF16 ) { int i, numChars = 1; uint theChars[2]; @@ -497,7 +502,7 @@ void WriteChar( uint c, StreamOut* out ) else { /* just put the char out */ - theChars[0] = (byte) c; + theChars[0] = c; } for (i = 0; i < numChars; i++) @@ -546,13 +551,13 @@ void WriteChar( uint c, StreamOut* out ) ** regardless of specified encoding. Set at compile time ** to either Windows or Mac. */ -int ReplacementCharEncoding = DFLT_REPL_CHARENC; +const int ReplacementCharEncoding = DFLT_REPL_CHARENC; /* Mapping for Windows Western character set CP 1252 ** (chars 128-159/U+0080-U+009F) to Unicode. */ -uint Win2Unicode[32] = +static const uint Win2Unicode[32] = { 0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000, @@ -569,13 +574,30 @@ uint DecodeWin1252(uint c) return c; } +void EncodeWin1252( uint c, StreamOut* out ) +{ + if (c < 128 || (c > 159 && c < 256)) + PutByte(c, out); + else + { + int i; + + for (i = 128; i < 160; i++) + if (Win2Unicode[i - 128] == c) + { + PutByte(i, out); + break; + } + } +} + /* John Love-Jensen contributed this table for mapping MacRoman character set to Unicode */ /* modified to only need chars 128-255/U+0080-U+00FF - Terry Teague 19 Aug 01 */ -uint Mac2Unicode[128] = +static const uint Mac2Unicode[128] = { /* x7F = DEL */ @@ -615,13 +637,121 @@ uint DecodeMacRoman(uint c) return c; } +void EncodeMacRoman( uint c, StreamOut* out ) +{ + if (c < 128) + PutByte(c, out); + else + { + /* For mac users, map Unicode back to MacRoman. */ + int i; + for (i = 128; i < 256; i++) + { + if (Mac2Unicode[i - 128] == c) + { + PutByte(i, out); + break; + } + } + } +} + +/* Mapping for OS/2 Western character set CP 850 +** (chars 128-255) to Unicode. +*/ +const uint IBM2Unicode[128] = +{ + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, + 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, + 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, + 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x00a4, + 0x00f0, 0x00d0, 0x00ca, 0x00cb, 0x00c8, 0x20AC, 0x00cd, 0x00ce, + 0x00cf, 0x2518, 0x250c, 0x2588, 0x2584, 0x00a6, 0x00cc, 0x2580, + 0x00d3, 0x00df, 0x00d4, 0x00d2, 0x00f5, 0x00d5, 0x00b5, 0x00fe, + 0x00de, 0x00da, 0x00db, 0x00d9, 0x00fd, 0x00dd, 0x00af, 0x00b4, + 0x00ad, 0x00b1, 0x2017, 0x00be, 0x00b6, 0x00a7, 0x00f7, 0x00b8, + 0x00b0, 0x00a8, 0x00b7, 0x00b9, 0x00b3, 0x00b2, 0x25a0, 0x00a0 +}; + +/* Function for conversion from OS/2-850 to Unicode */ +uint DecodeIbm850(uint c) +{ + if (127 < c && c < 256) + c = IBM2Unicode[c - 128]; + + return c; +} + +/* For OS/2,Java users, map Unicode back to IBM858 (IBM850+Euro). */ +void EncodeIbm858( uint c, StreamOut* out ) +{ + if (c < 128) + PutByte(c, out); + else + { + int i; + for (i = 128; i < 256; i++) + { + if (IBM2Unicode[i - 128] == c) + { + PutByte(i, out); + break; + } + } + } +} + + +/* Convert from Latin0 (aka Latin9, ISO-8859-15) to Unicode */ +uint DecodeLatin0(uint c) +{ + if (159 < c && c < 191) + { + switch (c) + { + case 0xA4: c = 0x20AC; break; + case 0xA6: c = 0x0160; break; + case 0xA8: c = 0x0161; break; + case 0xB4: c = 0x017D; break; + case 0xB8: c = 0x017E; break; + case 0xBC: c = 0x0152; break; + case 0xBD: c = 0x0153; break; + case 0xBE: c = 0x0178; break; + } + } + return c; +} + +/* Map Unicode back to ISO-8859-15. */ +void EncodeLatin0( uint c, StreamOut* out ) +{ + switch (c) + { + case 0x20AC: c = 0xA4; break; + case 0x0160: c = 0xA6; break; + case 0x0161: c = 0xA8; break; + case 0x017D: c = 0xB4; break; + case 0x017E: c = 0xB8; break; + case 0x0152: c = 0xBC; break; + case 0x0153: c = 0xBD; break; + case 0x0178: c = 0xBE; break; + } + PutByte(c, out); +} + /* Table to map symbol font characters to Unicode; undefined characters are mapped to 0x0000 and characters without any Unicode equivalent are mapped to '?'. Is this appropriate? */ -static uint Symbol2Unicode[] = +static const uint Symbol2Unicode[] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, diff --git a/tidylib-src/src/streamio.h b/tidylib-src/src/streamio.h old mode 100755 new mode 100644 index 620afc17..d1af1a0a --- a/tidylib-src/src/streamio.h +++ b/tidylib-src/src/streamio.h @@ -3,14 +3,14 @@ /* streamio.h -- handles character stream I/O - (c) 1998-2002 (W3C) MIT, INRIA, Keio University + (c) 1998-2003 (W3C) MIT, INRIA, Keio University See tidy.h for the copyright notice. CVS Info : - $Author: creitzel $ - $Date: 2002/07/28 18:10:16 $ - $Revision: 1.1.2.5 $ + $Author: lpassey $ + $Date: 2003/02/25 21:12:03 $ + $Revision: 1.3 $ Wrapper around Tidy input source and output sink that calls appropriate interfaces, and applies @@ -20,7 +20,6 @@ */ #include "forward.h" -#include "tidy.h" #include "buffio.h" #include "fileio.h" @@ -74,16 +73,17 @@ Bool IsEOF( StreamIn* in ); struct _StreamOut { - int encoding; - int state; /* for ISO 2022 */ + int encoding; + int state; /* for ISO 2022 */ + uint nl; IOType iotype; TidyOutputSink sink; }; -StreamOut* FileOutput( FILE* fp, int encoding ); -StreamOut* BufferOutput( TidyBuffer* buf, int encoding ); -StreamOut* UserOutput( TidyOutputSink* sink, int encoding ); +StreamOut* FileOutput( FILE* fp, int encoding, uint newln ); +StreamOut* BufferOutput( TidyBuffer* buf, int encoding, uint newln ); +StreamOut* UserOutput( TidyOutputSink* sink, int encoding, uint newln ); StreamOut* StdErrOutput(); StreamOut* StdOutOutput(); @@ -100,16 +100,18 @@ void outBOM( StreamOut *out ); */ #define RAW 0 #define ASCII 1 -#define LATIN1 2 -#define UTF8 3 -#define ISO2022 4 -#define MACROMAN 5 -#define WIN1252 6 +#define LATIN0 2 +#define LATIN1 3 +#define UTF8 4 +#define ISO2022 5 +#define MACROMAN 6 +#define WIN1252 7 +#define IBM858 8 #if SUPPORT_UTF16_ENCODINGS -#define UTF16LE 7 -#define UTF16BE 8 -#define UTF16 9 +#define UTF16LE 9 +#define UTF16BE 10 +#define UTF16 11 #endif /* Note that Big5 and SHIFTJIS are not converted to ISO 10646 codepoints @@ -118,11 +120,11 @@ void outBOM( StreamOut *out ); */ #if SUPPORT_ASIAN_ENCODINGS #if SUPPORT_UTF16_ENCODINGS -#define BIG5 10 -#define SHIFTJIS 11 +#define BIG5 12 +#define SHIFTJIS 13 #else -#define BIG5 7 -#define SHIFTJIS 8 +#define BIG5 9 +#define SHIFTJIS 10 #endif #endif @@ -150,7 +152,7 @@ void outBOM( StreamOut *out ); ** regardless of specified encoding. Set at compile time ** to either Windows or Mac. */ -extern int ReplacementCharEncoding; +extern const int ReplacementCharEncoding; /* Function for conversion from Windows-1252 to Unicode */ uint DecodeWin1252(uint c); @@ -158,8 +160,29 @@ uint DecodeWin1252(uint c); /* Function to convert from MacRoman to Unicode */ uint DecodeMacRoman(uint c); +/* Function for conversion from OS/2-850 to Unicode */ +uint DecodeIbm850(uint c); + +/* Function for conversion from Latin0 to Unicode */ +uint DecodeLatin0(uint c); + /* Function to convert from Symbol Font chars to Unicode */ uint DecodeSymbolFont(uint c); +/* Use numeric constants as opposed to escape chars (\r, \n) +** to avoid conflict Mac compilers that may re-define these. +*/ +#define CR 0xD +#define LF 0xA + +#if defined(MAC_OS_CLASSIC) +#define DEFAULT_NL_CONFIG TidyCR +#elif defined(_WIN32) || defined(OS2_OS) +#define DEFAULT_NL_CONFIG TidyCRLF +#else +#define DEFAULT_NL_CONFIG TidyLF +#endif + + #endif /* __STREAMIO_H__ */ diff --git a/tidylib-src/src/tagask.c b/tidylib-src/src/tagask.c old mode 100755 new mode 100644 index 79d0cf6b..ad864f02 --- a/tidylib-src/src/tagask.c +++ b/tidylib-src/src/tagask.c @@ -6,8 +6,8 @@ CVS Info : $Author: creitzel $ - $Date: 2002/07/08 18:03:19 $ - $Revision: 1.1.2.3 $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ */ diff --git a/tidylib-src/src/tags.c b/tidylib-src/src/tags.c old mode 100755 new mode 100644 index c1731398..1cdcd98e --- a/tidylib-src/src/tags.c +++ b/tidylib-src/src/tags.c @@ -1,16 +1,15 @@ /* tags.c -- recognize HTML tags - (c) 1998-2002 (W3C) MIT, INRIA, Keio University + (c) 1998-2003 (W3C) MIT, INRIA, Keio University See tidy.h for the copyright notice. CVS Info : - $Author: creitzel $ - $Date: 2002/10/15 19:54:31 $ - $Revision: 1.20.2.5 $ + $Author: terry_teague $ + $Date: 2003/03/02 04:29:12 $ + $Revision: 1.22 $ The HTML tags are stored as 8 bit ASCII strings. - Use lookupw() to find a tag given a wide char string. */ @@ -20,7 +19,7 @@ #include "tmbstr.h" #include "parser.h" /* For FixId() */ -static Dict tag_defs[] = +static const Dict tag_defs[] = { { TidyTag_UNKNOWN, "unknown!", 0, 0, null, null}, { TidyTag_A, "a", VERS_ALL, CM_INLINE, ParseInline, CheckAnchor}, @@ -148,13 +147,18 @@ static Dict tag_defs[] = /* choose what version to use for new doctype */ int HTMLVersion( TidyDocImpl* doc ) { + int dtver = doc->lexer->doctype; uint versions = doc->lexer->versions; - Bool isXml = cfgBool(doc, TidyXmlOut) - | cfgBool(doc, TidyXmlTags) - | doc->lexer->isvoyager; + TidyDoctypeModes dtmode = cfg(doc, TidyDoctypeMode); + + Bool wantXhtml = !cfgBool(doc, TidyHtmlOut) && + ( cfgBool(doc, TidyXmlOut) || doc->lexer->isvoyager ); + + Bool wantHtml4 = dtmode==TidyDoctypeStrict || dtmode==TidyDoctypeLoose || + dtver==VERS_HTML40_STRICT || dtver==VERS_HTML40_LOOSE; /* Prefer HTML 4.x for XHTML */ - if ( !isXml ) + if ( !wantXhtml && !wantHtml4 ) { if ( versions & VERS_HTML32 ) /* Prefer 3.2 over 2.0 */ return VERS_HTML32; @@ -163,7 +167,7 @@ int HTMLVersion( TidyDocImpl* doc ) return VERS_HTML20; } - if ( versions & VERS_XHTML11 ) + if ( wantXhtml && (versions & VERS_XHTML11) ) return VERS_XHTML11; if ( versions & VERS_HTML40_STRICT ) @@ -176,24 +180,21 @@ int HTMLVersion( TidyDocImpl* doc ) return VERS_FRAMESET; /* Still here? Try these again. */ - if ( isXml ) - { - if ( versions & VERS_HTML32 ) /* Prefer 3.2 over 2.0 */ - return VERS_HTML32; + if ( versions & VERS_HTML32 ) /* Prefer 3.2 over 2.0 */ + return VERS_HTML32; - if ( versions & VERS_HTML20 ) - return VERS_HTML20; - } + if ( versions & VERS_HTML20 ) + return VERS_HTML20; return VERS_UNKNOWN; } -static Dict *lookup( TidyTagImpl* tags, ctmbstr s ) +static const Dict* lookup( TidyTagImpl* tags, ctmbstr s ) { Dict *np = null; if ( s ) { - Dict *np = tag_defs + 1; /* Skip Unknown */ + const Dict *np = tag_defs + 1; /* Skip Unknown */ for ( /**/; np < tag_defs + N_TIDY_TAGS; ++np ) if ( tmbstrcmp(s, np->name) == 0 ) return np; @@ -206,32 +207,38 @@ static Dict *lookup( TidyTagImpl* tags, ctmbstr s ) } -static Dict* declare( TidyTagImpl* tags, - ctmbstr name, uint versions, uint model, - Parser *parser, CheckAttribs *chkattrs ) +static void declare( TidyTagImpl* tags, + ctmbstr name, uint versions, uint model, + Parser *parser, CheckAttribs *chkattrs ) { - Dict* np = lookup( tags, name ); - if ( np == null ) + if ( name ) { - np = (Dict*) MemAlloc( sizeof(Dict) ); - ClearMemory( np, sizeof(Dict) ); + Dict* np = (Dict*) lookup( tags, name ); + if ( np == null ) + { + np = (Dict*) MemAlloc( sizeof(Dict) ); + ClearMemory( np, sizeof(Dict) ); - np->name = tmbstrdup( name ); - np->next = tags->declared_tag_list; - tags->declared_tag_list = np; - } + np->name = tmbstrdup( name ); + np->next = tags->declared_tag_list; + tags->declared_tag_list = np; + } - np->versions = versions; - np->model |= model; - np->parser = parser; - np->chkattrs = chkattrs; - return np; + /* Make sure we are not over-writing predefined tags */ + if ( np->id == TidyTag_UNKNOWN ) + { + np->versions = versions; + np->model |= model; + np->parser = parser; + np->chkattrs = chkattrs; + } + } } /* public interface for finding tag by name */ Bool FindTag( TidyDocImpl* doc, Node *node ) { - Dict *np = null; + const Dict *np = null; if ( cfgBool(doc, TidyXmlTags) ) { node->tag = doc->tags.xml_tags; @@ -247,7 +254,7 @@ Bool FindTag( TidyDocImpl* doc, Node *node ) return no; } -Dict* LookupTagDef( TidyTagId tid ) +const Dict* LookupTagDef( TidyTagId tid ) { if ( tid > TidyTag_UNKNOWN && tid < N_TIDY_TAGS ) return tag_defs + tid; @@ -255,9 +262,9 @@ Dict* LookupTagDef( TidyTagId tid ) } -Parser *FindParser( TidyDocImpl* doc, Node *node ) +Parser* FindParser( TidyDocImpl* doc, Node *node ) { - Dict* np = lookup( &doc->tags, node->element ); + const Dict* np = lookup( &doc->tags, node->element ); if ( np ) return np->parser; return null; @@ -332,35 +339,78 @@ ctmbstr GetNextDeclaredTag( TidyDocImpl* doc, int tagType, break; } } - *iter = (TidyIterator) ( curr ? curr->next : null ); + *iter = (TidyIterator) ( curr ? curr : null ); return name; } void InitTags( TidyDocImpl* doc ) { + Dict* xml; TidyTagImpl* tags = &doc->tags; ClearMemory( tags, sizeof(TidyTagImpl) ); /* create dummy entry for all xml tags */ - tags->xml_tags = (Dict*) MemAlloc( sizeof(Dict) ); - tags->xml_tags->name = null; - tags->xml_tags->versions = VERS_XML; - tags->xml_tags->model = CM_BLOCK; - tags->xml_tags->parser = null; - tags->xml_tags->chkattrs = null; -} - -void FreeTags( TidyDocImpl* doc ) + xml = (Dict*) MemAlloc( sizeof(Dict) ); + ClearMemory( xml, sizeof(Dict) ); + xml->name = null; + xml->versions = VERS_XML; + xml->model = CM_BLOCK; + xml->parser = null; + xml->chkattrs = null; + tags->xml_tags = xml; +} + +/* By default, zap all of them. But allow +** an single type to be specified. +*/ +void FreeDeclaredTags( TidyDocImpl* doc, int tagType ) { TidyTagImpl* tags = &doc->tags; - Dict* curr; + Dict *curr, *next = null, *prev = null; - while ( curr = tags->declared_tag_list ) + for ( curr=tags->declared_tag_list; curr; curr = next ) { - tags->declared_tag_list = curr->next; - MemFree( curr->name ); - MemFree( curr ); + Bool deleteIt = yes; + next = curr->next; + switch ( tagType ) + { + case tagtype_empty: + deleteIt = ( curr->model & CM_EMPTY ); + break; + + case tagtype_inline: + deleteIt = ( curr->model & CM_INLINE ); + break; + + case tagtype_block: + deleteIt = ( (curr->model & CM_BLOCK) && + curr->parser == ParseBlock ); + break; + + case tagtype_pre: + deleteIt = ( (curr->model & CM_BLOCK) && + curr->parser == ParsePre ); + break; + } + + if ( deleteIt ) + { + MemFree( curr->name ); + MemFree( curr ); + if ( prev ) + prev->next = next; + else + tags->declared_tag_list = next; + } + else + prev = curr; } +} + +void FreeTags( TidyDocImpl* doc ) +{ + TidyTagImpl* tags = &doc->tags; + FreeDeclaredTags( doc, 0 ); MemFree( tags->xml_tags ); @@ -398,7 +448,7 @@ void CheckIMG( TidyDocImpl* doc, Node *node ) AttVal *attval; for ( attval = node->attributes; attval != null; attval = attval->next ) { - Attribute* dict = CheckAttribute( doc, node, attval ); + const Attribute* dict = CheckAttribute( doc, node, attval ); if ( dict ) { TidyAttrId id = dict->id; @@ -529,7 +579,7 @@ void CheckAREA( TidyDocImpl* doc, Node *node ) for (attval = node->attributes; attval != null; attval = attval->next) { - Attribute* dict = CheckAttribute( doc, node, attval ); + const Attribute* dict = CheckAttribute( doc, node, attval ); if ( dict ) { if ( dict->id == TidyAttr_ALT ) @@ -559,7 +609,7 @@ void CheckTABLE( TidyDocImpl* doc, Node *node ) for (attval = node->attributes; attval != null; attval = attval->next) { - Attribute* dict = CheckAttribute( doc, node, attval ); + const Attribute* dict = CheckAttribute( doc, node, attval ); if ( dict && dict->id == TidyAttr_SUMMARY ) HasSummary = yes; } @@ -605,7 +655,7 @@ void CheckSCRIPT( TidyDocImpl* doc, Node *node ) if ( !type ) { - ReportMissingAttr( doc, node, "type" ); + /* ReportMissingAttr( doc, node, "type" ); */ /* check for javascript */ if ( lang ) @@ -626,6 +676,8 @@ void CheckSCRIPT( TidyDocImpl* doc, Node *node ) } else AddAttribute( doc, node, "type", "text/javascript" ); + type = GetAttrByName( node, "type" ); + ReportAttrError( doc, node, type, INSERTING_ATTRIBUTE ); } } @@ -639,8 +691,9 @@ void CheckSTYLE( TidyDocImpl* doc, Node *node ) if ( !type ) { - ReportMissingAttr( doc, node, "type"); AddAttribute( doc, node, "type", "text/css" ); + type = GetAttrByName( node, "type" ); + ReportAttrError( doc, node, type, INSERTING_ATTRIBUTE ); } } @@ -657,8 +710,9 @@ void CheckLINK( TidyDocImpl* doc, Node *node ) AttVal *type = GetAttrByName(node, "type"); if (!type) { - ReportMissingAttr( doc, node, "type" ); AddAttribute( doc, node, "type", "text/css" ); + type = GetAttrByName( node, "type" ); + ReportAttrError( doc, node, type, INSERTING_ATTRIBUTE ); } } } @@ -690,8 +744,7 @@ Bool nodeIsText( Node* node ) Bool nodeHasText( TidyDocImpl* doc, Node* node ) { - assert( doc != null ); - if ( nodeIsText(node) ) + if ( doc && node ) { uint ix; Lexer* lexer = doc->lexer; diff --git a/tidylib-src/src/tags.h b/tidylib-src/src/tags.h old mode 100755 new mode 100644 index ad8e0b40..1d287994 --- a/tidylib-src/src/tags.h +++ b/tidylib-src/src/tags.h @@ -8,9 +8,9 @@ CVS Info : - $Author: lpassey $ - $Date: 2002/10/22 15:02:23 $ - $Revision: 1.1.2.7 $ + $Author: creitzel $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ The HTML tags are stored as 8 bit ASCII strings. Use lookupw() to find a tag given a wide char string. @@ -58,10 +58,11 @@ int HTMLVersion( TidyDocImpl* doc ); /* interface for finding tag by name */ -Dict* LookupTagDef( TidyTagId tid ); +const Dict* LookupTagDef( TidyTagId tid ); Bool FindTag( TidyDocImpl* doc, Node *node ); Parser* FindParser( TidyDocImpl* doc, Node *node ); void DefineTag( TidyDocImpl* doc, int tagType, ctmbstr name ); +void FreeDeclaredTags( TidyDocImpl* doc, int tagType ); /* 0 to free all */ TidyIterator GetDeclaredTagList( TidyDocImpl* doc ); Dict* GetNextDeclaredDict( TidyDocImpl* doc, TidyIterator* iter ); @@ -118,7 +119,7 @@ CheckAttribs CheckMETA; /* 0 == TidyTag_UNKNOWN */ -#define TagId(node) ((node) ? ((node)->tag ? (node)->tag->id : 0) : 0) +#define TagId(node) ((node) && (node)->tag ? (node)->tag->id : TidyTag_UNKNOWN) #define TagIsId(node, tid) ((node) && (node)->tag && (node)->tag->id == tid) Bool nodeIsText( Node* node ); diff --git a/tidylib-src/src/tidy-int.h b/tidylib-src/src/tidy-int.h old mode 100755 new mode 100644 index 00d21722..0f60d36a --- a/tidylib-src/src/tidy-int.h +++ b/tidylib-src/src/tidy-int.h @@ -9,8 +9,8 @@ CVS Info : $Author: creitzel $ - $Date: 2002/08/11 16:44:31 $ - $Revision: 1.1.2.8 $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ */ @@ -36,8 +36,10 @@ struct _TidyDocImpl TidyTagImpl tags; TidyAttribImpl attribs; +#if SUPPORT_ACCESSIBILITY_CHECKS /* Accessibility Checks state */ TidyAccessImpl access; +#endif /* The Pretty Print buffer */ TidyPrintImpl pprint; @@ -51,6 +53,7 @@ struct _TidyDocImpl StreamOut* docOut; StreamOut* errout; TidyReportFilter mssgFilt; + TidyOptCallback pOptCallback; /* Parse + Repair Results */ uint optionErrors; @@ -74,6 +77,7 @@ struct _TidyDocImpl #if PRESERVE_FILE_TIMES struct utimbuf filetimes; #endif + Node* givenDoctype; }; diff --git a/tidylib-src/src/tidylib.c b/tidylib-src/src/tidylib.c old mode 100755 new mode 100644 index fffe1737..3849822f --- a/tidylib-src/src/tidylib.c +++ b/tidylib-src/src/tidylib.c @@ -1,13 +1,13 @@ /* tidylib.c -- internal library definitions - (c) 1998-2002 (W3C) MIT, INRIA, Keio University + (c) 1998-2003 (W3C) MIT, INRIA, Keio University See tidy.h for the copyright notice. CVS Info : - $Author: creitzel $ - $Date: 2002/10/15 19:54:30 $ - $Revision: 1.1.2.9 $ + $Author: terry_teague $ + $Date: 2003/03/02 04:31:13 $ + $Revision: 1.4 $ Defines HTML Tidy API implemented by tidy library. @@ -163,6 +163,18 @@ ctmbstr tidyReleaseDate() /* Get/set configuration options */ +Bool tidySetOptionCallback( TidyDoc tdoc, TidyOptCallback pOptCallback ) +{ + TidyDocImpl* impl = tidyDocToImpl( tdoc ); + if ( impl ) + { + impl->pOptCallback = pOptCallback; + return yes; + } + return -EINVAL; +} + + int tidyLoadConfig( TidyDoc tdoc, ctmbstr cfgfil ) { TidyDocImpl* impl = tidyDocToImpl( tdoc ); @@ -381,7 +393,7 @@ ctmbstr tidyOptGetCurrPick( TidyDoc tdoc, TidyOptionId optId ) if ( option && option->pickList ) { uint ix, pick = tidyOptGetInt( tdoc, optId ); - ctmbstr* pL = option->pickList; + const ctmbstr* pL = option->pickList; for ( ix=0; *pL && ix < pick; ++ix ) ++pL; if ( *pL ) @@ -574,11 +586,13 @@ FILE* tidySetErrorFile( TidyDoc tdoc, ctmbstr errfilnam ) TidyDocImpl* impl = tidyDocToImpl( tdoc ); if ( impl ) { - FILE* errout = fopen( errfilnam, "w" ); + FILE* errout = fopen( errfilnam, "wb" ); if ( errout ) { + uint outenc = cfg( impl, TidyOutCharEncoding ); + uint nl = cfg( impl, TidyNewline ); ReleaseStreamOut( impl->errout ); - impl->errout = FileOutput( errout, ASCII ); + impl->errout = FileOutput( errout, outenc, nl ); return errout; } } @@ -590,8 +604,10 @@ int tidySetErrorBuffer( TidyDoc tdoc, TidyBuffer* errbuf ) TidyDocImpl* impl = tidyDocToImpl( tdoc ); if ( impl ) { + uint outenc = cfg( impl, TidyOutCharEncoding ); + uint nl = cfg( impl, TidyNewline ); ReleaseStreamOut( impl->errout ); - impl->errout = BufferOutput( errbuf, ASCII ); + impl->errout = BufferOutput( errbuf, outenc, nl ); return ( impl->errout ? 0 : -ENOMEM ); } return -EINVAL; @@ -602,8 +618,10 @@ int tidySetErrorSink( TidyDoc tdoc, TidyOutputSink* sink ) TidyDocImpl* impl = tidyDocToImpl( tdoc ); if ( impl ) { + uint outenc = cfg( impl, TidyOutCharEncoding ); + uint nl = cfg( impl, TidyNewline ); ReleaseStreamOut( impl->errout ); - impl->errout = UserOutput( sink, ASCII ); + impl->errout = UserOutput( sink, outenc, nl ); return ( impl->errout ? 0 : -ENOMEM ); } return -EINVAL; @@ -726,7 +744,7 @@ int tidyDocParseFile( TidyDocImpl* doc, ctmbstr filnam ) { int status = -ENOENT; uint inenc = cfg( doc, TidyInCharEncoding ); - FILE* fin = fopen( filnam, "r" ); + FILE* fin = fopen( filnam, "rb" ); #if PRESERVE_FILE_TIMES struct stat sbuf = {0}; @@ -831,38 +849,78 @@ int tidySaveSink( TidyDoc tdoc, TidyOutputSink* sink ) int tidyDocSaveFile( TidyDocImpl* doc, ctmbstr filnam ) { int status = -ENOENT; - StreamOut* out = null; - uint outenc = cfg( doc, TidyOutCharEncoding ); - FILE* fout = fopen( filnam, "w" ); + FILE* fout = null; + + /* Don't zap input file if no output */ + if ( doc->errors > 0 && + cfgBool(doc, TidyWriteBack) && !cfgBool(doc, TidyForceOutput) ) + status = tidyDocStatus( doc ); + else + fout = fopen( filnam, "wb" ); + if ( fout ) { - out = FileOutput( fout, outenc ); + uint outenc = cfg( doc, TidyOutCharEncoding ); + uint nl = cfg( doc, TidyNewline ); + StreamOut* out = FileOutput( fout, outenc, nl ); + status = tidyDocSaveStream( doc, out ); + fclose( fout ); + MemFree( out ); + #if PRESERVE_FILE_TIMES - if ( !doc->filetimes.actime ) - fclose( fout ); - else + if ( doc->filetimes.actime ) { /* set file last accessed/modified times to original values */ - fclose( fout ); utime( filnam, &doc->filetimes ); ClearMemory( &doc->filetimes, sizeof(doc->filetimes) ); } -#else - fclose( fout ); #endif /* PRESERVFILETIMES */ - MemFree( out ); } return status; } + +/* Note, _setmode() does NOT work on Win2K Pro w/ VC++ 6.0 SP3. +** The code has been left in in case it works w/ other compilers +** or operating systems. If stdout is in Text mode, be aware that +** it will garble UTF16 documents. In text mode, when it encounters +** a single byte of value 10 (0xA), it will insert a single byte +** value 13 (0xD) just before it. This has the effect of garbling +** the entire document. +*/ + +#if defined(_WIN32) || defined(OS2_OS) +#include
tags from out of paragraphs */ + /*! Do we want to do this for all block-level elements? */ + FixBrakes( doc, FindBody( doc )); + + /* Reconcile http-equiv meta element with output encoding */ + if (RAW != cfg( doc, TidyOutCharEncoding)) + VerifyHTTPEquiv( doc, FindHEAD( doc )); + if ( !CheckNodeIntegrity(doc->root) ) FatalError( integrity ); - /* remember given doctype */ - doctype = CloneNodeEx( doc, FindDocType(doc) ); + /* remember given doctype for reporting */ + doc->givenDoctype = CloneNodeEx( doc, FindDocType(doc) ); if ( doc->root->content ) { - if ( xhtmlOut ) + /* If we had XHTML input but want HTML output */ + if ( htmlOut && doc->lexer->isvoyager ) + { + Node* node = FindDocType( doc ); + /* Remove reference, but do not free */ + if ( node ) + RemoveNode( node ); + if ( node = FindHTML(doc) ) + { + AttVal* av = AttrGetById( node, TidyAttr_XMLNS ); + if ( av ) + RemoveAttribute( node, av ); + } + } + + if ( xhtmlOut && !htmlOut ) SetXHTMLDocType( doc ); else FixDocType( doc ); @@ -1082,20 +1170,28 @@ int tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out ) { Bool showMarkup = cfgBool( doc, TidyShowMarkup ); Bool forceOutput = cfgBool( doc, TidyForceOutput ); +#if SUPPORT_UTF16_ENCODINGS Bool outputBOM = ( cfg(doc, TidyOutputBOM) == yes ); Bool smartBOM = ( cfg(doc, TidyOutputBOM) == TidyAutoState ); +#endif Bool xmlOut = cfgBool( doc, TidyXmlOut ); Bool xhtmlOut = cfgBool( doc, TidyXhtmlOut ); Bool bodyOnly = cfgBool( doc, TidyBodyOnly ); if ( showMarkup && (doc->errors == 0 || forceOutput) ) { +#if SUPPORT_UTF16_ENCODINGS /* Output a Byte Order Mark if required */ if ( outputBOM || (doc->inputHadBOM && smartBOM) ) outBOM( out ); +#endif - if ( !FindDocType(doc) ) - SetOptionBool( doc, TidyNumEntities, yes ); + /* No longer necessary. No DOCTYPE == HTML 3.2, + ** which gives you only the basic character entities, + ** which are safe in any browser. + ** if ( !FindDocType(doc) ) + ** SetOptionBool( doc, TidyNumEntities, yes ); + */ doc->docOut = out; if ( xmlOut && !xhtmlOut ) @@ -1207,14 +1303,17 @@ Bool tidyNodeHasText( TidyDoc tdoc, TidyNode tnod ) return nodeHasText( doc, tidyNodeToImpl(tnod) ); return no; } + + Bool tidyNodeGetText( TidyDoc tdoc, TidyNode tnod, TidyBuffer* outbuf ) { TidyDocImpl* doc = tidyDocToImpl( tdoc ); Node* nimp = tidyNodeToImpl( tnod ); - if ( doc && nodeHasText(doc, nimp) && outbuf ) + if ( doc && nimp && outbuf ) { uint outenc = cfg( doc, TidyOutCharEncoding ); - StreamOut* out = BufferOutput( outbuf, outenc ); + uint nl = cfg( doc, TidyNewline ); + StreamOut* out = BufferOutput( outbuf, outenc, nl ); Bool xmlOut = cfgBool( doc, TidyXmlOut ); Bool xhtmlOut = cfgBool( doc, TidyXhtmlOut ); diff --git a/tidylib-src/src/tmbstr.c b/tidylib-src/src/tmbstr.c old mode 100755 new mode 100644 index 41280979..a2d36302 --- a/tidylib-src/src/tmbstr.c +++ b/tidylib-src/src/tmbstr.c @@ -5,9 +5,9 @@ CVS Info : - $Author: lpassey $ - $Date: 2002/10/29 23:52:26 $ - $Revision: 1.1.2.5 $ + $Author: creitzel $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ */ diff --git a/tidylib-src/src/tmbstr.h b/tidylib-src/src/tmbstr.h old mode 100755 new mode 100644 index e0c56314..b0ad2fcb --- a/tidylib-src/src/tmbstr.h +++ b/tidylib-src/src/tmbstr.h @@ -8,9 +8,9 @@ CVS Info : - $Author: lpassey $ - $Date: 2002/10/29 23:52:03 $ - $Revision: 1.1.2.3 $ + $Author: creitzel $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ */ diff --git a/tidylib-src/src/utf8.c b/tidylib-src/src/utf8.c old mode 100755 new mode 100644 index d01db5b4..7c829d1c --- a/tidylib-src/src/utf8.c +++ b/tidylib-src/src/utf8.c @@ -6,8 +6,8 @@ CVS Info : $Author: creitzel $ - $Date: 2002/10/15 19:50:30 $ - $Revision: 1.1.2.6 $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ Uses public interfaces to abstract input source and output sink, which may be user supplied or either FILE* or memory @@ -139,7 +139,7 @@ DBFF DFF* F4 8F BF B* 0010FFF* /* offsets into validUTF8 table below */ -static int offsetUTF8Sequences[kMaxUTF8Bytes + 1] = +static const int offsetUTF8Sequences[kMaxUTF8Bytes + 1] = { 0, /* 1 byte */ 1, /* 2 bytes */ @@ -148,7 +148,7 @@ static int offsetUTF8Sequences[kMaxUTF8Bytes + 1] = kNumUTF8Sequences /* must be last */ }; -static struct validUTF8Sequence +static const struct validUTF8Sequence { uint lowChar; uint highChar; diff --git a/tidylib-src/src/utf8.h b/tidylib-src/src/utf8.h old mode 100755 new mode 100644 index f9895e9a..e74eaafd --- a/tidylib-src/src/utf8.h +++ b/tidylib-src/src/utf8.h @@ -9,8 +9,8 @@ CVS Info : $Author: creitzel $ - $Date: 2002/07/08 18:03:19 $ - $Revision: 1.1.2.3 $ + $Date: 2003/02/16 19:33:11 $ + $Revision: 1.2 $ */ diff --git a/tidylib-src/test/input/cfg_427812.txt b/tidylib-src/test/input/cfg_427812.txt deleted file mode 100755 index 3670e37c..00000000 --- a/tidylib-src/test/input/cfg_427812.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #427812 -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_427821.txt b/tidylib-src/test/input/cfg_427821.txt deleted file mode 100755 index c17f0b27..00000000 --- a/tidylib-src/test/input/cfg_427821.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #427821 -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_427825.txt b/tidylib-src/test/input/cfg_427825.txt deleted file mode 100755 index 045aa062..00000000 --- a/tidylib-src/test/input/cfg_427825.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #427825 -new-inline-tags: lm:xcode - diff --git a/tidylib-src/test/input/cfg_427826.txt b/tidylib-src/test/input/cfg_427826.txt deleted file mode 100755 index 0fc9caee..00000000 --- a/tidylib-src/test/input/cfg_427826.txt +++ /dev/null @@ -1,10 +0,0 @@ -// Tidy configuration file for bug #427826 -indent: auto -char-encoding: latin1 -tidy-mark: no -clean: yes -drop-font-tags: yes -logical-emphasis: yes -indent-attributes: yes -output-xhtml: yes - diff --git a/tidylib-src/test/input/cfg_427835.txt b/tidylib-src/test/input/cfg_427835.txt deleted file mode 100755 index 547e5244..00000000 --- a/tidylib-src/test/input/cfg_427835.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #427835 -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_427837.txt b/tidylib-src/test/input/cfg_427837.txt deleted file mode 100755 index d0a3ff97..00000000 --- a/tidylib-src/test/input/cfg_427837.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Tidy configuration file for bug #427837 -// add-xml-decl: yes -input-xml: yes -output-xml: yes -char-encoding: latin1 diff --git a/tidylib-src/test/input/cfg_427839.txt b/tidylib-src/test/input/cfg_427839.txt deleted file mode 100755 index e5ec6e5e..00000000 --- a/tidylib-src/test/input/cfg_427839.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #427839 -output-xhtml: yes -doctype: omit \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_427845.txt b/tidylib-src/test/input/cfg_427845.txt deleted file mode 100755 index 2169624d..00000000 --- a/tidylib-src/test/input/cfg_427845.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #427845 -wrap: 60 \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_431716.txt b/tidylib-src/test/input/cfg_431716.txt deleted file mode 100755 index afc3a5ad..00000000 --- a/tidylib-src/test/input/cfg_431716.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #431716 -split: yes \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_431721.txt b/tidylib-src/test/input/cfg_431721.txt deleted file mode 100755 index ab04c701..00000000 --- a/tidylib-src/test/input/cfg_431721.txt +++ /dev/null @@ -1,11 +0,0 @@ -// Tidy configuration file for bug #431721 -indent: auto -new-inline-tags: o:p -char-encoding: latin1 -tidy-mark: no -clean: yes -drop-font-tags: yes -logical-emphasis: yes -word-2000: yes -indent-attributes: yes - diff --git a/tidylib-src/test/input/cfg_431736.txt b/tidylib-src/test/input/cfg_431736.txt deleted file mode 100755 index e7643211..00000000 --- a/tidylib-src/test/input/cfg_431736.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #431736 -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_431889.txt b/tidylib-src/test/input/cfg_431889.txt deleted file mode 100755 index 3dc21a66..00000000 --- a/tidylib-src/test/input/cfg_431889.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Config file for bug [ #431889 ] Config file options w/"param" don't work -doctype: "-//ACME//DTD HTML 3.14159//EN" -alt-text: "Alternate" \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_431895.txt b/tidylib-src/test/input/cfg_431895.txt deleted file mode 100755 index 41584939..00000000 --- a/tidylib-src/test/input/cfg_431895.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Tidy configuration file for bug #431895 -quiet: yes -markup: no -gnu-emacs: yes \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_431956.txt b/tidylib-src/test/input/cfg_431956.txt deleted file mode 100755 index 15c73145..00000000 --- a/tidylib-src/test/input/cfg_431956.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #431956 -input-xml: yes -output-xml: yes diff --git a/tidylib-src/test/input/cfg_431958.txt b/tidylib-src/test/input/cfg_431958.txt deleted file mode 100755 index 990c0130..00000000 --- a/tidylib-src/test/input/cfg_431958.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Tidy configuration file for bug #431958 -// Warning - this will modify the INPUT file (each time it is run) -indent: auto -write-back: yes \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_432677.txt b/tidylib-src/test/input/cfg_432677.txt deleted file mode 100755 index 4e73e6dd..00000000 --- a/tidylib-src/test/input/cfg_432677.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #432677 -output-xml: yes diff --git a/tidylib-src/test/input/cfg_433604.txt b/tidylib-src/test/input/cfg_433604.txt deleted file mode 100755 index 2a03e4c9..00000000 --- a/tidylib-src/test/input/cfg_433604.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #433604 -input-xml: yes diff --git a/tidylib-src/test/input/cfg_433607.txt b/tidylib-src/test/input/cfg_433607.txt deleted file mode 100755 index e4478c3f..00000000 --- a/tidylib-src/test/input/cfg_433607.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #433607 -input-xml: yes diff --git a/tidylib-src/test/input/cfg_433670.txt b/tidylib-src/test/input/cfg_433670.txt deleted file mode 100755 index 9cc682f5..00000000 --- a/tidylib-src/test/input/cfg_433670.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #433670 -input-xml: yes diff --git a/tidylib-src/test/input/cfg_433856.txt b/tidylib-src/test/input/cfg_433856.txt deleted file mode 100755 index c61c8293..00000000 --- a/tidylib-src/test/input/cfg_433856.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #433856 -drop-font-tags: yes \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_434100.txt b/tidylib-src/test/input/cfg_434100.txt deleted file mode 100755 index 713d5d5d..00000000 --- a/tidylib-src/test/input/cfg_434100.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #434100 -input-xml: yes \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_434940.txt b/tidylib-src/test/input/cfg_434940.txt deleted file mode 100755 index 1e174070..00000000 --- a/tidylib-src/test/input/cfg_434940.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #434940 -show-body-only: yes \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_438954.txt b/tidylib-src/test/input/cfg_438954.txt deleted file mode 100755 index bb4e33b0..00000000 --- a/tidylib-src/test/input/cfg_438954.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #438954 -hide-endtags: yes \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_444394.txt b/tidylib-src/test/input/cfg_444394.txt deleted file mode 100755 index 0048a266..00000000 --- a/tidylib-src/test/input/cfg_444394.txt +++ /dev/null @@ -1,11 +0,0 @@ -// Tidy configuration file for bug #444394 -indent: auto -new-inline-tags: o:p -char-encoding: latin1 -tidy-mark: no -clean: yes -drop-font-tags: yes -logical-emphasis: yes -word-2000: yes -indent-attributes: yes - diff --git a/tidylib-src/test/input/cfg_449348.txt b/tidylib-src/test/input/cfg_449348.txt deleted file mode 100755 index 8717b2cf..00000000 --- a/tidylib-src/test/input/cfg_449348.txt +++ /dev/null @@ -1 +0,0 @@ -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_463066.txt b/tidylib-src/test/input/cfg_463066.txt deleted file mode 100755 index 682eb3f8..00000000 --- a/tidylib-src/test/input/cfg_463066.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #463066 -word-2000: yes - diff --git a/tidylib-src/test/input/cfg_470663.txt b/tidylib-src/test/input/cfg_470663.txt deleted file mode 100755 index f00aace1..00000000 --- a/tidylib-src/test/input/cfg_470663.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #470663 -word-2000: yes - diff --git a/tidylib-src/test/input/cfg_473490.txt b/tidylib-src/test/input/cfg_473490.txt deleted file mode 100755 index 55679514..00000000 --- a/tidylib-src/test/input/cfg_473490.txt +++ /dev/null @@ -1,11 +0,0 @@ -// Tidy configuration file for bug #473490 -tidy-mark: no -wrap: 0 -output-xhtml: yes -doctype: auto -quote-nbsp: yes -uppercase-tags: yes -quote-ampersand: yes -add-xml-space: no -show-warnings:no -quiet: yes diff --git a/tidylib-src/test/input/cfg_480406.txt b/tidylib-src/test/input/cfg_480406.txt deleted file mode 100755 index 50bc5f57..00000000 --- a/tidylib-src/test/input/cfg_480406.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #480406 -input-xml: yes -output-xml: yes diff --git a/tidylib-src/test/input/cfg_480701.txt b/tidylib-src/test/input/cfg_480701.txt deleted file mode 100755 index 9d95a808..00000000 --- a/tidylib-src/test/input/cfg_480701.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #480701 -input-xml: yes -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_480843.txt b/tidylib-src/test/input/cfg_480843.txt deleted file mode 100755 index b49a0b45..00000000 --- a/tidylib-src/test/input/cfg_480843.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #480843 -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_500236.txt b/tidylib-src/test/input/cfg_500236.txt deleted file mode 100755 index 410fadfb..00000000 --- a/tidylib-src/test/input/cfg_500236.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Tidy configuration file for bug #500236 -word-2000: yes -input-xml: yes -output-xml: yes - diff --git a/tidylib-src/test/input/cfg_503436.txt b/tidylib-src/test/input/cfg_503436.txt deleted file mode 100755 index 8a380d20..00000000 --- a/tidylib-src/test/input/cfg_503436.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #503436 -input-xml: yes diff --git a/tidylib-src/test/input/cfg_508936.txt b/tidylib-src/test/input/cfg_508936.txt deleted file mode 100755 index ba9c0e97..00000000 --- a/tidylib-src/test/input/cfg_508936.txt +++ /dev/null @@ -1,19 +0,0 @@ -clean: yes - -# Error 1: escaped number too long. Max 4 hex digits -# css-prefix: \77777abc - -# Error 2: class prefix starts with digit -# css-prefix: 77abc - -# Error 3: Unescaped invalid character -# css-prefix: abc - -# OK 1: Plain old name -# css-prefix: abc123 - -# OK 2: Begin w/ escaped number -# css-prefix: \77abc - -# OK 3: escaped number -css-prefix: abc\8 diff --git a/tidylib-src/test/input/cfg_511243.txt b/tidylib-src/test/input/cfg_511243.txt deleted file mode 100755 index c305be86..00000000 --- a/tidylib-src/test/input/cfg_511243.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #511243 -char-encoding: utf8 diff --git a/tidylib-src/test/input/cfg_514348.txt b/tidylib-src/test/input/cfg_514348.txt deleted file mode 100755 index a0afb0c6..00000000 --- a/tidylib-src/test/input/cfg_514348.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Tidy configuration file for bug #514348 -uppercase-tags: true -indent: auto -indent-spaces: 2 \ No newline at end of file diff --git a/tidylib-src/test/input/cfg_517550.txt b/tidylib-src/test/input/cfg_517550.txt deleted file mode 100755 index b94453ec..00000000 --- a/tidylib-src/test/input/cfg_517550.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #517550 -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_531964.txt b/tidylib-src/test/input/cfg_531964.txt deleted file mode 100755 index 2d18ab5f..00000000 --- a/tidylib-src/test/input/cfg_531964.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug 531964 -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_532535.txt b/tidylib-src/test/input/cfg_532535.txt deleted file mode 100755 index 27188213..00000000 --- a/tidylib-src/test/input/cfg_532535.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #532535 -word-2000: yes diff --git a/tidylib-src/test/input/cfg_533233.txt b/tidylib-src/test/input/cfg_533233.txt deleted file mode 100755 index 1de4c82c..00000000 --- a/tidylib-src/test/input/cfg_533233.txt +++ /dev/null @@ -1,2 +0,0 @@ -output-xhtml: yes -indent: auto diff --git a/tidylib-src/test/input/cfg_537604.txt b/tidylib-src/test/input/cfg_537604.txt deleted file mode 100755 index c41660fb..00000000 --- a/tidylib-src/test/input/cfg_537604.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #537604 -input-xml: yes -clean: no diff --git a/tidylib-src/test/input/cfg_540045.txt b/tidylib-src/test/input/cfg_540045.txt deleted file mode 100755 index d0a1e859..00000000 --- a/tidylib-src/test/input/cfg_540045.txt +++ /dev/null @@ -1,11 +0,0 @@ -// Tidy configuration file for bug #540045 -wrap: 64 -indent: no -indent-spaces: 4 -add-xml-decl: yes -#output-xhtml: yes -break-before-br: yes -clean: yes -logical-emphasis: yes -enclose-text: yes -enclose-block-text: yes diff --git a/tidylib-src/test/input/cfg_540571.txt b/tidylib-src/test/input/cfg_540571.txt deleted file mode 100755 index 48a1c073..00000000 --- a/tidylib-src/test/input/cfg_540571.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Tidy configuration file for bug #540571 Inconsistent behaviour with span inline element -output-xml: yes -wrap: 255 -clean: no diff --git a/tidylib-src/test/input/cfg_542029.txt b/tidylib-src/test/input/cfg_542029.txt deleted file mode 100755 index 5b27d6f1..00000000 --- a/tidylib-src/test/input/cfg_542029.txt +++ /dev/null @@ -1,3 +0,0 @@ -// Tidy configuration file for bug #542029 -add-xml-decl: yes -output-xml: yes diff --git a/tidylib-src/test/input/cfg_543262.txt b/tidylib-src/test/input/cfg_543262.txt deleted file mode 100755 index 02ead1fa..00000000 --- a/tidylib-src/test/input/cfg_543262.txt +++ /dev/null @@ -1,5 +0,0 @@ -doctype: omit -output-xhtml: yes -char-encoding: latin1 -numeric-entities: yes -quiet: yes diff --git a/tidylib-src/test/input/cfg_545772.txt b/tidylib-src/test/input/cfg_545772.txt deleted file mode 100755 index dcbc2ade..00000000 --- a/tidylib-src/test/input/cfg_545772.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Tidy configuration file for bug #547057 -output-xhtml: yes diff --git a/tidylib-src/test/input/cfg_570027.txt b/tidylib-src/test/input/cfg_570027.txt deleted file mode 100755 index 82c04c95..00000000 --- a/tidylib-src/test/input/cfg_570027.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Tidy configuration file for bug 570027 -clean: yes -word-2000: yes - diff --git a/tidylib-src/test/input/cfg_586555.txt b/tidylib-src/test/input/cfg_586555.txt deleted file mode 100755 index f458aea1..00000000 --- a/tidylib-src/test/input/cfg_586555.txt +++ /dev/null @@ -1,25 +0,0 @@ -wrap: 68 -tab-size: 4 -repeated-attributes: keep-last -alt-text: None, says tidy -show-warnings: no -quiet: yes -indent: auto -indent-attributes: yes -output-xml: yes -output-xhtml: yes -add-xml-decl: yes -bare: yes -logical-emphasis: yes -drop-proprietary-attributes: yes -break-before-br: yes -quote-nbsp: no -assume-xml-procins: yes -keep-time: no -word-2000: yes -tidy-mark: no -literal-attributes: yes -hide-comments: yes -ascii-chars: no -join-styles: no -output-bom: no diff --git a/tidylib-src/test/input/cfg_default.txt b/tidylib-src/test/input/cfg_default.txt deleted file mode 100755 index 5fd52cf6..00000000 --- a/tidylib-src/test/input/cfg_default.txt +++ /dev/null @@ -1,10 +0,0 @@ -// HTML Tidy configuration file created by TidyGUI -indent: auto -char-encoding: latin1 -tidy-mark: no -clean: yes -drop-font-tags: yes -logical-emphasis: yes -indent-attributes: yes -// output-xhtml: yes - diff --git a/tidylib-src/test/input/in_426885.html b/tidylib-src/test/input/in_426885.html deleted file mode 100755 index be3296b9..00000000 --- a/tidylib-src/test/input/in_426885.html +++ /dev/null @@ -1,15 +0,0 @@ - - -
Heading 1
Term 1Term 2Heading 2
-
-
- Term 3
-
- Term 4
-
This is a carriage return This is a Unix line-ending -This is a DOS line ending - - - diff --git a/tidylib-src/test/input/in_427662.html b/tidylib-src/test/input/in_427662.html deleted file mode 100755 index cbaebe97..00000000 --- a/tidylib-src/test/input/in_427662.html +++ /dev/null @@ -1,10 +0,0 @@ - -
--
-
- first item -
- frame item - - - -
- last item -
This is a
This is a Red - - link
- - diff --git a/tidylib-src/test/input/in_427810.html b/tidylib-src/test/input/in_427810.html deleted file mode 100755 index 997d320e..00000000 --- a/tidylib-src/test/input/in_427810.html +++ /dev/null @@ -1,13 +0,0 @@ - - -Test inline element
- -Test inline element
- - diff --git a/tidylib-src/test/input/in_427811.html b/tidylib-src/test/input/in_427811.html deleted file mode 100755 index b5f94496..00000000 --- a/tidylib-src/test/input/in_427811.html +++ /dev/null @@ -1,16 +0,0 @@ - - -- |
-
-
-
- abc -
If converted to XML/XHTML, the < in the javascript source -above causes problems for XML tools.
- - - diff --git a/tidylib-src/test/input/in_427827.html b/tidylib-src/test/input/in_427827.html deleted file mode 100755 index f01e66a7..00000000 --- a/tidylib-src/test/input/in_427827.html +++ /dev/null @@ -1,9 +0,0 @@ - - -Tidy uses an incorrect XHTML 1.0 Namespace, - even if the correct namespace is given.
- - diff --git a/tidylib-src/test/input/in_427833.html b/tidylib-src/test/input/in_427833.html deleted file mode 100755 index 4ad987ba..00000000 --- a/tidylib-src/test/input/in_427833.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -#include <stdio.h>
-#include <stdio.h>
-#include <stdio.h>
- - diff --git a/tidylib-src/test/input/in_427834.html b/tidylib-src/test/input/in_427834.html deleted file mode 100755 index 76d6bca6..00000000 --- a/tidylib-src/test/input/in_427834.html +++ /dev/null @@ -1,10 +0,0 @@ - - - -Test input file for bug #427835
-Use with or without the -asxhtml option.
--clean has no effect
- - diff --git a/tidylib-src/test/input/in_427836.html b/tidylib-src/test/input/in_427836.html deleted file mode 100755 index dbb39f60..00000000 --- a/tidylib-src/test/input/in_427836.html +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/tidylib-src/test/input/in_427837.xml b/tidylib-src/test/input/in_427837.xml deleted file mode 100755 index e5feff0b..00000000 --- a/tidylib-src/test/input/in_427837.xml +++ /dev/null @@ -1,4 +0,0 @@ -
-
-lots more stuff deleted....
-
-
-some text
-some text
-
-
-
\ No newline at end of file
diff --git a/tidylib-src/test/input/in_427839.html b/tidylib-src/test/input/in_427839.html
deleted file mode 100755
index ac83fc27..00000000
--- a/tidylib-src/test/input/in_427839.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Inside a span. Tidy crashes on badly formed HTML
-involving nested lists.
-
- Problem is spec want "HTML 3.2 Final", but everyone
- in the world, including Tidy, uses "HTML 3.2". So the
- software has to recognize both FPI's as equivalent.
-
- Bryan
-Joe-Bob LLP is a leading national and international corporate, litigation and
-private client law firm. We represent a
-wide variety of business, institutional and individual clients for whom our
-lawyers handle a wide range of matters.
-As a result, our lawyers are well prepared to meet the needs of clients
-whether large or small, public or private, for-profit or not-for-profit. Joe-Bob
-Briggs has more offices than you can shake a stick at.
-These locations give Joe-Bob the geographic reach to assist his
-clients where their needs are most pressing. ·
-Estate Planning ·
-Closely-Held Business Practice ·
-Estate, Gift, Income and Other Tax Advice Joe-Bob
-joined the Firm in 1995 after 15 years with the Kansas City firm of Fish,
-Gill, Smoker & Butts, where he was a Shareholder/Director. John is a past Chair of the Estate Planning,
-Probate and Trust Committee of the Kansas City Metropolitan Bar Association and
-co-authored the Drinking Procedures Manual for County
-Practitioners. Currently, JB is a
-member of the Missouri Bar Probate and Trust Committee, the Estate Planning Society
-and the Mid-America Planned Giving Council.
-A fellow of the American College of Trust and Estate Counsel, JB
-lectures frequently on Estate Planning topics for both legal and lay
-organizations. Run tidy w/ -asxhtml or -asxml options...
-
-
-
-
-
-
-
-
diff --git a/tidylib-src/test/input/in_427844.html b/tidylib-src/test/input/in_427844.html
deleted file mode 100755
index a0445d19..00000000
--- a/tidylib-src/test/input/in_427844.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
diff --git a/tidylib-src/test/input/in_431883.html b/tidylib-src/test/input/in_431883.html
deleted file mode 100755
index b54a620d..00000000
--- a/tidylib-src/test/input/in_431883.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-text-one
-
-text-two
-
-
-
\ No newline at end of file
diff --git a/tidylib-src/test/input/in_431716.html b/tidylib-src/test/input/in_431716.html
deleted file mode 100755
index 9edcf798..00000000
--- a/tidylib-src/test/input/in_431716.html
+++ /dev/null
@@ -1,377 +0,0 @@
-
-
-
-
-
-
-
-Civil Rights #2
-
-Overview
-
-
-
-
-Who are you protected from?
-
-
-
-
-
-
-Who are you protected from?
-
-
-
-
-
-
-Who are you protected from?
-
-
-
-
-
-
-
-
-How are rules enforced?
-
-
-
-
-How are rules enforced?
-
-
-
-
-
-
-How are rules enforced?
-
-
-
-
-
-
-What about Affirmative Action?
-
-
-
-
-What about Affirmative Action?
-
-
-
-
-What about Affirmative Action?
-
-
-
-
-
-
-Why do protections grow and shrink?
-
-
-
-
-
-
-Racial Minorities
-
-
-
-
-Rights of Women
-
-
-
-
-Rights of Women
-
-
-
-
-Rights of Women
-
-
-
-
-Equal Rights Amendments
-
-
-
-
-Equal Rights Amendments
-
-
-
-
-Equal Rights Amendments
-
-
-
-
-
-
-Women in the Labor Force
-
-
-
-
-
-
-Women in the Labor Force
-
-
-
-
-
-
-Women in the Labor Force
-
-
-
-
-
-
-Higher Education
-
-
-
-
-Rights of disabled people
-
-
-
-
-
-
-Rights of disabled people
-
-
-
-
-
-
-
-
-Politics and Native American Rights
-
-
-
-
-
-
-
diff --git a/tidylib-src/test/input/in_431719.html b/tidylib-src/test/input/in_431719.html
deleted file mode 100755
index 341546ec..00000000
--- a/tidylib-src/test/input/in_431719.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tidylib-src/test/input/in_431721.html b/tidylib-src/test/input/in_431721.html
deleted file mode 100755
index 5d851a1b..00000000
--- a/tidylib-src/test/input/in_431721.html
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Missing table summary only applies to HTML 4.x
- Joe-Bob Briggs LLP
-
-
-OUTSIDE
-
-
\ No newline at end of file
diff --git a/tidylib-src/test/input/in_431736.html b/tidylib-src/test/input/in_431736.html
deleted file mode 100755
index b8b46c3f..00000000
--- a/tidylib-src/test/input/in_431736.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
Example
-
-
\ No newline at end of file
diff --git a/tidylib-src/test/input/in_431874.html b/tidylib-src/test/input/in_431874.html
deleted file mode 100755
index 3af169c3..00000000
--- a/tidylib-src/test/input/in_431874.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
| A cell. | -
This image has no ALT attribute.
-
Some text.
- - - diff --git a/tidylib-src/test/input/in_431898.html b/tidylib-src/test/input/in_431898.html deleted file mode 100755 index 6af7ba07..00000000 --- a/tidylib-src/test/input/in_431898.html +++ /dev/null @@ -1,13 +0,0 @@ - - -]> - -| A cell. | -
- - - - - - - - - - - id=ID =XX
- - - id=ID¡=XX
- - - id=ID¢=XX
- - - id=ID£=XX
- - - id=ID¤=XX
- - - id=ID¥=XX
- - - id=ID¦=XX
- - - id=ID§=XX
- - - id=ID¨=XX
- - - id=ID©=XX
- - - id=IDª=XX
- - - id=ID«=XX
- - - id=ID¬=XX
- - - id=ID=XX
- - - id=ID®=XX
- - - id=ID¯=XX
- - - id=ID°=XX
- - - id=ID±=XX
- - - id=ID²=XX
- - - id=ID³=XX
- - - id=ID´=XX
- - - id=IDµ=XX
- - - id=ID¶=XX
- - - id=ID·=XX
- - - id=ID¸=XX
- - - id=ID¹=XX
- - - id=IDº=XX
- - - id=ID»=XX
- - - id=ID¼=XX
- - - id=ID½=XX
- - - id=ID¾=XX
- - - id=ID¿=XX
- - - id=IDÀ=XX
- - - id=IDÁ=XX
- - - id=IDÂ=XX
- - - id=IDÃ=XX
- - - id=IDÄ=XX
- - - id=IDÅ=XX
- - - id=IDÆ=XX
- - - id=IDÇ=XX
- - - id=IDÈ=XX
- - - id=IDÉ=XX
- - - id=IDÊ=XX
- - - id=IDË=XX
- - - id=IDÌ=XX
- - - id=IDÍ=XX
- - - id=IDÎ=XX
- - - id=IDÏ=XX
- - - id=IDÐ=XX
- - - id=IDÑ=XX
- - - id=IDÒ=XX
- - - id=IDÓ=XX
- - - id=IDÔ=XX
- - - id=IDÕ=XX
- - - id=IDÖ=XX
- - - id=ID×=XX
- - - id=IDØ=XX
- - - id=IDÙ=XX
- - - id=IDÚ=XX
- - - id=IDÛ=XX
- - - id=IDÜ=XX
- - - id=IDÝ=XX
- - - id=IDÞ=XX
- - - id=IDß=XX
- - - id=IDà=XX
- - - id=IDá=XX
- - - id=IDâ=XX
- - - id=IDã=XX
- - - id=IDä=XX
- - - id=IDå=XX
- - - id=IDæ=XX
- - - id=IDç=XX
- - - id=IDè=XX
- - - id=IDé=XX
- - - id=IDê=XX
- - - id=IDë=XX
- - - id=IDì=XX
- - - id=IDí=XX
- - - id=IDî=XX
- - - id=IDï=XX
- - - id=IDð=XX
- - - id=IDñ=XX
- - - id=IDò=XX
- - - id=IDó=XX
- - - id=IDô=XX
- - - id=IDõ=XX
- - - id=IDö=XX
- - - id=ID÷=XX
- - - id=IDø=XX
- - - id=IDù=XX
- - - id=IDú=XX
- - - id=IDû=XX
- - - id=IDü=XX
- - - id=IDý=XX
- - - id=IDþ=XX
- - - id=IDÿ=XX
- - - - - - - - id=ID&fnof=XX
- - - id=ID&Alpha=XX
- - - id=ID&Beta=XX
- - - id=ID&Gamma=XX
- - - id=ID&Delta=XX
- - - id=ID&Epsilon=XX
- - - id=ID&Zeta=XX
- - - id=ID&Eta=XX
- - - id=ID&Theta=XX
- - - id=ID&Iota=XX
- - - id=ID&Kappa=XX
- - - id=ID&Lambda=XX
- - - id=ID&Mu=XX
- - - id=ID&Nu=XX
- - - id=ID&Xi=XX
- - - id=ID&Omicron=XX
- - - id=ID&Pi=XX
- - - id=ID&Rho=XX
- - - id=ID&Sigma=XX
- - - id=ID&Tau=XX
- - - id=ID&Upsilon=XX
- - - id=ID&Phi=XX
- - - id=ID&Chi=XX
- - - id=ID&Psi=XX
- - - id=ID&Omega=XX
- - - id=ID&alpha=XX
- - - id=ID&beta=XX
- - - id=ID&gamma=XX
- - - id=ID&delta=XX
- - - id=ID&epsilon=XX
- - - id=ID&zeta=XX
- - - id=ID&eta=XX
- - - id=ID&theta=XX
- - - id=ID&iota=XX
- - - id=ID&kappa=XX
- - - id=ID&lambda=XX
- - - id=ID&mu=XX
- - - id=ID&nu=XX
- - - id=ID&xi=XX
- - - id=ID&omicron=XX
- - - id=ID&pi=XX
- - - id=ID&rho=XX
- - - id=ID&sigmaf=XX
- - - id=ID&sigma=XX
- - - id=ID&tau=XX
- - - id=ID&upsilon=XX
- - - id=ID&phi=XX
- - - id=ID&chi=XX
- - - id=ID&psi=XX
- - - id=ID&omega=XX
- - - id=ID&thetasym=XX
- - - id=ID&upsih=XX
- - - id=ID&piv=XX
- - - id=ID&bull=XX
- - - id=ID&hellip=XX
- - - id=ID&prime=XX
- - - id=ID&Prime=XX
- - - id=ID&oline=XX
- - - id=ID&frasl=XX
- - - id=ID&weierp=XX
- - - id=ID&image=XX
- - - id=ID&real=XX
- - - id=ID&trade=XX
- - - id=ID&alefsym=XX
- - - id=ID&larr=XX
- - - id=ID&uarr=XX
- - - id=ID&rarr=XX
- - - id=ID&darr=XX
- - - id=ID&harr=XX
- - - id=ID&crarr=XX
- - - id=ID&lArr=XX
- - - id=ID&uArr=XX
- - - id=ID&rArr=XX
- - - id=ID&dArr=XX
- - - id=ID&hArr=XX
- - - id=ID&forall=XX
- - - id=ID&part=XX
- - - id=ID&exist=XX
- - - id=ID&empty=XX
- - - id=ID&nabla=XX
- - - id=ID&isin=XX
- - - - - - id=ID¬in=XX
- - - id=ID&ni=XX
- - - id=ID&prod=XX
- - - id=ID&sum=XX
- - - id=ID&minus=XX
- - - id=ID&lowast=XX
- - - id=ID&radic=XX
- - - id=ID&prop=XX
- - - id=ID&infin=XX
- - - id=ID&ang=XX
- - - id=ID&and=XX
- - - id=ID&or=XX
- - - id=ID&cap=XX
- - - id=ID&cup=XX
- - - id=ID&int=XX
- - - id=ID&there4=XX
- - - id=ID&sim=XX
- - - id=ID&cong=XX
- - - id=ID&asymp=XX
- - - id=ID&ne=XX
- - - id=ID&equiv=XX
- - - id=ID&le=XX
- - - id=ID&ge=XX
- - - id=ID&sub=XX
- - - id=ID&sup=XX
- - - id=ID&nsub=XX
- - - id=ID&sube=XX
- - - id=ID&supe=XX
- - - id=ID&oplus=XX
- - - id=ID&otimes=XX
- - - id=ID&perp=XX
- - - id=ID&sdot=XX
- - - id=ID&lceil=XX
- - - id=ID&rceil=XX
- - - id=ID&lfloor=XX
- - - id=ID&rfloor=XX
- - - id=ID&lang=XX
- - - id=ID&rang=XX
- - - id=ID&loz=XX
- - - id=ID&spades=XX
- - - id=ID&clubs=XX
- - - id=ID&hearts=XX
- - - id=ID&diams=XX
- - - - - - - - - id=ID"=XX
- - - id=ID&=XX
- - - id=ID<=XX
- - - id=ID>=XX
- - - - - - - - id=ID&OElig=XX
- - - id=ID&oelig=XX
- - - id=ID&Scaron=XX
- - - id=ID&scaron=XX
- - - id=ID&Yuml=XX
- - - id=ID&circ=XX
- - - id=ID&tilde=XX
- - - id=ID&ensp=XX
- - - id=ID&emsp=XX
- - - id=ID&thinsp=XX
- - - id=ID&zwnj=XX
- - - id=ID&zwj=XX
- - - id=ID&lrm=XX
- - - id=ID&rlm=XX
- - - id=ID&ndash=XX
- - - id=ID&mdash=XX
- - - id=ID&lsquo=XX
- - - id=ID&rsquo=XX
- - - id=ID&sbquo=XX
- - - id=ID&ldquo=XX
- - - id=ID&rdquo=XX
- - - id=ID&bdquo=XX
- - - id=ID&dagger=XX
- - - id=ID&Dagger=XX
- - - id=ID&permil=XX
- - - id=ID&lsaquo=XX
- - - id=ID&rsaquo=XX
- - - - - - id=ID&euro=XX
- - - - - - - - id=ID&apos=XX
- - - id=ID&foo=XX
- - diff --git a/tidylib-src/test/input/in_433021.html b/tidylib-src/test/input/in_433021.html deleted file mode 100755 index 82eb8df4..00000000 --- a/tidylib-src/test/input/in_433021.html +++ /dev/null @@ -1,18 +0,0 @@ - - -
text
-"valign" attr value can't be "center" - |
-"valign" attr value can't be "fuzzle" - |
-"align"/"valign" attr values can't be "fuzzle" - |
-
-There seems to be an error occurring when you don't -end a tag with a >. Tidy won't fix it. -
- - \ No newline at end of file diff --git a/tidylib-src/test/input/in_433604.xml b/tidylib-src/test/input/in_433604.xml deleted file mode 100755 index 81c0b659..00000000 --- a/tidylib-src/test/input/in_433604.xml +++ /dev/null @@ -1,4 +0,0 @@ - -| Test | -
Section heading
-Another heading
- -
Goto Another Heading - - diff --git a/tidylib-src/test/input/in_433856.html b/tidylib-src/test/input/in_433856.html deleted file mode 100755 index 5c2fd05e..00000000 --- a/tidylib-src/test/input/in_433856.html +++ /dev/null @@ -1,14 +0,0 @@ - - -
- - -De kop
- -Dit is een test.
- - \ No newline at end of file diff --git a/tidylib-src/test/input/in_434047.html b/tidylib-src/test/input/in_434047.html deleted file mode 100755 index 3a4ef701..00000000 --- a/tidylib-src/test/input/in_434047.html +++ /dev/null @@ -1,13 +0,0 @@ - - - -| Some text. | -
| - | -
So then I said to him,- - diff --git a/tidylib-src/test/input/in_435920.html b/tidylib-src/test/input/in_435920.html deleted file mode 100755 index c0fade23..00000000 --- a/tidylib-src/test/input/in_435920.html +++ /dev/null @@ -1,13 +0,0 @@ - - -don't go there.
| - |
- - - diff --git a/tidylib-src/test/input/in_435923.html b/tidylib-src/test/input/in_435923.html deleted file mode 100755 index 7a8af10a..00000000 --- a/tidylib-src/test/input/in_435923.html +++ /dev/null @@ -1,9 +0,0 @@ - - -
Phrase with numeric quotes expressly stated: “Déjà conçu à l'ère de Caféïne”
- - diff --git a/tidylib-src/test/input/in_438650.html b/tidylib-src/test/input/in_438650.html deleted file mode 100755 index 55c8a197..00000000 --- a/tidylib-src/test/input/in_438650.html +++ /dev/null @@ -1,9 +0,0 @@ - - -| Test | -
- -text-one - -- -text-two - - - \ No newline at end of file diff --git a/tidylib-src/test/input/in_441740.xhtml b/tidylib-src/test/input/in_441740.xhtml deleted file mode 100755 index 47ee9385..00000000 --- a/tidylib-src/test/input/in_441740.xhtml +++ /dev/null @@ -1,28 +0,0 @@ - - - - -
-
-
Unofficial W3C Validator FAQ
-This is a list of frequently asked questions and answers asked on the -www-validator-css@w3.org mailing list. - -
-What does "org.xml.sax.SAXException:
-Please, fix your system identifier (URI) in the DOCTYPE rule." mean?
-
-
-Your XHTML document contains a document type -declaration but the system identifier points at some -non-W3C URI. Your document probably contains something -like this: -
-- - -- - \ No newline at end of file diff --git a/tidylib-src/test/input/in_443381.xhtml b/tidylib-src/test/input/in_443381.xhtml deleted file mode 100755 index b5c6b9ac..00000000 --- a/tidylib-src/test/input/in_443381.xhtml +++ /dev/null @@ -1,10 +0,0 @@ - - - -
TestTest
Hello
- -
This is a nice document
- -With a nice picture
The predicate calculus has a number of theorems and axioms for proving logical statements. Here are the main symbols used in predicate calculus:
-P(x) – proposition – a logical statement in the condition x.
-x – any condition in the set of possible conditions.
-c – a particular condition in the set of possible conditions.
-" - – "For every"
-$ - – "Exists"
-® - – Implication
-Ù - – Conjunction (logical and)
-Ú - – Disjunction (logical or)
- - diff --git a/tidylib-src/test/input/in_446019.xhtml b/tidylib-src/test/input/in_446019.xhtml deleted file mode 100755 index afa5328c..00000000 --- a/tidylib-src/test/input/in_446019.xhtml +++ /dev/null @@ -1,12 +0,0 @@ - - - -
-
Test
-
Make this wrap at the end of the line12345678: white-space![joebob](-"joebob.gif")
This is long enough a wrap at the next line text -...
- - - diff --git a/tidylib-src/test/input/in_450389.html b/tidylib-src/test/input/in_450389.html deleted file mode 100755 index ebe001c9..00000000 --- a/tidylib-src/test/input/in_450389.html +++ /dev/null @@ -1,82 +0,0 @@ - - -
-Test black
-Test green
-Test silver
-Test lime
-Test gray
-Test olive
-Test white
-Test yellow
-Test maroon
-Test navy
-Test red
-Test blue
-Test purple
-Test teal
-Test fuchsia
-Test aqua
-
-Test Red
-Test RED
-
-Test invalid reddish
-
-Test black #000000
-Test green #008000
-Test silver #C0C0C0
-Test lime #00FF00
-Test gray #808080
-Test olive #808000
-Test white #FFFFFF
-Test yellow #FFFF00
-Test maroon #800000
-Test navy #000080
-Test red #FF0000
-Test blue #0000FF
-Test purple #800080
-Test teal #008080
-Test fuchsia #FF00FF
-Test aqua #00FFFF
-
-Test red #ff0000
-Test red #fF0000
-
-Test invalid red #FF
-
-Test invalid grurple
-Test invalid #grurple
-Test invalid #1234567
-
- - diff --git a/tidylib-src/test/input/in_463066.html b/tidylib-src/test/input/in_463066.html deleted file mode 100755 index 8af45ba2..00000000 --- a/tidylib-src/test/input/in_463066.html +++ /dev/null @@ -1,552 +0,0 @@ - - - - - - - - - - - - - - - - - - -
Test 1
- - - --
-
-
- Here - -
- We - -
- Go - -
- Again - -
- - - -
-
-
-
- Ok - -
- That - -
- Worked - -
- - - -
v But
- - - -v It
- - - -v Does
- - - -v Not
- - - -v Work
- - - -v With
- - - -v Bullet
- - - -v Points
- - - -- - - -
q - -Now
- - - -q - -It
- - - -q - -Is
- - - -q - -Working
- - - -- - - -
-
-
-
- Try - -
- It - -
- Again - -
- - - -
-
-
-
- Do - -
- It - -
- Again - -
- And - -
(foo bar). -...
- - diff --git a/tidylib-src/test/input/in_470663.html b/tidylib-src/test/input/in_470663.html deleted file mode 100755 index e165354c..00000000 --- a/tidylib-src/test/input/in_470663.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - -Body doesn't matter. Problem occurs parsing <head> element.
- - diff --git a/tidylib-src/test/input/in_470688.html b/tidylib-src/test/input/in_470688.html deleted file mode 100755 index f3c4f7fa..00000000 --- a/tidylib-src/test/input/in_470688.html +++ /dev/null @@ -1,10 +0,0 @@ - - - -RIGHT TRIANGLES
- - diff --git a/tidylib-src/test/input/in_471264.html b/tidylib-src/test/input/in_471264.html deleted file mode 100755 index b284b05c..00000000 --- a/tidylib-src/test/input/in_471264.html +++ /dev/null @@ -1,11 +0,0 @@ - - --
-
- first element -
- second element -
Test
-Introduction
-New Introduction
- - \ No newline at end of file diff --git a/tidylib-src/test/input/in_487204.html b/tidylib-src/test/input/in_487204.html deleted file mode 100755 index 02d29672..00000000 --- a/tidylib-src/test/input/in_487204.html +++ /dev/null @@ -1,12 +0,0 @@ - - --
-
- One -
- Two -
- Three -
-
-
| row 1, cell 1 - | row 1, cell 2 - |
| row 2, cell 1 - | row 2, cell 2 - |
| xx | -
-
-
diff --git a/tidylib-src/test/input/in_504206.html b/tidylib-src/test/input/in_504206.html
deleted file mode 100755
index b4b95684..00000000
--- a/tidylib-src/test/input/in_504206.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-COMM 428: Feedback Survey
- -Please fill out the following form based on YOUR -experience in COMM 428 to date.
-Use the Send button at the bottom -of the page to send your feedback to me via e-mail. -
- - - diff --git a/tidylib-src/test/input/in_508936.html b/tidylib-src/test/input/in_508936.html deleted file mode 100755 index f950f1dc..00000000 --- a/tidylib-src/test/input/in_508936.html +++ /dev/null @@ -1,11 +0,0 @@ - - -
Allow user to specify -prefix for -class names Tidy generates with --clean yes option. -
- - diff --git a/tidylib-src/test/input/in_511243.xhtml b/tidylib-src/test/input/in_511243.xhtml deleted file mode 100755 index 00f222fc..00000000 --- a/tidylib-src/test/input/in_511243.xhtml +++ /dev/null @@ -1,12 +0,0 @@ - - - -
-How to…
-Place an extended-hours order:
-
-
\ No newline at end of file
diff --git a/tidylib-src/test/input/in_514348.html b/tidylib-src/test/input/in_514348.html
deleted file mode 100755
index 2f483e25..00000000
--- a/tidylib-src/test/input/in_514348.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
Test valid D
-Test valid ID
-Test valid ID - : should only be used for namespaces
-Test invalid ID
-Test invalid ID
- - \ No newline at end of file diff --git a/tidylib-src/test/input/in_517550.xhtml b/tidylib-src/test/input/in_517550.xhtml deleted file mode 100755 index 723eb4c4..00000000 --- a/tidylib-src/test/input/in_517550.xhtml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - -A test document
- - diff --git a/tidylib-src/test/input/in_525081.html b/tidylib-src/test/input/in_525081.html deleted file mode 100755 index 1a393dc1..00000000 --- a/tidylib-src/test/input/in_525081.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -Script sample 1
-Headline project—Link to offsite page.
-Input 1
-texttext
- - - diff --git a/tidylib-src/test/input/in_537604.xml b/tidylib-src/test/input/in_537604.xml deleted file mode 100755 index 713d2c85..00000000 --- a/tidylib-src/test/input/in_537604.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - -
-
-
\ No newline at end of file
diff --git a/tidylib-src/test/input/in_540296.html b/tidylib-src/test/input/in_540296.html
deleted file mode 100755
index 1188debd..00000000
--- a/tidylib-src/test/input/in_540296.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
--
-
-
-
- -- -
- - - -
#540555 Empty title tag is trimmed
- \ No newline at end of file diff --git a/tidylib-src/test/input/in_540571.html b/tidylib-src/test/input/in_540571.html deleted file mode 100755 index 03bdf6f9..00000000 --- a/tidylib-src/test/input/in_540571.html +++ /dev/null @@ -1,15 +0,0 @@ - - -Hello World
--The font inline is moved so it becomes a child of the h1 element. -
-Hello World
--The span inline is not moved so it becomes a child of the h1 element, which is inconsistent and does not correspond with current browser behaviour any more. -
- - \ No newline at end of file diff --git a/tidylib-src/test/input/in_542029.html b/tidylib-src/test/input/in_542029.html deleted file mode 100755 index 2d2aff51..00000000 --- a/tidylib-src/test/input/in_542029.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -Test
- - diff --git a/tidylib-src/test/input/in_545067.html b/tidylib-src/test/input/in_545067.html deleted file mode 100755 index 7b28f1c1..00000000 --- a/tidylib-src/test/input/in_545067.html +++ /dev/null @@ -1,3 +0,0 @@ - -diff --git a/tidylib-src/test/input/in_545772.html b/tidylib-src/test/input/in_545772.html deleted file mode 100755 index e96216a7..00000000 --- a/tidylib-src/test/input/in_545772.html +++ /dev/null @@ -1,13 +0,0 @@ - -
-| Testing | -
á
-;
-Introduction
[ 586555 ] Misplaced backslash caused by newline
- - - - - diff --git a/tidylib-src/test/input/in_586562.html b/tidylib-src/test/input/in_586562.html deleted file mode 100755 index 1d72b550..00000000 --- a/tidylib-src/test/input/in_586562.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - -Two DOCTYPE's!
- - diff --git a/tidylib-src/test/input/in_588061.html b/tidylib-src/test/input/in_588061.html deleted file mode 100755 index 811a715d..00000000 --- a/tidylib-src/test/input/in_588061.html +++ /dev/null @@ -1,428 +0,0 @@ - - - - - - - - -TVNAV.COM
-Toll Free 877-625-3546 (US only)
- -
- -
-
-
-To track your package click here.
-
-Check the current REBATE offers!
-**NEW! GPSMAP 76S IN STOCK!**
-
-
-
-**NEW! Rino 110/120 GPS/FRS/GMRS Expected September**
-
-
-**NEW! GPSMAP 196 Coming Soon!**
-
-
-**NEW! City Navigator Australia....$265.00 IN STOCK!**
-
-**NEW! BlueChart software IN STOCK!**
-
-
-**NEW! Europe MapSource: City Navigator, City Select, MetroGuide and Roads & Recreation IN STOCK!**
-
-
-**NEW! We now have remanufactured GPS III ($150) in stock. 1 year warranty.**
-
-**NEW! GPS V IN STOCK!**
-
-**NEW! eTrex/eMap/StreetPilot/ColorMap/StreetPilot III/GPSMAP 295 Bean Bag IN STOCK!**
-
-**NEW! StreetPilot III IN STOCK!**
-
-**NEW! StreetPilot/ColorMap/295 Deluxe Case IN STOCK!**
-
-**NEW! Sunvisor for StreetPilot, ColorMap, StreetPilot III and GPSMAP 295....$20.00 IN STOCK!**
-
-**We have R-A-M mounts now in stock for most Garmin units....Call or email us for prices and availability.**
-
-
- - -
- -
Total Video became an authorized Garmin dealer in January 1999. We sold 300+ GPS units prior to becoming a Garmin direct dealer, picking them up from various distributors and individuals to sell. By becoming a Garmin direct dealer we now are able to sell for less! Total Video prides itself with *very quick shipping and a strong history of customer satisfaction. Comments from customers.
-
-
-
-Want to learn more about GPS? Click here for further GPS information.
-
-
-
-Rino 110/120 GPS-Integrated FRS/GMRS Radios....(MAP $169.99/$249.99) Call or email us for our current price....too low to advertise! Coming Soon!
-
-
-
-eMap....$170.00 IN STOCK!
-
-
-
-eMap with 8MB memory cartridge....$200.00 IN STOCK!
-
-
-
-eMap with 8MB memory cartridge and USA MetroGuide MapSource....$215.00 IN STOCK!
-
-
-
-eTrex....$115.00 IN STOCK!
-
-
-
-eTrex Summit....$210.00 IN STOCK!
-
-
-
-eTrex Camo....$125.00 IN STOCK!
-
-
-
-eTrex Venture....(MAP $169.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-eTrex Legend....(MAP $249.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-eTrex Vista....(MAP $349.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-GPSMAP 76S....(MAP $449.99) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-GPSMAP 76....(MAP $349.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-GPS 76....(MAP $219.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-GPSMAP 176....(MAP $499.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-GPSMAP 176C....(MAP $599.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-GPSMAP 2006....(MAP $1199.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-GPSMAP 2006C....(MAP $1999.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-GPSMAP 2010C....(MAP $2499.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-
-GPS 12....$140.00 IN STOCK!
-
-
-
-GPS 12XL with carrying case....$190.00 IN STOCK!
-
-
-
-GPS 12 MAP with PC interface cable....$280.00 IN STOCK!
-
-
-
-GPS II Plus....$190.00 IN STOCK!
-
-
-
-
-GPS III Plus with PC interface cable....$280.00 IN STOCK!
-
-
-
-GPS V Deluxe w/*new* City Select with all unlocks....(MAP $499.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-*U.S. Roads and Recreation MapSource....$80.00 IN STOCK!
-
-
-
-*WorldMap MapSource....$80.00 IN STOCK!
-
-
-
-*TOPO MapSource....$85.00 IN STOCK!
-
-
-
-*Fishing Hot Spots MapSource (includes one coverage area unlock)....$85.00 IN STOCK!
-
-
-
-*U.S. Waterways & Lights MapSource....$60.00 IN STOCK!
-
-
-
-StreetPilot with dash mount, cigarette power cable and PC interface cable....$385.00 IN STOCK!
-
-
-
-StreetPilot ColorMap with dash mount, cigarette power cable and PC interface cable....$540.00 IN STOCK!
-
-
-
-StreetPilot III Deluxe w/128MB, *new* City Navigator w/all unlocks and portable bean bag mount....(MAP $999.00) Call or email us for our current price....too low to advertise! IN STOCK!
-
-
-
-*MetroGuide USA MapSource....$90.00 IN STOCK!
-
-
-
-*MetroGuide USA MapSource w/Blank 8MB Memory Cartridge....$110.00 IN STOCK!
-
-
-
-*MetroGuide USA MapSource w/Blank 16MB Memory Cartridge....$115.00 IN STOCK!
-
-
-
-*MetroGuide Canada with Roads & Recreation....$80.00 IN STOCK!
-
-
-
-*City Navigator Europe....$195.00 IN STOCK!
-
-
-
-*City Navigator Europe "All" unlock....$215.00 IN STOCK!
-
-
-
-*City Select Europe....$115.00 IN STOCK!
-
-
-
-*City Select Europe "All" unlock....$115.00 IN STOCK!
-
-
-
-*MetroGuide Europe....$115.00 IN STOCK!
-
-
-
-*Roads & Recreation Europe....$85.00 IN STOCK!
-
-
-
-*City Navigator Australia....$265.00 IN STOCK!
-
-
-
-*BlueChart w/one coverage area....(MAP Americas-$139.00/Atlantic-$229.00/Pacific-$189.00) Call or email us for our current prices....too low to advertise! IN STOCK!
-
-
-
-*BlueChart Single Region Unlock....Americas-$85.00/Atlantic-$145.00/Pacific-$105.00 IN STOCK!
-
-
-
-Blank 8MB Memory Cartridge....$45.00 IN STOCK!
-
-
-
-Blank 16MB Memory Cartridge....$55.00 IN STOCK!
-
-
-
-Blank 32MB Memory Cartridge....$70.00 IN STOCK!
-
-
-
-Blank 64MB Memory Cartridge....$105.00 IN STOCK!
-
-
-
-Blank 128MB Memory Cartridge....$155.00 IN STOCK!
-
-
-
-USB Data Card Programmer....$70.00 IN STOCK!
-
-
-
-PC Download Kit (includes AC/DC adapter and 12V cigarette power/PC interface cable (for round, 4 pin connectors only)....$45.00
-
-
-
-eMap/eTrex PC Download Kit (includes AC/DC adapter and cigarette power/PC interface cable....$50.00
-
-
-
-GPSMAP 162....$355.00 (w/internal antenna)/$375.00 (w/external antenna) IN STOCK!
-
-
-
-GPSMAP 168 Sounder....$495.00 (w/internal antenna)/$515.00 (w/external antenna) IN STOCK!
-
-
-
-NavTalk Cellular phone/GPS (ver. 2.16)....$375.00
-
-
-
-GBR 21 and GBR 23 Differential Receivers....$180.00
-
-
-
-Videos available on many of the Garmin products as well as general GPS usage videos.
-
-
-
-Garmin GPS and accessories catalog....$2.00 (for s/h in US. Refundable/free with order)
-
-
-
-Online GARMIN manuals.
-
-
-
-Stock status subject to change. We try to update the stock status continuously but we sometimes don't get it changed immediately. Check with us for current stock status.
-
-Our Return Policy
Software Return Policy
-
-
-
-
-Accessories and Miscellaneous Items
-
-
-
-
-AVIATION GPS
-
-We also sell Garmin GPS accessories such as mounts, cables, cases, etc.
-
-
-
- We sell everything in the Garmin outdoor recreation, marine and cartography line. Email us for prices on any items you don't see listed above.
-
-
-
-We charge a flat $10.00 shipping and handling charge (via UPS ground) per GPS order (not per item) in the 48/US.
$5.00 shipping and handling for accessories in the 48/US.
An additional $10.00 charge for COD orders (COD s/h must be credit card secured).
Faster shipping available.
*3 day select (usually arrives in 2 days!)--addtl. $3.00.
*2nd day air--addtl. $5.00.
*Next day air saver--addtl. $20.00.
*Next day air-Saturday delivery--addtl. $35.00
*More shipping may be required on larger packages for 3 day, 2nd day and next day air packages.
Click here to get UPS Ground delivery times. Our zip code is 67601 (Hays, Kansas).
-
Add $10 to UPS charges for FedEx shipping. (minimum FedEx s/h is $18)
-
-
-
-
$20 for Priority Mail s/h on GPS units and $15 for accessories in the US.
-
-
-
-Email us for requirements/costs for out of 48/US sales or click here.
-
-
-
-ORDERING INFORMATION
-
-* Most orders received by 2:00 p.m. central time for in stock items will ship the same day (business days only).
-
-
-
-All orders in Kansas must pay a 6.8% sales tax.
-
-
-
-We accept payment by Discover/MasterCard/Visa/Pre-pay (orders paid by personal/company check orders held for 10 business days for check clearing. Cashier checks/money orders ship same day.). COD orders welcome (cashiers check or money order).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Toll Free Order Line (877) 625-3546 (US only)
FAX (413) 383-8800
Information /International Order Line (785) 625-3546
-
-
-
-Home Page
-
-
-
-- -eMap....$170.00 IN STOCK! - -
- -eMap with 8MB memory cartridge....$200.00 IN STOCK! - -
- -eMap with 8MB memory cartridge and USA MetroGuide MapSource....$215.00 IN STOCK! - -
- -eTrex....$115.00 IN STOCK! - -
- -eTrex Summit....$210.00 IN STOCK! - -
- -eTrex Camo....$125.00 IN STOCK! - -
- -eTrex Venture....(MAP $169.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -eTrex Legend....(MAP $249.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -eTrex Vista....(MAP $349.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -GPSMAP 76S....(MAP $449.99) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -GPSMAP 76....(MAP $349.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -GPS 76....(MAP $219.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -GPSMAP 176....(MAP $499.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -GPSMAP 176C....(MAP $599.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -GPSMAP 2006....(MAP $1199.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -GPSMAP 2006C....(MAP $1999.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -GPSMAP 2010C....(MAP $2499.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- - -GPS 12....$140.00 IN STOCK! - -
- -GPS 12XL with carrying case....$190.00 IN STOCK! - -
- -GPS 12 MAP with PC interface cable....$280.00 IN STOCK! - -
- -GPS II Plus....$190.00 IN STOCK! - -
- - -GPS III Plus with PC interface cable....$280.00 IN STOCK! - -
- -GPS V Deluxe w/*new* City Select with all unlocks....(MAP $499.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -*U.S. Roads and Recreation MapSource....$80.00 IN STOCK! - -
- -*WorldMap MapSource....$80.00 IN STOCK! - -
- -*TOPO MapSource....$85.00 IN STOCK! - -
- -*Fishing Hot Spots MapSource (includes one coverage area unlock)....$85.00 IN STOCK! - -
- -*U.S. Waterways & Lights MapSource....$60.00 IN STOCK! - -
- -StreetPilot with dash mount, cigarette power cable and PC interface cable....$385.00 IN STOCK! - -
- -StreetPilot ColorMap with dash mount, cigarette power cable and PC interface cable....$540.00 IN STOCK! - -
- -StreetPilot III Deluxe w/128MB, *new* City Navigator w/all unlocks and portable bean bag mount....(MAP $999.00) Call or email us for our current price....too low to advertise! IN STOCK! - -
- -*MetroGuide USA MapSource....$90.00 IN STOCK! - -
- -*MetroGuide USA MapSource w/Blank 8MB Memory Cartridge....$110.00 IN STOCK! - -
- -*MetroGuide USA MapSource w/Blank 16MB Memory Cartridge....$115.00 IN STOCK! - -
- -*MetroGuide Canada with Roads & Recreation....$80.00 IN STOCK! - -
- -*City Navigator Europe....$195.00 IN STOCK! - -
- -*City Navigator Europe "All" unlock....$215.00 IN STOCK! - -
- -*City Select Europe....$115.00 IN STOCK! - -
- -*City Select Europe "All" unlock....$115.00 IN STOCK! - -
- -*MetroGuide Europe....$115.00 IN STOCK! - -
- -*Roads & Recreation Europe....$85.00 IN STOCK! - -
- -*City Navigator Australia....$265.00 IN STOCK! - -
- -*BlueChart w/one coverage area....(MAP Americas-$139.00/Atlantic-$229.00/Pacific-$189.00) Call or email us for our current prices....too low to advertise! IN STOCK! - -
- -*BlueChart Single Region Unlock....Americas-$85.00/Atlantic-$145.00/Pacific-$105.00 IN STOCK! - -
- -Blank 8MB Memory Cartridge....$45.00 IN STOCK! - -
- -Blank 16MB Memory Cartridge....$55.00 IN STOCK! - -
- -Blank 32MB Memory Cartridge....$70.00 IN STOCK! - -
- -Blank 64MB Memory Cartridge....$105.00 IN STOCK! - -
- -Blank 128MB Memory Cartridge....$155.00 IN STOCK! - -
- -USB Data Card Programmer....$70.00 IN STOCK! - -
- -PC Download Kit (includes AC/DC adapter and 12V cigarette power/PC interface cable (for round, 4 pin connectors only)....$45.00 - -
- -eMap/eTrex PC Download Kit (includes AC/DC adapter and cigarette power/PC interface cable....$50.00 - -
- -GPSMAP 162....$355.00 (w/internal antenna)/$375.00 (w/external antenna) IN STOCK! - -
- -GPSMAP 168 Sounder....$495.00 (w/internal antenna)/$515.00 (w/external antenna) IN STOCK! - -
- -NavTalk Cellular phone/GPS (ver. 2.16)....$375.00 - -
- -GBR 21 and GBR 23 Differential Receivers....$180.00 - -
- -Videos available on many of the Garmin products as well as general GPS usage videos. - -
- -Garmin GPS and accessories catalog....$2.00 (for s/h in US. Refundable/free with order) - -
- -Online GARMIN manuals.
Our Return Policy
Software Return Policy
-
-
-
-
-Accessories and Miscellaneous Items
-
-
-
-
-AVIATION GPS
- - We sell everything in the Garmin outdoor recreation, marine and cartography line. Email us for prices on any items you don't see listed above. - -
-
-We charge a flat $10.00 shipping and handling charge (via UPS ground) per GPS order (not per item) in the 48/US.
$5.00 shipping and handling for accessories in the 48/US.
An additional $10.00 charge for COD orders (COD s/h must be credit card secured).
Faster shipping available.
*3 day select (usually arrives in 2 days!)--addtl. $3.00.
*2nd day air--addtl. $5.00.
*Next day air saver--addtl. $20.00.
*Next day air-Saturday delivery--addtl. $35.00
*More shipping may be required on larger packages for 3 day, 2nd day and next day air packages.
Click here to get UPS Ground delivery times. Our zip code is 67601 (Hays, Kansas).
-
Add $10 to UPS charges for FedEx shipping. (minimum FedEx s/h is $18)
-
-- -
$20 for Priority Mail s/h on GPS units and $15 for accessories in the US.
-
-- -Email us for requirements/costs for out of 48/US sales or click here. - -
- -
ORDERING INFORMATION
- -* Most orders received by 2:00 p.m. central time for in stock items will ship the same day (business days only). - -
- -All orders in Kansas must pay a 6.8% sales tax. - -
- -We accept payment by Discover/MasterCard/Visa/Pre-pay (orders paid by personal/company check orders held for 10 business days for check clearing. Cashier checks/money orders ship same day.). COD orders welcome (cashiers check or money order).
-
-- -
-
-- -
-
-- -
Toll Free Order Line (877) 625-3546 (US only)
FAX (413) 383-8800
Information /International Order Line (785) 625-3546
-
-- -
Home Page
- - -
- -Counter reset 2/1/99 -
-This site last modified 7/25/02 - -
- - - - - - diff --git a/tidylib-src/test/output/out_427820.html b/tidylib-src/test/output/out_427820.html deleted file mode 100755 index aa08f0c8..00000000 --- a/tidylib-src/test/output/out_427820.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -
- |
-
If converted to XML/XHTML, the < in the javascript source -above causes problems for XML tools.
- - - diff --git a/tidylib-src/test/output/out_431721.html b/tidylib-src/test/output/out_431721.html deleted file mode 100755 index 716a09b1..00000000 --- a/tidylib-src/test/output/out_431721.html +++ /dev/null @@ -1,54 +0,0 @@ - - -Joe-Bob Briggs LLP
- - - -Bryan Joe-Bob LLP is a leading national and international - corporate, litigation and private client law firm. We - represent a wide variety of business, institutional and - individual clients for whom our lawyers handle a wide range - of matters. As a result, our lawyers are well prepared - to meet the needs of clients whether large or small, public - or private, for-profit or not-for-profit.
- - - -Joe-Bob Briggs has more offices than you can shake a stick - at. These locations give Joe-Bob the geographic reach - to assist his clients where their needs are most - pressing.
- --
-
- Estate Planning - -
- Closely-Held Business Practice - -
- Estate, Gift, Income and Other Tax Advice -
Joe-Bob joined the Firm in 1995 after 15 years with the - Kansas City firm of Fish, Gill, Smoker & Butts, where he - was a Shareholder/Director. John is a past Chair of the - Estate Planning, Probate and Trust Committee of the Kansas - City Metropolitan Bar Association and co-authored the - Drinking Procedures Manual for County Practitioners. - Currently, JB is a member of the Missouri Bar Probate and - Trust Committee, the Estate Planning Society and the - Mid-America Planned Giving Council. A fellow of the - American College of Trust and Estate Counsel, JB lectures - frequently on Estate Planning topics for both legal and lay - organizations.
- - -Script sample 1
- -Headline project—Link to offsite page.
- -Input 1
- -texttext
- - - diff --git a/tidylib-src/test/output/out_540571.html b/tidylib-src/test/output/out_540571.html deleted file mode 100755 index 66077b3d..00000000 --- a/tidylib-src/test/output/out_540571.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - -- Hello World -
- -The font inline is moved so it becomes a child of the h1 element.
- -- Hello World -
- -The span inline is not moved so it becomes a child of the h1 element, which is inconsistent and does not correspond with current browser behaviour any more.
- - - diff --git a/tidylib-src/test/testall.sh b/tidylib-src/test/testall.sh deleted file mode 100755 index cefcd1bb..00000000 --- a/tidylib-src/test/testall.sh +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh - -# -# testall.sh - execute all testcases for regression testing -# -# (c) 1998-2001 (W3C) MIT, INRIA, Keio University -# See tidy.c for the copyright notice. -# -#