From 800b91e57669a27c9126a62a54ddf40a216041c3 Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Thu, 5 Nov 2015 15:19:39 +0100 Subject: [PATCH] Issue #65 - effect name change to skip-nested, and default to on --- include/tidyenum.h | 2 +- src/config.c | 2 +- src/lexer.c | 2 +- src/localize.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/tidyenum.h b/include/tidyenum.h index 4ed82b0..3ef0298 100644 --- a/include/tidyenum.h +++ b/include/tidyenum.h @@ -205,7 +205,7 @@ typedef enum TidyMergeSpans, /**< Merge multiple SPANs */ TidyAnchorAsName, /**< Define anchors as name attributes */ TidyPPrintTabs, /**< Indent using tabs istead of spaces */ - TidySkipQuotes, /**< Skip quotes and comments in script CDATA */ + TidySkipNested, /**< Skip nested tags in script and style CDATA */ N_TIDY_OPTIONS /**< Must be last */ } TidyOptionId; diff --git a/src/config.c b/src/config.c index b44a1b8..fc67eb1 100644 --- a/src/config.c +++ b/src/config.c @@ -321,7 +321,7 @@ static const TidyOptionImpl option_defs[] = { TidyMergeSpans, MU, "merge-spans", IN, TidyAutoState, ParseAutoBool, autoBoolPicks }, { TidyAnchorAsName, MU, "anchor-as-name", BL, yes, ParseBool, boolPicks }, { TidyPPrintTabs, PP, "indent-with-tabs", BL, no, ParseTabs, boolPicks }, /* 20150515 - Issue #108 */ - { TidySkipQuotes, MU, "skip-quotes", BL, no, ParseBool, boolPicks }, /* 1642186 - Issue #65 */ + { TidySkipNested, MU, "skip-nested", BL, yes, ParseBool, boolPicks }, /* 1642186 - Issue #65 */ { N_TIDY_OPTIONS, XX, NULL, XY, 0, NULL, NULL } }; diff --git a/src/lexer.c b/src/lexer.c index fde246a..32d93d7 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -2008,7 +2008,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container ) * If yes, then avoid incrementing nested... \*/ Bool nonested = ((nodeIsSCRIPT(container) || (nodeIsSTYLE(container))) && - cfgBool(doc, TidySkipQuotes)) ? yes : no; + cfgBool(doc, TidySkipNested)) ? yes : no; SetLexerLocus( doc, lexer ); lexer->waswhite = no; diff --git a/src/localize.c b/src/localize.c index 812205c..03db7b6 100755 --- a/src/localize.c +++ b/src/localize.c @@ -1097,7 +1097,7 @@ static const TidyOptionDoc option_docs[] = "Note tab-size controls converting input tabs to spaces. Set " "it to zero to retain input tabs. " }, - {TidySkipQuotes, + {TidySkipNested, "This option specifies that Tidy should skip nested tags when parsing " "script and style data. " },