diff --git a/console/tidy.c b/console/tidy.c index 77dc24c..d107c6c 100644 --- a/console/tidy.c +++ b/console/tidy.c @@ -2480,19 +2480,18 @@ int main( int argc, char** argv ) if ( argc <= 1 ) break; } /* read command line loop */ - - - if (!tidyOptGetBool(tdoc, TidyQuiet) && - errout == stderr && !contentErrors) + + /* blank line for screen formatting */ + if ( errout == stderr && !contentErrors && !tidyOptGetBool( tdoc, TidyQuiet ) ) fprintf(errout, "\n"); - - if (contentErrors + contentWarnings > 0 && - !tidyOptGetBool(tdoc, TidyQuiet)) + + /* footnote printing only if errors or warnings */ + if ( contentErrors + contentWarnings > 0 ) tidyErrorSummary(tdoc); - - if (!tidyOptGetBool(tdoc, TidyQuiet)) - tidyGeneralInfo(tdoc); - + + /* prints the general info, if applicable */ + tidyGeneralInfo(tdoc); + /* called to free hash tables etc. */ tidyRelease( tdoc ); diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po index c61cab8..4488c1a 100644 --- a/localize/translations/language_en_gb.po +++ b/localize/translations/language_en_gb.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-10-05 09:29:27\n" +"PO-Revision-Date: 2017-10-05 15:13:40\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2089,7 +2089,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. #, c-format msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" +msgid "Tidy found %u %s and %u %s!\n" msgstr "" #. This console output should be limited to 78 characters per line. @@ -2101,7 +2101,7 @@ msgid "" msgstr "" msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." +msgid "No warnings or errors were found.\n" msgstr "" msgctxt "STRING_NO_SYSID" @@ -2110,7 +2110,7 @@ msgstr "" #, c-format msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n" msgstr "" #. This console output should be limited to 78 characters per line. diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po index 2a00ff3..8fd8648 100644 --- a/localize/translations/language_es.po +++ b/localize/translations/language_es.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-10-05 09:29:27\n" +"PO-Revision-Date: 2017-10-05 15:13:40\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2033,7 +2033,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. #, c-format msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" +msgid "Tidy found %u %s and %u %s!\n" msgstr "" #. This console output should be limited to 78 characters per line. @@ -2045,7 +2045,7 @@ msgid "" msgstr "" msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." +msgid "No warnings or errors were found.\n" msgstr "" msgctxt "STRING_NO_SYSID" @@ -2054,7 +2054,7 @@ msgstr "" #, c-format msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n" msgstr "" #. This console output should be limited to 78 characters per line. diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po index 6fab04d..6146909 100644 --- a/localize/translations/language_es_mx.po +++ b/localize/translations/language_es_mx.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-10-05 09:29:27\n" +"PO-Revision-Date: 2017-10-05 15:13:40\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2028,7 +2028,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. #, c-format msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" +msgid "Tidy found %u %s and %u %s!\n" msgstr "" #. This console output should be limited to 78 characters per line. @@ -2040,7 +2040,7 @@ msgid "" msgstr "" msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." +msgid "No warnings or errors were found.\n" msgstr "" msgctxt "STRING_NO_SYSID" @@ -2049,7 +2049,7 @@ msgstr "" #, c-format msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n" msgstr "" #. This console output should be limited to 78 characters per line. diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po index f88a90e..7e14df3 100644 --- a/localize/translations/language_fr.po +++ b/localize/translations/language_fr.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-10-05 09:29:27\n" +"PO-Revision-Date: 2017-10-05 15:13:40\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2461,8 +2461,8 @@ msgstr "DOCTYPE donnée est «%s»" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. #, c-format msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" -msgstr "Tidy a trouvé %u %s et %u %s!" +msgid "Tidy found %u %s and %u %s!\n" +msgstr "Tidy a trouvé %u %s et %u %s!\n" #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. @@ -2475,8 +2475,8 @@ msgstr "" "en utilisant HTML Tidy pour produire une version nettoyée.\n" msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." -msgstr "Aucun avertissement ou erreur trouvée." +msgid "No warnings or errors were found.\n" +msgstr "Aucun avertissement ou erreur trouvée.\n" msgctxt "STRING_NO_SYSID" msgid "No system identifier in emitted doctype" @@ -2484,8 +2484,8 @@ msgstr "Aucun identifiant système dans le doctype soumis" #, c-format msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." -msgstr "Tidy a trouvé %u %s et %u %s! Tous les avertissements et erreurs n'ont pas été affichés." +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n" +msgstr "Tidy a trouvé %u %s et %u %s! Tous les avertissements et erreurs n'ont pas été affichés.\n" #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. diff --git a/localize/translations/language_pt_br.po b/localize/translations/language_pt_br.po index 6c8e8df..b138585 100644 --- a/localize/translations/language_pt_br.po +++ b/localize/translations/language_pt_br.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-10-05 09:29:27\n" +"PO-Revision-Date: 2017-10-05 15:13:40\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2544,8 +2544,8 @@ msgstr "Doctype dado é \"%s\"" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. #, c-format msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" -msgstr "Tidy encontrou %u %s e %u %s!" +msgid "Tidy found %u %s and %u %s!\n" +msgstr "Tidy encontrou %u %s e %u %s!\n" #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. @@ -2558,8 +2558,8 @@ msgstr "" "antes de usar HTML Tidy para gerar uma versão arrumada.\n" msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." -msgstr "Nenhum aviso ou erro foi localizado." +msgid "No warnings or errors were found.\n" +msgstr "Nenhum aviso ou erro foi localizado.\n" msgctxt "STRING_NO_SYSID" msgid "No system identifier in emitted doctype" @@ -2567,8 +2567,8 @@ msgstr "Nenhum identificado de sistema no doctype emitido" #, c-format msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." -msgstr "Tidy encontrou %u %s e %u %s! Nem todos avisos/erros foram mostrados." +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n" +msgstr "Tidy encontrou %u %s e %u %s! Nem todos avisos/erros foram mostrados.\n" #. This console output should be limited to 78 characters per line. #. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po index a48970d..0dd2b2c 100644 --- a/localize/translations/language_zh_cn.po +++ b/localize/translations/language_zh_cn.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"PO-Revision-Date: 2017-10-05 09:29:27\n" +"PO-Revision-Date: 2017-10-05 15:13:40\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2026,7 +2026,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. #, c-format msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" +msgid "Tidy found %u %s and %u %s!\n" msgstr "" #. This console output should be limited to 78 characters per line. @@ -2038,7 +2038,7 @@ msgid "" msgstr "" msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." +msgid "No warnings or errors were found.\n" msgstr "" msgctxt "STRING_NO_SYSID" @@ -2047,7 +2047,7 @@ msgstr "" #, c-format msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n" msgstr "" #. This console output should be limited to 78 characters per line. diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot index 48e6008..cb66228 100644 --- a/localize/translations/tidy.pot +++ b/localize/translations/tidy.pot @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\n" "Project-Id-Version: \n" -"POT-Creation-Date: 2017-10-05 09:29:27\n" +"POT-Creation-Date: 2017-10-05 15:13:40\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2028,7 +2028,7 @@ msgstr "" #. The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. #, c-format msgctxt "STRING_ERROR_COUNT" -msgid "Tidy found %u %s and %u %s!" +msgid "Tidy found %u %s and %u %s!\n" msgstr "" #. This console output should be limited to 78 characters per line. @@ -2040,7 +2040,7 @@ msgid "" msgstr "" msgctxt "STRING_NO_ERRORS" -msgid "No warnings or errors were found." +msgid "No warnings or errors were found.\n" msgstr "" msgctxt "STRING_NO_SYSID" @@ -2049,7 +2049,7 @@ msgstr "" #, c-format msgctxt "STRING_NOT_ALL_SHOWN" -msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown." +msgid "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n" msgstr "" #. This console output should be limited to 78 characters per line. diff --git a/src/language_en.h b/src/language_en.h index f29f39f..19a22a8 100644 --- a/src/language_en.h +++ b/src/language_en.h @@ -1799,7 +1799,7 @@ static languageDefinition language_en = { whichPluralForm_en, { { STRING_CONTENT_LOOKS, 0, "Document content looks like %s" }, { STRING_DOCTYPE_GIVEN, 0, "Doctype given is \"%s\"" }, {/* The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ - STRING_ERROR_COUNT, 0, "Tidy found %u %s and %u %s!" + STRING_ERROR_COUNT, 0, "Tidy found %u %s and %u %s!\n" }, {/* This console output should be limited to 78 characters per line. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ @@ -1807,9 +1807,9 @@ static languageDefinition language_en = { whichPluralForm_en, { "This document has errors that must be fixed before\n" "using HTML Tidy to generate a tidied up version.\n" }, - { STRING_NO_ERRORS, 0, "No warnings or errors were found." }, + { STRING_NO_ERRORS, 0, "No warnings or errors were found.\n" }, { STRING_NO_SYSID, 0, "No system identifier in emitted doctype" }, - { STRING_NOT_ALL_SHOWN, 0, "Tidy found %u %s and %u %s! Not all warnings/errors were shown." }, + { STRING_NOT_ALL_SHOWN, 0, "Tidy found %u %s and %u %s! Not all warnings/errors were shown.\n" }, {/* This console output should be limited to 78 characters per line. - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TEXT_GENERAL_INFO, 0, diff --git a/src/language_fr.h b/src/language_fr.h index 1ab25e1..c6140e9 100644 --- a/src/language_fr.h +++ b/src/language_fr.h @@ -28,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2017-10-05 09:29:27 + * PO_REVISION_DATE=2017-10-05 15:13:40 */ #ifdef _MSC_VER @@ -736,14 +736,14 @@ static languageDefinition language_fr = { whichPluralForm_fr, { }, { STRING_CONTENT_LOOKS, 0, "Le contenu du document ressemble à %s" }, { STRING_DOCTYPE_GIVEN, 0, "DOCTYPE donnée est «%s»" }, - { STRING_ERROR_COUNT, 0, "Tidy a trouvé %u %s et %u %s!" }, + { STRING_ERROR_COUNT, 0, "Tidy a trouvé %u %s et %u %s!\n" }, { STRING_NEEDS_INTERVENTION, 0, "Ce document contient des erreurs qui doivent d'abord être résolues\n" "en utilisant HTML Tidy pour produire une version nettoyée.\n" }, - { STRING_NO_ERRORS, 0, "Aucun avertissement ou erreur trouvée." }, + { STRING_NO_ERRORS, 0, "Aucun avertissement ou erreur trouvée.\n" }, { STRING_NO_SYSID, 0, "Aucun identifiant système dans le doctype soumis" }, - { STRING_NOT_ALL_SHOWN, 0, "Tidy a trouvé %u %s et %u %s! Tous les avertissements et erreurs n'ont pas été affichés." }, + { STRING_NOT_ALL_SHOWN, 0, "Tidy a trouvé %u %s et %u %s! Tous les avertissements et erreurs n'ont pas été affichés.\n" }, { TEXT_GENERAL_INFO, 0, "À propos de HTML Tidy: https://github.com/htacg/tidy-html5\n" "Rapports de bugs et commentaires: https://github.com/htacg/tidy-html5/issues\n" diff --git a/src/language_pt_br.h b/src/language_pt_br.h index efc48cf..2b65d88 100644 --- a/src/language_pt_br.h +++ b/src/language_pt_br.h @@ -28,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2017-10-05 09:29:27 + * PO_REVISION_DATE=2017-10-05 15:13:40 */ #ifdef _MSC_VER @@ -830,14 +830,14 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, { { TEXT_USING_BODY, 0, "É recomendável usar CSS para especificar cores de página e link" }, { STRING_CONTENT_LOOKS, 0, "O conteúdo do documento se parece com %s" }, { STRING_DOCTYPE_GIVEN, 0, "Doctype dado é \"%s\"" }, - { STRING_ERROR_COUNT, 0, "Tidy encontrou %u %s e %u %s!" }, + { STRING_ERROR_COUNT, 0, "Tidy encontrou %u %s e %u %s!\n" }, { STRING_NEEDS_INTERVENTION, 0, "Esse documento possui erros que devem ser corrigidos\n" "antes de usar HTML Tidy para gerar uma versão arrumada.\n" }, - { STRING_NO_ERRORS, 0, "Nenhum aviso ou erro foi localizado." }, + { STRING_NO_ERRORS, 0, "Nenhum aviso ou erro foi localizado.\n" }, { STRING_NO_SYSID, 0, "Nenhum identificado de sistema no doctype emitido" }, - { STRING_NOT_ALL_SHOWN, 0, "Tidy encontrou %u %s e %u %s! Nem todos avisos/erros foram mostrados." }, + { STRING_NOT_ALL_SHOWN, 0, "Tidy encontrou %u %s e %u %s! Nem todos avisos/erros foram mostrados.\n" }, { TEXT_GENERAL_INFO, 0, "Sobre o HTML Tidy: https://github.com/htacg/tidy-html5\n" "Relatórios de erro e comentários: https://github.com/htacg/tidy-html5/" diff --git a/src/message.c b/src/message.c index fd97164..e8d5f25 100644 --- a/src/message.c +++ b/src/message.c @@ -159,16 +159,22 @@ static void messageOut( TidyMessageImpl *message ) go = go & ( doc->errors < cfg(doc, TidyShowErrors) ); } -// /* Suppress TidyInfo on Reports if applicable. */ -// if ( message->level == TidyInfo ) -// { -// go = go & (cfgBool(doc, TidyShowInfo) == yes); -// } - - /* If suppressing TidyInfo/TidyDialogueInfo on Reports, suppress them. */ - if ( message->level == TidyInfo || message->level == TidyDialogueInfo ) + /* Check for conditions to suppress TidyInfo. */ + if ( message->level == TidyInfo ) { go = go & (cfgBool(doc, TidyShowInfo) == yes); + + /* Temporary; we currently let TidyQuiet hide these: */ + switch ( message->code ) + { + case STRING_DOCTYPE_GIVEN: + case STRING_CONTENT_LOOKS: + case STRING_NO_SYSID: + go = go && !cfgBool(doc, TidyQuiet); + break; + default: + break; + } } /* Suppress TidyWarning on Reports if applicable. */ @@ -177,6 +183,23 @@ static void messageOut( TidyMessageImpl *message ) go = go & (cfgBool(doc, TidyShowWarnings) == yes); } + /* Check for conditions to suppress TidyDialogueInfo */ + if ( message->level == TidyDialogueInfo ) + { + /* Temporary; TidyShowInfo shouldn't affect TidyDialogueInfo, but + right now such messages are hidden until we granularize the + output controls. */ + go = go & (cfgBool(doc, TidyShowInfo) == yes); + go = go | (cfgBool(doc, TidyQuiet) == yes); + } + + /* Check for conditions to suppress TidyDialogueSummary */ + /* Temporary; TidyQuiet shouldn't hide this type of message. */ + if ( message->level == TidyDialogueSummary && message->code != STRING_NEEDS_INTERVENTION ) + { + go = go & !cfgBool(doc, TidyQuiet); + } + /* If we're TidyQuiet and handling any type of dialogue above summaries, then suppress. */ if ( message->level > TidyDialogueSummary ) @@ -1225,7 +1248,6 @@ void TY_(ErrorSummary)( TidyDocImpl* doc ) if (doc->footnotes & FN_TRIM_EMPTY_ELEMENT) TY_(Dialogue)( doc, FOOTNOTE_TRIM_EMPTY_ELEMENT ); } - } @@ -1277,8 +1299,6 @@ void TY_(ReportNumWarnings)( TidyDocImpl* doc ) { TY_(Dialogue)( doc, STRING_NO_ERRORS ); } - - TY_(WriteChar)( '\n', doc->errout ); } diff --git a/src/tidylib.c b/src/tidylib.c index d433edc..100973a 100644 --- a/src/tidylib.c +++ b/src/tidylib.c @@ -1380,17 +1380,10 @@ int TY_(DocParseStream)( TidyDocImpl* doc, StreamIn* in ) int tidyDocRunDiagnostics( TidyDocImpl* doc ) { - Bool quiet = cfgBool( doc, TidyQuiet ); - Bool force = cfgBool( doc, TidyForceOutput ); + TY_(ReportMarkupVersion)( doc ); + TY_(ReportNumWarnings)( doc ); - if ( !quiet ) - { - - TY_(ReportMarkupVersion)( doc ); - TY_(ReportNumWarnings)( doc ); - } - - if ( doc->errors > 0 && !force ) + if ( doc->errors > 0 && !cfgBool( doc, TidyForceOutput ) ) TY_(Dialogue)(doc, STRING_NEEDS_INTERVENTION ); return tidyDocStatus( doc ); diff --git a/version.txt b/version.txt index 988f92c..2435cfc 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -5.5.56 -2017.10.04 +5.5.57 +2017.10.05