From 77397613b49da2c87aad7b67466d8260357a355f Mon Sep 17 00:00:00 2001 From: Wang Guan Date: Sun, 8 Oct 2017 15:05:17 +0900 Subject: [PATCH 1/6] remove unused build flags in libtidy 5.6 --- binding.gyp | 3 --- 1 file changed, 3 deletions(-) diff --git a/binding.gyp b/binding.gyp index fbb9b1d..2dd1e99 100644 --- a/binding.gyp +++ b/binding.gyp @@ -42,9 +42,6 @@ 'defines': [ '_REENTRANT', 'HAVE_CONFIG_H', - 'SUPPORT_UTF16_ENCODINGS=1', - 'SUPPORT_ASIAN_ENCODINGS=1', - 'SUPPORT_ACCESSIBILITY_CHECKS=1', 'LIBTIDY_VERSION=" Date: Sat, 25 Nov 2017 21:11:45 +0900 Subject: [PATCH 2/6] build with tidy-html5 v5.6.0 --- tidy-html5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tidy-html5 b/tidy-html5 index 0016e00..3a30f6a 160000 --- a/tidy-html5 +++ b/tidy-html5 @@ -1 +1 @@ -Subproject commit 0016e0083505ccee25a5c76dcf64cfe336765128 +Subproject commit 3a30f6a4300417674026f6dddea5973debc6b808 From c0cb6f09267dd4bff6de61d8b198bb165073957f Mon Sep 17 00:00:00 2001 From: Ferdinand Prantl Date: Sun, 25 Feb 2018 16:25:04 +0100 Subject: [PATCH 3/6] Update node-gyp source file list to match tidy-html 5.6 sources --- binding.gyp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/binding.gyp b/binding.gyp index 2dd1e99..208b87d 100644 --- a/binding.gyp +++ b/binding.gyp @@ -21,9 +21,7 @@ 'tidy-html5/src/message.c', 'tidy-html5/src/config.c', 'tidy-html5/src/alloc.c', - 'tidy-html5/src/attrask.c', 'tidy-html5/src/attrdict.c', - 'tidy-html5/src/attrget.c', 'tidy-html5/src/buffio.c', 'tidy-html5/src/fileio.c', 'tidy-html5/src/streamio.c', @@ -34,6 +32,8 @@ 'tidy-html5/src/mappedio.c', 'tidy-html5/src/gdoc.c', 'tidy-html5/src/language.c', + 'tidy-html5/src/messageobj.c', + 'tidy-html5/src/sprtf.c' ], 'include_dirs': [ 'tidy-html5/include', @@ -71,9 +71,6 @@ }, 'conditions': [ ['OS=="win"', { - 'sources': [ - 'tidy-html5/src/sprtf.c', - ], 'defines': [ 'NOMINMAX', '_USE_MATH_DEFINES', From 669db891fc979a0b3079f84f127483c80b2ec3c0 Mon Sep 17 00:00:00 2001 From: Ferdinand Prantl Date: Sun, 25 Feb 2018 16:37:17 +0100 Subject: [PATCH 4/6] Update option category list to match tidy-html 5.6 --- src/opt.cc | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/src/opt.cc b/src/opt.cc index a8a7b51..a7f0999 100644 --- a/src/opt.cc +++ b/src/opt.cc @@ -78,20 +78,41 @@ namespace node_libtidy { TidyOption opt = Unwrap(info.Holder()); if (!opt) return; const char* res; switch (tidyOptGetCategory(opt)) { - case TidyMarkup: - res = "Markup"; - break; case TidyDiagnostics: res = "Diagnostics"; break; - case TidyPrettyPrint: - res = "PrettyPrint"; + case TidyDisplay: + res = "Display"; + break; + case TidyDocumentIO: + res = "DocumentIO"; break; case TidyEncoding: res = "Encoding"; break; - case TidyMiscellaneous: - res = "Miscellaneous"; + case TidyFileIO: + res = "FileIO"; + break; + case TidyMarkupCleanup: + res = "MarkupCleanup"; + break; + case TidyMarkupEntities: + res = "MarkupEntities"; + break; + case TidyMarkupRepair: + res = "MarkupRepair"; + break; + case TidyMarkupTeach: + res = "MarkupTeach"; + break; + case TidyMarkupXForm: + res = "MarkupXForm"; + break; + case TidyPrettyPrint: + res = "PrettyPrint"; + break; + case TidyInternalCategory: + res = "InternalCategory"; break; default: Nan::ThrowError("Unknown option category"); From 41cd3638ac0c7d3bf481e4d3c7baa090d7819959 Mon Sep 17 00:00:00 2001 From: Ferdinand Prantl Date: Sun, 25 Feb 2018 16:37:36 +0100 Subject: [PATCH 5/6] Fix a unit test setting a wrong value to a boolean option --- test/opt-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/opt-test.js b/test/opt-test.js index 3b82951..1946f47 100644 --- a/test/opt-test.js +++ b/test/opt-test.js @@ -75,7 +75,7 @@ describe("TidyOption:", function() { it("can handle boolean options", function() { var doc = TidyDoc(); expect(doc.optGet("add-xml-decl")).to.be.false; - expect(doc.optSet("add-xml-decl", "this starts with T")).to.be.undefined; + expect(doc.optSet("add-xml-decl", true)).to.be.undefined; expect(doc.optGet("add-xml-decl")).to.be.true; expect(doc.optSet("add-xml-decl", false)).to.be.undefined; expect(doc.optGet("add-xml-decl")).to.be.false; From 1ee5b88f546c4516ccdbe9b84c729ea21a6f0221 Mon Sep 17 00:00:00 2001 From: Ferdinand Prantl Date: Sun, 25 Feb 2018 16:45:50 +0100 Subject: [PATCH 6/6] Upgrade links to HTML Tidy documentation to point to version 5.6.0 --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d4b0157..0fab875 100644 --- a/README.md +++ b/README.md @@ -258,9 +258,9 @@ using that version. If the version in question is not the latest release, then please provide some reason why that particular version would be useful. -[tidyParseBuffer]: http://api.html-tidy.org/tidy/tidylib_api_5.4.0/group__Parse.html#gaa28ce34c95750f150205843885317851 -[tidyCleanAndRepair]: http://api.html-tidy.org/tidy/tidylib_api_5.4.0/group__Clean.html#ga11fd23eeb4acfaa0f9501effa0c21269 -[tidyRunDiagnostics]: http://api.html-tidy.org/tidy/tidylib_api_5.4.0/group__Clean.html#ga6170500974cc02114f6e4a29d44b7d77 -[tidySaveBuffer]: http://api.html-tidy.org/tidy/tidylib_api_5.4.0/group__Save.html#ga7e8642262c8c4d34cf7cc426647d29f0 -[quick_ref]: http://api.html-tidy.org/tidy/quickref_5.4.0.html -[upstream-license]: https://github.com/htacg/tidy-html5/blob/5.4.0/README/LICENSE.md +[tidyParseBuffer]: http://api.html-tidy.org/tidy/tidylib_api_5.6.0/group__Parse.html#gaa28ce34c95750f150205843885317851 +[tidyCleanAndRepair]: http://api.html-tidy.org/tidy/tidylib_api_5.6.0/group__Clean.html#ga11fd23eeb4acfaa0f9501effa0c21269 +[tidyRunDiagnostics]: http://api.html-tidy.org/tidy/tidylib_api_5.6.0/group__Clean.html#ga6170500974cc02114f6e4a29d44b7d77 +[tidySaveBuffer]: http://api.html-tidy.org/tidy/tidylib_api_5.6.0/group__Save.html#ga7e8642262c8c4d34cf7cc426647d29f0 +[quick_ref]: http://api.html-tidy.org/tidy/quickref_5.6.0.html +[upstream-license]: https://github.com/htacg/tidy-html5/blob/5.6.0/README/LICENSE.md