diff --git a/console/tidy.c b/console/tidy.c index 58d8ac3..f05833d 100644 --- a/console/tidy.c +++ b/console/tidy.c @@ -1936,7 +1936,7 @@ int main( int argc, char** argv ) #if (!defined(NDEBUG) && defined(_MSC_VER)) SPRTF("Tidying '%s'\n", htmlfil); #endif /* DEBUG outout */ - if ( tidyOptGetBool(tdoc, TidyEmacs) ) + if ( tidyOptGetBool(tdoc, TidyEmacs) && !tidyOptGetValue(tdoc, TidyEmacsFile) ) tidyOptSetValue( tdoc, TidyEmacsFile, htmlfil ); status = tidyParseFile( tdoc, htmlfil ); } diff --git a/include/tidyenum.h b/include/tidyenum.h index 882bd5b..3ecfe10 100644 --- a/include/tidyenum.h +++ b/include/tidyenum.h @@ -71,9 +71,6 @@ typedef enum TidyDuplicateAttrs, /**< Keep first or last duplicate attribute */ TidyAltText, /**< Default text for alt attribute */ - /* obsolete */ - 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 */ @@ -105,9 +102,6 @@ typedef enum TidyFixComments, /**< Fix comments with adjacent hyphens */ TidyBreakBeforeBR, /**< Output newline before
or not? */ - /* obsolete */ - TidyBurstSlides, /**< Create slides on each h2 element */ - TidyNumEntities, /**< Use numeric entities */ TidyQuoteMarks, /**< Output " marks as " */ TidyQuoteNbsp, /**< Output non-breaking space as entity */ diff --git a/include/tidyplatform.h b/include/tidyplatform.h index c8954a9..9187e4b 100644 --- a/include/tidyplatform.h +++ b/include/tidyplatform.h @@ -569,8 +569,10 @@ typedef const tmbchar* ctmbstr; /* Ditto, but const */ #if defined(__GNUC__) || defined(__INTEL_COMPILER) # define ARG_UNUSED(x) x __attribute__((unused)) +# define FUNC_UNUSED __attribute__((unused)) #else # define ARG_UNUSED(x) x +# define FUNC_UNUSED #endif /* HAS_VSNPRINTF triggers the use of "vsnprintf", which is safe related to diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po index ed4d800..cb9b288 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-02-17 14:46:38\n" +"PO-Revision-Date: 2017-02-18 18:13:23\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2437,18 +2437,6 @@ msgid "" "Chinese punctuation characters. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyBurstSlides" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2667,20 +2655,6 @@ msgid "" "char-encoding for more info. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyLanguage" -msgid "" -"Currently not used, but this option specifies the language Tidy would use " -"if it were properly localized. For example: en. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2808,7 +2782,10 @@ msgstr "" #. - The strings "Tidy" and "HTML Tidy" are the program name and must not #. be translated. msgctxt "TidyEmacsFile" -msgid "Used internally. " +msgid "" +"When gnu-emacs is yes, then this option value " +"specifies the filename to be used in the output report. The HTML Tidy " +"command line program will set this automatically. " msgstr "" #. Important notes for translators: @@ -2860,18 +2837,6 @@ msgid "" "of errors and warnings, or the welcome or informational messages. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidySlideStyle" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -3461,12 +3426,12 @@ msgstr "" msgctxt "TC_TXT_HELP_LANG_1" msgid "" "\n" -"The --language (or --lang) option indicates which language Tidy \n" +"The -language (or -lang) option indicates which language Tidy \n" "should use to communicate its output. Please note that this is not \n" "a document translation service, and only affects the messages that \n" "Tidy communicates to you. \n" "\n" -"When used from the command line the --language argument must \n" +"When used from the command line the -language argument must \n" "be used before any arguments that result in output, otherwise Tidy \n" "will produce output before it knows which language to use. \n" "\n" diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po index 359ed80..dad16a0 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-02-17 14:46:38\n" +"PO-Revision-Date: 2017-02-18 18:13:23\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2414,18 +2414,6 @@ msgid "" "Chinese punctuation characters. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyBurstSlides" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2644,20 +2632,6 @@ msgid "" "char-encoding for more info. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyLanguage" -msgid "" -"Currently not used, but this option specifies the language Tidy would use " -"if it were properly localized. For example: en. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2785,7 +2759,10 @@ msgstr "" #. - The strings "Tidy" and "HTML Tidy" are the program name and must not #. be translated. msgctxt "TidyEmacsFile" -msgid "Used internally. " +msgid "" +"When gnu-emacs is yes, then this option value " +"specifies the filename to be used in the output report. The HTML Tidy " +"command line program will set this automatically. " msgstr "" #. Important notes for translators: @@ -2837,18 +2814,6 @@ msgid "" "of errors and warnings, or the welcome or informational messages. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidySlideStyle" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -3438,12 +3403,12 @@ msgstr "" msgctxt "TC_TXT_HELP_LANG_1" msgid "" "\n" -"The --language (or --lang) option indicates which language Tidy \n" +"The -language (or -lang) option indicates which language Tidy \n" "should use to communicate its output. Please note that this is not \n" "a document translation service, and only affects the messages that \n" "Tidy communicates to you. \n" "\n" -"When used from the command line the --language argument must \n" +"When used from the command line the -language argument must \n" "be used before any arguments that result in output, otherwise Tidy \n" "will produce output before it knows which language to use. \n" "\n" @@ -3457,12 +3422,12 @@ msgid "" "\n" msgstr "" "\n" -"La opción --language (o --lang) indica el lenguaje Tidy debe \n" +"La opción -language (o -lang) indica el lenguaje Tidy debe \n" "utilizar para comunicar su salida. Tenga en cuenta que esto no es \n" "un servicio de traducción de documentos, y sólo afecta a los mensajes \n" "que Tidy comunica a usted. \n" "\n" -"Cuando se utiliza la línea de comandos el argumento --language debe \n" +"Cuando se utiliza la línea de comandos el argumento -language debe \n" "utilizarse antes de cualquier argumento que dan lugar a la producción, \n" "de lo contrario Tidy producirá la salida antes de que se conozca el \n" "idioma a utilizar. \n" diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po index 5d5e73f..d38eb37 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-02-17 14:46:38\n" +"PO-Revision-Date: 2017-02-18 18:13:23\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2409,18 +2409,6 @@ msgid "" "Chinese punctuation characters. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyBurstSlides" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2639,20 +2627,6 @@ msgid "" "char-encoding for more info. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyLanguage" -msgid "" -"Currently not used, but this option specifies the language Tidy would use " -"if it were properly localized. For example: en. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2780,7 +2754,10 @@ msgstr "" #. - The strings "Tidy" and "HTML Tidy" are the program name and must not #. be translated. msgctxt "TidyEmacsFile" -msgid "Used internally. " +msgid "" +"When gnu-emacs is yes, then this option value " +"specifies the filename to be used in the output report. The HTML Tidy " +"command line program will set this automatically. " msgstr "" #. Important notes for translators: @@ -2832,18 +2809,6 @@ msgid "" "of errors and warnings, or the welcome or informational messages. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidySlideStyle" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -3433,12 +3398,12 @@ msgstr "" msgctxt "TC_TXT_HELP_LANG_1" msgid "" "\n" -"The --language (or --lang) option indicates which language Tidy \n" +"The -language (or -lang) option indicates which language Tidy \n" "should use to communicate its output. Please note that this is not \n" "a document translation service, and only affects the messages that \n" "Tidy communicates to you. \n" "\n" -"When used from the command line the --language argument must \n" +"When used from the command line the -language argument must \n" "be used before any arguments that result in output, otherwise Tidy \n" "will produce output before it knows which language to use. \n" "\n" diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po index 3f69dfb..5ec6b82 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-02-17 14:46:38\n" +"PO-Revision-Date: 2017-02-18 18:13:23\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2594,18 +2594,6 @@ msgid "" "Chinese punctuation characters. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyBurstSlides" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2824,20 +2812,6 @@ msgid "" "char-encoding for more info. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyLanguage" -msgid "" -"Currently not used, but this option specifies the language Tidy would use " -"if it were properly localized. For example: en. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2965,7 +2939,10 @@ msgstr "" #. - The strings "Tidy" and "HTML Tidy" are the program name and must not #. be translated. msgctxt "TidyEmacsFile" -msgid "Used internally. " +msgid "" +"When gnu-emacs is yes, then this option value " +"specifies the filename to be used in the output report. The HTML Tidy " +"command line program will set this automatically. " msgstr "" #. Important notes for translators: @@ -3017,18 +2994,6 @@ msgid "" "of errors and warnings, or the welcome or informational messages. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidySlideStyle" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -3674,12 +3639,12 @@ msgstr "Les valeurs autorisées" msgctxt "TC_TXT_HELP_LANG_1" msgid "" "\n" -"The --language (or --lang) option indicates which language Tidy \n" +"The -language (or -lang) option indicates which language Tidy \n" "should use to communicate its output. Please note that this is not \n" "a document translation service, and only affects the messages that \n" "Tidy communicates to you. \n" "\n" -"When used from the command line the --language argument must \n" +"When used from the command line the -language argument must \n" "be used before any arguments that result in output, otherwise Tidy \n" "will produce output before it knows which language to use. \n" "\n" @@ -3693,13 +3658,13 @@ msgid "" "\n" msgstr "" "\n" -"L'option --language (ou --lang) indique la langue Tidy\n" +"L'option -language (ou -lang) indique la langue Tidy\n" "doit utiliser pour communiquer sa sortie. S'il vous plaît noter que ce ne sont pas " "un service de traduction de documents, et affecte uniquement les messages qui Tidy " "communique à vous.\n" "\n" "Lorsqu'il est utilisé à partir de la ligne de commande de l'argument doit \n" -"--language être utilisé avant des arguments qui résultent de la production, sinon " +"-language être utilisé avant des arguments qui résultent de la production, sinon " "Tidy\n" "va produire une sortie avant qu'il connaît la langue à utiliser.\n" "\n" diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po index 9f7990d..1738f87 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-02-17 14:46:38\n" +"PO-Revision-Date: 2017-02-18 18:13:23\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2403,18 +2403,6 @@ msgid "" "Chinese punctuation characters. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyBurstSlides" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2633,20 +2621,6 @@ msgid "" "char-encoding for more info. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyLanguage" -msgid "" -"Currently not used, but this option specifies the language Tidy would use " -"if it were properly localized. For example: en. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2774,7 +2748,10 @@ msgstr "" #. - The strings "Tidy" and "HTML Tidy" are the program name and must not #. be translated. msgctxt "TidyEmacsFile" -msgid "Used internally. " +msgid "" +"When gnu-emacs is yes, then this option value " +"specifies the filename to be used in the output report. The HTML Tidy " +"command line program will set this automatically. " msgstr "" #. Important notes for translators: @@ -2826,18 +2803,6 @@ msgid "" "of errors and warnings, or the welcome or informational messages. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidySlideStyle" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -3427,12 +3392,12 @@ msgstr "" msgctxt "TC_TXT_HELP_LANG_1" msgid "" "\n" -"The --language (or --lang) option indicates which language Tidy \n" +"The -language (or -lang) option indicates which language Tidy \n" "should use to communicate its output. Please note that this is not \n" "a document translation service, and only affects the messages that \n" "Tidy communicates to you. \n" "\n" -"When used from the command line the --language argument must \n" +"When used from the command line the -language argument must \n" "be used before any arguments that result in output, otherwise Tidy \n" "will produce output before it knows which language to use. \n" "\n" diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot index 2c39aca..6e6c309 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-02-17 14:46:38\n" +"POT-Creation-Date: 2017-02-18 18:13:23\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2405,18 +2405,6 @@ msgid "" "Chinese punctuation characters. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyBurstSlides" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2635,20 +2623,6 @@ msgid "" "char-encoding for more info. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidyLanguage" -msgid "" -"Currently not used, but this option specifies the language Tidy would use " -"if it were properly localized. For example: en. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -2776,7 +2750,10 @@ msgstr "" #. - The strings "Tidy" and "HTML Tidy" are the program name and must not #. be translated. msgctxt "TidyEmacsFile" -msgid "Used internally. " +msgid "" +"When gnu-emacs is yes, then this option value " +"specifies the filename to be used in the output report. The HTML Tidy " +"command line program will set this automatically. " msgstr "" #. Important notes for translators: @@ -2828,18 +2805,6 @@ msgid "" "of errors and warnings, or the welcome or informational messages. " msgstr "" -#. Important notes for translators: -#. - Use only , , , , and -#.
. -#. - Entities, tags, attributes, etc., should be enclosed in . -#. - Option values should be enclosed in . -#. - It's very important that
be self-closing! -#. - The strings "Tidy" and "HTML Tidy" are the program name and must not -#. be translated. -msgctxt "TidySlideStyle" -msgid "This option has no function and is deprecated. " -msgstr "" - #. Important notes for translators: #. - Use only , , , , and #.
. @@ -3429,12 +3394,12 @@ msgstr "" msgctxt "TC_TXT_HELP_LANG_1" msgid "" "\n" -"The --language (or --lang) option indicates which language Tidy \n" +"The -language (or -lang) option indicates which language Tidy \n" "should use to communicate its output. Please note that this is not \n" "a document translation service, and only affects the messages that \n" "Tidy communicates to you. \n" "\n" -"When used from the command line the --language argument must \n" +"When used from the command line the -language argument must \n" "be used before any arguments that result in output, otherwise Tidy \n" "will produce output before it knows which language to use. \n" "\n" diff --git a/src/config.c b/src/config.c index c138698..887100c 100644 --- a/src/config.c +++ b/src/config.c @@ -226,10 +226,6 @@ static const TidyOptionImpl option_defs[] = { TidyDoctype, MU, "doctype", ST, 0, ParseDocType, doctypePicks }, { TidyDuplicateAttrs, MU, "repeated-attributes", IN, TidyKeepLast, ParseRepeatAttr, repeatAttrPicks }, { TidyAltText, MU, "alt-text", ST, 0, ParseString, NULL }, - - /* obsolete */ - { TidySlideStyle, MS, "slide-style", ST, 0, ParseName, NULL }, - { TidyErrFile, MS, "error-file", ST, 0, ParseString, NULL }, { TidyOutFile, MS, "output-file", ST, 0, ParseString, NULL }, { TidyWriteBack, MS, "write-back", BL, no, ParseBool, boolPicks }, @@ -258,10 +254,6 @@ static const TidyOptionImpl option_defs[] = { TidyDropEmptyParas, MU, "drop-empty-paras", BL, yes, ParseBool, boolPicks }, { TidyFixComments, MU, "fix-bad-comments", BL, yes, ParseBool, boolPicks }, { TidyBreakBeforeBR, PP, "break-before-br", BL, no, ParseBool, boolPicks }, - - /* obsolete */ - { TidyBurstSlides, PP, "split", BL, no, ParseBool, boolPicks }, - { TidyNumEntities, MU, "numeric-entities", BL, no, ParseBool, boolPicks }, { TidyQuoteMarks, MU, "quote-marks", BL, no, ParseBool, boolPicks }, { TidyQuoteNbsp, MU, "quote-nbsp", BL, yes, ParseBool, boolPicks }, @@ -626,14 +618,6 @@ ctmbstr TY_(_cfgGetString)( TidyDocImpl* doc, TidyOptionId optId ) #endif -#if 0 -/* for use with Gnu Emacs */ -void SetEmacsFilename( TidyDocImpl* doc, ctmbstr filename ) -{ - SetOptionValue( doc, TidyEmacsFile, filename ); -} -#endif - static tchar GetC( TidyConfigImpl* config ) { if ( config->cfgIn ) @@ -1173,7 +1157,7 @@ Bool ParseAutoBool( TidyDocImpl* doc, const TidyOptionImpl* entry ) } /* a string excluding whitespace */ -Bool ParseName( TidyDocImpl* doc, const TidyOptionImpl* option ) +Bool FUNC_UNUSED ParseName( TidyDocImpl* doc, const TidyOptionImpl* option ) { tmbchar buf[ 1024 ] = {0}; uint i = 0; diff --git a/src/config.h b/src/config.h index 5336f46..0a4864d 100644 --- a/src/config.h +++ b/src/config.h @@ -119,8 +119,6 @@ int TY_(CharEncodingId)( TidyDocImpl* doc, ctmbstr charenc ); ctmbstr TY_(CharEncodingName)( int encoding ); ctmbstr TY_(CharEncodingOptName)( int encoding ); -/* void SetEmacsFilename( TidyDocImpl* doc, ctmbstr filename ); */ - #ifdef _DEBUG diff --git a/src/language_en.h b/src/language_en.h index 67fd8c4..8b88bb5 100644 --- a/src/language_en.h +++ b/src/language_en.h @@ -1547,17 +1547,6 @@ static languageDefinition language_en = { whichPluralForm_en, { "Chinese punctuation characters. " }, #endif - {/* Important notes for translators: - - Use only , , , , and -
. - - Entities, tags, attributes, etc., should be enclosed in . - - Option values should be enclosed in . - - It's very important that
be self-closing! - - The strings "Tidy" and "HTML Tidy" are the program name and must not - be translated. */ - TidyBurstSlides, 0, - "This option has no function and is deprecated. " - }, {/* Important notes for translators: - Use only , , , , and
. @@ -1867,7 +1856,9 @@ static languageDefinition language_en = { whichPluralForm_en, { - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TidyEmacsFile, 0, - "Used internally. " + "When gnu-emacs is yes, then this option value " + "specifies the filename to be used in the output report. The HTML Tidy " + "command line program will set this automatically. " }, {/* Important notes for translators: - Use only , , , , and @@ -1912,17 +1903,6 @@ static languageDefinition language_en = { whichPluralForm_en, { "This option specifies if Tidy should output the summary of the numbers " "of errors and warnings, or the welcome or informational messages. " }, - {/* Important notes for translators: - - Use only , , , , and -
. - - Entities, tags, attributes, etc., should be enclosed in . - - Option values should be enclosed in . - - It's very important that
be self-closing! - - The strings "Tidy" and "HTML Tidy" are the program name and must not - be translated. */ - TidySlideStyle, 0, - "This option has no function and is deprecated. " - }, {/* Important notes for translators: - Use only , , , , and
. diff --git a/src/language_en_gb.h b/src/language_en_gb.h index 6f82df4..e5e7558 100644 --- a/src/language_en_gb.h +++ b/src/language_en_gb.h @@ -28,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2017-02-17 14:46:38 + * PO_REVISION_DATE=2017-02-18 18:13:23 */ #ifdef _MSC_VER diff --git a/src/language_es.h b/src/language_es.h index 83fb422..11780b4 100644 --- a/src/language_es.h +++ b/src/language_es.h @@ -28,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2017-02-17 14:46:38 + * PO_REVISION_DATE=2017-02-18 18:13:23 */ #ifdef _MSC_VER diff --git a/src/language_es_mx.h b/src/language_es_mx.h index 66f01ba..8a4daae 100644 --- a/src/language_es_mx.h +++ b/src/language_es_mx.h @@ -28,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2017-02-17 14:46:38 + * PO_REVISION_DATE=2017-02-18 18:13:23 */ #ifdef _MSC_VER diff --git a/src/language_fr.h b/src/language_fr.h index 3b9d96a..d181f22 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-02-17 14:46:38 + * PO_REVISION_DATE=2017-02-18 18:13:23 */ #ifdef _MSC_VER diff --git a/src/language_zh_cn.h b/src/language_zh_cn.h index e57efd0..2086732 100644 --- a/src/language_zh_cn.h +++ b/src/language_zh_cn.h @@ -28,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2017-02-17 14:46:38 + * PO_REVISION_DATE=2017-02-18 18:13:23 */ #ifdef _MSC_VER