From 1dd85ad1c623e647ac3205b6ca28056255143373 Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Fri, 17 Nov 2017 19:16:58 -0500 Subject: [PATCH] Restore alphabetical order to the options enums and structure. No version bump. --- include/tidyenum.h | 4 ++-- src/config.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/tidyenum.h b/include/tidyenum.h index 90d7352..7168a06 100644 --- a/include/tidyenum.h +++ b/include/tidyenum.h @@ -614,6 +614,8 @@ typedef enum TidyMergeEmphasis, /**< Merge nested B and I elements */ TidyMergeSpans, /**< Merge multiple SPANs */ TidyMetaCharset, /**< Adds/checks/fixes meta charset in the head, based on document type */ + TidyMuteReports, /**< Filter these messages from output. */ + TidyMuteShow, /**< Show message ID's in the error table */ TidyNCR, /**< Allow numeric character references */ TidyNewline, /**< Output line ending (default to platform) */ TidyNumEntities, /**< Use numeric entities */ @@ -638,8 +640,6 @@ typedef enum TidyShowWarnings, /**< However errors are always shown */ TidySkipNested, /**< Skip nested tags in script and style CDATA */ TidySortAttributes, /**< Sort attributes */ - TidyMuteReports, /**< Filter these messages from output. */ - TidyMuteShow, /**< Show message ID's in the error table */ TidyStrictTagsAttr, /**< Ensure tags and attributes match output HTML version */ TidyStyleTags, /**< Move sytle to head */ TidyTabSize, /**< Expand tabs to n spaces */ diff --git a/src/config.c b/src/config.c index 2fd89d7..6afa7c1 100644 --- a/src/config.c +++ b/src/config.c @@ -224,6 +224,8 @@ static const TidyOptionImpl option_defs[] = { TidyMergeEmphasis, MX, "merge-emphasis", BL, yes, ParsePickList, &boolPicks }, { TidyMergeSpans, MC, "merge-spans", IN, TidyAutoState, ParsePickList, &autoBoolPicks }, { TidyMetaCharset, DT, "add-meta-charset", BL, no, ParsePickList, &boolPicks }, /* 20161004 - Issue #456 */ + { TidyMuteReports, DD, "mute", ST, 0, ParseList, NULL }, + { TidyMuteShow, DD, "mute-id", BL, no, ParsePickList, &boolPicks }, { TidyNCR, ME, "ncr", BL, yes, ParsePickList, &boolPicks }, { TidyNewline, CE, "newline", IN, DLF, ParsePickList, &newlinePicks }, { TidyNumEntities, ME, "numeric-entities", BL, no, ParsePickList, &boolPicks }, @@ -248,8 +250,6 @@ static const TidyOptionImpl option_defs[] = { TidyShowWarnings, DD, "show-warnings", BL, yes, ParsePickList, &boolPicks }, { TidySkipNested, MR, "skip-nested", BL, yes, ParsePickList, &boolPicks }, /* 1642186 - Issue #65 */ { TidySortAttributes, PP, "sort-attributes", IN, TidySortAttrNone,ParsePickList, &sorterPicks }, - { TidyMuteReports, DD, "mute", ST, 0, ParseList, NULL }, - { TidyMuteShow, DD, "mute-id", BL, no, ParsePickList, &boolPicks }, { TidyStrictTagsAttr, MR, "strict-tags-attributes", BL, no, ParsePickList, &boolPicks }, /* 20160209 - Issue #350 */ { TidyStyleTags, MR, "fix-style-tags", BL, yes, ParsePickList, &boolPicks }, { TidyTabSize, PP, "tab-size", IN, 8, ParseInt, NULL },