+
diff --git a/html-utils/src/test/resources/html/html-4.01-strict.html b/html-utils/src/test/resources/html/html-4.01-strict.html
deleted file mode 100644
index f222a77..0000000
--- a/html-utils/src/test/resources/html/html-4.01-strict.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
- untitled
-
-
-
- content
-
-
\ No newline at end of file
diff --git a/html-utils/src/test/resources/html/html5-mathml.html b/html-utils/src/test/resources/html/html5-mathml.html
deleted file mode 100644
index 9f0c9cf..0000000
--- a/html-utils/src/test/resources/html/html5-mathml.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
- title
-
-
- The quadratic formula
-
-
-
-
-
\ No newline at end of file
diff --git a/html-utils/src/test/resources/html/html5-minimal.html b/html-utils/src/test/resources/html/html5-minimal.html
deleted file mode 100644
index b829446..0000000
--- a/html-utils/src/test/resources/html/html5-minimal.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- title
-
-
-
-
-
\ No newline at end of file
diff --git a/html-utils/src/test/resources/html/html5-noxml.html b/html-utils/src/test/resources/html/html5-noxml.html
deleted file mode 100644
index 18d5ee5..0000000
--- a/html-utils/src/test/resources/html/html5-noxml.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-blah
-I'm the content
\ No newline at end of file
diff --git a/html-utils/src/test/resources/html/html5-svg.html b/html-utils/src/test/resources/html/html5-svg.html
deleted file mode 100644
index bc2d398..0000000
--- a/html-utils/src/test/resources/html/html5-svg.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- title
-
-
- SVG Example
-
-
-
\ No newline at end of file
diff --git a/html-utils/src/test/resources/html/html5-wellformed.html b/html-utils/src/test/resources/html/html5-wellformed.html
deleted file mode 100644
index 5c3b443..0000000
--- a/html-utils/src/test/resources/html/html5-wellformed.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- title
-
-
- content
-
-
\ No newline at end of file
diff --git a/html-utils/src/test/resources/html/xhtml-1.0-strict.xhtml b/html-utils/src/test/resources/html/xhtml-1.0-strict.xhtml
deleted file mode 100644
index 42adb05..0000000
--- a/html-utils/src/test/resources/html/xhtml-1.0-strict.xhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
- untitled
-
-
-
- content
-
-
diff --git a/html-utils/src/test/resources/html5-outliner_test.xml b/html-utils/src/test/resources/html5-outliner_test.xml
deleted file mode 100755
index 01c1331..0000000
--- a/html-utils/src/test/resources/html5-outliner_test.xml
+++ /dev/null
@@ -1,1198 +0,0 @@
-
-
-
-
-
-
-
-
-
- section heading: basic
-
-
-
-
- heading
-
-
-
-
-
- - heading
-
-
-
-
-
- section heading: 'a' in heading content is translated to 'span'
-
-
-
-
-
-
-
-
-
-
- - heading with a link and another link
-
-
-
-
-
- section heading: not h1
-
-
-
-
- heading
-
-
-
-
-
- - heading
-
-
-
-
-
- section heading: hgroup
-
-
-
-
-
- heading
- other
-
-
-
-
-
-
- - heading
-
-
-
-
-
- section heading: hgroup with highest rank not first child
-
-
-
-
-
- other
- heading
-
-
-
-
-
-
- - heading
-
-
-
-
-
- section heading: not first child
-
-
-
-
- paragraph
- heading
-
-
-
-
-
- - heading
-
-
-
-
-
- section heading: after subsection
-
-
-
-
-
- h12
-
-
-
-
-
- - h12
-
- - h11
-
-
-
-
-
-
-
- section heading: between subsections
-
-
-
-
-
- h12
-
-
-
-
-
-
- - h12
-
- - h11
- - h13
-
-
-
-
-
-
-
-
-
-
-
- 'section' subsection: basic
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
-
- - h12
-
-
-
-
-
-
-
- 'section' subsection: nested
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
-
- - h12
-
- - h13
-
-
-
-
-
-
-
-
-
- 'section' subsection: siblings
-
-
-
-
- h11
-
-
-
-
-
-
-
- - h11
-
- - h12
- - h13
-
-
-
-
-
-
-
- 'article' subsection: basic
-
-
-
-
- h11
-
- h12
-
-
-
-
-
-
- - h11
-
- - h12
-
-
-
-
-
-
-
- 'aside' subsection: basic
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
-
- - h12
-
-
-
-
-
-
-
- 'nav' subsection: basic
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
-
- - h12
-
-
-
-
-
-
-
- mixed subsections: basic
-
-
-
-
- h11
-
-
- h14
-
-
-
-
-
-
-
- - h11
-
- - h12
-
- - h13
-
-
- - h14
-
- - h15
-
-
-
-
-
-
-
-
-
-
-
-
-
- lower rank heading: basic
-
-
-
-
- h1
- h2
-
-
-
-
-
- - h1
-
- - h2
-
-
-
-
-
-
-
- lower rank heading: skip rank
-
-
-
-
- h1
- h3
-
-
-
-
-
- - h1
-
- - h3
-
-
-
-
-
-
-
- lower rank heading: hgroup
-
-
-
-
- h1
-
- h2
- h3
-
-
-
-
-
-
- - h1
-
- - h2
-
-
-
-
-
-
-
- lower rank heading: hgroup with highest rank not first child
-
-
-
-
- h1
-
- h3
- h2
-
-
-
-
-
-
- - h1
-
- - h2
-
-
-
-
-
-
-
- lower rank heading: successively
-
-
-
-
- h1
- h2
- h3
- h4
- h5
- h6
-
-
-
-
-
- - h1
-
- - h2
-
- - h3
-
- - h4
-
- - h5
-
- - h6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- lower rank heading: after subsection
-
-
-
-
- h11
-
- h2
-
-
-
-
-
- - h11
-
- - h12
- - h2
-
-
-
-
-
-
-
-
-
-
-
- same rank heading: basic
-
-
-
-
- h11
- h12
-
-
-
-
-
- - h11
- - h12
-
-
-
-
-
- same rank heading: within nested divs
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
- - h12
-
-
-
-
-
- same rank heading: within an hgroup
-
-
-
-
- h11
-
- h2
- h12
-
-
-
-
-
-
- - h11
- - h12
-
-
-
-
-
- same rank heading: within a section
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
-
- - h12
- - h13
-
-
-
-
-
-
-
-
-
-
- higher rank heading: basic
-
-
-
-
- h2
- h1
-
-
-
-
-
- - h2
- - h1
-
-
-
-
-
- higher rank heading: within nested divs
-
-
-
-
- h2
-
-
-
-
-
-
- - h2
- - h1
-
-
-
-
-
- higher rank heading: within an hgroup
-
-
-
-
- h2
-
- h3
- h1
-
-
-
-
-
-
- - h2
- - h1
-
-
-
-
-
- higher rank heading: within a section
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
-
- - h2
- - h12
-
-
-
-
-
-
-
-
-
-
-
- default heading: body
-
-
-
-
-
-
-
-
- - Untitled document
-
-
-
-
-
- default heading: section
-
-
-
-
- h1
-
-
-
-
-
-
- - h1
-
- - Untitled section
-
-
-
-
-
-
-
- default heading: article
-
-
-
-
- h1
-
-
-
-
-
-
- - h1
-
- - Article
-
-
-
-
-
-
-
- default heading: aside
-
-
-
-
- h1
-
-
-
-
-
-
- - h1
-
- - Sidebar
-
-
-
-
-
-
-
- default heading: nav
-
-
-
-
- h1
-
-
-
-
-
-
- - h1
-
- - Navigation
-
-
-
-
-
-
-
-
-
-
-
- sectioning root: blockquote
-
-
-
-
- h11
-
- h12
-
-
-
-
-
-
- - h11
-
-
-
-
-
- sectioning root: details
-
-
-
-
- h11
-
- h12
-
-
-
-
-
-
- - h11
-
-
-
-
-
- sectioning root: fieldset
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
-
-
-
-
-
- sectioning root: figure
-
-
-
-
- h11
-
- h12
-
-
-
-
-
-
- - h11
-
-
-
-
-
- sectioning root: td
-
-
-
-
- h11
-
-
-
-
-
-
- - h11
-
-
-
-
-
-
-
-
-
-
- complex 1
-
-
-
-
- Foo
- Bar
-
- Bla
-
- Baz
- Quux
-
- Grunt
-
-
-
-
-
- - Foo
-
- - Bar
- - Quux
- - Thud
-
-
-
-
-
-
-
- complex 2
-
-
-
-
-
- Foo
- Bar
- Quux
-
-
-
-
-
-
- - Foo
-
- - Thud
-
-
- - Bar
-
- - Quux
- - Thud
-
-
-
-
-
-
-
- complex 3
-
-
-
-
-
- Foo
- Bar
-
- Bar
- Quux
-
-
-
-
-
-
- - Foo
-
- - Thud
-
-
- - Bar
-
- - Thud
-
-
- - Bar
-
- - Quux
- - Thud
-
-
-
-
-
-
-
- complex 4
-
-
-
-
- h1
- h1
- h2
- h3
-
- h3
- h2
-
-
-
-
-
- - h1
- - h1
-
- - h2
-
- - h3
-
-
- - h1
- - h3
- - h2
-
-
-
-
-
-
-
- complex 5
-
-
-
-
- h1
- h1
-
- h3
- h2
- h3
-
-
-
-
-
- - h1
- - h1
-
- - h1
- - h3
- - h2
-
- - h3
-
-
-
-
-
-
-
-
-
- complex 6
-
-
-
-
-
- h2
- h3
- h2
- h3
-
-
-
-
-
- - h2
-
- - h1
- - h3
-
-
- - h2
-
- - h3
-
-
-
-
-
-
-
- complex 7
-
-
-
-
- h1
- h2
- h3
- h3
- h4
- h4
-
-
-
-
-
- - h1
-
- - h2
-
- - h3
- - h3
-
- - h4
- - h4
-
-
-
-
-
-
-
-
-
-
-
diff --git a/html-utils/src/test/resources/remove-non-xhtml-namespaces_test.xml b/html-utils/src/test/resources/remove-non-xhtml-namespaces_test.xml
deleted file mode 100755
index 541801d..0000000
--- a/html-utils/src/test/resources/remove-non-xhtml-namespaces_test.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
- remove non-xhtml namespaces
-
-
-
-
- text
-
-
-
- xmlns --> inside non-xhtml
- xmlns:other --> inside non-xhtml
-
-
-
-
-
-
-
- text
-
-
-
- xmlns --> inside non-xhtml
- xmlns:other --> inside non-xhtml
-
-
-
-
-
-
-
diff --git a/html-utils/src/test/resources/test.sh b/html-utils/src/test/resources/test.sh
deleted file mode 100755
index 78d869b..0000000
--- a/html-utils/src/test/resources/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -x
-SCRIPTPATH=`dirname $0 | xargs readlink -f`
-$UTFX_HOME/utfx.sh -Dutfx.test.dir=$SCRIPTPATH
diff --git a/html-utils/src/test/resources/utfx_tests.rnc b/html-utils/src/test/resources/utfx_tests.rnc
deleted file mode 100755
index 1678a94..0000000
--- a/html-utils/src/test/resources/utfx_tests.rnc
+++ /dev/null
@@ -1,103 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# $Id$
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# $Source: /cvs/utf-x/framework/src/dtd/utfx_tests.dtd,v $
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# $Name: $
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Copyright (C) 2004-2006 UTF-X Development team.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# UTF-X test definition file (TDF) Document Type Definition
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-namespace utfx = "http://utfx.org/test-definition"
-
-start = utfx.tests
-
-utfx.tests =
- element utfx:tests {
- attlist.utfx.tests,
- utfx.stylesheet,
- utfx.css?,
- utfx.source-validation?,
- utfx.expected-validation?,
- utfx.source-builder?,
- utfx.test*
- }
-attlist.utfx.tests &= empty
-utfx.stylesheet = element utfx:stylesheet { attlist.utfx.stylesheet, empty }
-attlist.utfx.stylesheet &=
- attribute src { text },
- attribute output { "xhtml" | "fo" }?
-utfx.css = element utfx:css { attlist.utfx.css, empty }
-attlist.utfx.css &= attribute uri { text }
-utfx.source-validation = element utfx:source-validation { attlist.utfx.source-validation, utfx.dtd }
-attlist.utfx.source-validation &= empty
-utfx.expected-validation =
- element utfx:expected-validation { attlist.utfx.expected-validation, utfx.dtd }
-attlist.utfx.expected-validation &= empty
-utfx.dtd = element utfx:dtd { attlist.utfx.dtd, empty }
-attlist.utfx.dtd &=
- attribute public { text }?,
- attribute system { text }
-utfx.source-builder =
- element utfx:source-builder {
- attlist.utfx.source-builder, utfx.class-name, utfx.constructor-params
- }
-attlist.utfx.source-builder &= empty
-utfx.class-name = element utfx:class-name { attlist.utfx.class-name, text }
-attlist.utfx.class-name &= empty
-utfx.constructor-params =
- element utfx:constructor-params { attlist.utfx.constructor-params, utfx.param* }
-attlist.utfx.constructor-params &= empty
-utfx.param = element utfx:param { attlist.utfx.param, text }
-attlist.utfx.param &=
- [ a:defaultValue = "String" ] attribute type { "String" | "Integer" | "Boolean" | "Double" }?
-utfx.test =
- element utfx:test {
- attlist.utfx.test,
- utfx.name,
- utfx.stylesheet-params?,
- utfx.source-builder?,
- utfx.call-template?,
- utfx.assert-equal
- }
-attlist.utfx.test &= empty
-utfx.stylesheet-params =
- element utfx:stylesheet-params { attlist.utfx.stylesheet-params, utfx.with-param* }
-attlist.utfx.stylesheet-params &= empty
-utfx.call-template = element utfx:call-template { attlist.utfx.call-template, utfx.with-param* }
-attlist.utfx.call-template &= attribute name { text }
-utfx.with-param = element utfx:with-param { attlist.utfx.with-param, any }
-attlist.utfx.with-param &= attribute name { text }
-attlist.utfx.with-param &= attribute select { text }?
-utfx.name = element utfx:name { attlist.utfx.name, text }
-attlist.utfx.name &= empty
-utfx.assert-equal =
- element utfx:assert-equal { attlist.utfx.assert-equal, utfx.source, utfx.expected, utfx.message? }
-attlist.utfx.assert-equal &=
- [ a:defaultValue = "no" ] attribute normalise-internal-whitespace { "yes" | "no" }?
-utfx.source = element utfx:source { attlist.utfx.source, any }
-attlist.utfx.source &=
- [ a:defaultValue = "yes" ] attribute validate { "yes" | "no" }?,
- [ a:defaultValue = "no" ] attribute use-source-parser { "yes" | "no" }?,
- [ a:defaultValue = "preserve" ] attribute xml:space { "preserve" | "default" }?,
- attribute context-node { text }?,
- attribute href { text }?
-utfx.expected = element utfx:expected { attlist.utfx.expected, any }
-attlist.utfx.expected &=
- [ a:defaultValue = "yes" ] attribute validate { "yes" | "no" }?,
- [ a:defaultValue = "preserve" ] attribute xml:space { "preserve" | "default" }?,
- attribute href { text }?
-utfx.message = element utfx:message { attlist.utfx.message, text }
-attlist.utfx.message &= empty
-any =
- (element * {
- attribute * { text }*,
- any
- }
- | text)*
diff --git a/html-utils/src/test/xspec/html5-outliner.xspec b/html-utils/src/test/xspec/html5-outliner.xspec
new file mode 100644
index 0000000..f1be1a1
--- /dev/null
+++ b/html-utils/src/test/xspec/html5-outliner.xspec
@@ -0,0 +1,1106 @@
+
+
+
+
+
+
+
+
+
+
+
+ heading
+
+
+
+
+
+ - heading
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - heading with a link and another link
+
+
+
+
+
+
+
+
+ heading
+
+
+
+
+
+ - heading
+
+
+
+
+
+
+
+
+
+ heading
+ other
+
+
+
+
+
+
+ - heading
+
+
+
+
+
+
+
+
+
+ other
+ heading
+
+
+
+
+
+
+ - heading
+
+
+
+
+
+
+
+
+ paragraph
+ heading
+
+
+
+
+
+ - heading
+
+
+
+
+
+
+
+
+
+ h12
+
+
+
+
+
+ - h12
+
+ - h11
+
+
+
+
+
+
+
+
+
+
+
+ h12
+
+
+
+
+
+
+ - h12
+
+ - h11
+ - h13
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+
+ - h12
+
+
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+
+ - h12
+
+ - h13
+
+
+
+
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+
+ - h11
+
+ - h12
+ - h13
+
+
+
+
+
+
+
+
+
+
+ h11
+
+ h12
+
+
+
+
+
+
+ - h11
+
+ - h12
+
+
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+
+ - h12
+
+
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+
+ - h12
+
+
+
+
+
+
+
+
+
+
+ h11
+
+
+ h14
+
+
+
+
+
+
+
+ - h11
+
+ - h12
+
+ - h13
+
+
+ - h14
+
+ - h15
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ h1
+ h2
+
+
+
+
+
+ - h1
+
+ - h2
+
+
+
+
+
+
+
+
+
+
+ h1
+ h3
+
+
+
+
+
+ - h1
+
+ - h3
+
+
+
+
+
+
+
+
+
+
+ h1
+
+ h2
+ h3
+
+
+
+
+
+
+ - h1
+
+ - h2
+
+
+
+
+
+
+
+
+
+
+ h1
+
+ h3
+ h2
+
+
+
+
+
+
+ - h1
+
+ - h2
+
+
+
+
+
+
+
+
+
+
+ h1
+ h2
+ h3
+ h4
+ h5
+ h6
+
+
+
+
+
+ - h1
+
+ - h2
+
+ - h3
+
+ - h4
+
+ - h5
+
+ - h6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ h11
+
+ h2
+
+
+
+
+
+ - h11
+
+ - h12
+ - h2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ h11
+ h12
+
+
+
+
+
+ - h11
+ - h12
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+ - h12
+
+
+
+
+
+
+
+
+ h11
+
+ h2
+ h12
+
+
+
+
+
+
+ - h11
+ - h12
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+
+ - h12
+ - h13
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ h2
+ h1
+
+
+
+
+
+ - h2
+ - h1
+
+
+
+
+
+
+
+
+ h2
+
+
+
+
+
+
+ - h2
+ - h1
+
+
+
+
+
+
+
+
+ h2
+
+ h3
+ h1
+
+
+
+
+
+
+ - h2
+ - h1
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+
+ - h2
+ - h12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Untitled document
+
+
+
+
+
+
+
+
+ h1
+
+
+
+
+
+
+ - h1
+
+ - Untitled section
+
+
+
+
+
+
+
+
+
+
+ h1
+
+
+
+
+
+
+ - h1
+
+ - Article
+
+
+
+
+
+
+
+
+
+
+ h1
+
+
+
+
+
+
+ - h1
+
+ - Sidebar
+
+
+
+
+
+
+
+
+
+
+ h1
+
+
+
+
+
+
+ - h1
+
+ - Navigation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ h11
+
+ h12
+
+
+
+
+
+
+ - h11
+
+
+
+
+
+
+
+
+ h11
+
+ h12
+
+
+
+
+
+
+ - h11
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+
+
+
+
+
+
+
+
+ h11
+
+ h12
+
+
+
+
+
+
+ - h11
+
+
+
+
+
+
+
+
+ h11
+
+
+
+
+
+
+ - h11
+
+
+
+
+
+
+
+
+
+
+
+
+ Foo
+ Bar
+
+ Bla
+
+ Baz
+ Quux
+
+ Grunt
+
+
+
+
+
+ - Foo
+
+ - Bar
+ - Quux
+ - Thud
+
+
+
+
+
+
+
+
+
+
+
+ Foo
+ Bar
+ Quux
+
+
+
+
+
+
+ - Foo
+
+ - Thud
+
+
+ - Bar
+
+ - Quux
+ - Thud
+
+
+
+
+
+
+
+
+
+
+
+ Foo
+ Bar
+
+ Bar
+ Quux
+
+
+
+
+
+
+ - Foo
+
+ - Thud
+
+
+ - Bar
+
+ - Thud
+
+
+ - Bar
+
+ - Quux
+ - Thud
+
+
+
+
+
+
+
+
+
+
+ h1
+ h1
+ h2
+ h3
+
+ h3
+ h2
+
+
+
+
+
+ - h1
+ - h1
+
+ - h2
+
+ - h3
+
+
+ - h1
+ - h3
+ - h2
+
+
+
+
+
+
+
+
+
+
+ h1
+ h1
+
+ h3
+ h2
+ h3
+
+
+
+
+
+ - h1
+ - h1
+
+ - h1
+ - h3
+ - h2
+
+ - h3
+
+
+
+
+
+
+
+
+
+
+
+
+
+ h2
+ h3
+ h2
+ h3
+
+
+
+
+
+ - h2
+
+ - h1
+ - h3
+
+
+ - h2
+
+ - h3
+
+
+
+
+
+
+
+
+
+
+ h1
+ h2
+ h3
+ h3
+ h4
+ h4
+
+
+
+
+
+ - h1
+
+ - h2
+
+ - h3
+ - h3
+
+ - h4
+ - h4
+
+
+
+
+
+
+
+
+
+
+
diff --git a/html-utils/src/test/xspec/namespace-fixup.xspec b/html-utils/src/test/xspec/namespace-fixup.xspec
index 9d93bcf..bd0e3d4 100644
--- a/html-utils/src/test/xspec/namespace-fixup.xspec
+++ b/html-utils/src/test/xspec/namespace-fixup.xspec
@@ -61,8 +61,6 @@
-
-
@@ -304,4 +302,34 @@
+
+
+
+
+
+ text
+
+
+
+ xmlns --> inside non-xhtml
+ xmlns:other --> inside non-xhtml
+
+
+
+
+
+
+
+ text
+
+
+
+ xmlns --> inside non-xhtml
+ xmlns:other --> inside non-xhtml
+
+
+
+
+
+