Hello community, here is the log from the commit of package html-xml-utils for openSUSE:Factory checked in at 2018-02-26 23:25:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/html-xml-utils (Old) and /work/SRC/openSUSE:Factory/.html-xml-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "html-xml-utils" Mon Feb 26 23:25:19 2018 rev:2 rq:579964 version:7.6 Changes: -------- --- /work/SRC/openSUSE:Factory/html-xml-utils/html-xml-utils.changes 2018-01-19 11:51:52.611417361 +0100 +++ /work/SRC/openSUSE:Factory/.html-xml-utils.new/html-xml-utils.changes 2018-02-26 23:25:24.449782709 +0100 @@ -1,0 +2,9 @@ +Sun Feb 18 17:03:55 UTC 2018 - sebix+novell....@sebix.at + +- update to version 7.6: + * fix read uninitialized memory bug +- update to version 7.5: + * bugfixes + * Added support for HTML5 elements (source, audio, video) + +------------------------------------------------------------------- Old: ---- html-xml-utils-7.4.tar.gz New: ---- html-xml-utils-7.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ html-xml-utils.spec ++++++ --- /var/tmp/diff_new_pack.wJB49E/_old 2018-02-26 23:25:25.425747609 +0100 +++ /var/tmp/diff_new_pack.wJB49E/_new 2018-02-26 23:25:25.429747464 +0100 @@ -1,7 +1,7 @@ # # spec file for package html-xml-utils # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,17 @@ Name: html-xml-utils -Version: 7.4 +Version: 7.6 Release: 0 Summary: A number of simple utilities for manipulating HTML and XML files License: W3C Group: Development/Languages/Other -URL: https://www.w3.org/Tools/HTML-XML-utils/ +Url: https://www.w3.org/Tools/HTML-XML-utils/ Source: https://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-%{version}.tar.gz -BuildRequires: libidn2-devel BuildRequires: bison -BuildRequires: libcurl-devel BuildRequires: flex +BuildRequires: libcurl-devel +BuildRequires: libidn2-devel %description HTML-XML-utils provides a number of simple utilities for manipulating and ++++++ html-xml-utils-7.4.tar.gz -> html-xml-utils-7.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/ChangeLog new/html-xml-utils-7.6/ChangeLog --- old/html-xml-utils-7.4/ChangeLog 2017-11-24 18:36:15.000000000 +0100 +++ new/html-xml-utils-7.6/ChangeLog 2018-02-09 16:13:26.000000000 +0100 @@ -1,5 +1,38 @@ +2018-02-09 Bert Bos <b...@w3.org> + + * Version 7.6 released. + + * selmatch.c: matches_sel() could read uninitialized memory + (h->parent where h is the root of a tree) potentially leading to a + SIGBUS. Thanks to Anthony J. Bentley for finding this bug. + +2018-01-20 Bert Bos <b...@w3.org> + + * Version 7.5 released. + + * hxcite.1: Spelling error. + + * hxincl.1: Spelling error. + + * url.c: Fixed unsafe way to call warnx(). Thanks to Robin + Naundorf for these three corrections. + +2017-12-08 Bert Bos <b...@w3.org> + + * tests/normalize11.sh: Added to test for "main". + + * dtd.hash: Added the HTML5 element "main". + +2017-12-07 Bert Bos <b...@w3.org> + + * hxwls.c: Added support for HTML5 elements (source, audio, video) + and for the classid and codebase attribute. Fixed an error: input + has a src attribute, not href. + 2017-11-24 Bert Bos <b...@w3.org> + * Version 7.4 released. + * hxremove.1, hxselect.1: Updated. * tests/remove4.sh, tests/select18.sh, tests/select19.sh, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/Makefile.am new/html-xml-utils-7.6/Makefile.am --- old/html-xml-utils-7.4/Makefile.am 2017-11-24 18:05:34.000000000 +0100 +++ new/html-xml-utils-7.6/Makefile.am 2017-12-08 17:17:37.000000000 +0100 @@ -177,7 +177,7 @@ tests/mkbib1.sh tests/normalize1.sh tests/normalize2.sh\ tests/normalize3.sh tests/normalize4.sh tests/normalize5.sh\ tests/normalize6.sh tests/normalize7.sh tests/normalize8.sh\ - tests/normalize9.sh tests/normalize10.sh\ + tests/normalize9.sh tests/normalize10.sh tests/normalize11.sh\ tests/pipe1.sh tests/pipe2.sh tests/pipe3.sh tests/pipe4.sh\ tests/printlinks1.sh tests/printlinks2.sh tests/printlinks3.sh\ tests/printlinks4.sh tests/ref1.sh\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/Makefile.in new/html-xml-utils-7.6/Makefile.in --- old/html-xml-utils-7.4/Makefile.in 2017-11-24 18:28:20.000000000 +0100 +++ new/html-xml-utils-7.6/Makefile.in 2018-02-09 16:13:08.000000000 +0100 @@ -907,7 +907,7 @@ tests/mkbib1.sh tests/normalize1.sh tests/normalize2.sh\ tests/normalize3.sh tests/normalize4.sh tests/normalize5.sh\ tests/normalize6.sh tests/normalize7.sh tests/normalize8.sh\ - tests/normalize9.sh tests/normalize10.sh\ + tests/normalize9.sh tests/normalize10.sh tests/normalize11.sh\ tests/pipe1.sh tests/pipe2.sh tests/pipe3.sh tests/pipe4.sh\ tests/printlinks1.sh tests/printlinks2.sh tests/printlinks3.sh\ tests/printlinks4.sh tests/ref1.sh\ @@ -1907,6 +1907,13 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/normalize11.sh.log: tests/normalize11.sh + @p='tests/normalize11.sh'; \ + b='tests/normalize11.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) tests/pipe1.sh.log: tests/pipe1.sh @p='tests/pipe1.sh'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/TODO new/html-xml-utils-7.6/TODO --- old/html-xml-utils-7.4/TODO 2017-10-16 15:17:59.000000000 +0200 +++ new/html-xml-utils-7.6/TODO 2017-11-24 20:09:38.000000000 +0100 @@ -1,13 +1,3 @@ -Suggestions from Werner Heuser <werner.heu...@web.de> - -- `printlinks' is a great help, but I would like some links not - to be touched, e.g. some graphics. - -- please include a download URL into the source. Imagine somebody - likes the program and wants to come back and get the current - version - - Proprietary extensions: Microsoft Internet Explorer accepts a proprietary extension to HTML that looks like malformed mark-up: "<![if xxx]>" or "<![endif]>" (where xxx is text that doesn't contain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/configure new/html-xml-utils-7.6/configure --- old/html-xml-utils-7.4/configure 2017-11-24 18:28:20.000000000 +0100 +++ new/html-xml-utils-7.6/configure 2018-02-09 16:13:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for html-xml-utils 7.4. +# Generated by GNU Autoconf 2.69 for html-xml-utils 7.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='html-xml-utils' PACKAGE_TARNAME='html-xml-utils' -PACKAGE_VERSION='7.4' -PACKAGE_STRING='html-xml-utils 7.4' +PACKAGE_VERSION='7.6' +PACKAGE_STRING='html-xml-utils 7.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1289,7 +1289,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures html-xml-utils 7.4 to adapt to many kinds of systems. +\`configure' configures html-xml-utils 7.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1356,7 +1356,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of html-xml-utils 7.4:";; + short | recursive ) echo "Configuration of html-xml-utils 7.6:";; esac cat <<\_ACEOF @@ -1461,7 +1461,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -html-xml-utils configure 7.4 +html-xml-utils configure 7.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2056,7 +2056,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by html-xml-utils $as_me 7.4, which was +It was created by html-xml-utils $as_me 7.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2919,7 +2919,7 @@ # Define the identity of the package. PACKAGE='html-xml-utils' - VERSION='7.4' + VERSION='7.6' cat >>confdefs.h <<_ACEOF @@ -6948,7 +6948,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by html-xml-utils $as_me 7.4, which was +This file was extended by html-xml-utils $as_me 7.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7014,7 +7014,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -html-xml-utils config.status 7.4 +html-xml-utils config.status 7.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/configure.ac new/html-xml-utils-7.6/configure.ac --- old/html-xml-utils-7.4/configure.ac 2017-11-24 18:28:14.000000000 +0100 +++ new/html-xml-utils-7.6/configure.ac 2018-02-09 16:12:42.000000000 +0100 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([html-xml-utils],[7.4]) +AC_INIT([html-xml-utils],[7.6]) dnl print all automake warnings with -Wall dnl http://sources.redhat.com/automake/automake.html#Options AM_INIT_AUTOMAKE([-Wall]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/dtd.c new/html-xml-utils-7.6/dtd.c --- old/html-xml-utils-7.4/dtd.c 2017-11-24 11:30:38.000000000 +0100 +++ new/html-xml-utils-7.6/dtd.c 2017-12-08 17:18:11.000000000 +0100 @@ -80,16 +80,16 @@ /* Different kinds of parent elements: */ #define PHRASE "abbr", "acronym", "b", "bdi", "bdo", "big", "cite", "code", "dfn", "em", "i", "kbd", "q", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "tt", "u", "var" #define BRIDGE "p", "address", "caption", "dt", "h1", "h2", "h3", "h4", "h5", "h6", "legend", "pre" -#define FLOW "article", "aside", "dd", "del", "details", "div", "fieldset", "figcaption", "figure", "footer", "header", "ins", "li", "nav", "section", "object", "td", "th" +#define FLOW "article", "aside", "dd", "del", "details", "div", "fieldset", "figcaption", "figure", "footer", "header", "ins", "li", "nav", "section", "main", "object", "td", "th" #define INLINE_PARENT BRIDGE, PHRASE, FLOW #define BLOCK_PARENT "body", "blockquote", "map", "noscript" -#define TOTAL_KEYWORDS 96 +#define TOTAL_KEYWORDS 97 #define MIN_WORD_LENGTH 1 #define MAX_WORD_LENGTH 10 #define MIN_HASH_VALUE 1 -#define MAX_HASH_VALUE 158 -/* maximum key range = 158, duplicates = 0 */ +#define MAX_HASH_VALUE 227 +/* maximum key range = 227, duplicates = 0 */ #ifdef __GNUC__ __inline @@ -103,32 +103,32 @@ { static const unsigned char asso_values[] = { - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 0, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 45, - 40, 30, 25, 15, 10, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 5, 15, 90, - 5, 0, 55, 20, 45, 45, 159, 75, 10, 55, - 30, 15, 25, 0, 20, 35, 0, 95, 5, 25, - 159, 5, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159 + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 0, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 35, + 30, 20, 15, 5, 0, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 5, 60, 80, + 5, 0, 85, 37, 65, 20, 228, 15, 10, 10, + 25, 35, 25, 0, 80, 30, 0, 65, 105, 0, + 228, 40, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228 }; register unsigned int hval = len; @@ -150,21 +150,21 @@ static const ElementType wordlist[] = { {""}, -#line 129 "dtd.hash" +#line 130 "dtd.hash" {"q", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 152 "dtd.hash" +#line 153 "dtd.hash" {"tt", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, {""}, {""}, {""}, {""}, #line 90 "dtd.hash" {"dt", 1, 0, 0, 1, 0, 0, 1, 1, {"dl", NULL}}, {""}, {""}, -#line 142 "dtd.hash" +#line 143 "dtd.hash" {"table", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, #line 62 "dtd.hash" {"a", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "label", NULL}}, -#line 144 "dtd.hash" - {"td", 1, 0, 0, 1, 0, 0, 1, 1, {"tr", NULL}}, #line 145 "dtd.hash" + {"td", 1, 0, 0, 1, 0, 0, 1, 1, {"tr", NULL}}, +#line 146 "dtd.hash" {"textarea", 1, 0, 0, 1, 1, 1, 0, 0, {INLINE_PARENT, "a", "label", NULL}}, {""}, #line 61 "dtd.hash" @@ -174,208 +174,221 @@ {"dd", 1, 0, 0, 1, 0, 0, 1, 1, {"dl", NULL}}, #line 85 "dtd.hash" {"del", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, BLOCK_PARENT, "a", "button", "colgroup", "dl", "form", "label", "ol", "optgroup", "option", "select", "table", "tbody", "textarea", "tfoot", "thead", "ul", NULL}}, - {""}, {""}, +#line 120 "dtd.hash" + {"meta", 0, 1, 0, 1, 0, 0, 1, 0, {INLINE_PARENT, "head", "a", "button", "label", NULL}}, +#line 92 "dtd.hash" + {"embed", 0, 1, 0, 1, 0, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, #line 115 "dtd.hash" {"legend", 1, 0, 0, 1, 1, 0, 1, 1, {"fieldset", NULL}}, +#line 91 "dtd.hash" + {"em", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, {""}, {""}, -#line 71 "dtd.hash" - {"base", 0, 1, 0, 1, 0, 0, 1, 1, {"head", NULL}}, -#line 143 "dtd.hash" - {"tbody", 0, 0, 0, 0, 0, 0, 1, 1, {"table", NULL}}, +#line 150 "dtd.hash" + {"title", 1, 0, 0, 1, 1, 0, 1, 1, {"head", NULL}}, {""}, #line 89 "dtd.hash" {"dl", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, {""}, {""}, #line 114 "dtd.hash" {"label", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", NULL}}, -#line 70 "dtd.hash" - {"b", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 67 "dtd.hash" - {"article", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 154 "dtd.hash" - {"var", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 66 "dtd.hash" - {"area", 0, 1, 0, 1, 0, 0, 0, 0, {"map", NULL}}, -#line 75 "dtd.hash" - {"blockquote", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 122 "dtd.hash" - {"object", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "del", "header", "aside", "section", "article", "nav", "fieldset", "head", "ins", "label", "object", NULL}}, -#line 123 "dtd.hash" - {"ol", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 73 "dtd.hash" - {"bdo", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 76 "dtd.hash" - {"body", 0, 0, 0, 0, 0, 0, 1, 1, {"html", NULL}}, -#line 138 "dtd.hash" + {""}, {""}, {""}, {""}, +#line 139 "dtd.hash" {"style", 1, 0, 1, 1, 1, 1, 1, 0, {"head", NULL}}, -#line 133 "dtd.hash" +#line 134 "dtd.hash" {"select", 0, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "label", NULL}}, -#line 150 "dtd.hash" - {"tr", 0, 0, 0, 1, 0, 0, 1, 1, {"tbody", "tfoot", "thead", NULL}}, -#line 120 "dtd.hash" - {"nav", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 63 "dtd.hash" - {"abbr", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, + {""}, {""}, {""}, #line 68 "dtd.hash" {"aside", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, - {""}, +#line 108 "dtd.hash" + {"i", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, #line 86 "dtd.hash" {"details", 1, 0, 0, 1, 1, 0, 1, 1, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 119 "dtd.hash" + {"map", 0, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 118 "dtd.hash" + {"main", 1, 0, 0, 1, 1, 0, 1, 1, {"body", "div", "noscript", NULL}}, #line 128 "dtd.hash" - {"pre", 1, 0, 0, 1, 1, 1, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, - {""}, -#line 149 "dtd.hash" - {"title", 1, 0, 0, 1, 1, 0, 1, 1, {"head", NULL}}, -#line 126 "dtd.hash" - {"p", 1, 0, 0, 1, 0, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, + {"param", 0, 1, 0, 1, 0, 0, 1, 1, {"object", NULL}}, +#line 113 "dtd.hash" + {"keygen", 0, 1, 0, 1, 0, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, #line 65 "dtd.hash" {"address", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 121 "dtd.hash" - {"noscript", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 104 "dtd.hash" - {"head", 0, 0, 0, 0, 0, 0, 1, 1, {"html", NULL}}, -#line 148 "dtd.hash" - {"thead", 0, 0, 0, 1, 0, 0, 1, 1, {"table", NULL}}, + {""}, +#line 117 "dtd.hash" + {"link", 0, 1, 0, 1, 0, 0, 1, 0, {"head", NULL}}, +#line 110 "dtd.hash" + {"input", 0, 1, 0, 1, 0, 0, 0, 0, {INLINE_PARENT, "a", "label", NULL}}, +#line 127 "dtd.hash" + {"p", 1, 0, 0, 1, 0, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 116 "dtd.hash" + {"li", 1, 0, 0, 1, 0, 0, 1, 1, {"ul", "ol", NULL}}, + {""}, {""}, #line 135 "dtd.hash" - {"source", 0, 1, 0, 1, 0, 0, 1, 1, {"audio", "video", "template", NULL}}, -#line 77 "dtd.hash" - {"br", 0, 1, 0, 1, 0, 0, 0, 1, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 88 "dtd.hash" - {"div", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 107 "dtd.hash" - {"html", 0, 0, 0, 0, 0, 0, 1, 1, {NULL, NULL}}, -#line 146 "dtd.hash" - {"tfoot", 0, 0, 0, 1, 0, 0, 1, 1, {"table", NULL}}, -#line 137 "dtd.hash" - {"strong", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, + {"small", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, {""}, -#line 156 "dtd.hash" - {"wbr", 0, 1, 0, 1, 0, 0, 0, 1, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 119 "dtd.hash" - {"meta", 0, 1, 0, 1, 0, 0, 1, 0, {INLINE_PARENT, "head", "a", "button", "label", NULL}}, -#line 92 "dtd.hash" - {"embed", 0, 1, 0, 1, 0, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 124 "dtd.hash" + {"ol", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, + {""}, {""}, {""}, {""}, +#line 133 "dtd.hash" + {"section", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, {""}, -#line 103 "dtd.hash" - {"h6", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 72 "dtd.hash" - {"bdi", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 130 "dtd.hash" +#line 131 "dtd.hash" {"samp", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 155 "dtd.hash" - {"video", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 105 "dtd.hash" - {"header", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 132 "dtd.hash" - {"section", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 124 "dtd.hash" - {"optgroup", 0, 0, 0, 1, 1, 0, 1, 1, {"select", NULL}}, {""}, {""}, -#line 125 "dtd.hash" - {"option", 1, 0, 0, 1, 0, 0, 1, 1, {"select", "optgroup", NULL}}, +#line 103 "dtd.hash" + {"h6", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 122 "dtd.hash" + {"noscript", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 71 "dtd.hash" + {"base", 0, 1, 0, 1, 0, 0, 1, 1, {"head", NULL}}, +#line 109 "dtd.hash" + {"img", 0, 1, 0, 1, 0, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 136 "dtd.hash" + {"source", 0, 1, 0, 1, 0, 0, 1, 1, {"audio", "video", "template", NULL}}, + {""}, +#line 138 "dtd.hash" + {"strong", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 104 "dtd.hash" + {"head", 0, 0, 0, 0, 0, 0, 1, 1, {"html", NULL}}, +#line 149 "dtd.hash" + {"thead", 0, 0, 0, 1, 0, 0, 1, 1, {"table", NULL}}, + {""}, #line 102 "dtd.hash" {"h5", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 111 "dtd.hash" + {"ins", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, BLOCK_PARENT, "a", "button", "colgroup", "dl", "form", "label", "ol", "optgroup", "option", "select", "table", "tbody", "textarea", "tfoot", "thead", "ul", NULL}}, +#line 107 "dtd.hash" + {"html", 0, 0, 0, 0, 0, 0, 1, 1, {NULL, NULL}}, +#line 75 "dtd.hash" + {"blockquote", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, {""}, {""}, -#line 110 "dtd.hash" - {"input", 0, 1, 0, 1, 0, 0, 0, 0, {INLINE_PARENT, "a", "label", NULL}}, +#line 112 "dtd.hash" + {"kbd", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 137 "dtd.hash" + {"span", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, {""}, {""}, -#line 74 "dtd.hash" - {"big", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, - {""}, {""}, {""}, -#line 106 "dtd.hash" - {"hr", 0, 1, 0, 1, 0, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 118 "dtd.hash" - {"map", 0, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 154 "dtd.hash" + {"ul", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 72 "dtd.hash" + {"bdi", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, {""}, -#line 127 "dtd.hash" - {"param", 0, 1, 0, 1, 0, 0, 1, 1, {"object", NULL}}, -#line 108 "dtd.hash" - {"i", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, #line 147 "dtd.hash" - {"th", 1, 0, 0, 1, 0, 0, 1, 1, {"tr", NULL}}, -#line 87 "dtd.hash" - {"dfn", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 136 "dtd.hash" - {"span", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, - {""}, -#line 96 "dtd.hash" - {"footer", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, + {"tfoot", 0, 0, 0, 1, 0, 0, 1, 1, {"table", NULL}}, +#line 126 "dtd.hash" + {"option", 1, 0, 0, 1, 0, 0, 1, 1, {"select", "optgroup", NULL}}, +#line 67 "dtd.hash" + {"article", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 125 "dtd.hash" + {"optgroup", 0, 0, 0, 1, 1, 0, 1, 1, {"select", NULL}}, +#line 66 "dtd.hash" + {"area", 0, 1, 0, 1, 0, 0, 0, 0, {"map", NULL}}, + {""}, {""}, #line 101 "dtd.hash" {"h4", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 112 "dtd.hash" - {"kbd", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, - {""}, -#line 151 "dtd.hash" + {""}, {""}, +#line 152 "dtd.hash" {"track", 0, 1, 0, 1, 0, 0, 1, 1, {"audio", "video", "template", NULL}}, +#line 123 "dtd.hash" + {"object", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "del", "header", "aside", "section", "main", "article", "nav", "fieldset", "head", "ins", "label", "object", NULL}}, +#line 64 "dtd.hash" + {"acronym", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 73 "dtd.hash" + {"bdo", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 80 "dtd.hash" + {"cite", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 144 "dtd.hash" + {"tbody", 0, 0, 0, 0, 0, 0, 1, 1, {"table", NULL}}, {""}, -#line 116 "dtd.hash" - {"li", 1, 0, 0, 1, 0, 0, 1, 1, {"ul", "ol", NULL}}, - {""}, {""}, -#line 134 "dtd.hash" - {"small", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 95 "dtd.hash" - {"figure", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, #line 100 "dtd.hash" {"h3", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 129 "dtd.hash" + {"pre", 1, 0, 0, 1, 1, 1, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, + {""}, +#line 69 "dtd.hash" + {"audio", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 95 "dtd.hash" + {"figure", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, + {""}, #line 93 "dtd.hash" {"fieldset", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "form", NULL}}, + {""}, {""}, +#line 132 "dtd.hash" + {"script", 1, 0, 1, 1, 1, 1, 1, 0, {"body", INLINE_PARENT, "blockquote", "head", "map", "a", "button", "form", "label", NULL}}, +#line 79 "dtd.hash" + {"caption", 1, 0, 0, 1, 1, 0, 1, 1, {"table", NULL}}, +#line 87 "dtd.hash" + {"dfn", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, #line 81 "dtd.hash" {"code", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 74 "dtd.hash" + {"big", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 70 "dtd.hash" + {"b", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, {""}, -#line 113 "dtd.hash" - {"keygen", 0, 1, 0, 1, 0, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 91 "dtd.hash" - {"em", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 111 "dtd.hash" - {"ins", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, BLOCK_PARENT, "a", "button", "colgroup", "dl", "form", "label", "ol", "optgroup", "option", "select", "table", "tbody", "textarea", "tfoot", "thead", "ul", NULL}}, +#line 142 "dtd.hash" + {"sup", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, {""}, {""}, {""}, -#line 153 "dtd.hash" - {"ul", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 99 "dtd.hash" + {"h2", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, #line 82 "dtd.hash" {"col", 0, 1, 0, 1, 0, 0, 0, 0, {"colgroup", "table", NULL}}, - {""}, -#line 69 "dtd.hash" - {"audio", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, - {""}, {""}, -#line 109 "dtd.hash" - {"img", 0, 1, 0, 1, 0, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, {""}, {""}, {""}, -#line 99 "dtd.hash" - {"h2", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, - {""}, +#line 148 "dtd.hash" + {"th", 1, 0, 0, 1, 0, 0, 1, 1, {"tr", NULL}}, +#line 88 "dtd.hash" + {"div", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, #line 97 "dtd.hash" {"form", 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, NULL}}, - {""}, -#line 131 "dtd.hash" - {"script", 1, 0, 1, 1, 1, 1, 1, 0, {"body", INLINE_PARENT, "blockquote", "head", "map", "a", "button", "form", "label", NULL}}, -#line 79 "dtd.hash" - {"caption", 1, 0, 0, 1, 1, 0, 1, 1, {"table", NULL}}, - {""}, -#line 117 "dtd.hash" - {"link", 0, 1, 0, 1, 0, 0, 1, 0, {"head", NULL}}, {""}, {""}, #line 98 "dtd.hash" {"h1", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, -#line 83 "dtd.hash" - {"colgroup", 0, 0, 0, 1, 1, 0, 1, 1, {"table", NULL}}, -#line 80 "dtd.hash" - {"cite", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, +#line 121 "dtd.hash" + {"nav", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, +#line 76 "dtd.hash" + {"body", 0, 0, 0, 0, 0, 0, 1, 1, {"html", NULL}}, #line 94 "dtd.hash" {"figcaption", 1, 0, 0, 1, 1, 0, 1, 1, {"figure", NULL}}, {""}, -#line 140 "dtd.hash" +#line 141 "dtd.hash" {"summary", 1, 0, 0, 1, 1, 0, 0, 0, {"details", NULL}}, - {""}, {""}, {""}, +#line 157 "dtd.hash" + {"wbr", 0, 1, 0, 1, 0, 0, 0, 1, {INLINE_PARENT, "a", "button", "label", NULL}}, + {""}, {""}, {""}, {""}, +#line 83 "dtd.hash" + {"colgroup", 0, 0, 0, 1, 1, 0, 1, 1, {"table", NULL}}, +#line 63 "dtd.hash" + {"abbr", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, + {""}, +#line 105 "dtd.hash" + {"header", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, + {""}, {""}, {""}, {""}, #line 78 "dtd.hash" {"button", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "label", NULL}}, {""}, -#line 139 "dtd.hash" +#line 140 "dtd.hash" {"sub", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 64 "dtd.hash" - {"acronym", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, -#line 141 "dtd.hash" - {"sup", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}} + {""}, {""}, {""}, +#line 151 "dtd.hash" + {"tr", 0, 0, 0, 1, 0, 0, 1, 1, {"tbody", "tfoot", "thead", NULL}}, + {""}, {""}, +#line 156 "dtd.hash" + {"video", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 155 "dtd.hash" + {"var", 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL}}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 96 "dtd.hash" + {"footer", 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 77 "dtd.hash" + {"br", 0, 1, 0, 1, 0, 0, 0, 1, {INLINE_PARENT, "a", "button", "label", NULL}}, + {""}, {""}, {""}, {""}, +#line 106 "dtd.hash" + {"hr", 0, 1, 0, 1, 0, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL}} }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -392,5 +405,5 @@ } return 0; } -#line 157 "dtd.hash" +#line 158 "dtd.hash" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/dtd.e new/html-xml-utils-7.6/dtd.e --- old/html-xml-utils-7.4/dtd.e 2017-11-24 11:30:57.000000000 +0100 +++ new/html-xml-utils-7.6/dtd.e 2017-12-08 17:18:11.000000000 +0100 @@ -1,9 +1,7 @@ #define MAXNAMELEN 10 typedef struct _ElementType { string name; - - _Bool - mixed, empty, cdata, stag, etag, pre, break_before, break_after; + _Bool mixed, empty, cdata, stag, etag, pre, break_before, break_after; string parents[76]; } ElementType; extern const ElementType * lookup_element(register const char *str, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/dtd.hash new/html-xml-utils-7.6/dtd.hash --- old/html-xml-utils-7.4/dtd.hash 2017-11-24 11:16:29.000000000 +0100 +++ new/html-xml-utils-7.6/dtd.hash 2017-12-08 17:17:37.000000000 +0100 @@ -49,7 +49,7 @@ /* Different kinds of parent elements: */ #define PHRASE "abbr", "acronym", "b", "bdi", "bdo", "big", "cite", "code", "dfn", "em", "i", "kbd", "q", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "tt", "u", "var" #define BRIDGE "p", "address", "caption", "dt", "h1", "h2", "h3", "h4", "h5", "h6", "legend", "pre" -#define FLOW "article", "aside", "dd", "del", "details", "div", "fieldset", "figcaption", "figure", "footer", "header", "ins", "li", "nav", "section", "object", "td", "th" +#define FLOW "article", "aside", "dd", "del", "details", "div", "fieldset", "figcaption", "figure", "footer", "header", "ins", "li", "nav", "section", "main", "object", "td", "th" #define INLINE_PARENT BRIDGE, PHRASE, FLOW #define BLOCK_PARENT "body", "blockquote", "map", "noscript" %} @@ -115,11 +115,12 @@ legend, 1, 0, 0, 1, 1, 0, 1, 1, {"fieldset", NULL} li, 1, 0, 0, 1, 0, 0, 1, 1, {"ul", "ol", NULL} link, 0, 1, 0, 1, 0, 0, 1, 0, {"head", NULL} +main, 1, 0, 0, 1, 1, 0, 1, 1, {"body", "div", "noscript", NULL} map, 0, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "label", NULL} meta, 0, 1, 0, 1, 0, 0, 1, 0, {INLINE_PARENT, "head", "a", "button", "label", NULL} nav, 1, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL} noscript, 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL} -object, 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "del", "header", "aside", "section", "article", "nav", "fieldset", "head", "ins", "label", "object", NULL} +object, 1, 0, 0, 1, 1, 0, 0, 0, {INLINE_PARENT, "a", "button", "del", "header", "aside", "section", "main", "article", "nav", "fieldset", "head", "ins", "label", "object", NULL} ol, 0, 0, 0, 1, 1, 0, 1, 1, {BLOCK_PARENT, FLOW, "button", "form", NULL} optgroup, 0, 0, 0, 1, 1, 0, 1, 1, {"select", NULL} option, 1, 0, 0, 1, 0, 0, 1, 1, {"select", "optgroup", NULL} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/hxcite.1 new/html-xml-utils-7.6/hxcite.1 --- old/html-xml-utils-7.4/hxcite.1 2016-04-15 00:04:21.000000000 +0200 +++ new/html-xml-utils-7.6/hxcite.1 2018-01-22 12:23:42.000000000 +0100 @@ -154,7 +154,7 @@ .B hxcite does not actually parse HTML or XML input and the .B \-c -option simply treats every occurence of "<!--" as the start of an XML +option simply treats every occurrence of "<!--" as the start of an XML comment, even if it occurs inside an attribute value or a CDATA section. Likewise for "-->" for the end of a comment. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/hxincl.1 new/html-xml-utils-7.6/hxincl.1 --- old/html-xml-utils-7.4/hxincl.1 2016-04-15 00:04:21.000000000 +0200 +++ new/html-xml-utils-7.6/hxincl.1 2018-01-22 12:23:42.000000000 +0100 @@ -96,7 +96,7 @@ .B \-f Removes the comments after including the files. This means .B hxincl -connot be run on the resulting file later to update the inclusions. +cannot be run on the resulting file later to update the inclusions. (Mnemonic: .BR f inal or @@ -134,7 +134,7 @@ are given, then the "xxx-%name%" will expand to "xxx-subst.rrr". .TP .BI \-M " target" -Instead of outputing the input file with all inclusions expanded, +Instead of outputting the input file with all inclusions expanded, output just the list of all files that the input includes, recursively, in the form of a rule that is suitable for a Makefile. The diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/hxwls.c new/html-xml-utils-7.6/hxwls.c --- old/html-xml-utils-7.4/hxwls.c 2017-11-24 10:50:25.000000000 +0100 +++ new/html-xml-utils-7.6/hxwls.c 2017-12-08 17:18:54.000000000 +0100 @@ -4,12 +4,9 @@ * Copyright © 1994-2000 World Wide Web Consortium * See http://www.w3.org/Consortium/Legal/copyright-software * - * TODO: An option to output URIs mapped to ASCII via Punycode and - * %-escaping instead of IRIs (in UTF-8). - * * Bert Bos <b...@w3.org> * Created 31 July 1999 - * $Id: hxwls.c,v 1.11 2017/11/24 09:50:25 bbos Exp $ + * $Id: hxwls.c,v 1.12 2017/12/07 02:05:23 bbos Exp $ */ #include "config.h" #include <assert.h> @@ -233,9 +230,11 @@ output("img", NULL, pairlist_get(attribs, "src")); output("longdesc", NULL, pairlist_get(attribs, "longdesc")); } else if (strcasecmp(name, "input") == 0) { - output("input", NULL, pairlist_get(attribs, "href")); + output("input", NULL, pairlist_get(attribs, "src")); } else if (strcasecmp(name, "object") == 0) { output("object", NULL, pairlist_get(attribs, "data")); + output("object", NULL, pairlist_get(attribs, "classid")); + output("object", NULL, pairlist_get(attribs, "codebase")); } else if (strcasecmp(name, "area") == 0) { output("area", pairlist_get(attribs, "rel"), pairlist_get(attribs, "href")); } else if (strcasecmp(name, "ins") == 0) { @@ -258,6 +257,13 @@ output("script", NULL, pairlist_get(attribs, "src")); } else if (strcasecmp(name, "body") == 0) { output("body", NULL, pairlist_get(attribs, "background")); + } else if (strcasecmp(name, "video") == 0) { + output("video", NULL, pairlist_get(attribs, "src")); + } else if (strcasecmp(name, "audio") == 0) { + output("audio", NULL, pairlist_get(attribs, "src")); + } else if (strcasecmp(name, "source") == 0) { + output("source", NULL, pairlist_get(attribs, "srcset")); + output("source", NULL, pairlist_get(attribs, "src")); } /* Free memory */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/selmatch.c new/html-xml-utils-7.6/selmatch.c --- old/html-xml-utils-7.4/selmatch.c 2017-11-24 18:34:56.000000000 +0100 +++ new/html-xml-utils-7.6/selmatch.c 2018-02-09 15:45:04.000000000 +0100 @@ -274,8 +274,9 @@ if (!s->context) return true; switch (s->combinator) { case Descendant: - for (h = t->parent; h && !matches_sel(h, s->context); h = h->parent); - return h != NULL; + for (h = t->parent; h->tp != Root && !matches_sel(h, s->context); + h = h->parent); + return h->tp != Root; case Child: return matches_sel(t->parent, s->context); case Adjacent: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/tests/extract1.sh new/html-xml-utils-7.6/tests/extract1.sh --- old/html-xml-utils-7.4/tests/extract1.sh 2017-10-06 18:02:07.000000000 +0200 +++ new/html-xml-utils-7.6/tests/extract1.sh 2018-01-22 14:19:27.000000000 +0100 @@ -18,7 +18,7 @@ p=$(($PORT + $i)) q=$(($p + 1)) printf "HTTP/1.1 302\r\nLocation: http://127.0.0.1:$q/\r\n\r"; |\ - (nc -N -l -n -p $p || nc -l -n $p) >/dev/null 2>&1 & + (nc -q0 -l -n -p $p || nc -l -n $p) & done sleep 1 # Give the servers time to start diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/tests/normalize11.sh new/html-xml-utils-7.6/tests/normalize11.sh --- old/html-xml-utils-7.4/tests/normalize11.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/html-xml-utils-7.6/tests/normalize11.sh 2017-12-08 17:17:09.000000000 +0100 @@ -0,0 +1,46 @@ +: +# Test of HTML5 element "main" + +trap 'rm $TMP1 $TMP2 $TMP3' 0 +TMP1=`mktemp /tmp/tmp.XXXXXXXXXX` || exit 1 +TMP2=`mktemp /tmp/tmp.XXXXXXXXXX` || exit 1 +TMP3=`mktemp /tmp/tmp.XXXXXXXXXX` || exit 1 + +cat >$TMP1 <<EOF +<!DOCTYPE html> +<html> +<head lang="en"> +<meta charset="UTF-8"> +<title>Title</title> +</head> +<body> +<p>Before the main text. +<section> +<p>Also before the main text. Missing close tag for section. +<main> +<p>Inside the main text. Missing close tag for main. +</html> +EOF + +cat >$TMP2 <<EOF +<!DOCTYPE html> + +<html> + <head lang=en> + <meta charset=UTF-8> + <title>Title</title> + + <body> + <p>Before the main text. + + <section> + <p>Also before the main text. Missing close tag for section. + </section> + + <main> + <p>Inside the main text. Missing close tag for main. + </main> +EOF + +./hxnormalize $TMP1 >$TMP3 +diff -u $TMP2 $TMP3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/tests/wls1.sh new/html-xml-utils-7.6/tests/wls1.sh --- old/html-xml-utils-7.4/tests/wls1.sh 2010-11-17 23:36:54.000000000 +0100 +++ new/html-xml-utils-7.6/tests/wls1.sh 2017-12-08 17:17:37.000000000 +0100 @@ -9,12 +9,18 @@ <a href="foo.html">.</a> <img src="bar/foo.png"> <img src="../bar/foo.png"> + <picture> + <source type="image/svg+xml" srcset="foo.svg"> + <img src="foo.png" alt=""> + </picture> EOF cat >$TMP2 <<-EOF http://example.org/style.css ../othersub/foo.html ../othersub/bar/foo.png ../bar/foo.png + ../othersub/foo.svg + ../othersub/foo.png EOF ./hxwls -b ../othersub/base $TMP1 >$TMP3 cmp -s $TMP2 $TMP3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html-xml-utils-7.4/url.c new/html-xml-utils-7.6/url.c --- old/html-xml-utils-7.4/url.c 2017-11-24 10:43:57.000000000 +0100 +++ new/html-xml-utils-7.6/url.c 2018-01-22 12:23:42.000000000 +0100 @@ -61,7 +61,7 @@ rc = idn2_lookup_u8((uint8_t*)s, (uint8_t**)&p, IDN2_NFC_INPUT); if (rc == IDN2_OK) return p; - warnx(idn2_strerror(rc)); + warnx("%s", idn2_strerror(rc)); return newstring(s); #elif HAVE_LIBIDN string p;
