From 27f6aa8b7748d427870bbcb3c939e5649627e3e8 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Fri, 19 Nov 2021 10:51:58 +0100 Subject: [PATCH 1/6] PPrintXMLTree: avoids infinite loop on root node with no content --- src/pprint.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pprint.c b/src/pprint.c index 4917c06a..53fcbc96 100644 --- a/src/pprint.c +++ b/src/pprint.c @@ -2586,9 +2586,12 @@ void TY_(PPrintXMLTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node ) } else if ( node->type == RootNode ) { - if (node->content) + if (node->content) { node = node->content; - continue; + continue; + } else { + break; + } } else if ( node->type == CommentTag ) { From 42d7a607edc1f49cae770e7b229ee48f358b6698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=BF=E5=BE=92?= <1366185201@qq.com> Date: Wed, 22 Dec 2021 11:31:38 +0800 Subject: [PATCH 2/6] bugfix --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37190c57..a01240e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -399,6 +399,7 @@ endif () #------------------------------------------------------------------------ set(name tidy-static) add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} ) +target_include_directories( ${name} PUBLIC "${PROJECT_SOURCE_DIR}/include") if (WIN32) set_target_properties( ${name} PROPERTIES OUTPUT_NAME ${LIB_NAME}_static ) @@ -427,6 +428,7 @@ if (BUILD_SHARED_LIB) set(CMAKE_MACOSX_RPATH 1) endif () add_library ( ${name} SHARED ${CFILES} ${HFILES} ${LIBHFILES} ) + target_include_directories( ${name} PUBLIC "${PROJECT_SOURCE_DIR}/include") set_target_properties( ${name} PROPERTIES OUTPUT_NAME ${LIB_NAME} ) set_target_properties( ${name} PROPERTIES From e411ad0d2582471fe0961900b2789ee8b5b9cc4c Mon Sep 17 00:00:00 2001 From: Markus Pister Date: Wed, 5 Jan 2022 08:30:10 +0100 Subject: [PATCH 3/6] Attribute 'type' in tag 'ol' allowed for (X)HTML5 Mark the attribute 'type' as allowed for tag 'ol' in (X)HTML5. The attribute type was deprecated in HTML4. This decision was reverted for HTML5, see https://www.w3.org/TR/2014/NOTE-html5-diff-20141209/#changed-attributes This fixes htacg#1012. --- src/attrdict.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/attrdict.c b/src/attrdict.c index f7c08628..e05a3052 100644 --- a/src/attrdict.c +++ b/src/attrdict.c @@ -2321,7 +2321,7 @@ const AttrVersion TY_(W3CAttrsFor_OL)[] = { TidyAttr_START, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 }, { TidyAttr_STYLE, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|xxxx|HT50|XH50 }, /* CORE override */ { TidyAttr_TITLE, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 }, /* CORE override */ - { TidyAttr_TYPE, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx }, + { TidyAttr_TYPE, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 }, { TidyAttr_XMLNS, xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|XH11|XB10|HT50|XH50 }, /* CORE override */ { TidyAttr_XML_LANG, xxxx|xxxx|xxxx|xxxx|X10T|xxxx|xxxx|X10F|xxxx|xxxx|X10S|XH11|XB10|xxxx|XH50 }, /* CORE override */ INCLUDE_CORE_ATTRIBS From ff7160b521f9f158c88420af95e4f682d282f8d5 Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Tue, 25 Jan 2022 09:18:01 -0500 Subject: [PATCH 4/6] Bump to 5.9.18 --- version.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.txt b/version.txt index c010d3f4..090f621f 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -5.9.17 -2021.08.26 +5.9.18 +2022.01.25 From 88a93398a5863880068a0c60b4249ee8f937f227 Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Tue, 25 Jan 2022 10:13:01 -0500 Subject: [PATCH 5/6] Bump to 5.9.19 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 090f621f..65843cd8 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -5.9.18 +5.9.19 2022.01.25 From d08ddc2860aa95ba8e301343a30837f157977cba Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Tue, 25 Jan 2022 10:17:15 -0500 Subject: [PATCH 6/6] Bump version. No binary change, but does affect environment. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 65843cd8..bdfb16a0 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -5.9.19 +5.9.20 2022.01.25