emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Always show DOCTYPE found

Browse source
This commit is contained in:
Geoff McLane 2014-09-14 19:06:19 +02:00
parent a08c7c9444
commit 20da40d2e8
3 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
console/tidy.c
View file

@ -1313,9 +1313,18 @@ int main( int argc, char** argv )
if ( status >= 0 ) if ( status >= 0 )
status = tidyCleanAndRepair( tdoc ); status = tidyCleanAndRepair( tdoc );
if ( status >= 0 ) if ( status >= 0 ) {
status = tidyRunDiagnostics( tdoc ); status = tidyRunDiagnostics( tdoc );
if ( !tidyOptGetBool(tdoc, TidyQuiet) ) {
/* NOT quiet, show DOCTYPE, if not already shown */
if (!tidyOptGetBool(tdoc, TidyShowInfo)) {
tidyOptSetBool( tdoc, TidyShowInfo, yes );
tidyReportDoctype( tdoc ); /* FIX20140913: like warnings, errors, ALWAYS report DOCTYPE */
tidyOptSetBool( tdoc, TidyShowInfo, no );
}
}
}
if ( status > 1 ) /* If errors, do we want to force output? */ if ( status > 1 ) /* If errors, do we want to force output? */
status = ( tidyOptGetBool(tdoc, TidyForceOutput) ? status : -1 ); status = ( tidyOptGetBool(tdoc, TidyForceOutput) ? status : -1 );

2
include/tidy.h
View file

@ -676,6 +676,8 @@ TIDY_EXPORT int TIDY_CALL tidyCleanAndRepair( TidyDoc tdoc );
*/ */
TIDY_EXPORT int TIDY_CALL tidyRunDiagnostics( TidyDoc tdoc ); TIDY_EXPORT int TIDY_CALL tidyRunDiagnostics( TidyDoc tdoc );
TIDY_EXPORT int TIDY_CALL tidyReportDoctype( TidyDoc tdoc );
/** @} end Clean group */ /** @} end Clean group */

17
src/tidylib.c
View file

@ -56,6 +56,7 @@ static int tidyDocParseSource( TidyDocImpl* impl, TidyInputSource* docI
** pre-or-post repair. ** pre-or-post repair.
*/ */
static int tidyDocRunDiagnostics( TidyDocImpl* doc ); static int tidyDocRunDiagnostics( TidyDocImpl* doc );
static void tidyDocReportDoctype( TidyDocImpl* doc );
static int tidyDocCleanAndRepair( TidyDocImpl* doc ); static int tidyDocCleanAndRepair( TidyDocImpl* doc );
@ -1136,6 +1137,16 @@ int TIDY_CALL tidyRunDiagnostics( TidyDoc tdoc )
return -EINVAL; return -EINVAL;
} }
int TIDY_CALL tidyReportDoctype( TidyDoc tdoc )
{
int iret = -EINVAL;
TidyDocImpl* impl = tidyDocToImpl( tdoc );
if ( impl ) {
tidyDocReportDoctype( impl );
iret = 0;
}
return iret;
}
/* Workhorse functions. /* Workhorse functions.
** **
@ -1228,6 +1239,12 @@ int tidyDocRunDiagnostics( TidyDocImpl* doc )
return tidyDocStatus( doc ); return tidyDocStatus( doc );
} }
void tidyDocReportDoctype( TidyDocImpl* doc )
{
TY_(ReportMarkupVersion)( doc );
}
/* ###################################################################################### /* ######################################################################################
HTML5 STUFF HTML5 STUFF
*/ */