Skip to content

[pull] next from htacg:next #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: next
Choose a base branch
from
Open

[pull] next from htacg:next #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
27f6aa8
PPrintXMLTree: avoids infinite loop on root node with no content
catenacyber Nov 19, 2021
42d7a60
bugfix
SuperCodeHero Dec 22, 2021
e411ad0
Attribute 'type' in tag 'ol' allowed for (X)HTML5
Jan 5, 2022
f7e46d9
Merge pull request #1011 from catenacyber/next
balthisar Jan 25, 2022
ff7160b
Bump to 5.9.18
balthisar Jan 25, 2022
bba1390
Merge pull request #1019 from MarkusPister/issue-1012
balthisar Jan 25, 2022
88a9339
Bump to 5.9.19
balthisar Jan 25, 2022
d345557
Merge pull request #1016 from SuperCodeHero/next
balthisar Jan 25, 2022
d08ddc2
Bump version. No binary change, but does affect environment.
balthisar Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/attrdict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions src/pprint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down
4 changes: 2 additions & 2 deletions version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
5.9.17
2021.08.26
5.9.20
2022.01.25