From fc4724ec8eed6b57f428f64a2f549c4c52b9bab8 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 14 Oct 2024 17:36:22 +0300
Subject: [PATCH] feat!: update parsers & bindings

- Migrate JS files to ESM
- Don't inherit from DTD in XML
- Add tree-sitter.json file
- Update the bindings
- Add release workflow
---
 .gitattributes                                |    2 +-
 .github/workflows/ci.yml                      |    6 +-
 .github/workflows/publish.yml                 |    2 +
 .gitignore                                    |    9 +-
 CMakeLists.txt                                |   63 +
 Cargo.lock                                    |   96 +
 Cargo.toml                                    |    9 +-
 Makefile                                      |    9 +-
 Package.resolved                              |   16 +
 Package.swift                                 |   52 +-
 bindings/c/tree-sitter-dtd.pc.in              |   16 +-
 bindings/c/tree-sitter-xml.pc.in              |   16 +-
 bindings/go/binding_test.go                   |    4 +-
 bindings/go/dtd.go                            |   10 +-
 bindings/go/go.mod                            |    5 -
 bindings/go/xml.go                            |    8 +-
 bindings/node/binding_test.js                 |   14 +
 bindings/python/tests/test_binding.py         |   17 +
 bindings/python/tree_sitter_xml/__init__.pyi  |    4 +-
 bindings/python/tree_sitter_xml/binding.c     |    4 +-
 bindings/rust/build.rs                        |   10 +-
 bindings/rust/lib.rs                          |   41 +-
 .../TreeSitterXMLTests.swift                  |   20 +
 bindings/swift/{ => dtd}/TreeSitterDTD/dtd.h  |    0
 bindings/swift/{ => xml}/TreeSitterXML/xml.h  |    0
 common/common.mak                             |   69 +-
 common/common.mjs                             |  375 +
 common/index.js                               |   68 -
 dtd/CMakeLists.txt                            |    3 +
 dtd/Makefile                                  |    1 +
 dtd/grammar.js                                |  330 +-
 dtd/package.json                              |    5 +-
 dtd/src/grammar.json                          |   95 +-
 dtd/src/node-types.json                       |   31 +-
 dtd/src/parser.c                              | 4772 ++++-----
 dtd/src/scanner.c                             |   14 +
 dtd/src/tree_sitter/alloc.h                   |    8 +-
 dtd/src/tree_sitter/parser.h                  |    1 +
 go.mod                                        |    9 +
 go.sum                                        |   36 +
 jsconfig.json                                 |   13 -
 package-lock.json                             |   34 +-
 package.json                                  |   46 +-
 pyproject.toml                                |   12 +-
 queries/dtd/highlights.scm                    |   14 +-
 queries/xml/highlights.scm                    |    7 +-
 setup.py                                      |   15 +-
 test/corpus/examples.txt                      |    2 +-
 test/corpus/issues.txt                        |    2 +-
 test/corpus/standard.txt                      |    8 +-
 tree-sitter.json                              |   55 +
 xml/CMakeLists.txt                            |    3 +
 xml/Makefile                                  |    1 +
 xml/grammar.js                                |   27 +-
 xml/package.json                              |    5 +-
 xml/src/grammar.json                          | 3306 +++---
 xml/src/node-types.json                       |   13 +-
 xml/src/parser.c                              | 9256 ++++++++---------
 xml/src/tree_sitter/alloc.h                   |    8 +-
 xml/src/tree_sitter/parser.h                  |    1 +
 60 files changed, 9611 insertions(+), 9467 deletions(-)
 create mode 100644 CMakeLists.txt
 create mode 100644 Cargo.lock
 create mode 100644 Package.resolved
 delete mode 100644 bindings/go/go.mod
 create mode 100644 bindings/node/binding_test.js
 create mode 100644 bindings/python/tests/test_binding.py
 create mode 100644 bindings/swift/TreeSitterXMLTests/TreeSitterXMLTests.swift
 rename bindings/swift/{ => dtd}/TreeSitterDTD/dtd.h (100%)
 rename bindings/swift/{ => xml}/TreeSitterXML/xml.h (100%)
 create mode 100644 common/common.mjs
 delete mode 100644 common/index.js
 create mode 100644 dtd/CMakeLists.txt
 create mode 100644 go.mod
 create mode 100644 go.sum
 delete mode 100644 jsconfig.json
 create mode 100644 tree-sitter.json
 create mode 100644 xml/CMakeLists.txt

diff --git a/.gitattributes b/.gitattributes
index 7f2edf5..fbcebd1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-* text eol=lf
+* text=auto eol=lf
 
 **/src/*.json linguist-generated
 **/src/parser.c linguist-generated
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f37766..1f9c7e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [master]
     paths:
-      - "scripts.js"
       - "common/*"
       - "*/grammar.js"
       - "*/src/**"
@@ -12,7 +11,6 @@ on:
       - "binding.gyp"
   pull_request:
     paths:
-      - "scripts.js"
       - "common/*"
       - "*/grammar.js"
       - "*/src/**"
@@ -42,7 +40,7 @@ jobs:
           path: examples/lemminx
           repository: eclipse/lemminx
           sparse-checkout: org.eclipse.lemminx/src/test/resources
-          ref: 6b12cd0a89205c2791ef1240e0d8401103f8c9a9
+          ref: d3a123531c8b48d6139759beab6ea1fdaeefe158
       - name: Run tests
         uses: tree-sitter/parser-test-action@v2
         with:
@@ -78,7 +76,7 @@ jobs:
           fetch-depth: 2
       - name: Check for scanner changes
         id: scanner-changes
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v45
         with:
           files: |-
             common/scanner.h
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7a73953..f3def51 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -5,6 +5,8 @@ on:
     tags: ["*"]
 
 jobs:
+  github:
+    uses: tree-sitter/workflows/.github/workflows/release.yml@main
   npm:
     uses: tree-sitter/workflows/.github/workflows/package-npm.yml@main
     with:
diff --git a/.gitignore b/.gitignore
index a30bedf..308fcab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 # Rust artifacts
-Cargo.lock
 target/
 
 # Node artifacts
@@ -9,10 +8,8 @@ node_modules/
 
 # Swift artifacts
 .build/
-Package.resolved
 
 # Go artifacts
-go.sum
 _obj/
 
 # Python artifacts
@@ -33,7 +30,11 @@ dist/
 /examples/*/
 
 # Grammar volatiles
-dsl.d.ts
 *.wasm
 *.obj
 *.o
+
+# Archives
+*.tar.gz
+*.tgz
+*.zip
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..5038e63
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,63 @@
+cmake_minimum_required(VERSION 3.13)
+
+project(tree-sitter-xml
+        VERSION "0.7.0"
+        DESCRIPTION "XML & DTD grammars for tree-sitter"
+        HOMEPAGE_URL "https://github.com/tree-sitter-grammars/tree-sitter-xml"
+        LANGUAGES C)
+
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+option(TREE_SITTER_REUSE_ALLOCATOR "Reuse the library allocator" OFF)
+
+set(TREE_SITTER_ABI_VERSION 14 CACHE STRING "Tree-sitter ABI version")
+if(NOT ${TREE_SITTER_ABI_VERSION} MATCHES "^[0-9]+$")
+    unset(TREE_SITTER_ABI_VERSION CACHE)
+    message(FATAL_ERROR "TREE_SITTER_ABI_VERSION must be an integer")
+endif()
+
+find_program(TREE_SITTER_CLI tree-sitter DOC "Tree-sitter CLI")
+
+include(GNUInstallDirs)
+
+macro(add_parser name)
+    add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/src/parser.c"
+                       DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/grammar.json"
+                       COMMAND "${TREE_SITTER_CLI}" generate src/grammar.json
+                                --abi=${TREE_SITTER_ABI_VERSION}
+                       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                       COMMENT "Generating parser.c")
+
+    add_library(tree-sitter-${name}
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/parser.c"
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/scanner.c")
+    target_include_directories(tree-sitter-${name} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
+
+    target_compile_definitions(tree-sitter-${name} PRIVATE
+                               $<$<BOOL:${TREE_SITTER_REUSE_ALLOCATOR}>:TREE_SITTER_REUSE_ALLOCATOR>
+                               $<$<CONFIG:Debug>:TREE_SITTER_DEBUG>)
+
+    set_target_properties(tree-sitter-${name}
+                          PROPERTIES
+                          C_STANDARD 11
+                          POSITION_INDEPENDENT_CODE ON
+                          SOVERSION "${TREE_SITTER_ABI_VERSION}.${PROJECT_VERSION_MAJOR}"
+                          DEFINE_SYMBOL "")
+
+    configure_file("${CMAKE_SOURCE_DIR}/bindings/c/tree-sitter-${name}.pc.in"
+                   "${CMAKE_CURRENT_BINARY_DIR}/tree-sitter-${name}.pc" @ONLY)
+
+    install(FILES "${CMAKE_SOURCE_DIR}/bindings/c/tree-sitter-${name}.h"
+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/tree_sitter")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tree-sitter-${name}.pc"
+            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig")
+    install(TARGETS tree-sitter-${name}
+            LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+endmacro()
+
+add_subdirectory(xml tree-sitter-xml)
+
+add_subdirectory(dtd tree-sitter-dtd)
+
+add_custom_target(test "${TREE_SITTER_CLI}" test
+                  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                  COMMENT "tree-sitter test")
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..aab823e
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,96 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
+
+[[package]]
+name = "tree-sitter"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9871f16d6cf5c4757dcf30d5d2172a2df6987c510c017bbb7abfb7f9aa24d06"
+dependencies = [
+ "cc",
+ "regex",
+ "regex-syntax",
+ "streaming-iterator",
+ "tree-sitter-language",
+]
+
+[[package]]
+name = "tree-sitter-language"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600"
+
+[[package]]
+name = "tree-sitter-xml"
+version = "0.7.0"
+dependencies = [
+ "cc",
+ "tree-sitter",
+ "tree-sitter-language",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 749c17f..9a00cd8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-xml"
 description = "XML & DTD grammars for tree-sitter"
-version = "0.6.4"
+version = "0.7.0"
 license = "MIT"
 readme = "README.md"
 keywords = ["incremental", "parsing", "tree-sitter", "dtd", "xml"]
@@ -29,7 +29,10 @@ include = [
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "^0.22.2"
+tree-sitter-language = "0.1"
 
 [build-dependencies]
-cc = "^1.0.90"
+cc = "1.1.22"
+
+[dev-dependencies]
+tree-sitter = "0.24.3"
diff --git a/Makefile b/Makefile
index 4533881..e7663cd 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,4 @@ all install uninstall clean:
 test:
 	$(TS) test
 
-update: VERSION := $(shell awk -F '"' '/^  "version"/{print $$4}' package.json)
-update:
-	sed -i common/common.mak -e 's/^VERSION := .*/VERSION := $(VERSION)/'
-	sed -i Cargo.toml -e 's/^version = .*/version = "$(VERSION)"/'
-	sed -i pyproject.toml -e 's/^version = .*/version = "$(VERSION)"/'
-	git add package.json package-lock.json Cargo.toml pyproject.toml common/common.mak
-
-.PHONY: all install uninstall clean test update
+.PHONY: all install uninstall clean test
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 0000000..9e0a023
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "SwiftTreeSitter",
+        "repositoryURL": "https://github.com/ChimeHQ/SwiftTreeSitter",
+        "state": {
+          "branch": null,
+          "revision": "2599e95310b3159641469d8a21baf2d3d200e61f",
+          "version": "0.8.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
index e978706..cb5d261 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,42 +1,17 @@
 // swift-tools-version:5.3
 import PackageDescription
 
-let excludes = [
-    "Cargo.toml",
-    "Makefile",
-    "binding.gyp",
-    "bindings/go",
-    "bindings/node",
-    "bindings/python",
-    "bindings/rust",
-    "common/common.mak",
-    "common/index.js",
-    "package.json",
-    "package-lock.json",
-    "pyproject.toml",
-    "setup.py",
-    "test",
-    ".editorconfig",
-    ".github",
-    ".gitignore",
-    ".gitattributes",
-]
-
 let package = Package(
     name: "TreeSitterXML",
     products: [
         .library(name: "TreeSitterXML", targets: ["TreeSitterXML", "TreeSitterDTD"]),
     ],
-    dependencies: [],
+    dependencies: [
+        .package(url: "https://github.com/ChimeHQ/SwiftTreeSitter", from: "0.8.0"),
+    ],
     targets: [
         .target(name: "TreeSitterXML",
                 path: ".",
-                exclude: excludes + [
-                    "bindings/swift/TreeSitterDTD",
-                    "xml/Makefile",
-                    "xml/grammar.js",
-                    "dtd",
-                ],
                 sources: [
                     "xml/src/parser.c",
                     "xml/src/scanner.c",
@@ -44,16 +19,10 @@ let package = Package(
                 resources: [
                     .copy("queries/xml")
                 ],
-                publicHeadersPath: "bindings/swift",
+                publicHeadersPath: "bindings/swift/xml",
                 cSettings: [.headerSearchPath("xml/src")]),
         .target(name: "TreeSitterDTD",
                 path: ".",
-                exclude: excludes + [
-                    "bindings/swift/TreeSitterXML",
-                    "dtd/Makefile",
-                    "dtd/grammar.js",
-                    "xml",
-                ],
                 sources: [
                     "dtd/src/parser.c",
                     "dtd/src/scanner.c",
@@ -61,8 +30,17 @@ let package = Package(
                 resources: [
                     .copy("queries/dtd")
                 ],
-                publicHeadersPath: "bindings/swift",
-                cSettings: [.headerSearchPath("dtd/src")])
+                publicHeadersPath: "bindings/swift/dtd",
+                cSettings: [.headerSearchPath("dtd/src")]),
+        .testTarget(
+            name: "TreeSitterXMLTests",
+            dependencies: [
+                "SwiftTreeSitter",
+                "TreeSitterXML",
+                "TreeSitterDTD",
+            ],
+            path: "bindings/swift/TreeSitterXMLTests"
+        )
     ],
     cLanguageStandard: .c11
 )
diff --git a/bindings/c/tree-sitter-dtd.pc.in b/bindings/c/tree-sitter-dtd.pc.in
index 13bd2ad..a06510e 100644
--- a/bindings/c/tree-sitter-dtd.pc.in
+++ b/bindings/c/tree-sitter-dtd.pc.in
@@ -1,11 +1,11 @@
-prefix=@PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: tree-sitter-dtd
-Description: DTD grammar for tree-sitter
-URL: @URL@
-Version: @VERSION@
-Requires: @REQUIRES@
-Libs: -L${libdir} @ADDITIONAL_LIBS@ -ltree-sitter-dtd
+Description: @PROJECT_DESCRIPTION@
+URL: @CMAKE_PROJECT_HOMEPAGE_URL@
+Version: @CMAKE_PROJECT_VERSION@
+Requires: @TS_REQUIRES@
+Libs: -L${libdir} -ltree-sitter-dtd
 Cflags: -I${includedir}
diff --git a/bindings/c/tree-sitter-xml.pc.in b/bindings/c/tree-sitter-xml.pc.in
index 65b333c..cec432b 100644
--- a/bindings/c/tree-sitter-xml.pc.in
+++ b/bindings/c/tree-sitter-xml.pc.in
@@ -1,11 +1,11 @@
-prefix=@PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: tree-sitter-xml
-Description: XML grammar for tree-sitter
-URL: @URL@
-Version: @VERSION@
-Requires: @REQUIRES@
-Libs: -L${libdir} @ADDITIONAL_LIBS@ -ltree-sitter-xml
+Description: @PROJECT_DESCRIPTION@
+URL: @CMAKE_PROJECT_HOMEPAGE_URL@
+Version: @CMAKE_PROJECT_VERSION@
+Requires: @TS_REQUIRES@
+Libs: -L${libdir} -ltree-sitter-xml
 Cflags: -I${includedir}
diff --git a/bindings/go/binding_test.go b/bindings/go/binding_test.go
index 330ef3a..f54b04a 100644
--- a/bindings/go/binding_test.go
+++ b/bindings/go/binding_test.go
@@ -3,8 +3,8 @@ package tree_sitter_xml_test
 import (
 	"testing"
 
-	tree_sitter "github.com/smacker/go-tree-sitter"
-	"github.com/tree-sitter-grammars/tree-sitter-xml"
+	tree_sitter "github.com/tree-sitter/go-tree-sitter"
+	tree_sitter_xml "github.com/tree-sitter-grammars/tree-sitter-xml/bindings/go"
 )
 
 func TestCanLoadXMLGrammar(t *testing.T) {
diff --git a/bindings/go/dtd.go b/bindings/go/dtd.go
index 4a4d6c1..79d026b 100644
--- a/bindings/go/dtd.go
+++ b/bindings/go/dtd.go
@@ -2,13 +2,13 @@ package tree_sitter_xml
 
 // #cgo CPPFLAGS: -I../../xml/src
 // #cgo CFLAGS: -std=c11 -fPIC
-// #include "../../xml/src/parser.c"
-// #include "../../xml/src/scanner.c"
+// #include "../../dtd/src/parser.c"
+// #include "../../dtd/src/scanner.c"
 import "C"
 
 import "unsafe"
 
-// Get the tree-sitter Language for XML.
-func LanguageXML() unsafe.Pointer {
-	return unsafe.Pointer(C.tree_sitter_xml())
+// Get the tree-sitter Language for DTD.
+func LanguageDTD() unsafe.Pointer {
+	return unsafe.Pointer(C.tree_sitter_dtd())
 }
diff --git a/bindings/go/go.mod b/bindings/go/go.mod
deleted file mode 100644
index a6e67c9..0000000
--- a/bindings/go/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module github.com/tree-sitter-grammars/tree-sitter-xml
-
-go 1.22
-
-require github.com/smacker/go-tree-sitter v0.0.0-20240214120134-1f283e24f560
diff --git a/bindings/go/xml.go b/bindings/go/xml.go
index f5c3500..9ca11ee 100644
--- a/bindings/go/xml.go
+++ b/bindings/go/xml.go
@@ -2,13 +2,13 @@ package tree_sitter_xml
 
 // #cgo CPPFLAGS: -I../../dtd/src
 // #cgo CFLAGS: -std=c11 -fPIC
-// #include "../../dtd/src/parser.c"
-// #include "../../dtd/src/scanner.c"
+// #include "../../xml/src/parser.c"
+// #include "../../xml/src/scanner.c"
 import "C"
 
 import "unsafe"
 
 // Get the tree-sitter Language for XML.
-func LanguageDTD() unsafe.Pointer {
-	return unsafe.Pointer(C.tree_sitter_dtd())
+func LanguageXML() unsafe.Pointer {
+	return unsafe.Pointer(C.tree_sitter_xml())
 }
diff --git a/bindings/node/binding_test.js b/bindings/node/binding_test.js
new file mode 100644
index 0000000..90caa82
--- /dev/null
+++ b/bindings/node/binding_test.js
@@ -0,0 +1,14 @@
+const assert = require("node:assert");
+const { test } = require("node:test");
+
+const Parser = require("tree-sitter");
+
+test("can load XML grammar", () => {
+  const parser = new Parser();
+  assert.doesNotThrow(() => parser.setLanguage(require("./xml")));
+});
+
+test("can load DTD grammar", () => {
+  const parser = new Parser();
+  assert.doesNotThrow(() => parser.setLanguage(require("./dtd")));
+});
diff --git a/bindings/python/tests/test_binding.py b/bindings/python/tests/test_binding.py
new file mode 100644
index 0000000..dfdbc83
--- /dev/null
+++ b/bindings/python/tests/test_binding.py
@@ -0,0 +1,17 @@
+from unittest import TestCase
+
+import tree_sitter, tree_sitter_xml
+
+
+class TestLanguage(TestCase):
+    def test_can_load_xml_grammar(self):
+        try:
+            tree_sitter.Language(tree_sitter_xml.language_xml())
+        except Exception:
+            self.fail("Error loading XML grammar")
+
+    def test_can_load_dtd_grammar(self):
+        try:
+            tree_sitter.Language(tree_sitter_xml.language_dtd())
+        except Exception:
+            self.fail("Error loading DTD grammar")
diff --git a/bindings/python/tree_sitter_xml/__init__.pyi b/bindings/python/tree_sitter_xml/__init__.pyi
index 9bf53fa..f49aecf 100644
--- a/bindings/python/tree_sitter_xml/__init__.pyi
+++ b/bindings/python/tree_sitter_xml/__init__.pyi
@@ -1,3 +1,3 @@
-def language_xml() -> int: ...
+def language_xml() -> object: ...
 
-def language_dtd() -> int: ...
+def language_dtd() -> object: ...
diff --git a/bindings/python/tree_sitter_xml/binding.c b/bindings/python/tree_sitter_xml/binding.c
index 648d8ed..5f69321 100644
--- a/bindings/python/tree_sitter_xml/binding.c
+++ b/bindings/python/tree_sitter_xml/binding.c
@@ -6,11 +6,11 @@ TSLanguage *tree_sitter_xml(void);
 TSLanguage *tree_sitter_dtd(void);
 
 static PyObject* _binding_language_xml(PyObject *self, PyObject *args) {
-    return PyLong_FromVoidPtr(tree_sitter_xml());
+    return PyCapsule_New(tree_sitter_xml(), "tree_sitter.Language", NULL);
 }
 
 static PyObject* _binding_language_dtd(PyObject *self, PyObject *args) {
-    return PyLong_FromVoidPtr(tree_sitter_dtd());
+    return PyCapsule_New(tree_sitter_dtd(), "tree_sitter.Language", NULL);
 }
 
 static PyMethodDef methods[] = {
diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
index d7a1bde..27e35af 100644
--- a/bindings/rust/build.rs
+++ b/bindings/rust/build.rs
@@ -5,11 +5,11 @@ fn main() {
     let common_dir = root_dir.join("common");
 
     let mut config = cc::Build::new();
-    config.include(&xml_dir);
-    config
-        .flag_if_supported("-std=c11")
-        .flag_if_supported("-Wno-unused-parameter")
-        .flag_if_supported("-Wno-unused-value");
+    config.std("c11").include(&xml_dir);
+    config.flag_if_supported("-Wno-unused-value");
+
+    #[cfg(target_env = "msvc")]
+    config.flag("-utf-8");
 
     for path in &[
         xml_dir.join("parser.c"),
diff --git a/bindings/rust/lib.rs b/bindings/rust/lib.rs
index 38d4235..397dfb3 100644
--- a/bindings/rust/lib.rs
+++ b/bindings/rust/lib.rs
@@ -1,6 +1,6 @@
-//! This crate provides XML and DTD grammars for the [tree-sitter][] parsing library.
+//! This crate provides XML and DTD language support for the [tree-sitter][] parsing library.
 //!
-//! Typically, you will use the [language_xml][language func] function to add this grammar to a
+//! Typically, you will use the [LANGUAGE_XML][] constant to add this language to a
 //! tree-sitter [Parser][], and then use the parser to parse some code:
 //!
 //! ```
@@ -16,38 +16,33 @@
 //! </note>
 //! "#;
 //! let mut parser = Parser::new();
+//! let language = tree_sitter_xml::LANGUAGE_XML;
 //! parser
-//!     .set_language(&tree_sitter_xml::language_xml())
-//!     .expect("Error loading XML grammar");
+//!     .set_language(&language.into())
+//!     .expect("Error loading XML parser");
 //! let tree = parser.parse(code, None).unwrap();
 //! assert!(!tree.root_node().has_error());
 //! ```
 //!
-//! [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
-//! [language func]: fn.language_xml.html
 //! [Parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
 //! [tree-sitter]: https://tree-sitter.github.io/
 
-use tree_sitter::Language;
+use tree_sitter_language::LanguageFn;
 
 extern "C" {
-    fn tree_sitter_dtd() -> Language;
-    fn tree_sitter_xml() -> Language;
+    fn tree_sitter_dtd() -> *const ();
+    fn tree_sitter_xml() -> *const ();
 }
 
-/// Returns the tree-sitter [Language][] for DTD.
+/// The tree-sitter [`LanguageFn`][LanguageFn] for the DTD grammar.
 ///
-/// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
-pub fn language_dtd() -> Language {
-    unsafe { tree_sitter_dtd() }
-}
+/// [LanguageFn]: https://docs.rs/tree-sitter-language/*/tree_sitter_language/struct.LanguageFn.html
+pub const LANGUAGE_DTD: LanguageFn = unsafe { LanguageFn::from_raw(tree_sitter_dtd) };
 
-/// Returns the tree-sitter [Language][] for XML.
+/// The tree-sitter [`LanguageFn`][LanguageFn] for the XML grammar.
 ///
-/// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
-pub fn language_xml() -> Language {
-    unsafe { tree_sitter_xml() }
-}
+/// [LanguageFn]: https://docs.rs/tree-sitter-language/*/tree_sitter_language/struct.LanguageFn.html
+pub const LANGUAGE_XML: LanguageFn = unsafe { LanguageFn::from_raw(tree_sitter_xml) };
 
 /// The syntax highlighting queries for XML.
 pub const XML_HIGHLIGHT_QUERY: &str = include_str!("../../queries/xml/highlights.scm");
@@ -71,15 +66,15 @@ mod tests {
     fn test_can_load_xml_grammar() {
         let mut parser = tree_sitter::Parser::new();
         parser
-            .set_language(&super::language_xml())
-            .expect("Error loading xml language");
+            .set_language(&super::LANGUAGE_XML.into())
+            .expect("Error loading XML parser");
     }
 
     #[test]
     fn test_can_load_dtd_grammar() {
         let mut parser = tree_sitter::Parser::new();
         parser
-            .set_language(&super::language_dtd())
-            .expect("Error loading dtd language");
+            .set_language(&super::LANGUAGE_DTD.into())
+            .expect("Error loading DTD parser");
     }
 }
diff --git a/bindings/swift/TreeSitterXMLTests/TreeSitterXMLTests.swift b/bindings/swift/TreeSitterXMLTests/TreeSitterXMLTests.swift
new file mode 100644
index 0000000..9c80e11
--- /dev/null
+++ b/bindings/swift/TreeSitterXMLTests/TreeSitterXMLTests.swift
@@ -0,0 +1,20 @@
+import XCTest
+import SwiftTreeSitter
+import TreeSitterXML
+import TreeSitterDTD
+
+final class TreeSitterXMLTests: XCTestCase {
+    func testCanLoadXMLGrammar() throws {
+        let parser = Parser()
+        let language = Language(language: tree_sitter_xml())
+        XCTAssertNoThrow(try parser.setLanguage(language),
+                         "Error loading XML grammar")
+    }
+
+    func testCanLoadDTDGrammar() throws {
+        let parser = Parser()
+        let language = Language(language: tree_sitter_dtd())
+        XCTAssertNoThrow(try parser.setLanguage(language),
+                         "Error loading DTD grammar")
+    }
+}
diff --git a/bindings/swift/TreeSitterDTD/dtd.h b/bindings/swift/dtd/TreeSitterDTD/dtd.h
similarity index 100%
rename from bindings/swift/TreeSitterDTD/dtd.h
rename to bindings/swift/dtd/TreeSitterDTD/dtd.h
diff --git a/bindings/swift/TreeSitterXML/xml.h b/bindings/swift/xml/TreeSitterXML/xml.h
similarity index 100%
rename from bindings/swift/TreeSitterXML/xml.h
rename to bindings/swift/xml/TreeSitterXML/xml.h
diff --git a/common/common.mak b/common/common.mak
index 42a4534..68f369f 100644
--- a/common/common.mak
+++ b/common/common.mak
@@ -1,24 +1,15 @@
-VERSION := 0.6.4
+ifeq ($(OS),Windows_NT)
+$(error "Windows is not supported")
+endif
+
+HOMEPAGE_URL := https://github.com/tree-sitter-grammars/tree-sitter-xml
+VERSION := 0.7.0
 
 # repository
 SRC_DIR := src
 
-PARSER_REPO_URL := $(shell git -C $(SRC_DIR) remote get-url origin 2>/dev/null)
-
-ifeq ($(PARSER_URL),)
-	PARSER_URL := $(subst .git,,$(PARSER_REPO_URL))
-ifeq ($(shell echo $(PARSER_URL) | grep '^[a-z][-+.0-9a-z]*://'),)
-	PARSER_URL := $(subst :,/,$(PARSER_URL))
-	PARSER_URL := $(subst git@,https://,$(PARSER_URL))
-endif
-endif
-
 TS ?= tree-sitter
 
-# ABI versioning
-SONAME_MAJOR := $(word 1,$(subst ., ,$(VERSION)))
-SONAME_MINOR := $(word 2,$(subst ., ,$(VERSION)))
-
 # install directory layout
 PREFIX ?= /usr/local
 INCLUDEDIR ?= $(PREFIX)/include
@@ -34,27 +25,21 @@ OBJS := $(patsubst %.c,%.o,$(PARSER) $(EXTRAS))
 ARFLAGS ?= rcs
 override CFLAGS += -I$(SRC_DIR) -std=c11 -fPIC
 
+# ABI versioning
+SONAME_MAJOR = $(shell sed -n 's/\#define LANGUAGE_VERSION //p' $(PARSER))
+SONAME_MINOR = $(word 1,$(subst ., ,$(VERSION)))
+
 # OS-specific bits
-ifeq ($(OS),Windows_NT)
-	$(error "Windows is not supported")
-else ifeq ($(shell uname),Darwin)
+ifeq ($(shell uname),Darwin)
 	SOEXT = dylib
-	SOEXTVER_MAJOR = $(SONAME_MAJOR).dylib
-	SOEXTVER = $(SONAME_MAJOR).$(SONAME_MINOR).dylib
-	LINKSHARED := $(LINKSHARED)-dynamiclib -Wl,
-	ifneq ($(ADDITIONAL_LIBS),)
-	LINKSHARED := $(LINKSHARED)$(ADDITIONAL_LIBS),
-	endif
-	LINKSHARED := $(LINKSHARED)-install_name,$(LIBDIR)/lib$(LANGUAGE_NAME).$(SONAME_MAJOR).dylib,-rpath,@executable_path/../Frameworks
+	SOEXTVER_MAJOR = $(SONAME_MAJOR).$(SOEXT)
+	SOEXTVER = $(SONAME_MAJOR).$(SONAME_MINOR).$(SOEXT)
+	LINKSHARED = -dynamiclib -Wl,-install_name,$(LIBDIR)/lib$(LANGUAGE_NAME).$(SOEXTVER),-rpath,@executable_path/../Frameworks
 else
 	SOEXT = so
-	SOEXTVER_MAJOR = so.$(SONAME_MAJOR)
-	SOEXTVER = so.$(SONAME_MAJOR).$(SONAME_MINOR)
-	LINKSHARED := $(LINKSHARED)-shared -Wl,
-	ifneq ($(ADDITIONAL_LIBS),)
-	LINKSHARED := $(LINKSHARED)$(ADDITIONAL_LIBS)
-	endif
-	LINKSHARED := $(LINKSHARED)-soname,lib$(LANGUAGE_NAME).so.$(SONAME_MAJOR)
+	SOEXTVER_MAJOR = $(SOEXT).$(SONAME_MAJOR)
+	SOEXTVER = $(SOEXT).$(SONAME_MAJOR).$(SONAME_MINOR)
+	LINKSHARED = -shared -Wl,-soname,lib$(LANGUAGE_NAME).$(SOEXTVER)
 endif
 ifneq ($(filter $(shell uname),FreeBSD NetBSD DragonFly),)
 	PCLIBDIR := $(PREFIX)/libdata/pkgconfig
@@ -72,17 +57,15 @@ ifneq ($(STRIP),)
 endif
 
 $(LANGUAGE_NAME).pc: ../bindings/c/$(LANGUAGE_NAME).pc.in
-	sed  -e 's|@URL@|$(PARSER_URL)|' \
-		-e 's|@VERSION@|$(VERSION)|' \
-		-e 's|@LIBDIR@|$(LIBDIR)|' \
-		-e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
-		-e 's|@REQUIRES@|$(REQUIRES)|' \
-		-e 's|@ADDITIONAL_LIBS@|$(ADDITIONAL_LIBS)|' \
-		-e 's|=$(PREFIX)|=$${prefix}|' \
-		-e 's|@PREFIX@|$(PREFIX)|' $< > $@
-
-$(PARSER): grammar.js
-	$(TS) generate --no-bindings
+	sed -e 's|@CMAKE_PROJECT_VERSION@|$(VERSION)|' \
+		-e 's|@CMAKE_INSTALL_LIBDIR@|$(LIBDIR:$(PREFIX)/%=%)|' \
+		-e 's|@CMAKE_INSTALL_INCLUDEDIR@|$(INCLUDEDIR:$(PREFIX)/%=%)|' \
+		-e 's|@PROJECT_DESCRIPTION@|$(DESCRIPTION)|' \
+		-e 's|@CMAKE_PROJECT_HOMEPAGE_URL@|$(HOMEPAGE_URL)|' \
+		-e 's|@CMAKE_INSTALL_PREFIX@|$(PREFIX)|' $< > $@
+
+$(PARSER): $(SRC_DIR)/grammar.json
+	$(TS) generate $^
 
 install: all
 	install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter '$(DESTDIR)$(PCLIBDIR)' '$(DESTDIR)$(LIBDIR)'
diff --git a/common/common.mjs b/common/common.mjs
new file mode 100644
index 0000000..436d814
--- /dev/null
+++ b/common/common.mjs
@@ -0,0 +1,375 @@
+/**
+ * @file Reusable constructs
+ * @author ObserverOfTime
+ * @license MIT
+ */
+
+/// <reference types="tree-sitter-cli/dsl" />
+// @ts-check
+
+/**
+ * @param {"'" | ''} q
+ * @see {@link https://www.w3.org/TR/xml/#NT-PubidChar}
+ */
+export const pubid_char = (q) =>
+  new RegExp(`[ \\r\\na-zA-Z0-9\\-${q}()+,./:=?;!*#@$_%]*`);
+
+/**
+ * @param {GrammarSymbols<any>} $
+ * @param {'"' | "'"} q
+ */
+export const att_value = ($, q) =>
+  seq(
+    q,
+    field(
+      'content',
+      repeat(choice(
+        new RegExp(`[^<&${q}]`),
+        $._Reference
+      ))
+    ),
+    q
+  );
+
+/**
+ * @param {GrammarSymbols<any>} $
+ * @param {'"' | "'"} q
+ */
+export const entity_value = ($, q) =>
+  seq(
+    q,
+    field(
+      'content',
+      repeat(choice(
+        new RegExp(`[^<%&${q}]`),
+        $.PEReference,
+        $._Reference
+      ))
+    ),
+    q
+  );
+
+
+/** @param {RuleOrLiteral[]} choices */
+export const str = (...choices) =>
+  choice(
+    seq("'", ...choices, "'"),
+    seq('"', ...choices, '"')
+  );
+
+/**
+ * @param {GrammarSymbols<any>} $
+ * @param {RuleOrLiteral[]} choices
+ */
+export const ref = ($, ...choices) =>
+  choice(...choices, $.PEReference);
+
+/** @param {RuleOrLiteral[]} rules */
+export const rseq = (...rules) => repeat(seq(...rules));
+
+/** @param {RuleOrLiteral[]} rules */
+export const rseq1 = (...rules) => repeat1(seq(...rules));
+
+const O = optional;
+
+/** @type {Record<string, ($: GrammarSymbols<any>) => RuleOrLiteral>} */
+export const rules = {
+    _markupdecl: $ => choice(
+      $.elementdecl,
+      $.AttlistDecl,
+      $._EntityDecl,
+      $.NotationDecl,
+      $.PI,
+      $.Comment
+    ),
+
+    _DeclSep: $ => choice($.PEReference, $._S),
+
+    elementdecl: $ => seq(
+      '<!',
+      'ELEMENT',
+      $._S,
+      ref($, $.Name),
+      $._S,
+      $.contentspec,
+      O($._S),
+      '>'
+    ),
+
+    contentspec: $ => choice(
+      'EMPTY',
+      'ANY',
+      $.Mixed,
+      $.children,
+      $.PEReference
+    ),
+
+    Mixed: $ => choice(
+      seq(
+        '(',
+        O($._S),
+        ref($, '#PCDATA'),
+        rseq(
+          O($._S),
+          '|',
+          O($._S),
+          ref($, $.Name),
+        ),
+        O($._S),
+        rseq(
+          $.PEReference,
+          O($._S)
+        ),
+        ')',
+        '*'
+      ),
+      prec(-1, seq(
+        '(',
+        O($._S),
+        ref($, '#PCDATA'),
+        O($._S),
+        rseq(
+          $.PEReference,
+          O($._S)
+        ),
+        ')'
+      ))
+    ),
+
+    children: $ => prec(1, seq(
+      $._choice,
+      O(choice('?', '*', '+'))
+    )),
+
+    _cp: $ => prec.left(seq(
+      ref($, $.Name, $._choice),
+      O(choice('?', '*', '+'))
+    )),
+
+    _choice: $ => seq(
+      '(',
+      O($._S),
+      $._cp,
+      rseq(
+        O($._S),
+        choice('|', ','),
+        O($._S),
+        $._cp
+      ),
+      rseq(
+        O($._S),
+        $.PEReference,
+      ),
+      O($._S),
+      ')'
+    ),
+
+    AttlistDecl: $ => seq(
+      '<!',
+      'ATTLIST',
+      $._S,
+      ref($, $.Name),
+      repeat(choice(
+        $.AttDef,
+        seq($._S, $.PEReference)
+      )),
+      O($._S),
+      '>'
+    ),
+
+    AttDef: $ => prec.right(seq(
+      $._S,
+      ref($, $.Name),
+      $._S,
+      $._AttType,
+      O(seq($._S, $.DefaultDecl))
+    )),
+
+    _AttType: $ => choice(
+      $.StringType,
+      $.TokenizedType,
+      $._EnumeratedType,
+      $.PEReference
+    ),
+
+    StringType: _ => 'CDATA',
+
+    TokenizedType: _ => token(choice(
+      'ID',
+      'IDREF',
+      'IDREFS',
+      'ENTITY',
+      'ENTITIES',
+      'NMTOKEN',
+      'NMTOKENS',
+    )),
+
+    _EnumeratedType: $ => choice(
+      $.NotationType,
+      $.Enumeration
+    ),
+
+    NotationType: $ => seq(
+      'NOTATION',
+      $._S,
+      '(',
+      O($._S),
+      ref($, $.Name),
+      rseq(
+        O($._S),
+        '|',
+        O($._S)
+      ),
+      ref($, $.Name),
+      O($._S),
+      ')'
+    ),
+
+    Enumeration: $ => seq(
+      '(',
+      O($._S),
+      $.Nmtoken,
+      rseq(
+        O($._S),
+        '|',
+        O($._S),
+        $.Nmtoken
+      ),
+      O($._S),
+      ')'
+    ),
+
+    DefaultDecl: $ => choice(
+      '#REQUIRED',
+      '#IMPLIED',
+      seq(
+        O(seq('#FIXED', $._S)),
+        $.AttValue
+      ),
+      $.PEReference
+    ),
+
+    _EntityDecl: $ => choice(
+      $.GEDecl,
+      $.PEDecl
+    ),
+
+    GEDecl: $ => seq(
+      '<!',
+      'ENTITY',
+      $._S,
+      ref($, $.Name),
+      $._S,
+      choice(
+        $.EntityValue,
+        seq(
+          $.ExternalID,
+          O($.NDataDecl)
+        )
+      ),
+      O($._S),
+      '>'
+    ),
+
+    PEDecl: $ => seq(
+      '<!',
+      'ENTITY',
+      $._S,
+      '%',
+      $._S,
+      $.Name,
+      $._S,
+      choice(
+        $.EntityValue,
+        $.ExternalID
+      ),
+      O($._S),
+      '>'
+    ),
+
+    EntityValue: $ => choice(
+      entity_value($, '"'),
+      entity_value($, "'")
+    ),
+
+    NDataDecl: $ => seq($._S, 'NDATA', $._S, ref($, $.Name)),
+
+    NotationDecl: $ => seq(
+      '<!',
+      'NOTATION',
+      $._S,
+      ref($, $.Name),
+      $._S,
+      choice($.ExternalID, $.PublicID),
+      O($._S),
+      '>'
+    ),
+
+    PEReference: $ => seq('%', $.Name, ';'),
+
+    _S: _ => /[ \t\r\n]+/,
+
+    Name: _ => /[a-zA-Z_][a-zA-Z0-9_:.·-]*/,
+
+    Nmtoken: _ => /[a-zA-Z0-9_:.·-]+/,
+
+    _Reference: $ => choice($.EntityRef, $.CharRef),
+
+    EntityRef: $ => seq('&', $.Name, ';'),
+
+    CharRef: _ => choice(
+      seq('&#', /[0-9]+/, ';'),
+      seq('&#x', /[0-9a-fA-F]+/, ';')
+    ),
+
+    AttValue: $ => choice(
+      att_value($, '"'),
+      att_value($, "'")
+    ),
+
+    ExternalID: $ => choice(
+      seq('SYSTEM', $._S, $.SystemLiteral),
+      seq('PUBLIC', $._S, $.PubidLiteral, $._S, $.SystemLiteral)
+    ),
+
+    PublicID: $ => prec.right(
+      seq(ref($, 'PUBLIC'), $._S, $.PubidLiteral)
+    ),
+
+    SystemLiteral: $ => choice(
+      seq('"', alias(/[^"]*/, $.URI), '"'),
+      seq("'", alias(/[^']*/, $.URI), "'")
+    ),
+
+    PubidLiteral: _ => choice(
+      seq('"', pubid_char("'"), '"'),
+      seq("'", pubid_char(''), "'")
+    ),
+
+    _VersionInfo: $ => seq(
+      $._S,
+      'version',
+      $._Eq,
+      str($.VersionNum)
+    ),
+
+    VersionNum: _ => /1\.[0-9]+/,
+
+    _EncodingDecl: $ => seq(
+      $._S,
+      'encoding',
+      $._Eq,
+      str($.EncName)
+    ),
+
+    EncName: _ => /[A-Za-z][A-Za-z0-9._\-]*/,
+
+    PI: $ => seq(
+      '<?',
+      $.PITarget,
+      O(seq($._S, $._pi_content)),
+      '?>'
+    ),
+
+    _Eq: $ => seq(O($._S), '=', O($._S))
+}
diff --git a/common/index.js b/common/index.js
deleted file mode 100644
index 03d2885..0000000
--- a/common/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @file Reusable constructs
- * @author ObserverOfTime
- * @license MIT
- */
-
-/**
- * @param {"'" | ''} q
- * @see {@link https://www.w3.org/TR/xml/#NT-PubidChar}
- */
-module.exports.pubid_char = (q) =>
-  new RegExp(`[ \\r\\na-zA-Z0-9\\-${q}()+,./:=?;!*#@$_%]*`);
-
-/**
- * @param {GrammarSymbols<any>} $
- * @param {'"' | "'"} q
- */
-module.exports.att_value = ($, q) =>
-  seq(
-    q,
-    field(
-      'content',
-      repeat(choice(
-        new RegExp(`[^<&${q}]`),
-        $._Reference
-      ))
-    ),
-    q
-  );
-
-/**
- * @param {GrammarSymbols<any>} $
- * @param {'"' | "'"} q
- */
-module.exports.entity_value = ($, q) =>
-  seq(
-    q,
-    field(
-      'content',
-      repeat(choice(
-        new RegExp(`[^<%&${q}]`),
-        $.PEReference,
-        $._Reference
-      ))
-    ),
-    q
-  );
-
-
-/** @param {RuleOrLiteral[]} choices */
-module.exports.str = (...choices) =>
-  choice(
-    seq("'", ...choices, "'"),
-    seq('"', ...choices, '"')
-  );
-
-/**
- * @param {GrammarSymbols<any>} $
- * @param {RuleOrLiteral[]} choices
- */
-module.exports.ref = ($, ...choices) =>
-  choice(...choices, $.PEReference);
-
-/** @param {RuleOrLiteral[]} rules */
-module.exports.rseq = (...rules) => repeat(seq(...rules));
-
-/** @param {RuleOrLiteral[]} rules */
-module.exports.rseq1 = (...rules) => repeat1(seq(...rules));
diff --git a/dtd/CMakeLists.txt b/dtd/CMakeLists.txt
new file mode 100644
index 0000000..3708122
--- /dev/null
+++ b/dtd/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(PROJECT_DESCRIPTION "DTD grammar for tree-sitter")
+
+add_parser(dtd)
diff --git a/dtd/Makefile b/dtd/Makefile
index 533f4c5..6f026b0 100644
--- a/dtd/Makefile
+++ b/dtd/Makefile
@@ -1,3 +1,4 @@
 LANGUAGE_NAME := tree-sitter-dtd
+DESCRIPTION := DTD grammar for tree-sitter
 
 include ../common/common.mak
diff --git a/dtd/grammar.js b/dtd/grammar.js
index 365d9e5..00a76d1 100644
--- a/dtd/grammar.js
+++ b/dtd/grammar.js
@@ -4,11 +4,14 @@
  * @license MIT
  */
 
-const c = require('../common');
+/// <reference types="tree-sitter-cli/dsl" />
+// @ts-check
+
+import * as c from '../common/common.mjs';
 
 const O = optional;
 
-module.exports = grammar({
+export default grammar({
   name: 'dtd',
 
   externals: $ => [
@@ -34,12 +37,20 @@ module.exports = grammar({
   word: $ => $.Name,
 
   rules: {
-    // AKA: extSubset
-    document: $ => seq(
-      O($.XMLDecl),
+    extSubset: $ => seq(
+      O($.TextDecl),
       repeat1($._extSubsetDecl)
     ),
 
+    TextDecl: $ => seq(
+      '<?',
+      'xml',
+      $._VersionInfo,
+      O($._EncodingDecl),
+      O($._S),
+      '?>'
+    ),
+
     _extSubsetDecl: $ => choice(
       $._markupdecl,
       $.conditionalSect,
@@ -56,313 +67,6 @@ module.exports = grammar({
       ']]>'
     ),
 
-    _markupdecl: $ => choice(
-      $.elementdecl,
-      $.AttlistDecl,
-      $._EntityDecl,
-      $.NotationDecl,
-      $.PI,
-      $.Comment
-    ),
-
-    _DeclSep: $ => choice($.PEReference, $._S),
-
-    elementdecl: $ => seq(
-      '<!',
-      'ELEMENT',
-      $._S,
-      c.ref($, $.Name),
-      $._S,
-      $.contentspec,
-      O($._S),
-      '>'
-    ),
-
-    contentspec: $ => choice(
-      'EMPTY',
-      'ANY',
-      $.Mixed,
-      $.children,
-      $.PEReference
-    ),
-
-    Mixed: $ => choice(
-      seq(
-        '(',
-        O($._S),
-        c.ref($, '#PCDATA'),
-        c.rseq(
-          O($._S),
-          '|',
-          O($._S),
-          c.ref($, $.Name),
-        ),
-        O($._S),
-        c.rseq(
-          $.PEReference,
-          O($._S)
-        ),
-        ')',
-        '*'
-      ),
-      prec(-1, seq(
-        '(',
-        O($._S),
-        c.ref($, '#PCDATA'),
-        O($._S),
-        c.rseq(
-          $.PEReference,
-          O($._S)
-        ),
-        ')'
-      ))
-    ),
-
-    children: $ => prec(1, seq(
-      $._choice,
-      O(choice('?', '*', '+'))
-    )),
-
-    _cp: $ => prec.left(seq(
-      c.ref($, $.Name, $._choice),
-      O(choice('?', '*', '+'))
-    )),
-
-    _choice: $ => seq(
-      '(',
-      O($._S),
-      $._cp,
-      c.rseq(
-        O($._S),
-        choice('|', ','),
-        O($._S),
-        $._cp
-      ),
-      c.rseq(
-        O($._S),
-        $.PEReference,
-      ),
-      O($._S),
-      ')'
-    ),
-
-    AttlistDecl: $ => seq(
-      '<!',
-      'ATTLIST',
-      $._S,
-      c.ref($, $.Name),
-      repeat(choice(
-        $.AttDef,
-        seq($._S, $.PEReference)
-      )),
-      O($._S),
-      '>'
-    ),
-
-    AttDef: $ => prec.right(seq(
-      $._S,
-      c.ref($, $.Name),
-      $._S,
-      $._AttType,
-      O(seq($._S, $.DefaultDecl))
-    )),
-
-    _AttType: $ => choice(
-      $.StringType,
-      $.TokenizedType,
-      $._EnumeratedType,
-      $.PEReference
-    ),
-
-    StringType: _ => 'CDATA',
-
-    TokenizedType: _ => token(choice(
-      'ID',
-      'IDREF',
-      'IDREFS',
-      'ENTITY',
-      'ENTITIES',
-      'NMTOKEN',
-      'NMTOKENS',
-    )),
-
-    _EnumeratedType: $ => choice(
-      $.NotationType,
-      $.Enumeration
-    ),
-
-    NotationType: $ => seq(
-      'NOTATION',
-      $._S,
-      '(',
-      O($._S),
-      c.ref($, $.Name),
-      c.rseq(
-        O($._S),
-        '|',
-        O($._S)
-      ),
-      c.ref($, $.Name),
-      O($._S),
-      ')'
-    ),
-
-    Enumeration: $ => seq(
-      '(',
-      O($._S),
-      $.Nmtoken,
-      c.rseq(
-        O($._S),
-        '|',
-        O($._S),
-        $.Nmtoken
-      ),
-      O($._S),
-      ')'
-    ),
-
-    DefaultDecl: $ => choice(
-      '#REQUIRED',
-      '#IMPLIED',
-      seq(
-        O(seq('#FIXED', $._S)),
-        $.AttValue
-      ),
-      $.PEReference
-    ),
-
-    _EntityDecl: $ => choice(
-      $.GEDecl,
-      $.PEDecl
-    ),
-
-    GEDecl: $ => seq(
-      '<!',
-      'ENTITY',
-      $._S,
-      c.ref($, $.Name),
-      $._S,
-      choice(
-        $.EntityValue,
-        seq(
-          $.ExternalID,
-          O($.NDataDecl)
-        )
-      ),
-      O($._S),
-      '>'
-    ),
-
-    PEDecl: $ => seq(
-      '<!',
-      'ENTITY',
-      $._S,
-      '%',
-      $._S,
-      $.Name,
-      $._S,
-      choice(
-        $.EntityValue,
-        $.ExternalID
-      ),
-      O($._S),
-      '>'
-    ),
-
-    EntityValue: $ => choice(
-      c.entity_value($, '"'),
-      c.entity_value($, "'")
-    ),
-
-    NDataDecl: $ => seq($._S, 'NDATA', $._S, c.ref($, $.Name)),
-
-    NotationDecl: $ => seq(
-      '<!',
-      'NOTATION',
-      $._S,
-      c.ref($, $.Name),
-      $._S,
-      choice($.ExternalID, $.PublicID),
-      O($._S),
-      '>'
-    ),
-
-    PEReference: $ => seq('%', $.Name, ';'),
-
-    _S: _ => /[ \t\r\n]+/,
-
-    Name: _ => /[a-zA-Z_][a-zA-Z0-9_:.·-]*/,
-
-    Nmtoken: _ => /[a-zA-Z0-9_:.·-]+/,
-
-    _Reference: $ => choice($.EntityRef, $.CharRef),
-
-    EntityRef: $ => seq('&', $.Name, ';'),
-
-    CharRef: _ => choice(
-      seq('&#', /[0-9]+/, ';'),
-      seq('&#x', /[0-9a-fA-F]+/, ';')
-    ),
-
-    AttValue: $ => choice(
-      c.att_value($, '"'),
-      c.att_value($, "'")
-    ),
-
-    ExternalID: $ => choice(
-      seq('SYSTEM', $._S, $.SystemLiteral),
-      seq('PUBLIC', $._S, $.PubidLiteral, $._S, $.SystemLiteral)
-    ),
-
-    PublicID: $ => prec.right(
-      seq(c.ref($, 'PUBLIC'), $._S, $.PubidLiteral)
-    ),
-
-    SystemLiteral: $ => choice(
-      seq('"', alias(/[^"]*/, $.URI), '"'),
-      seq("'", alias(/[^']*/, $.URI), "'")
-    ),
-
-    PubidLiteral: _ => choice(
-      seq('"', c.pubid_char("'"), '"'),
-      seq("'", c.pubid_char(''), "'")
-    ),
-
-    // AKA: TextDecl
-    XMLDecl: $ => seq(
-      '<?',
-      'xml',
-      $._VersionInfo,
-      O($._EncodingDecl),
-      O($._S),
-      '?>'
-    ),
-
-    _VersionInfo: $ => seq(
-      $._S,
-      'version',
-      $._Eq,
-      c.str($.VersionNum)
-    ),
-
-    VersionNum: _ => /1\.[0-9]+/,
-
-    _EncodingDecl: $ => seq(
-      $._S,
-      'encoding',
-      $._Eq,
-      c.str($.EncName)
-    ),
-
-    EncName: _ => /[A-Za-z][A-Za-z0-9._\-]*/,
-
-    PI: $ => seq(
-      '<?',
-      $.PITarget,
-      O(seq($._S, $._pi_content)),
-      '?>'
-    ),
-
-    _Eq: $ => seq(O($._S), '=', O($._S))
+    ...c.rules
   }
 });
diff --git a/dtd/package.json b/dtd/package.json
index e00d8c5..c58af7d 100644
--- a/dtd/package.json
+++ b/dtd/package.json
@@ -1,9 +1,10 @@
 {
   "main": "../bindings/node/dtd",
   "private": true,
+  "type": "module",
   "scripts": {
-    "build": "tree-sitter generate --no-bindings",
-    "prestart": "tree-sitter build --wasm -o tree-sitter-dtd.wasm",
+    "build": "tree-sitter generate",
+    "prestart": "tree-sitter build --wasm",
     "start": "tree-sitter playground"
   }
 }
diff --git a/dtd/src/grammar.json b/dtd/src/grammar.json
index efd475a..4c060e8 100644
--- a/dtd/src/grammar.json
+++ b/dtd/src/grammar.json
@@ -1,8 +1,9 @@
 {
+  "$schema": "https://tree-sitter.github.io/tree-sitter/assets/schemas/grammar.schema.json",
   "name": "dtd",
   "word": "Name",
   "rules": {
-    "document": {
+    "extSubset": {
       "type": "SEQ",
       "members": [
         {
@@ -10,7 +11,7 @@
           "members": [
             {
               "type": "SYMBOL",
-              "name": "XMLDecl"
+              "name": "TextDecl"
             },
             {
               "type": "BLANK"
@@ -26,6 +27,51 @@
         }
       ]
     },
+    "TextDecl": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "<?"
+        },
+        {
+          "type": "STRING",
+          "value": "xml"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_VersionInfo"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_EncodingDecl"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_S"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "?>"
+        }
+      ]
+    },
     "_extSubsetDecl": {
       "type": "CHOICE",
       "members": [
@@ -1738,51 +1784,6 @@
         }
       ]
     },
-    "XMLDecl": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "<?"
-        },
-        {
-          "type": "STRING",
-          "value": "xml"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_VersionInfo"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_EncodingDecl"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_S"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "STRING",
-          "value": "?>"
-        }
-      ]
-    },
     "_VersionInfo": {
       "type": "SEQ",
       "members": [
diff --git a/dtd/src/node-types.json b/dtd/src/node-types.json
index 4a717a0..b1d3288 100644
--- a/dtd/src/node-types.json
+++ b/dtd/src/node-types.json
@@ -456,7 +456,7 @@
     }
   },
   {
-    "type": "XMLDecl",
+    "type": "TextDecl",
     "named": true,
     "fields": {},
     "children": {
@@ -540,50 +540,51 @@
     }
   },
   {
-    "type": "document",
+    "type": "elementdecl",
     "named": true,
     "fields": {},
     "children": {
       "multiple": true,
-      "required": false,
+      "required": true,
       "types": [
         {
-          "type": "PEReference",
-          "named": true
-        },
-        {
-          "type": "XMLDecl",
+          "type": "Name",
           "named": true
         },
         {
-          "type": "_markupdecl",
+          "type": "PEReference",
           "named": true
         },
         {
-          "type": "conditionalSect",
+          "type": "contentspec",
           "named": true
         }
       ]
     }
   },
   {
-    "type": "elementdecl",
+    "type": "extSubset",
     "named": true,
+    "root": true,
     "fields": {},
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
-          "type": "Name",
+          "type": "PEReference",
           "named": true
         },
         {
-          "type": "PEReference",
+          "type": "TextDecl",
           "named": true
         },
         {
-          "type": "contentspec",
+          "type": "_markupdecl",
+          "named": true
+        },
+        {
+          "type": "conditionalSect",
           "named": true
         }
       ]
diff --git a/dtd/src/parser.c b/dtd/src/parser.c
index d3a7098..60841ab 100644
--- a/dtd/src/parser.c
+++ b/dtd/src/parser.c
@@ -17,57 +17,57 @@
 
 enum ts_symbol_identifiers {
   sym_Name = 1,
-  anon_sym_LT_BANG_LBRACK = 2,
-  anon_sym_IGNORE = 3,
-  anon_sym_INCLUDE = 4,
-  anon_sym_LBRACK = 5,
-  anon_sym_RBRACK_RBRACK_GT = 6,
-  anon_sym_LT_BANG = 7,
-  anon_sym_ELEMENT = 8,
-  anon_sym_GT = 9,
-  anon_sym_EMPTY = 10,
-  anon_sym_ANY = 11,
-  anon_sym_LPAREN = 12,
-  anon_sym_POUNDPCDATA = 13,
-  anon_sym_PIPE = 14,
-  anon_sym_RPAREN = 15,
-  anon_sym_STAR = 16,
-  anon_sym_QMARK = 17,
-  anon_sym_PLUS = 18,
-  anon_sym_COMMA = 19,
-  anon_sym_ATTLIST = 20,
-  sym_StringType = 21,
-  sym_TokenizedType = 22,
-  anon_sym_NOTATION = 23,
-  anon_sym_POUNDREQUIRED = 24,
-  anon_sym_POUNDIMPLIED = 25,
-  anon_sym_POUNDFIXED = 26,
-  anon_sym_ENTITY = 27,
-  anon_sym_PERCENT = 28,
-  anon_sym_DQUOTE = 29,
-  aux_sym_EntityValue_token1 = 30,
-  anon_sym_SQUOTE = 31,
-  aux_sym_EntityValue_token2 = 32,
-  anon_sym_NDATA = 33,
-  anon_sym_SEMI = 34,
-  sym__S = 35,
-  sym_Nmtoken = 36,
-  anon_sym_AMP = 37,
-  anon_sym_AMP_POUND = 38,
-  aux_sym_CharRef_token1 = 39,
-  anon_sym_AMP_POUNDx = 40,
-  aux_sym_CharRef_token2 = 41,
-  aux_sym_AttValue_token1 = 42,
-  aux_sym_AttValue_token2 = 43,
-  anon_sym_SYSTEM = 44,
-  anon_sym_PUBLIC = 45,
-  aux_sym_SystemLiteral_token1 = 46,
-  aux_sym_SystemLiteral_token2 = 47,
-  aux_sym_PubidLiteral_token1 = 48,
-  aux_sym_PubidLiteral_token2 = 49,
-  anon_sym_LT_QMARK = 50,
-  anon_sym_xml = 51,
-  anon_sym_QMARK_GT = 52,
+  anon_sym_LT_QMARK = 2,
+  anon_sym_xml = 3,
+  anon_sym_QMARK_GT = 4,
+  anon_sym_LT_BANG_LBRACK = 5,
+  anon_sym_IGNORE = 6,
+  anon_sym_INCLUDE = 7,
+  anon_sym_LBRACK = 8,
+  anon_sym_RBRACK_RBRACK_GT = 9,
+  anon_sym_LT_BANG = 10,
+  anon_sym_ELEMENT = 11,
+  anon_sym_GT = 12,
+  anon_sym_EMPTY = 13,
+  anon_sym_ANY = 14,
+  anon_sym_LPAREN = 15,
+  anon_sym_POUNDPCDATA = 16,
+  anon_sym_PIPE = 17,
+  anon_sym_RPAREN = 18,
+  anon_sym_STAR = 19,
+  anon_sym_QMARK = 20,
+  anon_sym_PLUS = 21,
+  anon_sym_COMMA = 22,
+  anon_sym_ATTLIST = 23,
+  sym_StringType = 24,
+  sym_TokenizedType = 25,
+  anon_sym_NOTATION = 26,
+  anon_sym_POUNDREQUIRED = 27,
+  anon_sym_POUNDIMPLIED = 28,
+  anon_sym_POUNDFIXED = 29,
+  anon_sym_ENTITY = 30,
+  anon_sym_PERCENT = 31,
+  anon_sym_DQUOTE = 32,
+  aux_sym_EntityValue_token1 = 33,
+  anon_sym_SQUOTE = 34,
+  aux_sym_EntityValue_token2 = 35,
+  anon_sym_NDATA = 36,
+  anon_sym_SEMI = 37,
+  sym__S = 38,
+  sym_Nmtoken = 39,
+  anon_sym_AMP = 40,
+  anon_sym_AMP_POUND = 41,
+  aux_sym_CharRef_token1 = 42,
+  anon_sym_AMP_POUNDx = 43,
+  aux_sym_CharRef_token2 = 44,
+  aux_sym_AttValue_token1 = 45,
+  aux_sym_AttValue_token2 = 46,
+  anon_sym_SYSTEM = 47,
+  anon_sym_PUBLIC = 48,
+  aux_sym_SystemLiteral_token1 = 49,
+  aux_sym_SystemLiteral_token2 = 50,
+  aux_sym_PubidLiteral_token1 = 51,
+  aux_sym_PubidLiteral_token2 = 52,
   anon_sym_version = 53,
   sym_VersionNum = 54,
   anon_sym_encoding = 55,
@@ -76,45 +76,45 @@ enum ts_symbol_identifiers {
   sym_PITarget = 58,
   sym__pi_content = 59,
   sym_Comment = 60,
-  sym_document = 61,
-  sym__extSubsetDecl = 62,
-  sym_conditionalSect = 63,
-  sym__markupdecl = 64,
-  sym__DeclSep = 65,
-  sym_elementdecl = 66,
-  sym_contentspec = 67,
-  sym_Mixed = 68,
-  sym_children = 69,
-  sym__cp = 70,
-  sym__choice = 71,
-  sym_AttlistDecl = 72,
-  sym_AttDef = 73,
-  sym__AttType = 74,
-  sym__EnumeratedType = 75,
-  sym_NotationType = 76,
-  sym_Enumeration = 77,
-  sym_DefaultDecl = 78,
-  sym__EntityDecl = 79,
-  sym_GEDecl = 80,
-  sym_PEDecl = 81,
-  sym_EntityValue = 82,
-  sym_NDataDecl = 83,
-  sym_NotationDecl = 84,
-  sym_PEReference = 85,
-  sym__Reference = 86,
-  sym_EntityRef = 87,
-  sym_CharRef = 88,
-  sym_AttValue = 89,
-  sym_ExternalID = 90,
-  sym_PublicID = 91,
-  sym_SystemLiteral = 92,
-  sym_PubidLiteral = 93,
-  sym_XMLDecl = 94,
+  sym_extSubset = 61,
+  sym_TextDecl = 62,
+  sym__extSubsetDecl = 63,
+  sym_conditionalSect = 64,
+  sym__markupdecl = 65,
+  sym__DeclSep = 66,
+  sym_elementdecl = 67,
+  sym_contentspec = 68,
+  sym_Mixed = 69,
+  sym_children = 70,
+  sym__cp = 71,
+  sym__choice = 72,
+  sym_AttlistDecl = 73,
+  sym_AttDef = 74,
+  sym__AttType = 75,
+  sym__EnumeratedType = 76,
+  sym_NotationType = 77,
+  sym_Enumeration = 78,
+  sym_DefaultDecl = 79,
+  sym__EntityDecl = 80,
+  sym_GEDecl = 81,
+  sym_PEDecl = 82,
+  sym_EntityValue = 83,
+  sym_NDataDecl = 84,
+  sym_NotationDecl = 85,
+  sym_PEReference = 86,
+  sym__Reference = 87,
+  sym_EntityRef = 88,
+  sym_CharRef = 89,
+  sym_AttValue = 90,
+  sym_ExternalID = 91,
+  sym_PublicID = 92,
+  sym_SystemLiteral = 93,
+  sym_PubidLiteral = 94,
   sym__VersionInfo = 95,
   sym__EncodingDecl = 96,
   sym_PI = 97,
   sym__Eq = 98,
-  aux_sym_document_repeat1 = 99,
+  aux_sym_extSubset_repeat1 = 99,
   aux_sym_Mixed_repeat1 = 100,
   aux_sym_Mixed_repeat2 = 101,
   aux_sym__choice_repeat1 = 102,
@@ -131,6 +131,9 @@ enum ts_symbol_identifiers {
 static const char * const ts_symbol_names[] = {
   [ts_builtin_sym_end] = "end",
   [sym_Name] = "Name",
+  [anon_sym_LT_QMARK] = "<\?",
+  [anon_sym_xml] = "xml",
+  [anon_sym_QMARK_GT] = "\?>",
   [anon_sym_LT_BANG_LBRACK] = "<![",
   [anon_sym_IGNORE] = "IGNORE",
   [anon_sym_INCLUDE] = "INCLUDE",
@@ -179,9 +182,6 @@ static const char * const ts_symbol_names[] = {
   [aux_sym_SystemLiteral_token2] = "URI",
   [aux_sym_PubidLiteral_token1] = "PubidLiteral_token1",
   [aux_sym_PubidLiteral_token2] = "PubidLiteral_token2",
-  [anon_sym_LT_QMARK] = "<\?",
-  [anon_sym_xml] = "xml",
-  [anon_sym_QMARK_GT] = "\?>",
   [anon_sym_version] = "version",
   [sym_VersionNum] = "VersionNum",
   [anon_sym_encoding] = "encoding",
@@ -190,7 +190,8 @@ static const char * const ts_symbol_names[] = {
   [sym_PITarget] = "PITarget",
   [sym__pi_content] = "_pi_content",
   [sym_Comment] = "Comment",
-  [sym_document] = "document",
+  [sym_extSubset] = "extSubset",
+  [sym_TextDecl] = "TextDecl",
   [sym__extSubsetDecl] = "_extSubsetDecl",
   [sym_conditionalSect] = "conditionalSect",
   [sym__markupdecl] = "_markupdecl",
@@ -223,12 +224,11 @@ static const char * const ts_symbol_names[] = {
   [sym_PublicID] = "PublicID",
   [sym_SystemLiteral] = "SystemLiteral",
   [sym_PubidLiteral] = "PubidLiteral",
-  [sym_XMLDecl] = "XMLDecl",
   [sym__VersionInfo] = "_VersionInfo",
   [sym__EncodingDecl] = "_EncodingDecl",
   [sym_PI] = "PI",
   [sym__Eq] = "_Eq",
-  [aux_sym_document_repeat1] = "document_repeat1",
+  [aux_sym_extSubset_repeat1] = "extSubset_repeat1",
   [aux_sym_Mixed_repeat1] = "Mixed_repeat1",
   [aux_sym_Mixed_repeat2] = "Mixed_repeat2",
   [aux_sym__choice_repeat1] = "_choice_repeat1",
@@ -245,6 +245,9 @@ static const char * const ts_symbol_names[] = {
 static const TSSymbol ts_symbol_map[] = {
   [ts_builtin_sym_end] = ts_builtin_sym_end,
   [sym_Name] = sym_Name,
+  [anon_sym_LT_QMARK] = anon_sym_LT_QMARK,
+  [anon_sym_xml] = anon_sym_xml,
+  [anon_sym_QMARK_GT] = anon_sym_QMARK_GT,
   [anon_sym_LT_BANG_LBRACK] = anon_sym_LT_BANG_LBRACK,
   [anon_sym_IGNORE] = anon_sym_IGNORE,
   [anon_sym_INCLUDE] = anon_sym_INCLUDE,
@@ -293,9 +296,6 @@ static const TSSymbol ts_symbol_map[] = {
   [aux_sym_SystemLiteral_token2] = aux_sym_SystemLiteral_token1,
   [aux_sym_PubidLiteral_token1] = aux_sym_PubidLiteral_token1,
   [aux_sym_PubidLiteral_token2] = aux_sym_PubidLiteral_token2,
-  [anon_sym_LT_QMARK] = anon_sym_LT_QMARK,
-  [anon_sym_xml] = anon_sym_xml,
-  [anon_sym_QMARK_GT] = anon_sym_QMARK_GT,
   [anon_sym_version] = anon_sym_version,
   [sym_VersionNum] = sym_VersionNum,
   [anon_sym_encoding] = anon_sym_encoding,
@@ -304,7 +304,8 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_PITarget] = sym_PITarget,
   [sym__pi_content] = sym__pi_content,
   [sym_Comment] = sym_Comment,
-  [sym_document] = sym_document,
+  [sym_extSubset] = sym_extSubset,
+  [sym_TextDecl] = sym_TextDecl,
   [sym__extSubsetDecl] = sym__extSubsetDecl,
   [sym_conditionalSect] = sym_conditionalSect,
   [sym__markupdecl] = sym__markupdecl,
@@ -337,12 +338,11 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_PublicID] = sym_PublicID,
   [sym_SystemLiteral] = sym_SystemLiteral,
   [sym_PubidLiteral] = sym_PubidLiteral,
-  [sym_XMLDecl] = sym_XMLDecl,
   [sym__VersionInfo] = sym__VersionInfo,
   [sym__EncodingDecl] = sym__EncodingDecl,
   [sym_PI] = sym_PI,
   [sym__Eq] = sym__Eq,
-  [aux_sym_document_repeat1] = aux_sym_document_repeat1,
+  [aux_sym_extSubset_repeat1] = aux_sym_extSubset_repeat1,
   [aux_sym_Mixed_repeat1] = aux_sym_Mixed_repeat1,
   [aux_sym_Mixed_repeat2] = aux_sym_Mixed_repeat2,
   [aux_sym__choice_repeat1] = aux_sym__choice_repeat1,
@@ -365,6 +365,18 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
+  [anon_sym_LT_QMARK] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_xml] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_QMARK_GT] = {
+    .visible = true,
+    .named = false,
+  },
   [anon_sym_LT_BANG_LBRACK] = {
     .visible = true,
     .named = false,
@@ -557,18 +569,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
-  [anon_sym_LT_QMARK] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_xml] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_QMARK_GT] = {
-    .visible = true,
-    .named = false,
-  },
   [anon_sym_version] = {
     .visible = true,
     .named = false,
@@ -601,7 +601,11 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [sym_document] = {
+  [sym_extSubset] = {
+    .visible = true,
+    .named = true,
+  },
+  [sym_TextDecl] = {
     .visible = true,
     .named = true,
   },
@@ -738,10 +742,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [sym_XMLDecl] = {
-    .visible = true,
-    .named = true,
-  },
   [sym__VersionInfo] = {
     .visible = false,
     .named = true,
@@ -758,7 +758,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = true,
   },
-  [aux_sym_document_repeat1] = {
+  [aux_sym_extSubset_repeat1] = {
     .visible = false,
     .named = false,
   },
@@ -877,11 +877,11 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [39] = 39,
   [40] = 40,
   [41] = 41,
-  [42] = 20,
+  [42] = 42,
   [43] = 43,
   [44] = 44,
   [45] = 45,
-  [46] = 46,
+  [46] = 17,
   [47] = 47,
   [48] = 48,
   [49] = 49,
@@ -907,41 +907,41 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [69] = 69,
   [70] = 70,
   [71] = 71,
-  [72] = 20,
-  [73] = 20,
-  [74] = 74,
+  [72] = 72,
+  [73] = 73,
+  [74] = 17,
   [75] = 75,
   [76] = 76,
   [77] = 77,
   [78] = 78,
-  [79] = 78,
+  [79] = 79,
   [80] = 80,
   [81] = 81,
   [82] = 82,
   [83] = 83,
-  [84] = 84,
+  [84] = 75,
   [85] = 85,
   [86] = 86,
-  [87] = 87,
-  [88] = 76,
-  [89] = 77,
-  [90] = 90,
+  [87] = 79,
+  [88] = 17,
+  [89] = 89,
+  [90] = 82,
   [91] = 91,
   [92] = 92,
-  [93] = 78,
-  [94] = 76,
+  [93] = 93,
+  [94] = 94,
   [95] = 95,
-  [96] = 77,
-  [97] = 97,
-  [98] = 78,
+  [96] = 75,
+  [97] = 79,
+  [98] = 75,
   [99] = 99,
   [100] = 100,
-  [101] = 76,
-  [102] = 77,
-  [103] = 103,
+  [101] = 101,
+  [102] = 82,
+  [103] = 82,
   [104] = 104,
   [105] = 105,
-  [106] = 106,
+  [106] = 79,
   [107] = 107,
   [108] = 108,
   [109] = 109,
@@ -1148,27 +1148,27 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [310] = 310,
   [311] = 311,
   [312] = 312,
-  [313] = 305,
-  [314] = 258,
-  [315] = 252,
-  [316] = 305,
-  [317] = 258,
-  [318] = 252,
-  [319] = 305,
-  [320] = 258,
-  [321] = 252,
-  [322] = 294,
-  [323] = 285,
-  [324] = 286,
-  [325] = 287,
-  [326] = 294,
-  [327] = 285,
-  [328] = 286,
-  [329] = 287,
-  [330] = 294,
-  [331] = 285,
-  [332] = 286,
-  [333] = 287,
+  [313] = 303,
+  [314] = 250,
+  [315] = 246,
+  [316] = 303,
+  [317] = 250,
+  [318] = 246,
+  [319] = 303,
+  [320] = 250,
+  [321] = 246,
+  [322] = 312,
+  [323] = 291,
+  [324] = 293,
+  [325] = 290,
+  [326] = 312,
+  [327] = 291,
+  [328] = 293,
+  [329] = 290,
+  [330] = 312,
+  [331] = 291,
+  [332] = 293,
+  [333] = 290,
 };
 
 static TSCharacterRange aux_sym_PubidLiteral_token1_character_set_1[] = {
@@ -1188,113 +1188,113 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 0:
       if (eof) ADVANCE(40);
       ADVANCE_MAP(
-        '"', 64,
-        '#', 68,
-        '%', 63,
-        '&', 118,
-        '\'', 78,
-        '(', 46,
-        ')', 49,
-        '*', 50,
-        '+', 52,
-        ',', 53,
-        '1', 66,
-        ';', 80,
+        '"', 66,
+        '#', 70,
+        '%', 65,
+        '&', 120,
+        '\'', 80,
+        '(', 48,
+        ')', 51,
+        '*', 52,
+        '+', 54,
+        ',', 55,
+        '1', 68,
+        ';', 82,
         '<', 1,
         '=', 133,
-        '>', 45,
-        '?', 51,
-        'E', 70,
-        'I', 67,
-        'N', 69,
-        '[', 42,
-        ']', 71,
-        '_', 77,
-        '|', 48,
-        '\t', 74,
-        '\n', 74,
-        '\r', 74,
-        ' ', 74,
-        '-', 76,
-        '.', 76,
-        ':', 76,
-        0xb7, 76,
+        '>', 47,
+        '?', 53,
+        'E', 72,
+        'I', 69,
+        'N', 71,
+        '[', 44,
+        ']', 73,
+        '_', 79,
+        '|', 50,
+        '\t', 76,
+        '\n', 76,
+        '\r', 76,
+        ' ', 76,
+        '-', 78,
+        '.', 78,
+        ':', 78,
+        0xb7, 78,
       );
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(75);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(77);
       if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(72);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(74);
       if (('G' <= lookahead && lookahead <= 'Z') ||
-          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(73);
-      if (lookahead != 0) ADVANCE(65);
+          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(75);
+      if (lookahead != 0) ADVANCE(67);
       END_STATE();
     case 1:
-      if (lookahead == '!') ADVANCE(44);
-      if (lookahead == '?') ADVANCE(129);
+      if (lookahead == '!') ADVANCE(46);
+      if (lookahead == '?') ADVANCE(41);
       END_STATE();
     case 2:
-      if (lookahead == '"') ADVANCE(64);
-      if (lookahead == '%') ADVANCE(63);
-      if (lookahead == '&') ADVANCE(118);
+      if (lookahead == '"') ADVANCE(66);
+      if (lookahead == '%') ADVANCE(65);
+      if (lookahead == '&') ADVANCE(120);
       if (lookahead != 0 &&
-          lookahead != '<') ADVANCE(65);
+          lookahead != '<') ADVANCE(67);
       END_STATE();
     case 3:
-      if (lookahead == '"') ADVANCE(64);
-      if (lookahead == '&') ADVANCE(118);
+      if (lookahead == '"') ADVANCE(66);
+      if (lookahead == '&') ADVANCE(120);
       if (lookahead != 0 &&
-          lookahead != '<') ADVANCE(123);
+          lookahead != '<') ADVANCE(125);
       END_STATE();
     case 4:
-      if (lookahead == '%') ADVANCE(63);
-      if (lookahead == '&') ADVANCE(118);
-      if (lookahead == '\'') ADVANCE(78);
+      if (lookahead == '%') ADVANCE(65);
+      if (lookahead == '&') ADVANCE(120);
+      if (lookahead == '\'') ADVANCE(80);
       if (lookahead != 0 &&
-          lookahead != '<') ADVANCE(79);
+          lookahead != '<') ADVANCE(81);
       END_STATE();
     case 5:
       ADVANCE_MAP(
-        '%', 63,
-        '(', 46,
+        '%', 65,
+        '(', 48,
         '?', 9,
-        'E', 99,
-        'I', 82,
-        'N', 97,
-        '\t', 81,
-        '\n', 81,
-        '\r', 81,
-        ' ', 81,
+        'E', 101,
+        'I', 84,
+        'N', 99,
+        '\t', 83,
+        '\n', 83,
+        '\r', 83,
+        ' ', 83,
       );
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(120);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(122);
       if (('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(113);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
       END_STATE();
     case 6:
-      if (lookahead == '&') ADVANCE(118);
-      if (lookahead == '\'') ADVANCE(78);
+      if (lookahead == '&') ADVANCE(120);
+      if (lookahead == '\'') ADVANCE(80);
       if (lookahead != 0 &&
-          lookahead != '<') ADVANCE(124);
+          lookahead != '<') ADVANCE(126);
       END_STATE();
     case 7:
       if (lookahead == '.') ADVANCE(36);
       END_STATE();
     case 8:
-      if (lookahead == '>') ADVANCE(43);
+      if (lookahead == '>') ADVANCE(45);
       END_STATE();
     case 9:
-      if (lookahead == '>') ADVANCE(130);
+      if (lookahead == '>') ADVANCE(42);
       END_STATE();
     case 10:
       if (lookahead == '?') ADVANCE(9);
       if (('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(113);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
       END_STATE();
     case 11:
       if (lookahead == 'A') ADVANCE(31);
       END_STATE();
     case 12:
-      if (lookahead == 'A') ADVANCE(47);
+      if (lookahead == 'A') ADVANCE(49);
       END_STATE();
     case 13:
       if (lookahead == 'C') ADVANCE(14);
@@ -1303,13 +1303,13 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == 'D') ADVANCE(11);
       END_STATE();
     case 15:
-      if (lookahead == 'D') ADVANCE(62);
+      if (lookahead == 'D') ADVANCE(64);
       END_STATE();
     case 16:
-      if (lookahead == 'D') ADVANCE(61);
+      if (lookahead == 'D') ADVANCE(63);
       END_STATE();
     case 17:
-      if (lookahead == 'D') ADVANCE(60);
+      if (lookahead == 'D') ADVANCE(62);
       END_STATE();
     case 18:
       if (lookahead == 'E') ADVANCE(29);
@@ -1369,14 +1369,14 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(81);
+          lookahead == ' ') ADVANCE(83);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(117);
+          lookahead == 0xb7) ADVANCE(119);
       END_STATE();
     case 36:
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(131);
@@ -1384,7 +1384,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 37:
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(122);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(124);
       END_STATE();
     case 38:
       if (('A' <= lookahead && lookahead <= 'Z') ||
@@ -1393,134 +1393,140 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 39:
       if (eof) ADVANCE(40);
       ADVANCE_MAP(
-        '"', 64,
+        '"', 66,
         '#', 22,
-        '%', 63,
-        '\'', 78,
-        '(', 46,
-        ')', 49,
-        '*', 50,
-        '+', 52,
-        ',', 53,
+        '%', 65,
+        '\'', 80,
+        '(', 48,
+        ')', 51,
+        '*', 52,
+        '+', 54,
+        ',', 55,
         '1', 7,
-        ';', 80,
+        ';', 82,
         '<', 1,
         '=', 133,
-        '>', 45,
-        '?', 51,
-        '[', 42,
+        '>', 47,
+        '?', 53,
+        '[', 44,
         ']', 34,
-        '|', 48,
-        '\t', 81,
-        '\n', 81,
-        '\r', 81,
-        ' ', 81,
+        '|', 50,
+        '\t', 83,
+        '\n', 83,
+        '\r', 83,
+        ' ', 83,
       );
       if (('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(113);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
       END_STATE();
     case 40:
       ACCEPT_TOKEN(ts_builtin_sym_end);
       END_STATE();
     case 41:
-      ACCEPT_TOKEN(anon_sym_LT_BANG_LBRACK);
+      ACCEPT_TOKEN(anon_sym_LT_QMARK);
       END_STATE();
     case 42:
-      ACCEPT_TOKEN(anon_sym_LBRACK);
+      ACCEPT_TOKEN(anon_sym_QMARK_GT);
       END_STATE();
     case 43:
-      ACCEPT_TOKEN(anon_sym_RBRACK_RBRACK_GT);
+      ACCEPT_TOKEN(anon_sym_LT_BANG_LBRACK);
       END_STATE();
     case 44:
-      ACCEPT_TOKEN(anon_sym_LT_BANG);
-      if (lookahead == '[') ADVANCE(41);
+      ACCEPT_TOKEN(anon_sym_LBRACK);
       END_STATE();
     case 45:
-      ACCEPT_TOKEN(anon_sym_GT);
+      ACCEPT_TOKEN(anon_sym_RBRACK_RBRACK_GT);
       END_STATE();
     case 46:
-      ACCEPT_TOKEN(anon_sym_LPAREN);
+      ACCEPT_TOKEN(anon_sym_LT_BANG);
+      if (lookahead == '[') ADVANCE(43);
       END_STATE();
     case 47:
-      ACCEPT_TOKEN(anon_sym_POUNDPCDATA);
+      ACCEPT_TOKEN(anon_sym_GT);
       END_STATE();
     case 48:
-      ACCEPT_TOKEN(anon_sym_PIPE);
+      ACCEPT_TOKEN(anon_sym_LPAREN);
       END_STATE();
     case 49:
-      ACCEPT_TOKEN(anon_sym_RPAREN);
+      ACCEPT_TOKEN(anon_sym_POUNDPCDATA);
       END_STATE();
     case 50:
-      ACCEPT_TOKEN(anon_sym_STAR);
+      ACCEPT_TOKEN(anon_sym_PIPE);
       END_STATE();
     case 51:
-      ACCEPT_TOKEN(anon_sym_QMARK);
+      ACCEPT_TOKEN(anon_sym_RPAREN);
       END_STATE();
     case 52:
-      ACCEPT_TOKEN(anon_sym_PLUS);
+      ACCEPT_TOKEN(anon_sym_STAR);
       END_STATE();
     case 53:
-      ACCEPT_TOKEN(anon_sym_COMMA);
+      ACCEPT_TOKEN(anon_sym_QMARK);
       END_STATE();
     case 54:
+      ACCEPT_TOKEN(anon_sym_PLUS);
+      END_STATE();
+    case 55:
+      ACCEPT_TOKEN(anon_sym_COMMA);
+      END_STATE();
+    case 56:
       ACCEPT_TOKEN(sym_TokenizedType);
-      if (lookahead == 'R') ADVANCE(83);
+      if (lookahead == 'R') ADVANCE(85);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 55:
+    case 57:
       ACCEPT_TOKEN(sym_TokenizedType);
-      if (lookahead == 'R') ADVANCE(86);
+      if (lookahead == 'R') ADVANCE(88);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 56:
+    case 58:
       ACCEPT_TOKEN(sym_TokenizedType);
-      if (lookahead == 'S') ADVANCE(58);
+      if (lookahead == 'S') ADVANCE(60);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 57:
+    case 59:
       ACCEPT_TOKEN(sym_TokenizedType);
-      if (lookahead == 'S') ADVANCE(59);
+      if (lookahead == 'S') ADVANCE(61);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 58:
+    case 60:
       ACCEPT_TOKEN(sym_TokenizedType);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 59:
+    case 61:
       ACCEPT_TOKEN(sym_TokenizedType);
       if (lookahead == '-' ||
           lookahead == '.' ||
@@ -1528,133 +1534,133 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 60:
+    case 62:
       ACCEPT_TOKEN(anon_sym_POUNDREQUIRED);
       END_STATE();
-    case 61:
+    case 63:
       ACCEPT_TOKEN(anon_sym_POUNDIMPLIED);
       END_STATE();
-    case 62:
+    case 64:
       ACCEPT_TOKEN(anon_sym_POUNDFIXED);
       END_STATE();
-    case 63:
+    case 65:
       ACCEPT_TOKEN(anon_sym_PERCENT);
       END_STATE();
-    case 64:
+    case 66:
       ACCEPT_TOKEN(anon_sym_DQUOTE);
       END_STATE();
-    case 65:
+    case 67:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
       END_STATE();
-    case 66:
+    case 68:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == '.') ADVANCE(114);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(115);
+      if (lookahead == '.') ADVANCE(116);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(117);
       if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(116);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(118);
       if (lookahead == '-' ||
           lookahead == ':' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('g' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(117);
+          lookahead == 0xb7) ADVANCE(119);
       END_STATE();
-    case 67:
+    case 69:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == 'D') ADVANCE(54);
+      if (lookahead == 'D') ADVANCE(56);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 68:
+    case 70:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
       if (lookahead == 'F') ADVANCE(23);
       if (lookahead == 'I') ADVANCE(27);
       if (lookahead == 'P') ADVANCE(13);
       if (lookahead == 'R') ADVANCE(18);
       END_STATE();
-    case 69:
+    case 71:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == 'M') ADVANCE(106);
+      if (lookahead == 'M') ADVANCE(108);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 70:
+    case 72:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == 'N') ADVANCE(105);
+      if (lookahead == 'N') ADVANCE(107);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(111);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(113);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 71:
+    case 73:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
       if (lookahead == ']') ADVANCE(8);
       END_STATE();
-    case 72:
+    case 74:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(111);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(113);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 73:
+    case 75:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 74:
+    case 76:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(81);
+          lookahead == ' ') ADVANCE(83);
       END_STATE();
-    case 75:
+    case 77:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(115);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(117);
       if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(116);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(118);
       if (lookahead == '-' ||
           lookahead == '.' ||
           lookahead == ':' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('g' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(117);
+          lookahead == 0xb7) ADVANCE(119);
       END_STATE();
-    case 76:
+    case 78:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
       if (lookahead == '-' ||
           lookahead == '.' ||
@@ -1662,9 +1668,9 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(117);
+          lookahead == 0xb7) ADVANCE(119);
       END_STATE();
-    case 77:
+    case 79:
       ACCEPT_TOKEN(aux_sym_EntityValue_token1);
       if (lookahead == '-' ||
           lookahead == '.' ||
@@ -1672,383 +1678,383 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 78:
+    case 80:
       ACCEPT_TOKEN(anon_sym_SQUOTE);
       END_STATE();
-    case 79:
+    case 81:
       ACCEPT_TOKEN(aux_sym_EntityValue_token2);
       END_STATE();
-    case 80:
+    case 82:
       ACCEPT_TOKEN(anon_sym_SEMI);
       END_STATE();
-    case 81:
+    case 83:
       ACCEPT_TOKEN(sym__S);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(81);
+          lookahead == ' ') ADVANCE(83);
       END_STATE();
-    case 82:
+    case 84:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'D') ADVANCE(55);
+      if (lookahead == 'D') ADVANCE(57);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 83:
+    case 85:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(89);
+      if (lookahead == 'E') ADVANCE(91);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 84:
+    case 86:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(98);
+      if (lookahead == 'E') ADVANCE(100);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 85:
+    case 87:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(103);
+      if (lookahead == 'E') ADVANCE(105);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 86:
+    case 88:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(90);
+      if (lookahead == 'E') ADVANCE(92);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 87:
+    case 89:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(104);
+      if (lookahead == 'E') ADVANCE(106);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 88:
+    case 90:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(100);
+      if (lookahead == 'E') ADVANCE(102);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 89:
+    case 91:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'F') ADVANCE(56);
+      if (lookahead == 'F') ADVANCE(58);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 90:
+    case 92:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'F') ADVANCE(57);
+      if (lookahead == 'F') ADVANCE(59);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 91:
+    case 93:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'I') ADVANCE(107);
+      if (lookahead == 'I') ADVANCE(109);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 92:
+    case 94:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'I') ADVANCE(85);
-      if (lookahead == 'Y') ADVANCE(58);
+      if (lookahead == 'I') ADVANCE(87);
+      if (lookahead == 'Y') ADVANCE(60);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 93:
+    case 95:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'I') ADVANCE(110);
+      if (lookahead == 'I') ADVANCE(112);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 94:
+    case 96:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'I') ADVANCE(87);
-      if (lookahead == 'Y') ADVANCE(59);
+      if (lookahead == 'I') ADVANCE(89);
+      if (lookahead == 'Y') ADVANCE(61);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 95:
+    case 97:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'K') ADVANCE(84);
+      if (lookahead == 'K') ADVANCE(86);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 96:
+    case 98:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'K') ADVANCE(88);
+      if (lookahead == 'K') ADVANCE(90);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 97:
+    case 99:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'M') ADVANCE(109);
+      if (lookahead == 'M') ADVANCE(111);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 98:
+    case 100:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'N') ADVANCE(56);
+      if (lookahead == 'N') ADVANCE(58);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 99:
+    case 101:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'N') ADVANCE(108);
+      if (lookahead == 'N') ADVANCE(110);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 100:
+    case 102:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'N') ADVANCE(57);
+      if (lookahead == 'N') ADVANCE(59);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 101:
+    case 103:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'O') ADVANCE(95);
+      if (lookahead == 'O') ADVANCE(97);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 102:
+    case 104:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'O') ADVANCE(96);
+      if (lookahead == 'O') ADVANCE(98);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 103:
+    case 105:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'S') ADVANCE(58);
+      if (lookahead == 'S') ADVANCE(60);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 104:
+    case 106:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'S') ADVANCE(59);
+      if (lookahead == 'S') ADVANCE(61);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 105:
+    case 107:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(91);
+      if (lookahead == 'T') ADVANCE(93);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 106:
+    case 108:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(101);
+      if (lookahead == 'T') ADVANCE(103);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 107:
+    case 109:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(92);
+      if (lookahead == 'T') ADVANCE(94);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 108:
+    case 110:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(93);
+      if (lookahead == 'T') ADVANCE(95);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 109:
+    case 111:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(102);
+      if (lookahead == 'T') ADVANCE(104);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 110:
+    case 112:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(94);
+      if (lookahead == 'T') ADVANCE(96);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 111:
+    case 113:
       ACCEPT_TOKEN(sym_Name);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(111);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(113);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 112:
+    case 114:
       ACCEPT_TOKEN(sym_Name);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(114);
       END_STATE();
-    case 113:
+    case 115:
       ACCEPT_TOKEN(sym_Name);
       if (lookahead == '-' ||
           lookahead == '.' ||
@@ -2056,46 +2062,46 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(113);
+          lookahead == 0xb7) ADVANCE(115);
       END_STATE();
-    case 114:
+    case 116:
       ACCEPT_TOKEN(sym_Nmtoken);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(114);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(116);
       if (lookahead == '-' ||
           lookahead == '.' ||
           lookahead == ':' ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(117);
+          lookahead == 0xb7) ADVANCE(119);
       END_STATE();
-    case 115:
+    case 117:
       ACCEPT_TOKEN(sym_Nmtoken);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(115);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(117);
       if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(116);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(118);
       if (lookahead == '-' ||
           lookahead == '.' ||
           lookahead == ':' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('g' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(117);
+          lookahead == 0xb7) ADVANCE(119);
       END_STATE();
-    case 116:
+    case 118:
       ACCEPT_TOKEN(sym_Nmtoken);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(116);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(118);
       if (lookahead == '-' ||
           lookahead == '.' ||
           lookahead == ':' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('g' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(117);
+          lookahead == 0xb7) ADVANCE(119);
       END_STATE();
-    case 117:
+    case 119:
       ACCEPT_TOKEN(sym_Nmtoken);
       if (lookahead == '-' ||
           lookahead == '.' ||
@@ -2103,58 +2109,52 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(117);
+          lookahead == 0xb7) ADVANCE(119);
       END_STATE();
-    case 118:
+    case 120:
       ACCEPT_TOKEN(anon_sym_AMP);
-      if (lookahead == '#') ADVANCE(119);
+      if (lookahead == '#') ADVANCE(121);
       END_STATE();
-    case 119:
+    case 121:
       ACCEPT_TOKEN(anon_sym_AMP_POUND);
-      if (lookahead == 'x') ADVANCE(121);
+      if (lookahead == 'x') ADVANCE(123);
       END_STATE();
-    case 120:
+    case 122:
       ACCEPT_TOKEN(aux_sym_CharRef_token1);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(120);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(122);
       END_STATE();
-    case 121:
+    case 123:
       ACCEPT_TOKEN(anon_sym_AMP_POUNDx);
       END_STATE();
-    case 122:
+    case 124:
       ACCEPT_TOKEN(aux_sym_CharRef_token2);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(122);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(124);
       END_STATE();
-    case 123:
+    case 125:
       ACCEPT_TOKEN(aux_sym_AttValue_token1);
       END_STATE();
-    case 124:
+    case 126:
       ACCEPT_TOKEN(aux_sym_AttValue_token2);
       END_STATE();
-    case 125:
+    case 127:
       ACCEPT_TOKEN(aux_sym_SystemLiteral_token1);
       if (lookahead != 0 &&
-          lookahead != '"') ADVANCE(125);
+          lookahead != '"') ADVANCE(127);
       END_STATE();
-    case 126:
+    case 128:
       ACCEPT_TOKEN(aux_sym_SystemLiteral_token2);
       if (lookahead != 0 &&
-          lookahead != '\'') ADVANCE(126);
-      END_STATE();
-    case 127:
-      ACCEPT_TOKEN(aux_sym_PubidLiteral_token1);
-      if (set_contains(aux_sym_PubidLiteral_token1_character_set_1, 9, lookahead)) ADVANCE(127);
-      END_STATE();
-    case 128:
-      ACCEPT_TOKEN(aux_sym_PubidLiteral_token2);
-      if (set_contains(aux_sym_PubidLiteral_token2_character_set_1, 9, lookahead)) ADVANCE(128);
+          lookahead != '\'') ADVANCE(128);
       END_STATE();
     case 129:
-      ACCEPT_TOKEN(anon_sym_LT_QMARK);
+      ACCEPT_TOKEN(aux_sym_PubidLiteral_token1);
+      if (set_contains(aux_sym_PubidLiteral_token1_character_set_1, 9, lookahead)) ADVANCE(129);
       END_STATE();
     case 130:
-      ACCEPT_TOKEN(anon_sym_QMARK_GT);
+      ACCEPT_TOKEN(aux_sym_PubidLiteral_token2);
+      if (set_contains(aux_sym_PubidLiteral_token2_character_set_1, 9, lookahead)) ADVANCE(130);
       END_STATE();
     case 131:
       ACCEPT_TOKEN(sym_VersionNum);
@@ -2471,55 +2471,55 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [10] = {.lex_state = 39, .external_lex_state = 2},
   [11] = {.lex_state = 39, .external_lex_state = 2},
   [12] = {.lex_state = 4},
-  [13] = {.lex_state = 2},
-  [14] = {.lex_state = 39},
+  [13] = {.lex_state = 39},
+  [14] = {.lex_state = 4},
   [15] = {.lex_state = 2},
   [16] = {.lex_state = 39},
-  [17] = {.lex_state = 4},
-  [18] = {.lex_state = 4},
-  [19] = {.lex_state = 2},
-  [20] = {.lex_state = 39},
+  [17] = {.lex_state = 39},
+  [18] = {.lex_state = 2},
+  [19] = {.lex_state = 4},
+  [20] = {.lex_state = 2},
   [21] = {.lex_state = 5},
   [22] = {.lex_state = 39},
-  [23] = {.lex_state = 39},
-  [24] = {.lex_state = 6},
-  [25] = {.lex_state = 39},
+  [23] = {.lex_state = 6},
+  [24] = {.lex_state = 3},
+  [25] = {.lex_state = 6},
   [26] = {.lex_state = 39},
   [27] = {.lex_state = 39},
-  [28] = {.lex_state = 3},
-  [29] = {.lex_state = 39},
+  [28] = {.lex_state = 39},
+  [29] = {.lex_state = 3},
   [30] = {.lex_state = 6},
-  [31] = {.lex_state = 6},
-  [32] = {.lex_state = 3},
+  [31] = {.lex_state = 3},
+  [32] = {.lex_state = 39},
   [33] = {.lex_state = 39},
-  [34] = {.lex_state = 3},
+  [34] = {.lex_state = 39},
   [35] = {.lex_state = 39, .external_lex_state = 2},
   [36] = {.lex_state = 39, .external_lex_state = 2},
   [37] = {.lex_state = 39, .external_lex_state = 2},
   [38] = {.lex_state = 39, .external_lex_state = 2},
-  [39] = {.lex_state = 39},
-  [40] = {.lex_state = 39, .external_lex_state = 2},
+  [39] = {.lex_state = 39, .external_lex_state = 2},
+  [40] = {.lex_state = 39},
   [41] = {.lex_state = 39, .external_lex_state = 2},
-  [42] = {.lex_state = 39, .external_lex_state = 2},
+  [42] = {.lex_state = 39},
   [43] = {.lex_state = 39, .external_lex_state = 2},
   [44] = {.lex_state = 39},
   [45] = {.lex_state = 39},
   [46] = {.lex_state = 39, .external_lex_state = 2},
   [47] = {.lex_state = 39, .external_lex_state = 2},
-  [48] = {.lex_state = 39},
+  [48] = {.lex_state = 39, .external_lex_state = 2},
   [49] = {.lex_state = 39, .external_lex_state = 2},
   [50] = {.lex_state = 39, .external_lex_state = 2},
   [51] = {.lex_state = 39, .external_lex_state = 2},
   [52] = {.lex_state = 39, .external_lex_state = 2},
   [53] = {.lex_state = 39, .external_lex_state = 2},
-  [54] = {.lex_state = 39},
+  [54] = {.lex_state = 39, .external_lex_state = 2},
   [55] = {.lex_state = 39, .external_lex_state = 2},
-  [56] = {.lex_state = 39, .external_lex_state = 2},
-  [57] = {.lex_state = 39, .external_lex_state = 2},
+  [56] = {.lex_state = 39},
+  [57] = {.lex_state = 39},
   [58] = {.lex_state = 39, .external_lex_state = 2},
   [59] = {.lex_state = 39, .external_lex_state = 2},
   [60] = {.lex_state = 39, .external_lex_state = 2},
-  [61] = {.lex_state = 39},
+  [61] = {.lex_state = 39, .external_lex_state = 2},
   [62] = {.lex_state = 39},
   [63] = {.lex_state = 39},
   [64] = {.lex_state = 39},
@@ -2529,42 +2529,42 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [68] = {.lex_state = 39},
   [69] = {.lex_state = 39},
   [70] = {.lex_state = 39},
-  [71] = {.lex_state = 39, .external_lex_state = 2},
-  [72] = {.lex_state = 4},
-  [73] = {.lex_state = 2},
-  [74] = {.lex_state = 39},
-  [75] = {.lex_state = 39},
-  [76] = {.lex_state = 4},
-  [77] = {.lex_state = 4},
-  [78] = {.lex_state = 4},
-  [79] = {.lex_state = 2},
+  [71] = {.lex_state = 39},
+  [72] = {.lex_state = 39},
+  [73] = {.lex_state = 39, .external_lex_state = 2},
+  [74] = {.lex_state = 4},
+  [75] = {.lex_state = 4},
+  [76] = {.lex_state = 39, .external_lex_state = 2},
+  [77] = {.lex_state = 39},
+  [78] = {.lex_state = 39},
+  [79] = {.lex_state = 4},
   [80] = {.lex_state = 39},
   [81] = {.lex_state = 39},
-  [82] = {.lex_state = 39},
-  [83] = {.lex_state = 39, .external_lex_state = 2},
-  [84] = {.lex_state = 39},
+  [82] = {.lex_state = 4},
+  [83] = {.lex_state = 39},
+  [84] = {.lex_state = 2},
   [85] = {.lex_state = 39},
-  [86] = {.lex_state = 39},
-  [87] = {.lex_state = 39, .external_lex_state = 2},
+  [86] = {.lex_state = 39, .external_lex_state = 2},
+  [87] = {.lex_state = 2},
   [88] = {.lex_state = 2},
-  [89] = {.lex_state = 2},
-  [90] = {.lex_state = 39},
+  [89] = {.lex_state = 39},
+  [90] = {.lex_state = 2},
   [91] = {.lex_state = 39},
   [92] = {.lex_state = 39},
-  [93] = {.lex_state = 3},
-  [94] = {.lex_state = 6},
+  [93] = {.lex_state = 39},
+  [94] = {.lex_state = 39},
   [95] = {.lex_state = 39},
-  [96] = {.lex_state = 6},
-  [97] = {.lex_state = 39},
+  [96] = {.lex_state = 3},
+  [97] = {.lex_state = 6},
   [98] = {.lex_state = 6},
   [99] = {.lex_state = 39},
   [100] = {.lex_state = 39},
-  [101] = {.lex_state = 3},
+  [101] = {.lex_state = 39},
   [102] = {.lex_state = 3},
-  [103] = {.lex_state = 39},
+  [103] = {.lex_state = 6},
   [104] = {.lex_state = 39},
   [105] = {.lex_state = 39},
-  [106] = {.lex_state = 39},
+  [106] = {.lex_state = 3},
   [107] = {.lex_state = 39},
   [108] = {.lex_state = 39},
   [109] = {.lex_state = 39},
@@ -2607,11 +2607,11 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [146] = {.lex_state = 39},
   [147] = {.lex_state = 39},
   [148] = {.lex_state = 39},
-  [149] = {.lex_state = 39},
+  [149] = {.lex_state = 5},
   [150] = {.lex_state = 39},
   [151] = {.lex_state = 39},
   [152] = {.lex_state = 39},
-  [153] = {.lex_state = 5},
+  [153] = {.lex_state = 39},
   [154] = {.lex_state = 39},
   [155] = {.lex_state = 39},
   [156] = {.lex_state = 39},
@@ -2639,12 +2639,12 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [178] = {.lex_state = 39},
   [179] = {.lex_state = 39},
   [180] = {.lex_state = 39},
-  [181] = {.lex_state = 39, .external_lex_state = 3},
+  [181] = {.lex_state = 5},
   [182] = {.lex_state = 39},
   [183] = {.lex_state = 5},
-  [184] = {.lex_state = 5},
+  [184] = {.lex_state = 39},
   [185] = {.lex_state = 39},
-  [186] = {.lex_state = 39},
+  [186] = {.lex_state = 5},
   [187] = {.lex_state = 39},
   [188] = {.lex_state = 39},
   [189] = {.lex_state = 39},
@@ -2654,7 +2654,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [193] = {.lex_state = 39},
   [194] = {.lex_state = 39},
   [195] = {.lex_state = 39},
-  [196] = {.lex_state = 39},
+  [196] = {.lex_state = 39, .external_lex_state = 3},
   [197] = {.lex_state = 39},
   [198] = {.lex_state = 39},
   [199] = {.lex_state = 39},
@@ -2668,22 +2668,22 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [207] = {.lex_state = 39},
   [208] = {.lex_state = 39},
   [209] = {.lex_state = 39},
-  [210] = {.lex_state = 39},
+  [210] = {.lex_state = 10},
   [211] = {.lex_state = 39},
   [212] = {.lex_state = 39},
-  [213] = {.lex_state = 39},
+  [213] = {.lex_state = 5},
   [214] = {.lex_state = 39},
   [215] = {.lex_state = 39},
-  [216] = {.lex_state = 5},
+  [216] = {.lex_state = 39},
   [217] = {.lex_state = 39},
-  [218] = {.lex_state = 39},
-  [219] = {.lex_state = 35},
+  [218] = {.lex_state = 35},
+  [219] = {.lex_state = 39},
   [220] = {.lex_state = 39},
-  [221] = {.lex_state = 10},
+  [221] = {.lex_state = 39},
   [222] = {.lex_state = 39},
   [223] = {.lex_state = 39},
   [224] = {.lex_state = 39},
-  [225] = {.lex_state = 5},
+  [225] = {.lex_state = 35},
   [226] = {.lex_state = 39},
   [227] = {.lex_state = 39},
   [228] = {.lex_state = 39},
@@ -2697,13 +2697,13 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [236] = {.lex_state = 39},
   [237] = {.lex_state = 39},
   [238] = {.lex_state = 39},
-  [239] = {.lex_state = 35},
+  [239] = {.lex_state = 39},
   [240] = {.lex_state = 39},
   [241] = {.lex_state = 39},
   [242] = {.lex_state = 39},
   [243] = {.lex_state = 39},
-  [244] = {.lex_state = 126},
-  [245] = {.lex_state = 38},
+  [244] = {.lex_state = 39},
+  [245] = {.lex_state = 39},
   [246] = {.lex_state = 39},
   [247] = {.lex_state = 39},
   [248] = {.lex_state = 39},
@@ -2720,8 +2720,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [259] = {.lex_state = 39},
   [260] = {.lex_state = 39},
   [261] = {.lex_state = 39},
-  [262] = {.lex_state = 5},
-  [263] = {.lex_state = 39},
+  [262] = {.lex_state = 39},
+  [263] = {.lex_state = 130},
   [264] = {.lex_state = 39},
   [265] = {.lex_state = 39},
   [266] = {.lex_state = 39},
@@ -2730,36 +2730,36 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [269] = {.lex_state = 39},
   [270] = {.lex_state = 5},
   [271] = {.lex_state = 39},
-  [272] = {.lex_state = 128},
+  [272] = {.lex_state = 129},
   [273] = {.lex_state = 35},
   [274] = {.lex_state = 39},
   [275] = {.lex_state = 39},
-  [276] = {.lex_state = 39},
+  [276] = {.lex_state = 5},
   [277] = {.lex_state = 39},
   [278] = {.lex_state = 39},
-  [279] = {.lex_state = 127},
+  [279] = {.lex_state = 128},
   [280] = {.lex_state = 39},
   [281] = {.lex_state = 35},
-  [282] = {.lex_state = 39},
-  [283] = {.lex_state = 0, .external_lex_state = 4},
+  [282] = {.lex_state = 127},
+  [283] = {.lex_state = 39},
   [284] = {.lex_state = 39},
-  [285] = {.lex_state = 39},
-  [286] = {.lex_state = 5},
-  [287] = {.lex_state = 37},
+  [285] = {.lex_state = 38},
+  [286] = {.lex_state = 38},
+  [287] = {.lex_state = 39},
   [288] = {.lex_state = 39},
   [289] = {.lex_state = 39},
-  [290] = {.lex_state = 39},
+  [290] = {.lex_state = 37},
   [291] = {.lex_state = 39},
   [292] = {.lex_state = 39},
-  [293] = {.lex_state = 39},
+  [293] = {.lex_state = 5},
   [294] = {.lex_state = 39},
   [295] = {.lex_state = 39},
   [296] = {.lex_state = 39},
   [297] = {.lex_state = 39},
-  [298] = {.lex_state = 125},
+  [298] = {.lex_state = 39},
   [299] = {.lex_state = 39},
-  [300] = {.lex_state = 38},
-  [301] = {.lex_state = 39},
+  [300] = {.lex_state = 39},
+  [301] = {.lex_state = 0, .external_lex_state = 4},
   [302] = {.lex_state = 0, .external_lex_state = 3},
   [303] = {.lex_state = 39},
   [304] = {.lex_state = 39},
@@ -2798,6 +2798,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [0] = {
     [ts_builtin_sym_end] = ACTIONS(1),
     [sym_Name] = ACTIONS(1),
+    [anon_sym_LT_QMARK] = ACTIONS(1),
+    [anon_sym_xml] = ACTIONS(1),
     [anon_sym_LT_BANG_LBRACK] = ACTIONS(1),
     [anon_sym_IGNORE] = ACTIONS(1),
     [anon_sym_INCLUDE] = ACTIONS(1),
@@ -2842,8 +2844,6 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [aux_sym_AttValue_token2] = ACTIONS(1),
     [anon_sym_SYSTEM] = ACTIONS(1),
     [anon_sym_PUBLIC] = ACTIONS(1),
-    [anon_sym_LT_QMARK] = ACTIONS(1),
-    [anon_sym_xml] = ACTIONS(1),
     [anon_sym_version] = ACTIONS(1),
     [sym_VersionNum] = ACTIONS(1),
     [anon_sym_encoding] = ACTIONS(1),
@@ -2854,26 +2854,26 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_Comment] = ACTIONS(1),
   },
   [1] = {
-    [sym_document] = STATE(311),
+    [sym_extSubset] = STATE(311),
+    [sym_TextDecl] = STATE(11),
     [sym__extSubsetDecl] = STATE(9),
     [sym_conditionalSect] = STATE(9),
     [sym__markupdecl] = STATE(9),
     [sym__DeclSep] = STATE(9),
-    [sym_elementdecl] = STATE(37),
-    [sym_AttlistDecl] = STATE(37),
-    [sym__EntityDecl] = STATE(37),
-    [sym_GEDecl] = STATE(56),
-    [sym_PEDecl] = STATE(56),
-    [sym_NotationDecl] = STATE(37),
+    [sym_elementdecl] = STATE(58),
+    [sym_AttlistDecl] = STATE(58),
+    [sym__EntityDecl] = STATE(58),
+    [sym_GEDecl] = STATE(51),
+    [sym_PEDecl] = STATE(51),
+    [sym_NotationDecl] = STATE(58),
     [sym_PEReference] = STATE(9),
-    [sym_XMLDecl] = STATE(11),
-    [sym_PI] = STATE(37),
-    [aux_sym_document_repeat1] = STATE(9),
-    [anon_sym_LT_BANG_LBRACK] = ACTIONS(3),
-    [anon_sym_LT_BANG] = ACTIONS(5),
-    [anon_sym_PERCENT] = ACTIONS(7),
-    [sym__S] = ACTIONS(9),
-    [anon_sym_LT_QMARK] = ACTIONS(11),
+    [sym_PI] = STATE(58),
+    [aux_sym_extSubset_repeat1] = STATE(9),
+    [anon_sym_LT_QMARK] = ACTIONS(3),
+    [anon_sym_LT_BANG_LBRACK] = ACTIONS(5),
+    [anon_sym_LT_BANG] = ACTIONS(7),
+    [anon_sym_PERCENT] = ACTIONS(9),
+    [sym__S] = ACTIONS(11),
     [sym_Comment] = ACTIONS(13),
   },
 };
@@ -2881,24 +2881,24 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
 static const uint16_t ts_small_parse_table[] = {
   [0] = 10,
     ACTIONS(17), 1,
-      anon_sym_LT_BANG_LBRACK,
+      anon_sym_LT_QMARK,
     ACTIONS(20), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(23), 1,
-      anon_sym_PERCENT,
+      anon_sym_LT_BANG,
     ACTIONS(26), 1,
-      sym__S,
+      anon_sym_PERCENT,
     ACTIONS(29), 1,
-      anon_sym_LT_QMARK,
+      sym__S,
     ACTIONS(32), 1,
       sym_Comment,
     ACTIONS(15), 2,
       ts_builtin_sym_end,
       anon_sym_RBRACK_RBRACK_GT,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -2910,26 +2910,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [42] = 10,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
     ACTIONS(35), 1,
-      anon_sym_RBRACK_RBRACK_GT,
+      anon_sym_LT_QMARK,
     ACTIONS(37), 1,
-      sym__S,
+      anon_sym_RBRACK_RBRACK_GT,
     ACTIONS(39), 1,
-      anon_sym_LT_QMARK,
-    STATE(56), 2,
+      sym__S,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -2941,26 +2941,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [83] = 10,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
-    ACTIONS(39), 1,
+    ACTIONS(35), 1,
       anon_sym_LT_QMARK,
     ACTIONS(41), 1,
       anon_sym_RBRACK_RBRACK_GT,
     ACTIONS(43), 1,
       sym__S,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -2972,57 +2972,57 @@ static const uint16_t ts_small_parse_table[] = {
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [124] = 10,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
-    ACTIONS(39), 1,
+    ACTIONS(35), 1,
       anon_sym_LT_QMARK,
     ACTIONS(45), 1,
       anon_sym_RBRACK_RBRACK_GT,
     ACTIONS(47), 1,
       sym__S,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
       sym_NotationDecl,
       sym_PI,
-    STATE(8), 6,
+    STATE(4), 6,
       sym__extSubsetDecl,
       sym_conditionalSect,
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [165] = 10,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
-    ACTIONS(39), 1,
+    ACTIONS(35), 1,
       anon_sym_LT_QMARK,
     ACTIONS(43), 1,
       sym__S,
     ACTIONS(49), 1,
       ts_builtin_sym_end,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3034,26 +3034,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [206] = 10,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
-    ACTIONS(39), 1,
+    ACTIONS(35), 1,
       anon_sym_LT_QMARK,
     ACTIONS(43), 1,
       sym__S,
     ACTIONS(51), 1,
       anon_sym_RBRACK_RBRACK_GT,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3065,26 +3065,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [247] = 10,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
     ACTIONS(35), 1,
-      anon_sym_RBRACK_RBRACK_GT,
-    ACTIONS(39), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(37), 1,
+      anon_sym_RBRACK_RBRACK_GT,
     ACTIONS(43), 1,
       sym__S,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3096,26 +3096,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [288] = 10,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
-    ACTIONS(39), 1,
+    ACTIONS(35), 1,
       anon_sym_LT_QMARK,
     ACTIONS(43), 1,
       sym__S,
     ACTIONS(53), 1,
       ts_builtin_sym_end,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3127,55 +3127,55 @@ static const uint16_t ts_small_parse_table[] = {
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [329] = 10,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
-    ACTIONS(39), 1,
+    ACTIONS(35), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(51), 1,
+    ACTIONS(41), 1,
       anon_sym_RBRACK_RBRACK_GT,
     ACTIONS(55), 1,
       sym__S,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
       sym_NotationDecl,
       sym_PI,
-    STATE(4), 6,
+    STATE(8), 6,
       sym__extSubsetDecl,
       sym_conditionalSect,
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [370] = 9,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG_LBRACK,
     ACTIONS(5), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(7), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(9), 1,
       anon_sym_PERCENT,
     ACTIONS(13), 1,
       sym_Comment,
-    ACTIONS(39), 1,
+    ACTIONS(35), 1,
       anon_sym_LT_QMARK,
     ACTIONS(57), 1,
       sym__S,
-    STATE(56), 2,
+    STATE(51), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(37), 5,
+    STATE(58), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3187,66 +3187,66 @@ static const uint16_t ts_small_parse_table[] = {
       sym__markupdecl,
       sym__DeclSep,
       sym_PEReference,
-      aux_sym_document_repeat1,
+      aux_sym_extSubset_repeat1,
   [408] = 8,
     ACTIONS(59), 1,
       anon_sym_PERCENT,
-    ACTIONS(61), 1,
+    ACTIONS(62), 1,
       anon_sym_SQUOTE,
-    ACTIONS(63), 1,
+    ACTIONS(64), 1,
       aux_sym_EntityValue_token2,
-    ACTIONS(65), 1,
-      anon_sym_AMP,
     ACTIONS(67), 1,
-      anon_sym_AMP_POUND,
-    ACTIONS(69), 1,
-      anon_sym_AMP_POUNDx,
-    STATE(78), 2,
-      sym_EntityRef,
-      sym_CharRef,
-    STATE(18), 3,
-      sym_PEReference,
-      sym__Reference,
-      aux_sym_EntityValue_repeat2,
-  [436] = 8,
-    ACTIONS(71), 1,
-      anon_sym_PERCENT,
-    ACTIONS(74), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(76), 1,
-      aux_sym_EntityValue_token1,
-    ACTIONS(79), 1,
       anon_sym_AMP,
-    ACTIONS(82), 1,
+    ACTIONS(70), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(85), 1,
+    ACTIONS(73), 1,
       anon_sym_AMP_POUNDx,
-    STATE(79), 2,
+    STATE(75), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(13), 3,
+    STATE(12), 3,
       sym_PEReference,
       sym__Reference,
-      aux_sym_EntityValue_repeat1,
-  [464] = 5,
-    STATE(66), 1,
+      aux_sym_EntityValue_repeat2,
+  [436] = 5,
+    STATE(68), 1,
       aux_sym_Mixed_repeat1,
-    STATE(125), 1,
+    STATE(135), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-    ACTIONS(90), 3,
+    ACTIONS(78), 3,
       anon_sym_STAR,
       anon_sym_QMARK,
       anon_sym_PLUS,
-    ACTIONS(88), 5,
+    ACTIONS(76), 5,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
+  [458] = 8,
+    ACTIONS(80), 1,
+      anon_sym_PERCENT,
+    ACTIONS(82), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(84), 1,
+      aux_sym_EntityValue_token2,
+    ACTIONS(86), 1,
+      anon_sym_AMP,
+    ACTIONS(88), 1,
+      anon_sym_AMP_POUND,
+    ACTIONS(90), 1,
+      anon_sym_AMP_POUNDx,
+    STATE(75), 2,
+      sym_EntityRef,
+      sym_CharRef,
+    STATE(19), 3,
+      sym_PEReference,
+      sym__Reference,
+      aux_sym_EntityValue_repeat2,
   [486] = 8,
-    ACTIONS(61), 1,
+    ACTIONS(82), 1,
       anon_sym_DQUOTE,
     ACTIONS(92), 1,
       anon_sym_PERCENT,
@@ -3258,103 +3258,103 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_POUND,
     ACTIONS(100), 1,
       anon_sym_AMP_POUNDx,
-    STATE(79), 2,
+    STATE(84), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(19), 3,
+    STATE(18), 3,
       sym_PEReference,
       sym__Reference,
       aux_sym_EntityValue_repeat1,
   [514] = 5,
     STATE(63), 1,
       aux_sym_Mixed_repeat1,
-    STATE(134), 1,
+    STATE(124), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-    ACTIONS(90), 3,
+    ACTIONS(78), 3,
       anon_sym_STAR,
       anon_sym_QMARK,
       anon_sym_PLUS,
-    ACTIONS(88), 5,
+    ACTIONS(76), 5,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_PERCENT,
+      sym__S,
+  [536] = 1,
+    ACTIONS(102), 11,
+      anon_sym_LBRACK,
+      anon_sym_GT,
       anon_sym_PIPE,
       anon_sym_RPAREN,
+      anon_sym_STAR,
+      anon_sym_QMARK,
+      anon_sym_PLUS,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [536] = 8,
-    ACTIONS(102), 1,
+      sym_Name,
+  [550] = 8,
+    ACTIONS(92), 1,
       anon_sym_PERCENT,
-    ACTIONS(105), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(107), 1,
-      aux_sym_EntityValue_token2,
-    ACTIONS(110), 1,
+    ACTIONS(96), 1,
       anon_sym_AMP,
-    ACTIONS(113), 1,
+    ACTIONS(98), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(116), 1,
+    ACTIONS(100), 1,
       anon_sym_AMP_POUNDx,
-    STATE(78), 2,
+    ACTIONS(104), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(106), 1,
+      aux_sym_EntityValue_token1,
+    STATE(84), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(17), 3,
+    STATE(20), 3,
       sym_PEReference,
       sym__Reference,
-      aux_sym_EntityValue_repeat2,
-  [564] = 8,
-    ACTIONS(59), 1,
+      aux_sym_EntityValue_repeat1,
+  [578] = 8,
+    ACTIONS(80), 1,
       anon_sym_PERCENT,
-    ACTIONS(65), 1,
+    ACTIONS(86), 1,
       anon_sym_AMP,
-    ACTIONS(67), 1,
+    ACTIONS(88), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(69), 1,
+    ACTIONS(90), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(119), 1,
+    ACTIONS(104), 1,
       anon_sym_SQUOTE,
-    ACTIONS(121), 1,
+    ACTIONS(108), 1,
       aux_sym_EntityValue_token2,
-    STATE(78), 2,
+    STATE(75), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(17), 3,
+    STATE(12), 3,
       sym_PEReference,
       sym__Reference,
       aux_sym_EntityValue_repeat2,
-  [592] = 8,
-    ACTIONS(92), 1,
+  [606] = 8,
+    ACTIONS(110), 1,
       anon_sym_PERCENT,
-    ACTIONS(96), 1,
+    ACTIONS(113), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(115), 1,
+      aux_sym_EntityValue_token1,
+    ACTIONS(118), 1,
       anon_sym_AMP,
-    ACTIONS(98), 1,
+    ACTIONS(121), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(100), 1,
+    ACTIONS(124), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(119), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(123), 1,
-      aux_sym_EntityValue_token1,
-    STATE(79), 2,
+    STATE(84), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(13), 3,
+    STATE(20), 3,
       sym_PEReference,
       sym__Reference,
       aux_sym_EntityValue_repeat1,
-  [620] = 1,
-    ACTIONS(125), 11,
-      anon_sym_LBRACK,
-      anon_sym_GT,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_STAR,
-      anon_sym_QMARK,
-      anon_sym_PLUS,
-      anon_sym_COMMA,
-      anon_sym_PERCENT,
-      sym__S,
-      sym_Name,
   [634] = 7,
     ACTIONS(127), 1,
       anon_sym_LPAREN,
@@ -3362,17 +3362,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_NOTATION,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    STATE(192), 1,
+    STATE(200), 1,
       sym__AttType,
     ACTIONS(129), 2,
       sym_StringType,
       sym_TokenizedType,
-    STATE(197), 2,
-      sym_NotationType,
-      sym_Enumeration,
-    STATE(240), 2,
+    STATE(194), 2,
       sym__EnumeratedType,
       sym_PEReference,
+    STATE(202), 2,
+      sym_NotationType,
+      sym_Enumeration,
   [659] = 1,
     ACTIONS(135), 9,
       anon_sym_GT,
@@ -3384,36 +3384,59 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [671] = 1,
-    ACTIONS(137), 9,
-      anon_sym_GT,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_STAR,
-      anon_sym_QMARK,
-      anon_sym_PLUS,
-      anon_sym_COMMA,
-      anon_sym_PERCENT,
-      sym__S,
-  [683] = 7,
-    ACTIONS(139), 1,
+  [671] = 7,
+    ACTIONS(137), 1,
       anon_sym_SQUOTE,
-    ACTIONS(141), 1,
+    ACTIONS(139), 1,
       anon_sym_AMP,
-    ACTIONS(143), 1,
+    ACTIONS(141), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(145), 1,
+    ACTIONS(143), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(147), 1,
+    ACTIONS(145), 1,
       aux_sym_AttValue_token2,
+    STATE(30), 2,
+      sym__Reference,
+      aux_sym_AttValue_repeat2,
+    STATE(98), 2,
+      sym_EntityRef,
+      sym_CharRef,
+  [695] = 7,
+    ACTIONS(137), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(147), 1,
+      anon_sym_AMP,
+    ACTIONS(149), 1,
+      anon_sym_AMP_POUND,
+    ACTIONS(151), 1,
+      anon_sym_AMP_POUNDx,
+    ACTIONS(153), 1,
+      aux_sym_AttValue_token1,
     STATE(31), 2,
+      sym__Reference,
+      aux_sym_AttValue_repeat1,
+    STATE(96), 2,
+      sym_EntityRef,
+      sym_CharRef,
+  [719] = 7,
+    ACTIONS(139), 1,
+      anon_sym_AMP,
+    ACTIONS(141), 1,
+      anon_sym_AMP_POUND,
+    ACTIONS(143), 1,
+      anon_sym_AMP_POUNDx,
+    ACTIONS(155), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(157), 1,
+      aux_sym_AttValue_token2,
+    STATE(23), 2,
       sym__Reference,
       aux_sym_AttValue_repeat2,
     STATE(98), 2,
       sym_EntityRef,
       sym_CharRef,
-  [707] = 1,
-    ACTIONS(149), 9,
+  [743] = 1,
+    ACTIONS(159), 9,
       anon_sym_GT,
       anon_sym_PIPE,
       anon_sym_RPAREN,
@@ -3423,8 +3446,8 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [719] = 1,
-    ACTIONS(151), 9,
+  [755] = 1,
+    ACTIONS(161), 9,
       anon_sym_GT,
       anon_sym_PIPE,
       anon_sym_RPAREN,
@@ -3434,83 +3457,44 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [731] = 6,
-    ACTIONS(133), 1,
+  [767] = 1,
+    ACTIONS(163), 9,
+      anon_sym_GT,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_STAR,
+      anon_sym_QMARK,
+      anon_sym_PLUS,
+      anon_sym_COMMA,
       anon_sym_PERCENT,
-    ACTIONS(155), 1,
-      anon_sym_LPAREN,
-    STATE(108), 1,
-      sym__choice,
-    STATE(235), 1,
-      sym_contentspec,
-    ACTIONS(153), 2,
-      anon_sym_EMPTY,
-      anon_sym_ANY,
-    STATE(238), 3,
-      sym_Mixed,
-      sym_children,
-      sym_PEReference,
-  [753] = 7,
-    ACTIONS(157), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(159), 1,
+      sym__S,
+  [779] = 7,
+    ACTIONS(147), 1,
       anon_sym_AMP,
-    ACTIONS(161), 1,
+    ACTIONS(149), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(163), 1,
+    ACTIONS(151), 1,
       anon_sym_AMP_POUNDx,
+    ACTIONS(155), 1,
+      anon_sym_DQUOTE,
     ACTIONS(165), 1,
       aux_sym_AttValue_token1,
-    STATE(32), 2,
+    STATE(24), 2,
       sym__Reference,
       aux_sym_AttValue_repeat1,
-    STATE(93), 2,
+    STATE(96), 2,
       sym_EntityRef,
       sym_CharRef,
-  [777] = 7,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(169), 1,
-      anon_sym_POUNDFIXED,
-    ACTIONS(171), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(173), 1,
-      anon_sym_SQUOTE,
-    STATE(179), 1,
-      sym_DefaultDecl,
-    ACTIONS(167), 2,
-      anon_sym_POUNDREQUIRED,
-      anon_sym_POUNDIMPLIED,
-    STATE(236), 2,
-      sym_PEReference,
-      sym_AttValue,
-  [801] = 7,
-    ACTIONS(175), 1,
+  [803] = 7,
+    ACTIONS(167), 1,
       anon_sym_SQUOTE,
-    ACTIONS(177), 1,
-      anon_sym_AMP,
-    ACTIONS(180), 1,
-      anon_sym_AMP_POUND,
-    ACTIONS(183), 1,
-      anon_sym_AMP_POUNDx,
-    ACTIONS(186), 1,
-      aux_sym_AttValue_token2,
-    STATE(30), 2,
-      sym__Reference,
-      aux_sym_AttValue_repeat2,
-    STATE(98), 2,
-      sym_EntityRef,
-      sym_CharRef,
-  [825] = 7,
-    ACTIONS(141), 1,
+    ACTIONS(169), 1,
       anon_sym_AMP,
-    ACTIONS(143), 1,
+    ACTIONS(172), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(145), 1,
+    ACTIONS(175), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(157), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(189), 1,
+    ACTIONS(178), 1,
       aux_sym_AttValue_token2,
     STATE(30), 2,
       sym__Reference,
@@ -3518,25 +3502,58 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(98), 2,
       sym_EntityRef,
       sym_CharRef,
-  [849] = 7,
-    ACTIONS(191), 1,
+  [827] = 7,
+    ACTIONS(181), 1,
       anon_sym_DQUOTE,
-    ACTIONS(193), 1,
+    ACTIONS(183), 1,
       anon_sym_AMP,
-    ACTIONS(196), 1,
+    ACTIONS(186), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(199), 1,
+    ACTIONS(189), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(202), 1,
+    ACTIONS(192), 1,
       aux_sym_AttValue_token1,
-    STATE(32), 2,
+    STATE(31), 2,
       sym__Reference,
       aux_sym_AttValue_repeat1,
-    STATE(93), 2,
+    STATE(96), 2,
       sym_EntityRef,
       sym_CharRef,
-  [873] = 1,
-    ACTIONS(205), 9,
+  [851] = 6,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(197), 1,
+      anon_sym_LPAREN,
+    STATE(110), 1,
+      sym__choice,
+    STATE(224), 1,
+      sym_contentspec,
+    ACTIONS(195), 2,
+      anon_sym_EMPTY,
+      anon_sym_ANY,
+    STATE(226), 3,
+      sym_Mixed,
+      sym_children,
+      sym_PEReference,
+  [873] = 7,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(201), 1,
+      anon_sym_POUNDFIXED,
+    ACTIONS(203), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(205), 1,
+      anon_sym_SQUOTE,
+    STATE(240), 1,
+      sym_DefaultDecl,
+    ACTIONS(199), 2,
+      anon_sym_POUNDREQUIRED,
+      anon_sym_POUNDIMPLIED,
+    STATE(236), 2,
+      sym_PEReference,
+      sym_AttValue,
+  [897] = 1,
+    ACTIONS(207), 9,
       anon_sym_GT,
       anon_sym_PIPE,
       anon_sym_RPAREN,
@@ -3546,550 +3563,595 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [885] = 7,
-    ACTIONS(139), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(159), 1,
-      anon_sym_AMP,
-    ACTIONS(161), 1,
-      anon_sym_AMP_POUND,
-    ACTIONS(163), 1,
-      anon_sym_AMP_POUNDx,
-    ACTIONS(207), 1,
-      aux_sym_AttValue_token1,
-    STATE(28), 2,
-      sym__Reference,
-      aux_sym_AttValue_repeat1,
-    STATE(93), 2,
-      sym_EntityRef,
-      sym_CharRef,
   [909] = 2,
     ACTIONS(211), 1,
       anon_sym_LT_BANG,
     ACTIONS(209), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
   [922] = 2,
     ACTIONS(215), 1,
       anon_sym_LT_BANG,
     ACTIONS(213), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
   [935] = 2,
     ACTIONS(219), 1,
       anon_sym_LT_BANG,
     ACTIONS(217), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
   [948] = 2,
     ACTIONS(223), 1,
       anon_sym_LT_BANG,
     ACTIONS(221), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [961] = 8,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(225), 1,
-      sym_Name,
+  [961] = 2,
     ACTIONS(227), 1,
-      anon_sym_LPAREN,
-    ACTIONS(229), 1,
-      anon_sym_POUNDPCDATA,
-    ACTIONS(231), 1,
-      sym__S,
-    STATE(16), 1,
-      sym_PEReference,
-    STATE(44), 1,
-      sym__cp,
-    STATE(45), 1,
-      sym__choice,
-  [986] = 2,
-    ACTIONS(235), 1,
       anon_sym_LT_BANG,
-    ACTIONS(233), 7,
+    ACTIONS(225), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [999] = 2,
-    ACTIONS(239), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(237), 7,
-      sym_Comment,
-      ts_builtin_sym_end,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_RBRACK_RBRACK_GT,
+  [974] = 6,
+    ACTIONS(133), 1,
       anon_sym_PERCENT,
+    ACTIONS(231), 1,
+      anon_sym_RPAREN,
+    ACTIONS(233), 1,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1012] = 2,
-    ACTIONS(241), 1,
+    STATE(77), 1,
+      aux_sym__choice_repeat1,
+    ACTIONS(229), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+    STATE(111), 2,
+      sym_PEReference,
+      aux_sym__choice_repeat2,
+  [995] = 2,
+    ACTIONS(237), 1,
       anon_sym_LT_BANG,
-    ACTIONS(125), 7,
+    ACTIONS(235), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1025] = 2,
+  [1008] = 6,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(239), 1,
+      anon_sym_RPAREN,
+    ACTIONS(241), 1,
+      sym__S,
+    STATE(77), 1,
+      aux_sym__choice_repeat1,
+    ACTIONS(229), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+    STATE(105), 2,
+      sym_PEReference,
+      aux_sym__choice_repeat2,
+  [1029] = 2,
     ACTIONS(245), 1,
       anon_sym_LT_BANG,
     ACTIONS(243), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1038] = 6,
+  [1042] = 6,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(249), 1,
+    ACTIONS(247), 1,
       anon_sym_RPAREN,
-    ACTIONS(251), 1,
+    ACTIONS(249), 1,
       sym__S,
-    STATE(54), 1,
+    STATE(42), 1,
       aux_sym__choice_repeat1,
-    ACTIONS(247), 2,
+    ACTIONS(229), 2,
       anon_sym_PIPE,
       anon_sym_COMMA,
-    STATE(95), 2,
+    STATE(108), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [1059] = 2,
-    ACTIONS(90), 3,
+  [1063] = 2,
+    ACTIONS(78), 3,
       anon_sym_STAR,
       anon_sym_QMARK,
       anon_sym_PLUS,
-    ACTIONS(88), 5,
+    ACTIONS(76), 5,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [1072] = 2,
+  [1076] = 2,
+    ACTIONS(251), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(102), 7,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_RBRACK_RBRACK_GT,
+      anon_sym_PERCENT,
+      sym__S,
+  [1089] = 2,
     ACTIONS(255), 1,
       anon_sym_LT_BANG,
     ACTIONS(253), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1085] = 2,
+  [1102] = 2,
     ACTIONS(259), 1,
       anon_sym_LT_BANG,
     ACTIONS(257), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
+  [1115] = 2,
+    ACTIONS(263), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(261), 7,
+      sym_Comment,
+      ts_builtin_sym_end,
       anon_sym_LT_QMARK,
-  [1098] = 6,
-    ACTIONS(133), 1,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
-    ACTIONS(261), 1,
-      anon_sym_RPAREN,
-    ACTIONS(263), 1,
       sym__S,
-    STATE(85), 1,
-      aux_sym__choice_repeat1,
-    ACTIONS(247), 2,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-    STATE(109), 2,
-      sym_PEReference,
-      aux_sym__choice_repeat2,
-  [1119] = 2,
+  [1128] = 2,
     ACTIONS(267), 1,
       anon_sym_LT_BANG,
     ACTIONS(265), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1132] = 2,
+  [1141] = 2,
     ACTIONS(271), 1,
       anon_sym_LT_BANG,
     ACTIONS(269), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1145] = 2,
+  [1154] = 2,
     ACTIONS(275), 1,
       anon_sym_LT_BANG,
     ACTIONS(273), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1158] = 2,
+  [1167] = 2,
     ACTIONS(279), 1,
       anon_sym_LT_BANG,
     ACTIONS(277), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1171] = 2,
+  [1180] = 2,
     ACTIONS(283), 1,
       anon_sym_LT_BANG,
     ACTIONS(281), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1184] = 6,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(285), 1,
-      anon_sym_RPAREN,
+  [1193] = 2,
     ACTIONS(287), 1,
-      sym__S,
-    STATE(85), 1,
-      aux_sym__choice_repeat1,
-    ACTIONS(247), 2,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-    STATE(110), 2,
-      sym_PEReference,
-      aux_sym__choice_repeat2,
-  [1205] = 2,
-    ACTIONS(291), 1,
       anon_sym_LT_BANG,
-    ACTIONS(289), 7,
+    ACTIONS(285), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1218] = 2,
+  [1206] = 8,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(289), 1,
+      sym_Name,
+    ACTIONS(291), 1,
+      anon_sym_LPAREN,
+    ACTIONS(293), 1,
+      anon_sym_POUNDPCDATA,
     ACTIONS(295), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(293), 7,
-      sym_Comment,
-      ts_builtin_sym_end,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_RBRACK_RBRACK_GT,
+      sym__S,
+    STATE(13), 1,
+      sym_PEReference,
+    STATE(44), 1,
+      sym__cp,
+    STATE(45), 1,
+      sym__choice,
+  [1231] = 6,
+    ACTIONS(133), 1,
       anon_sym_PERCENT,
+    ACTIONS(239), 1,
+      anon_sym_RPAREN,
+    ACTIONS(241), 1,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1231] = 2,
+    STATE(40), 1,
+      aux_sym__choice_repeat1,
+    ACTIONS(229), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+    STATE(105), 2,
+      sym_PEReference,
+      aux_sym__choice_repeat2,
+  [1252] = 2,
     ACTIONS(299), 1,
       anon_sym_LT_BANG,
     ACTIONS(297), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1244] = 2,
+  [1265] = 2,
     ACTIONS(303), 1,
       anon_sym_LT_BANG,
     ACTIONS(301), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1257] = 2,
+  [1278] = 2,
     ACTIONS(307), 1,
       anon_sym_LT_BANG,
     ACTIONS(305), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1270] = 2,
+  [1291] = 2,
     ACTIONS(311), 1,
       anon_sym_LT_BANG,
     ACTIONS(309), 7,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_RBRACK_RBRACK_GT,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1283] = 6,
+  [1304] = 6,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(285), 1,
-      anon_sym_RPAREN,
-    ACTIONS(287), 1,
+    ACTIONS(289), 1,
+      sym_Name,
+    ACTIONS(291), 1,
+      anon_sym_LPAREN,
+    ACTIONS(313), 1,
       sym__S,
-    STATE(48), 1,
-      aux_sym__choice_repeat1,
-    ACTIONS(247), 2,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-    STATE(110), 2,
+    STATE(44), 1,
+      sym__cp,
+    STATE(45), 2,
+      sym__choice,
       sym_PEReference,
-      aux_sym__choice_repeat2,
-  [1304] = 7,
+  [1324] = 7,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(313), 1,
-      anon_sym_PIPE,
     ACTIONS(315), 1,
-      anon_sym_RPAREN,
+      anon_sym_PIPE,
     ACTIONS(317), 1,
+      anon_sym_RPAREN,
+    ACTIONS(319), 1,
       sym__S,
-    STATE(66), 1,
+    STATE(115), 1,
       aux_sym_Mixed_repeat1,
     STATE(125), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-  [1326] = 7,
+  [1346] = 6,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(313), 1,
-      anon_sym_PIPE,
-    ACTIONS(319), 1,
-      anon_sym_RPAREN,
+    ACTIONS(289), 1,
+      sym_Name,
+    ACTIONS(291), 1,
+      anon_sym_LPAREN,
     ACTIONS(321), 1,
       sym__S,
-    STATE(107), 1,
-      aux_sym_Mixed_repeat1,
-    STATE(122), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(114), 1,
+      sym__cp,
+    STATE(45), 2,
+      sym__choice,
       sym_PEReference,
-  [1348] = 6,
+  [1366] = 7,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(225), 1,
-      sym_Name,
-    ACTIONS(227), 1,
-      anon_sym_LPAREN,
+    ACTIONS(315), 1,
+      anon_sym_PIPE,
     ACTIONS(323), 1,
+      anon_sym_RPAREN,
+    ACTIONS(325), 1,
       sym__S,
-    STATE(92), 1,
-      sym__cp,
-    STATE(45), 2,
-      sym__choice,
+    STATE(63), 1,
+      aux_sym_Mixed_repeat1,
+    STATE(124), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(148), 1,
       sym_PEReference,
-  [1368] = 6,
+  [1388] = 6,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(225), 1,
+    ACTIONS(289), 1,
       sym_Name,
-    ACTIONS(227), 1,
+    ACTIONS(291), 1,
       anon_sym_LPAREN,
-    ACTIONS(325), 1,
+    ACTIONS(327), 1,
       sym__S,
-    STATE(44), 1,
+    STATE(95), 1,
       sym__cp,
     STATE(45), 2,
       sym__choice,
       sym_PEReference,
-  [1388] = 7,
+  [1408] = 7,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(313), 1,
+    ACTIONS(315), 1,
       anon_sym_PIPE,
-    ACTIONS(327), 1,
-      anon_sym_RPAREN,
     ACTIONS(329), 1,
+      anon_sym_RPAREN,
+    ACTIONS(331), 1,
       sym__S,
-    STATE(107), 1,
+    STATE(68), 1,
       aux_sym_Mixed_repeat1,
-    STATE(144), 1,
+    STATE(135), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-  [1410] = 7,
+  [1430] = 7,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(313), 1,
+    ACTIONS(315), 1,
       anon_sym_PIPE,
-    ACTIONS(331), 1,
-      anon_sym_RPAREN,
     ACTIONS(333), 1,
+      anon_sym_RPAREN,
+    ACTIONS(335), 1,
       sym__S,
-    STATE(63), 1,
+    STATE(115), 1,
       aux_sym_Mixed_repeat1,
-    STATE(134), 1,
+    STATE(118), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-  [1432] = 7,
+  [1452] = 7,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(225), 1,
+    ACTIONS(289), 1,
       sym_Name,
-    ACTIONS(227), 1,
+    ACTIONS(291), 1,
       anon_sym_LPAREN,
-    ACTIONS(335), 1,
+    ACTIONS(337), 1,
       anon_sym_POUNDPCDATA,
-    STATE(14), 1,
+    STATE(16), 1,
       sym_PEReference,
     STATE(45), 1,
       sym__choice,
-    STATE(61), 1,
+    STATE(57), 1,
       sym__cp,
-  [1454] = 6,
+  [1474] = 6,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(225), 1,
+    ACTIONS(339), 1,
       sym_Name,
-    ACTIONS(227), 1,
-      anon_sym_LPAREN,
-    ACTIONS(337), 1,
+    ACTIONS(341), 1,
+      anon_sym_PIPE,
+    ACTIONS(343), 1,
       sym__S,
-    STATE(105), 1,
-      sym__cp,
-    STATE(45), 2,
-      sym__choice,
+    STATE(112), 1,
+      aux_sym_NotationType_repeat1,
+    STATE(192), 1,
       sym_PEReference,
-  [1474] = 5,
+  [1493] = 6,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(225), 1,
-      sym_Name,
-    ACTIONS(227), 1,
+    ACTIONS(341), 1,
+      anon_sym_PIPE,
+    ACTIONS(343), 1,
+      sym__S,
+    ACTIONS(345), 1,
+      sym_Name,
+    STATE(70), 1,
+      aux_sym_NotationType_repeat1,
+    STATE(199), 1,
+      sym_PEReference,
+  [1512] = 5,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(289), 1,
+      sym_Name,
+    ACTIONS(291), 1,
       anon_sym_LPAREN,
-    STATE(105), 1,
+    STATE(100), 1,
       sym__cp,
     STATE(45), 2,
       sym__choice,
       sym_PEReference,
-  [1491] = 2,
-    ACTIONS(341), 1,
+  [1529] = 2,
+    ACTIONS(349), 1,
       anon_sym_LT_BANG,
-    ACTIONS(339), 5,
+    ACTIONS(347), 5,
       sym_Comment,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1502] = 2,
-    ACTIONS(241), 2,
+  [1540] = 2,
+    ACTIONS(251), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(125), 4,
+    ACTIONS(102), 4,
       anon_sym_PERCENT,
       anon_sym_SQUOTE,
       aux_sym_EntityValue_token2,
       anon_sym_AMP_POUNDx,
-  [1513] = 2,
-    ACTIONS(241), 2,
+  [1551] = 2,
+    ACTIONS(353), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(125), 4,
+    ACTIONS(351), 4,
       anon_sym_PERCENT,
-      anon_sym_DQUOTE,
-      aux_sym_EntityValue_token1,
+      anon_sym_SQUOTE,
+      aux_sym_EntityValue_token2,
       anon_sym_AMP_POUNDx,
-  [1524] = 5,
+  [1562] = 2,
+    ACTIONS(357), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(355), 5,
+      sym_Comment,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_PERCENT,
+      sym__S,
+  [1573] = 4,
+    ACTIONS(364), 1,
+      sym__S,
+    STATE(77), 1,
+      aux_sym__choice_repeat1,
+    ACTIONS(359), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+    ACTIONS(362), 2,
+      anon_sym_RPAREN,
+      anon_sym_PERCENT,
+  [1588] = 5,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(225), 1,
+    ACTIONS(289), 1,
       sym_Name,
-    ACTIONS(227), 1,
+    ACTIONS(291), 1,
       anon_sym_LPAREN,
-    STATE(100), 1,
+    STATE(114), 1,
       sym__cp,
     STATE(45), 2,
       sym__choice,
       sym_PEReference,
-  [1541] = 5,
+  [1605] = 2,
+    ACTIONS(369), 2,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(367), 4,
+      anon_sym_PERCENT,
+      anon_sym_SQUOTE,
+      aux_sym_EntityValue_token2,
+      anon_sym_AMP_POUNDx,
+  [1616] = 6,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(341), 1,
+      anon_sym_PIPE,
+    ACTIONS(343), 1,
+      sym__S,
+    ACTIONS(345), 1,
+      sym_Name,
+    STATE(112), 1,
+      aux_sym_NotationType_repeat1,
+    STATE(199), 1,
+      sym_PEReference,
+  [1635] = 5,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(225), 1,
+    ACTIONS(289), 1,
       sym_Name,
-    ACTIONS(227), 1,
+    ACTIONS(291), 1,
       anon_sym_LPAREN,
-    STATE(61), 1,
+    STATE(57), 1,
       sym__cp,
     STATE(45), 2,
       sym__choice,
       sym_PEReference,
-  [1558] = 2,
-    ACTIONS(345), 2,
+  [1652] = 2,
+    ACTIONS(373), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(343), 4,
+    ACTIONS(371), 4,
       anon_sym_PERCENT,
       anon_sym_SQUOTE,
       aux_sym_EntityValue_token2,
       anon_sym_AMP_POUNDx,
-  [1569] = 2,
-    ACTIONS(349), 2,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-    ACTIONS(347), 4,
-      anon_sym_PERCENT,
-      anon_sym_SQUOTE,
-      aux_sym_EntityValue_token2,
-      anon_sym_AMP_POUNDx,
-  [1580] = 2,
-    ACTIONS(353), 2,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-    ACTIONS(351), 4,
-      anon_sym_PERCENT,
+  [1663] = 5,
+    ACTIONS(375), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(377), 1,
       anon_sym_SQUOTE,
-      aux_sym_EntityValue_token2,
-      anon_sym_AMP_POUNDx,
-  [1591] = 2,
+    ACTIONS(379), 1,
+      anon_sym_SYSTEM,
+    ACTIONS(381), 1,
+      anon_sym_PUBLIC,
+    STATE(230), 2,
+      sym_EntityValue,
+      sym_ExternalID,
+  [1680] = 2,
     ACTIONS(353), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
@@ -4098,150 +4160,119 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
       aux_sym_EntityValue_token1,
       anon_sym_AMP_POUNDx,
-  [1602] = 5,
-    ACTIONS(355), 1,
+  [1691] = 6,
+    ACTIONS(375), 1,
       anon_sym_DQUOTE,
-    ACTIONS(357), 1,
+    ACTIONS(377), 1,
       anon_sym_SQUOTE,
-    ACTIONS(359), 1,
+    ACTIONS(379), 1,
       anon_sym_SYSTEM,
-    ACTIONS(361), 1,
+    ACTIONS(381), 1,
       anon_sym_PUBLIC,
-    STATE(218), 2,
-      sym_EntityValue,
+    STATE(172), 1,
       sym_ExternalID,
-  [1619] = 6,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(363), 1,
-      sym_Name,
-    ACTIONS(365), 1,
-      anon_sym_PIPE,
-    ACTIONS(367), 1,
-      sym__S,
-    STATE(115), 1,
-      aux_sym_NotationType_repeat1,
-    STATE(191), 1,
-      sym_PEReference,
-  [1638] = 6,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(365), 1,
-      anon_sym_PIPE,
-    ACTIONS(367), 1,
-      sym__S,
-    ACTIONS(369), 1,
-      sym_Name,
-    STATE(115), 1,
-      aux_sym_NotationType_repeat1,
-    STATE(198), 1,
-      sym_PEReference,
-  [1657] = 2,
-    ACTIONS(373), 1,
+    STATE(212), 1,
+      sym_EntityValue,
+  [1710] = 2,
+    ACTIONS(385), 1,
       anon_sym_LT_BANG,
-    ACTIONS(371), 5,
+    ACTIONS(383), 5,
       sym_Comment,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_PERCENT,
-      sym__S,
       anon_sym_LT_QMARK,
-  [1668] = 5,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(359), 1,
-      anon_sym_SYSTEM,
-    ACTIONS(375), 1,
-      anon_sym_PUBLIC,
-    STATE(254), 1,
-      sym_PEReference,
-    STATE(223), 2,
-      sym_ExternalID,
-      sym_PublicID,
-  [1685] = 4,
-    ACTIONS(382), 1,
-      sym__S,
-    STATE(85), 1,
-      aux_sym__choice_repeat1,
-    ACTIONS(377), 2,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-    ACTIONS(380), 2,
-      anon_sym_RPAREN,
-      anon_sym_PERCENT,
-  [1700] = 6,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(365), 1,
-      anon_sym_PIPE,
-    ACTIONS(367), 1,
-      sym__S,
-    ACTIONS(369), 1,
-      sym_Name,
-    STATE(81), 1,
-      aux_sym_NotationType_repeat1,
-    STATE(198), 1,
-      sym_PEReference,
-  [1719] = 2,
-    ACTIONS(387), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(385), 5,
-      sym_Comment,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_PERCENT,
       sym__S,
-      anon_sym_LT_QMARK,
-  [1730] = 2,
-    ACTIONS(345), 2,
+  [1721] = 2,
+    ACTIONS(369), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(343), 4,
+    ACTIONS(367), 4,
       anon_sym_PERCENT,
       anon_sym_DQUOTE,
       aux_sym_EntityValue_token1,
       anon_sym_AMP_POUNDx,
-  [1741] = 2,
-    ACTIONS(349), 2,
+  [1732] = 2,
+    ACTIONS(251), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(347), 4,
+    ACTIONS(102), 4,
       anon_sym_PERCENT,
       anon_sym_DQUOTE,
       aux_sym_EntityValue_token1,
       anon_sym_AMP_POUNDx,
-  [1752] = 6,
-    ACTIONS(355), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(357), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(359), 1,
+  [1743] = 5,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(379), 1,
       anon_sym_SYSTEM,
-    ACTIONS(361), 1,
+    ACTIONS(387), 1,
       anon_sym_PUBLIC,
-    STATE(175), 1,
+    STATE(259), 1,
+      sym_PEReference,
+    STATE(215), 2,
       sym_ExternalID,
-    STATE(220), 1,
-      sym_EntityValue,
+      sym_PublicID,
+  [1760] = 2,
+    ACTIONS(373), 2,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(371), 4,
+      anon_sym_PERCENT,
+      anon_sym_DQUOTE,
+      aux_sym_EntityValue_token1,
+      anon_sym_AMP_POUNDx,
   [1771] = 6,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(365), 1,
+    ACTIONS(341), 1,
       anon_sym_PIPE,
-    ACTIONS(367), 1,
+    ACTIONS(343), 1,
       sym__S,
     ACTIONS(389), 1,
       sym_Name,
-    STATE(82), 1,
+    STATE(80), 1,
       aux_sym_NotationType_repeat1,
-    STATE(206), 1,
+    STATE(205), 1,
+      sym_PEReference,
+  [1790] = 4,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(393), 1,
+      anon_sym_RPAREN,
+    STATE(169), 1,
+      sym_PEReference,
+    ACTIONS(391), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+  [1804] = 4,
+    ACTIONS(395), 1,
+      anon_sym_RPAREN,
+    ACTIONS(397), 1,
+      anon_sym_PERCENT,
+    ACTIONS(400), 1,
+      sym__S,
+    STATE(93), 2,
+      sym_PEReference,
+      aux_sym__choice_repeat2,
+  [1818] = 5,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(323), 1,
+      anon_sym_RPAREN,
+    ACTIONS(403), 1,
+      anon_sym_PIPE,
+    STATE(124), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(148), 1,
       sym_PEReference,
-  [1790] = 1,
-    ACTIONS(380), 5,
+  [1834] = 1,
+    ACTIONS(362), 5,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [1798] = 2,
+  [1842] = 2,
     ACTIONS(353), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
@@ -4249,43 +4280,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
       anon_sym_AMP_POUNDx,
       aux_sym_AttValue_token1,
-  [1808] = 2,
-    ACTIONS(345), 2,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-    ACTIONS(343), 3,
-      anon_sym_SQUOTE,
-      anon_sym_AMP_POUNDx,
-      aux_sym_AttValue_token2,
-  [1818] = 4,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(285), 1,
-      anon_sym_RPAREN,
-    ACTIONS(391), 1,
-      sym__S,
-    STATE(104), 2,
-      sym_PEReference,
-      aux_sym__choice_repeat2,
-  [1832] = 2,
-    ACTIONS(349), 2,
+  [1852] = 2,
+    ACTIONS(369), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(347), 3,
+    ACTIONS(367), 3,
       anon_sym_SQUOTE,
       anon_sym_AMP_POUNDx,
       aux_sym_AttValue_token2,
-  [1842] = 4,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(285), 1,
-      anon_sym_RPAREN,
-    STATE(167), 1,
-      sym_PEReference,
-    ACTIONS(393), 2,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-  [1856] = 2,
+  [1862] = 2,
     ACTIONS(353), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
@@ -4293,86 +4296,106 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_SQUOTE,
       anon_sym_AMP_POUNDx,
       aux_sym_AttValue_token2,
-  [1866] = 1,
-    ACTIONS(395), 5,
+  [1872] = 1,
+    ACTIONS(405), 5,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [1874] = 1,
-    ACTIONS(397), 5,
+  [1880] = 1,
+    ACTIONS(407), 5,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [1882] = 2,
-    ACTIONS(345), 2,
+  [1888] = 4,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(239), 1,
+      anon_sym_RPAREN,
+    STATE(169), 1,
+      sym_PEReference,
+    ACTIONS(391), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+  [1902] = 2,
+    ACTIONS(373), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(343), 3,
+    ACTIONS(371), 3,
       anon_sym_DQUOTE,
       anon_sym_AMP_POUNDx,
       aux_sym_AttValue_token1,
-  [1892] = 2,
-    ACTIONS(349), 2,
+  [1912] = 2,
+    ACTIONS(373), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(347), 3,
-      anon_sym_DQUOTE,
+    ACTIONS(371), 3,
+      anon_sym_SQUOTE,
       anon_sym_AMP_POUNDx,
-      aux_sym_AttValue_token1,
-  [1902] = 5,
+      aux_sym_AttValue_token2,
+  [1922] = 5,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(315), 1,
-      anon_sym_RPAREN,
-    ACTIONS(399), 1,
+    ACTIONS(403), 1,
       anon_sym_PIPE,
-    STATE(125), 1,
+    ACTIONS(409), 1,
+      anon_sym_RPAREN,
+    STATE(139), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-  [1918] = 4,
-    ACTIONS(401), 1,
-      anon_sym_RPAREN,
-    ACTIONS(403), 1,
+  [1938] = 4,
+    ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(406), 1,
+    ACTIONS(231), 1,
+      anon_sym_RPAREN,
+    ACTIONS(411), 1,
       sym__S,
-    STATE(104), 2,
+    STATE(93), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [1932] = 1,
-    ACTIONS(409), 5,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
+  [1952] = 2,
+    ACTIONS(369), 2,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(367), 3,
+      anon_sym_DQUOTE,
+      anon_sym_AMP_POUNDx,
+      aux_sym_AttValue_token1,
+  [1962] = 4,
+    ACTIONS(133), 1,
       anon_sym_PERCENT,
+    ACTIONS(415), 1,
       sym__S,
-  [1940] = 5,
+    STATE(184), 1,
+      sym_PEReference,
+    ACTIONS(413), 2,
+      anon_sym_IGNORE,
+      anon_sym_INCLUDE,
+  [1976] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(327), 1,
+    ACTIONS(239), 1,
       anon_sym_RPAREN,
-    ACTIONS(399), 1,
-      anon_sym_PIPE,
-    STATE(144), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(158), 1,
-      sym_PEReference,
-  [1956] = 4,
-    ACTIONS(411), 1,
-      anon_sym_PIPE,
-    ACTIONS(416), 1,
+    ACTIONS(417), 1,
       sym__S,
-    STATE(107), 1,
-      aux_sym_Mixed_repeat1,
-    ACTIONS(414), 2,
-      anon_sym_RPAREN,
+    STATE(93), 2,
+      sym_PEReference,
+      aux_sym__choice_repeat2,
+  [1990] = 4,
+    ACTIONS(133), 1,
       anon_sym_PERCENT,
-  [1970] = 2,
+    ACTIONS(231), 1,
+      anon_sym_RPAREN,
+    STATE(169), 1,
+      sym_PEReference,
+    ACTIONS(391), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+  [2004] = 2,
     ACTIONS(419), 2,
       anon_sym_GT,
       sym__S,
@@ -4380,88 +4403,65 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR,
       anon_sym_QMARK,
       anon_sym_PLUS,
-  [1980] = 4,
+  [2014] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(423), 1,
+    ACTIONS(393), 1,
       anon_sym_RPAREN,
-    ACTIONS(425), 1,
+    ACTIONS(423), 1,
       sym__S,
-    STATE(104), 2,
+    STATE(93), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [1994] = 4,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(261), 1,
-      anon_sym_RPAREN,
+  [2028] = 4,
     ACTIONS(427), 1,
+      anon_sym_PIPE,
+    ACTIONS(430), 1,
       sym__S,
-    STATE(104), 2,
-      sym_PEReference,
-      aux_sym__choice_repeat2,
-  [2008] = 5,
-    ACTIONS(133), 1,
+    STATE(112), 1,
+      aux_sym_NotationType_repeat1,
+    ACTIONS(425), 2,
       anon_sym_PERCENT,
-    ACTIONS(399), 1,
-      anon_sym_PIPE,
-    ACTIONS(429), 1,
-      anon_sym_RPAREN,
-    STATE(141), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(158), 1,
-      sym_PEReference,
-  [2024] = 5,
+      sym_Name,
+  [2042] = 5,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(399), 1,
+    ACTIONS(403), 1,
       anon_sym_PIPE,
-    ACTIONS(431), 1,
+    ACTIONS(433), 1,
       anon_sym_RPAREN,
-    STATE(132), 1,
+    STATE(128), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
-      sym_PEReference,
-  [2040] = 4,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(261), 1,
-      anon_sym_RPAREN,
-    STATE(167), 1,
+    STATE(148), 1,
       sym_PEReference,
-    ACTIONS(393), 2,
+  [2058] = 1,
+    ACTIONS(435), 5,
       anon_sym_PIPE,
-      anon_sym_COMMA,
-  [2054] = 4,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(423), 1,
       anon_sym_RPAREN,
-    STATE(167), 1,
-      sym_PEReference,
-    ACTIONS(393), 2,
-      anon_sym_PIPE,
       anon_sym_COMMA,
-  [2068] = 4,
-    ACTIONS(435), 1,
+      anon_sym_PERCENT,
+      sym__S,
+  [2066] = 4,
+    ACTIONS(437), 1,
       anon_sym_PIPE,
-    ACTIONS(438), 1,
+    ACTIONS(442), 1,
       sym__S,
     STATE(115), 1,
-      aux_sym_NotationType_repeat1,
-    ACTIONS(433), 2,
+      aux_sym_Mixed_repeat1,
+    ACTIONS(440), 2,
+      anon_sym_RPAREN,
       anon_sym_PERCENT,
-      sym_Name,
-  [2082] = 4,
+  [2080] = 5,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(443), 1,
-      sym__S,
-    STATE(182), 1,
+    ACTIONS(317), 1,
+      anon_sym_RPAREN,
+    ACTIONS(403), 1,
+      anon_sym_PIPE,
+    STATE(125), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(148), 1,
       sym_PEReference,
-    ACTIONS(441), 2,
-      anon_sym_IGNORE,
-      anon_sym_INCLUDE,
   [2096] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
@@ -4469,237 +4469,237 @@ static const uint16_t ts_small_parse_table[] = {
       sym_Name,
     ACTIONS(447), 1,
       anon_sym_GT,
-    STATE(230), 1,
+    STATE(222), 1,
       sym_PEReference,
   [2109] = 4,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(317), 1,
+      anon_sym_RPAREN,
+    STATE(121), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(148), 1,
+      sym_PEReference,
+  [2122] = 4,
     ACTIONS(449), 1,
       anon_sym_PIPE,
     ACTIONS(451), 1,
       anon_sym_RPAREN,
     ACTIONS(453), 1,
       sym__S,
-    STATE(135), 1,
+    STATE(134), 1,
       aux_sym_Enumeration_repeat1,
-  [2122] = 1,
-    ACTIONS(433), 4,
-      anon_sym_PIPE,
-      anon_sym_PERCENT,
-      sym__S,
-      sym_Name,
-  [2129] = 4,
+  [2135] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(455), 1,
-      sym_Name,
-    ACTIONS(457), 1,
-      sym__S,
-    STATE(91), 1,
+    STATE(197), 1,
       sym_PEReference,
-  [2142] = 4,
-    ACTIONS(459), 1,
+    ACTIONS(455), 2,
+      anon_sym_IGNORE,
+      anon_sym_INCLUDE,
+  [2146] = 4,
+    ACTIONS(457), 1,
       anon_sym_RPAREN,
-    ACTIONS(461), 1,
+    ACTIONS(459), 1,
       anon_sym_PERCENT,
     STATE(121), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-  [2155] = 4,
+  [2159] = 1,
+    ACTIONS(462), 4,
+      anon_sym_PIPE,
+      anon_sym_PERCENT,
+      sym__S,
+      sym_Name,
+  [2166] = 1,
+    ACTIONS(464), 4,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_PERCENT,
+      sym__S,
+  [2173] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(327), 1,
+    ACTIONS(433), 1,
       anon_sym_RPAREN,
     STATE(121), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-  [2168] = 4,
-    ACTIONS(449), 1,
-      anon_sym_PIPE,
-    ACTIONS(464), 1,
-      anon_sym_RPAREN,
-    ACTIONS(466), 1,
-      sym__S,
-    STATE(135), 1,
-      aux_sym_Enumeration_repeat1,
-  [2181] = 2,
-    ACTIONS(470), 1,
-      sym__S,
-    ACTIONS(468), 3,
-      anon_sym_PIPE,
-      anon_sym_PERCENT,
-      sym_Name,
-  [2190] = 4,
+  [2186] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(431), 1,
+    ACTIONS(409), 1,
       anon_sym_RPAREN,
     STATE(121), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-  [2203] = 4,
+  [2199] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(473), 1,
+    ACTIONS(466), 1,
       sym_Name,
-    ACTIONS(475), 1,
+    ACTIONS(468), 1,
       sym__S,
-    STATE(143), 1,
+    STATE(123), 1,
       sym_PEReference,
-  [2216] = 1,
-    ACTIONS(414), 4,
+  [2212] = 1,
+    ACTIONS(440), 4,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_PERCENT,
       sym__S,
-  [2223] = 3,
-    ACTIONS(477), 1,
+  [2219] = 4,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(470), 1,
+      anon_sym_RPAREN,
+    STATE(121), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(148), 1,
+      sym_PEReference,
+  [2232] = 3,
+    ACTIONS(472), 1,
       anon_sym_GT,
-    ACTIONS(479), 1,
+    ACTIONS(474), 1,
       sym__S,
-    STATE(140), 2,
+    STATE(129), 2,
       sym_AttDef,
       aux_sym_AttlistDecl_repeat1,
-  [2234] = 3,
+  [2243] = 4,
+    ACTIONS(477), 1,
+      anon_sym_ELEMENT,
+    ACTIONS(479), 1,
+      anon_sym_ATTLIST,
     ACTIONS(481), 1,
-      anon_sym_GT,
+      anon_sym_NOTATION,
     ACTIONS(483), 1,
-      sym__S,
-    STATE(129), 2,
-      sym_AttDef,
-      aux_sym_AttlistDecl_repeat1,
-  [2245] = 4,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(486), 1,
-      sym_Name,
-    ACTIONS(488), 1,
-      sym__S,
-    STATE(127), 1,
-      sym_PEReference,
-  [2258] = 2,
-    ACTIONS(490), 1,
-      sym__S,
-    ACTIONS(433), 3,
-      anon_sym_PIPE,
-      anon_sym_PERCENT,
-      sym_Name,
-  [2267] = 4,
+      anon_sym_ENTITY,
+  [2256] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(493), 1,
-      anon_sym_RPAREN,
-    STATE(121), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(158), 1,
-      sym_PEReference,
-  [2280] = 1,
-    ACTIONS(495), 4,
-      anon_sym_PIPE,
-      anon_sym_PERCENT,
-      sym__S,
+    ACTIONS(445), 1,
       sym_Name,
-  [2287] = 4,
+    ACTIONS(485), 1,
+      anon_sym_GT,
+    STATE(222), 1,
+      sym_PEReference,
+  [2269] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(315), 1,
-      anon_sym_RPAREN,
-    STATE(121), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    ACTIONS(487), 1,
+      sym_Name,
+    ACTIONS(489), 1,
+      sym__S,
+    STATE(127), 1,
       sym_PEReference,
-  [2300] = 4,
-    ACTIONS(497), 1,
+  [2282] = 4,
+    ACTIONS(449), 1,
       anon_sym_PIPE,
-    ACTIONS(500), 1,
+    ACTIONS(491), 1,
       anon_sym_RPAREN,
-    ACTIONS(502), 1,
+    ACTIONS(493), 1,
       sym__S,
-    STATE(135), 1,
+    STATE(140), 1,
       aux_sym_Enumeration_repeat1,
-  [2313] = 4,
+  [2295] = 4,
     ACTIONS(449), 1,
       anon_sym_PIPE,
-    ACTIONS(505), 1,
+    ACTIONS(491), 1,
       anon_sym_RPAREN,
-    ACTIONS(507), 1,
+    ACTIONS(493), 1,
       sym__S,
-    STATE(123), 1,
+    STATE(142), 1,
       aux_sym_Enumeration_repeat1,
-  [2326] = 3,
+  [2308] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    STATE(189), 1,
+    ACTIONS(323), 1,
+      anon_sym_RPAREN,
+    STATE(121), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(148), 1,
       sym_PEReference,
-    ACTIONS(509), 2,
-      anon_sym_IGNORE,
-      anon_sym_INCLUDE,
-  [2337] = 4,
+  [2321] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(445), 1,
+    ACTIONS(495), 1,
       sym_Name,
-    ACTIONS(511), 1,
-      anon_sym_GT,
-    STATE(230), 1,
-      sym_PEReference,
-  [2350] = 4,
-    ACTIONS(449), 1,
-      anon_sym_PIPE,
-    ACTIONS(464), 1,
-      anon_sym_RPAREN,
-    ACTIONS(466), 1,
+    ACTIONS(497), 1,
       sym__S,
-    STATE(118), 1,
-      aux_sym_Enumeration_repeat1,
-  [2363] = 3,
-    ACTIONS(511), 1,
+    STATE(91), 1,
+      sym_PEReference,
+  [2334] = 3,
+    ACTIONS(447), 1,
       anon_sym_GT,
-    ACTIONS(513), 1,
+    ACTIONS(499), 1,
       sym__S,
     STATE(129), 2,
       sym_AttDef,
       aux_sym_AttlistDecl_repeat1,
-  [2374] = 4,
+  [2345] = 1,
+    ACTIONS(501), 4,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_PERCENT,
+      sym__S,
+  [2352] = 4,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(515), 1,
+    ACTIONS(503), 1,
       anon_sym_RPAREN,
     STATE(121), 1,
       aux_sym_Mixed_repeat2,
-    STATE(158), 1,
+    STATE(148), 1,
       sym_PEReference,
-  [2387] = 1,
-    ACTIONS(517), 4,
+  [2365] = 4,
+    ACTIONS(449), 1,
       anon_sym_PIPE,
+    ACTIONS(505), 1,
       anon_sym_RPAREN,
-      anon_sym_PERCENT,
+    ACTIONS(507), 1,
+      sym__S,
+    STATE(142), 1,
+      aux_sym_Enumeration_repeat1,
+  [2378] = 3,
+    ACTIONS(509), 1,
+      anon_sym_GT,
+    ACTIONS(511), 1,
       sym__S,
-  [2394] = 1,
-    ACTIONS(519), 4,
+    STATE(137), 2,
+      sym_AttDef,
+      aux_sym_AttlistDecl_repeat1,
+  [2389] = 4,
+    ACTIONS(513), 1,
       anon_sym_PIPE,
+    ACTIONS(516), 1,
       anon_sym_RPAREN,
+    ACTIONS(518), 1,
+      sym__S,
+    STATE(142), 1,
+      aux_sym_Enumeration_repeat1,
+  [2402] = 2,
+    ACTIONS(523), 1,
+      sym__S,
+    ACTIONS(521), 3,
+      anon_sym_PIPE,
+      anon_sym_PERCENT,
+      sym_Name,
+  [2411] = 1,
+    ACTIONS(425), 4,
+      anon_sym_PIPE,
       anon_sym_PERCENT,
       sym__S,
-  [2401] = 4,
-    ACTIONS(133), 1,
+      sym_Name,
+  [2418] = 2,
+    ACTIONS(526), 1,
+      sym__S,
+    ACTIONS(425), 3,
+      anon_sym_PIPE,
       anon_sym_PERCENT,
-    ACTIONS(429), 1,
-      anon_sym_RPAREN,
-    STATE(121), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(158), 1,
-      sym_PEReference,
-  [2414] = 4,
-    ACTIONS(521), 1,
-      anon_sym_ELEMENT,
-    ACTIONS(523), 1,
-      anon_sym_ATTLIST,
-    ACTIONS(525), 1,
-      anon_sym_NOTATION,
-    ACTIONS(527), 1,
-      anon_sym_ENTITY,
+      sym_Name,
   [2427] = 2,
     ACTIONS(531), 1,
       anon_sym_STAR,
@@ -4707,215 +4707,215 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_GT,
       sym__S,
   [2435] = 3,
-    ACTIONS(533), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(535), 1,
-      anon_sym_SQUOTE,
-    STATE(214), 1,
-      sym_PubidLiteral,
-  [2445] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
+    ACTIONS(533), 1,
+      sym_Name,
+    STATE(239), 1,
+      sym_PEReference,
+  [2445] = 2,
     ACTIONS(537), 1,
+      sym__S,
+    ACTIONS(535), 2,
+      anon_sym_RPAREN,
+      anon_sym_PERCENT,
+  [2453] = 3,
+    ACTIONS(539), 1,
+      anon_sym_QMARK_GT,
+    ACTIONS(541), 1,
+      sym__S,
+    STATE(213), 1,
+      sym__EncodingDecl,
+  [2463] = 3,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(543), 1,
       sym_Name,
-    STATE(275), 1,
+    STATE(262), 1,
       sym_PEReference,
-  [2455] = 3,
+  [2473] = 1,
+    ACTIONS(545), 3,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      sym__S,
+  [2479] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(539), 1,
+    ACTIONS(547), 1,
       sym_Name,
-    STATE(128), 1,
+    STATE(141), 1,
       sym_PEReference,
-  [2465] = 3,
+  [2489] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(541), 1,
+    ACTIONS(549), 1,
       sym_Name,
-    STATE(269), 1,
+    STATE(260), 1,
       sym_PEReference,
-  [2475] = 3,
-    ACTIONS(543), 1,
+  [2499] = 3,
+    ACTIONS(551), 1,
       sym_Name,
-    ACTIONS(545), 1,
+    ACTIONS(553), 1,
       anon_sym_PERCENT,
-    STATE(265), 1,
+    STATE(253), 1,
       sym_PEReference,
-  [2485] = 1,
-    ACTIONS(547), 3,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      sym__S,
-  [2491] = 3,
-    ACTIONS(549), 1,
+  [2509] = 3,
+    ACTIONS(555), 1,
       sym__S,
-    ACTIONS(551), 1,
-      anon_sym_QMARK_GT,
-    STATE(225), 1,
-      sym__EncodingDecl,
-  [2501] = 1,
-    ACTIONS(553), 3,
+    ACTIONS(557), 1,
+      anon_sym_EQ,
+    STATE(234), 1,
+      sym__Eq,
+  [2519] = 1,
+    ACTIONS(559), 3,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       sym__S,
-  [2507] = 3,
-    ACTIONS(171), 1,
+  [2525] = 3,
+    ACTIONS(203), 1,
       anon_sym_DQUOTE,
-    ACTIONS(173), 1,
+    ACTIONS(205), 1,
       anon_sym_SQUOTE,
-    STATE(205), 1,
+    STATE(204), 1,
       sym_AttValue,
-  [2517] = 3,
+  [2535] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(555), 1,
+    ACTIONS(561), 1,
       sym_Name,
-    STATE(86), 1,
+    STATE(71), 1,
       sym_PEReference,
-  [2527] = 3,
-    ACTIONS(557), 1,
-      sym__S,
-    ACTIONS(559), 1,
-      anon_sym_EQ,
-    STATE(234), 1,
-      sym__Eq,
-  [2537] = 2,
-    ACTIONS(563), 1,
-      sym__S,
-    ACTIONS(561), 2,
-      anon_sym_RPAREN,
-      anon_sym_PERCENT,
   [2545] = 1,
-    ACTIONS(500), 3,
+    ACTIONS(516), 3,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       sym__S,
   [2551] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(565), 1,
+    ACTIONS(563), 1,
       anon_sym_RPAREN,
-    STATE(167), 1,
+    STATE(169), 1,
       sym_PEReference,
   [2561] = 2,
-    ACTIONS(569), 1,
+    ACTIONS(567), 1,
+      anon_sym_STAR,
+    ACTIONS(565), 2,
+      anon_sym_GT,
+      sym__S,
+  [2569] = 2,
+    ACTIONS(571), 1,
       sym__S,
-    ACTIONS(567), 2,
+    ACTIONS(569), 2,
       anon_sym_DQUOTE,
       anon_sym_SQUOTE,
-  [2569] = 3,
-    ACTIONS(557), 1,
+  [2577] = 3,
+    ACTIONS(555), 1,
       sym__S,
-    ACTIONS(559), 1,
+    ACTIONS(557), 1,
       anon_sym_EQ,
-    STATE(211), 1,
+    STATE(227), 1,
       sym__Eq,
-  [2579] = 3,
+  [2587] = 2,
+    ACTIONS(575), 1,
+      sym__S,
+    ACTIONS(573), 2,
+      anon_sym_DQUOTE,
+      anon_sym_SQUOTE,
+  [2595] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(423), 1,
+    ACTIONS(393), 1,
       anon_sym_RPAREN,
-    STATE(167), 1,
+    STATE(169), 1,
       sym_PEReference,
-  [2589] = 3,
-    ACTIONS(533), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(535), 1,
-      anon_sym_SQUOTE,
-    STATE(290), 1,
-      sym_PubidLiteral,
-  [2599] = 3,
-    ACTIONS(533), 1,
+  [2605] = 3,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(577), 1,
+      sym_Name,
+    STATE(138), 1,
+      sym_PEReference,
+  [2615] = 3,
+    ACTIONS(579), 1,
       anon_sym_DQUOTE,
-    ACTIONS(535), 1,
+    ACTIONS(581), 1,
       anon_sym_SQUOTE,
-    STATE(213), 1,
+    STATE(309), 1,
       sym_PubidLiteral,
-  [2609] = 2,
-    ACTIONS(573), 1,
+  [2625] = 2,
+    ACTIONS(585), 1,
       anon_sym_STAR,
-    ACTIONS(571), 2,
+    ACTIONS(583), 2,
       anon_sym_GT,
       sym__S,
-  [2617] = 1,
-    ACTIONS(401), 3,
+  [2633] = 1,
+    ACTIONS(395), 3,
       anon_sym_RPAREN,
       anon_sym_PERCENT,
       sym__S,
-  [2623] = 3,
-    ACTIONS(575), 1,
+  [2639] = 3,
+    ACTIONS(587), 1,
       anon_sym_DQUOTE,
-    ACTIONS(577), 1,
+    ACTIONS(589), 1,
       anon_sym_SQUOTE,
-    STATE(199), 1,
+    STATE(243), 1,
       sym_SystemLiteral,
-  [2633] = 3,
+  [2649] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(261), 1,
+    ACTIONS(231), 1,
       anon_sym_RPAREN,
-    STATE(167), 1,
+    STATE(169), 1,
       sym_PEReference,
-  [2643] = 3,
+  [2659] = 3,
+    ACTIONS(591), 1,
+      anon_sym_GT,
+    ACTIONS(593), 1,
+      sym__S,
+    STATE(187), 1,
+      sym_NDataDecl,
+  [2669] = 3,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    ACTIONS(445), 1,
+    ACTIONS(466), 1,
       sym_Name,
-    STATE(230), 1,
+    STATE(123), 1,
       sym_PEReference,
-  [2653] = 3,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
+  [2679] = 3,
     ACTIONS(579), 1,
-      sym_Name,
-    STATE(142), 1,
-      sym_PEReference,
-  [2663] = 3,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
-    ACTIONS(473), 1,
-      sym_Name,
-    STATE(143), 1,
-      sym_PEReference,
-  [2673] = 3,
-    ACTIONS(133), 1,
-      anon_sym_PERCENT,
+      anon_sym_DQUOTE,
     ACTIONS(581), 1,
-      sym_Name,
-    STATE(237), 1,
-      sym_PEReference,
-  [2683] = 3,
-    ACTIONS(575), 1,
+      anon_sym_SQUOTE,
+    STATE(219), 1,
+      sym_PubidLiteral,
+  [2689] = 3,
+    ACTIONS(579), 1,
       anon_sym_DQUOTE,
-    ACTIONS(577), 1,
+    ACTIONS(581), 1,
       anon_sym_SQUOTE,
-    STATE(243), 1,
-      sym_SystemLiteral,
-  [2693] = 3,
-    ACTIONS(583), 1,
-      anon_sym_GT,
-    ACTIONS(585), 1,
-      sym__S,
-    STATE(194), 1,
-      sym_NDataDecl,
-  [2703] = 2,
+    STATE(217), 1,
+      sym_PubidLiteral,
+  [2699] = 3,
+    ACTIONS(587), 1,
+      anon_sym_DQUOTE,
     ACTIONS(589), 1,
+      anon_sym_SQUOTE,
+    STATE(207), 1,
+      sym_SystemLiteral,
+  [2709] = 2,
+    ACTIONS(597), 1,
       anon_sym_STAR,
-    ACTIONS(587), 2,
-      anon_sym_GT,
-      sym__S,
-  [2711] = 2,
-    ACTIONS(593), 1,
-      anon_sym_STAR,
-    ACTIONS(591), 2,
+    ACTIONS(595), 2,
       anon_sym_GT,
       sym__S,
-  [2719] = 2,
-    ACTIONS(597), 1,
-      sym__S,
-    ACTIONS(595), 2,
-      anon_sym_DQUOTE,
-      anon_sym_SQUOTE,
+  [2717] = 3,
+    ACTIONS(133), 1,
+      anon_sym_PERCENT,
+    ACTIONS(445), 1,
+      sym_Name,
+    STATE(222), 1,
+      sym_PEReference,
   [2727] = 1,
     ACTIONS(599), 2,
       anon_sym_GT,
@@ -4926,93 +4926,93 @@ static const uint16_t ts_small_parse_table[] = {
       sym__S,
   [2737] = 2,
     ACTIONS(603), 1,
-      anon_sym_xml,
+      anon_sym_QMARK_GT,
     ACTIONS(605), 1,
-      sym_PITarget,
+      sym__S,
   [2744] = 2,
     ACTIONS(607), 1,
-      anon_sym_LBRACK,
-    ACTIONS(609), 1,
       sym__S,
+    STATE(149), 1,
+      sym__VersionInfo,
   [2751] = 1,
-    ACTIONS(611), 2,
-      sym__S,
+    ACTIONS(609), 2,
       anon_sym_QMARK_GT,
+      sym__S,
   [2756] = 2,
+    ACTIONS(611), 1,
+      anon_sym_LBRACK,
     ACTIONS(613), 1,
       sym__S,
-    ACTIONS(615), 1,
-      anon_sym_QMARK_GT,
-  [2763] = 2,
-    ACTIONS(617), 1,
-      sym__S,
-    STATE(153), 1,
-      sym__VersionInfo,
-  [2770] = 1,
-    ACTIONS(619), 2,
+  [2763] = 1,
+    ACTIONS(615), 2,
       anon_sym_GT,
       sym__S,
-  [2775] = 1,
-    ACTIONS(587), 2,
+  [2768] = 1,
+    ACTIONS(617), 2,
+      anon_sym_QMARK_GT,
+      sym__S,
+  [2773] = 2,
+    ACTIONS(619), 1,
       anon_sym_GT,
+    ACTIONS(621), 1,
       sym__S,
   [2780] = 1,
-    ACTIONS(621), 2,
+    ACTIONS(595), 2,
       anon_sym_GT,
       sym__S,
   [2785] = 2,
+    ACTIONS(619), 1,
+      anon_sym_GT,
     ACTIONS(623), 1,
-      anon_sym_LBRACK,
-    ACTIONS(625), 1,
-      sym__S,
+      anon_sym_NDATA,
   [2792] = 1,
-    ACTIONS(459), 2,
+    ACTIONS(625), 2,
+      anon_sym_GT,
+      sym__S,
+  [2797] = 1,
+    ACTIONS(457), 2,
       anon_sym_RPAREN,
       anon_sym_PERCENT,
-  [2797] = 2,
+  [2802] = 2,
     ACTIONS(627), 1,
       anon_sym_RPAREN,
     ACTIONS(629), 1,
       sym__S,
-  [2804] = 2,
-    ACTIONS(631), 1,
+  [2809] = 1,
+    ACTIONS(631), 2,
+      anon_sym_GT,
+      sym__S,
+  [2814] = 1,
+    ACTIONS(633), 2,
       anon_sym_GT,
-    ACTIONS(633), 1,
       sym__S,
-  [2811] = 1,
+  [2819] = 1,
     ACTIONS(635), 2,
-      anon_sym_DQUOTE,
-      anon_sym_SQUOTE,
-  [2816] = 2,
-    ACTIONS(637), 1,
       anon_sym_GT,
-    ACTIONS(639), 1,
       sym__S,
-  [2823] = 2,
+  [2824] = 2,
     ACTIONS(637), 1,
-      anon_sym_GT,
+      anon_sym_xml,
+    ACTIONS(639), 1,
+      sym_PITarget,
+  [2831] = 2,
     ACTIONS(641), 1,
-      anon_sym_NDATA,
-  [2830] = 1,
-    ACTIONS(643), 2,
-      anon_sym_GT,
+      anon_sym_LBRACK,
+    ACTIONS(643), 1,
       sym__S,
-  [2835] = 1,
+  [2838] = 1,
     ACTIONS(645), 2,
       anon_sym_GT,
       sym__S,
-  [2840] = 2,
+  [2843] = 2,
     ACTIONS(647), 1,
       anon_sym_RPAREN,
     ACTIONS(649), 1,
       sym__S,
-  [2847] = 1,
-    ACTIONS(651), 2,
-      anon_sym_GT,
-      sym__S,
-  [2852] = 1,
-    ACTIONS(653), 2,
+  [2850] = 2,
+    ACTIONS(651), 1,
       anon_sym_GT,
+    ACTIONS(653), 1,
       sym__S,
   [2857] = 1,
     ACTIONS(655), 2,
@@ -5030,165 +5030,165 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(661), 2,
       anon_sym_GT,
       sym__S,
-  [2877] = 1,
-    ACTIONS(663), 2,
+  [2877] = 2,
+    ACTIONS(663), 1,
+      anon_sym_RPAREN,
+    ACTIONS(665), 1,
+      sym__S,
+  [2884] = 1,
+    ACTIONS(667), 2,
+      anon_sym_DQUOTE,
+      anon_sym_SQUOTE,
+  [2889] = 1,
+    ACTIONS(669), 2,
       anon_sym_GT,
       sym__S,
-  [2882] = 2,
-    ACTIONS(665), 1,
-      anon_sym_RPAREN,
-    ACTIONS(667), 1,
-      sym__S,
-  [2889] = 2,
-    ACTIONS(669), 1,
-      anon_sym_PIPE,
+  [2894] = 2,
     ACTIONS(671), 1,
+      anon_sym_PIPE,
+    ACTIONS(673), 1,
       anon_sym_RPAREN,
-  [2896] = 1,
-    ACTIONS(673), 2,
-      anon_sym_GT,
-      sym__S,
   [2901] = 1,
     ACTIONS(675), 2,
       anon_sym_GT,
       sym__S,
   [2906] = 2,
     ACTIONS(677), 1,
-      sym_Name,
+      anon_sym_QMARK_GT,
     ACTIONS(679), 1,
+      anon_sym_encoding,
+  [2913] = 1,
+    ACTIONS(681), 2,
+      anon_sym_GT,
       sym__S,
-  [2913] = 2,
-    ACTIONS(681), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(683), 1,
-      anon_sym_SQUOTE,
-  [2920] = 1,
-    ACTIONS(685), 2,
+  [2918] = 2,
+    ACTIONS(591), 1,
       anon_sym_GT,
+    ACTIONS(683), 1,
       sym__S,
   [2925] = 2,
-    ACTIONS(687), 1,
-      anon_sym_GT,
-    ACTIONS(689), 1,
+    ACTIONS(677), 1,
+      anon_sym_QMARK_GT,
+    ACTIONS(685), 1,
       sym__S,
   [2932] = 1,
     ACTIONS(687), 2,
       anon_sym_GT,
       sym__S,
-  [2937] = 1,
-    ACTIONS(595), 2,
-      anon_sym_DQUOTE,
-      anon_sym_SQUOTE,
-  [2942] = 1,
-    ACTIONS(691), 2,
+  [2937] = 2,
+    ACTIONS(689), 1,
+      anon_sym_GT,
+    ACTIONS(691), 1,
       sym__S,
-      anon_sym_QMARK_GT,
-  [2947] = 1,
-    ACTIONS(591), 2,
+  [2944] = 1,
+    ACTIONS(583), 2,
       anon_sym_GT,
       sym__S,
-  [2952] = 2,
+  [2949] = 2,
     ACTIONS(693), 1,
       anon_sym_GT,
     ACTIONS(695), 1,
       sym__S,
-  [2959] = 2,
+  [2956] = 2,
     ACTIONS(697), 1,
       sym__S,
     ACTIONS(699), 1,
       sym_Nmtoken,
-  [2966] = 2,
-    ACTIONS(583), 1,
+  [2963] = 1,
+    ACTIONS(693), 2,
       anon_sym_GT,
-    ACTIONS(701), 1,
       sym__S,
-  [2973] = 2,
+  [2968] = 2,
+    ACTIONS(701), 1,
+      sym_Name,
     ACTIONS(703), 1,
-      anon_sym_QMARK_GT,
-    ACTIONS(705), 1,
-      anon_sym_encoding,
-  [2980] = 2,
-    ACTIONS(451), 1,
+      sym__S,
+  [2975] = 2,
+    ACTIONS(505), 1,
       anon_sym_RPAREN,
-    ACTIONS(669), 1,
+    ACTIONS(671), 1,
       anon_sym_PIPE,
-  [2987] = 2,
-    ACTIONS(707), 1,
+  [2982] = 2,
+    ACTIONS(472), 1,
       anon_sym_GT,
-    ACTIONS(709), 1,
+    ACTIONS(705), 1,
       sym__S,
-  [2994] = 1,
-    ACTIONS(711), 2,
+  [2989] = 1,
+    ACTIONS(708), 2,
       anon_sym_GT,
       sym__S,
-  [2999] = 2,
-    ACTIONS(703), 1,
-      anon_sym_QMARK_GT,
-    ACTIONS(713), 1,
-      sym__S,
-  [3006] = 1,
-    ACTIONS(715), 2,
+  [2994] = 2,
+    ACTIONS(710), 1,
       anon_sym_GT,
+    ACTIONS(712), 1,
       sym__S,
-  [3011] = 1,
-    ACTIONS(529), 2,
+  [3001] = 2,
+    ACTIONS(714), 1,
+      sym__S,
+    ACTIONS(716), 1,
+      sym_Nmtoken,
+  [3008] = 1,
+    ACTIONS(718), 2,
       anon_sym_GT,
       sym__S,
-  [3016] = 1,
-    ACTIONS(393), 2,
+  [3013] = 2,
+    ACTIONS(720), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(722), 1,
+      anon_sym_SQUOTE,
+  [3020] = 1,
+    ACTIONS(391), 2,
       anon_sym_PIPE,
       anon_sym_COMMA,
-  [3021] = 2,
+  [3025] = 2,
     ACTIONS(133), 1,
       anon_sym_PERCENT,
-    STATE(167), 1,
+    STATE(169), 1,
       sym_PEReference,
-  [3028] = 2,
-    ACTIONS(481), 1,
+  [3032] = 2,
+    ACTIONS(724), 1,
       anon_sym_GT,
-    ACTIONS(717), 1,
+    ACTIONS(726), 1,
       sym__S,
-  [3035] = 2,
-    ACTIONS(720), 1,
+  [3039] = 2,
+    ACTIONS(728), 1,
       sym__S,
-    ACTIONS(722), 1,
+    ACTIONS(730), 1,
       sym_Nmtoken,
-  [3042] = 1,
-    ACTIONS(724), 2,
+  [3046] = 1,
+    ACTIONS(732), 2,
       anon_sym_GT,
       sym__S,
-  [3047] = 2,
-    ACTIONS(464), 1,
+  [3051] = 2,
+    ACTIONS(491), 1,
       anon_sym_RPAREN,
-    ACTIONS(669), 1,
+    ACTIONS(671), 1,
       anon_sym_PIPE,
-  [3054] = 2,
-    ACTIONS(726), 1,
+  [3058] = 2,
+    ACTIONS(734), 1,
       anon_sym_DQUOTE,
-    ACTIONS(728), 1,
+    ACTIONS(736), 1,
       anon_sym_SQUOTE,
-  [3061] = 2,
-    ACTIONS(730), 1,
+  [3065] = 1,
+    ACTIONS(573), 2,
+      anon_sym_DQUOTE,
+      anon_sym_SQUOTE,
+  [3070] = 1,
+    ACTIONS(738), 2,
       anon_sym_GT,
-    ACTIONS(732), 1,
       sym__S,
-  [3068] = 1,
-    ACTIONS(734), 2,
+  [3075] = 1,
+    ACTIONS(529), 2,
       anon_sym_GT,
       sym__S,
-  [3073] = 1,
-    ACTIONS(736), 2,
+  [3080] = 1,
+    ACTIONS(740), 2,
       anon_sym_GT,
       sym__S,
-  [3078] = 1,
-    ACTIONS(738), 2,
+  [3085] = 1,
+    ACTIONS(742), 2,
       anon_sym_GT,
       sym__S,
-  [3083] = 2,
-    ACTIONS(740), 1,
-      sym__S,
-    ACTIONS(742), 1,
-      sym_Nmtoken,
   [3090] = 1,
     ACTIONS(744), 2,
       anon_sym_GT,
@@ -5207,211 +5207,211 @@ static const uint16_t ts_small_parse_table[] = {
       sym__S,
   [3110] = 1,
     ACTIONS(752), 1,
-      aux_sym_SystemLiteral_token2,
+      sym__S,
   [3114] = 1,
-    ACTIONS(754), 1,
-      sym_EncName,
+    ACTIONS(619), 1,
+      anon_sym_GT,
   [3118] = 1,
-    ACTIONS(756), 1,
-      sym__S,
+    ACTIONS(754), 1,
+      anon_sym_SEMI,
   [3122] = 1,
-    ACTIONS(758), 1,
+    ACTIONS(756), 1,
       sym__S,
   [3126] = 1,
     ACTIONS(531), 1,
       anon_sym_STAR,
   [3130] = 1,
-    ACTIONS(760), 1,
-      sym__S,
+    ACTIONS(758), 1,
+      sym_VersionNum,
   [3134] = 1,
+    ACTIONS(760), 1,
+      anon_sym_SEMI,
+  [3138] = 1,
     ACTIONS(762), 1,
       anon_sym_EQ,
-  [3138] = 1,
-    ACTIONS(764), 1,
-      sym_Name,
   [3142] = 1,
-    ACTIONS(766), 1,
-      anon_sym_SEMI,
+    ACTIONS(764), 1,
+      sym_VersionNum,
   [3146] = 1,
-    ACTIONS(768), 1,
+    ACTIONS(766), 1,
       sym__S,
   [3150] = 1,
-    ACTIONS(770), 1,
+    ACTIONS(768), 1,
       sym__S,
   [3154] = 1,
-    ACTIONS(772), 1,
+    ACTIONS(770), 1,
       sym__S,
   [3158] = 1,
-    ACTIONS(774), 1,
+    ACTIONS(772), 1,
       sym__S,
   [3162] = 1,
     ACTIONS(699), 1,
       sym_Nmtoken,
   [3166] = 1,
-    ACTIONS(776), 1,
-      anon_sym_SEMI,
-  [3170] = 1,
-    ACTIONS(399), 1,
+    ACTIONS(403), 1,
       anon_sym_PIPE,
+  [3170] = 1,
+    ACTIONS(774), 1,
+      sym__S,
   [3174] = 1,
-    ACTIONS(593), 1,
-      anon_sym_STAR,
+    ACTIONS(776), 1,
+      sym__S,
   [3178] = 1,
-    ACTIONS(778), 1,
-      sym_VersionNum,
+    ACTIONS(585), 1,
+      anon_sym_STAR,
   [3182] = 1,
-    ACTIONS(780), 1,
-      anon_sym_QMARK_GT,
+    ACTIONS(778), 1,
+      sym__S,
   [3186] = 1,
-    ACTIONS(782), 1,
-      sym_VersionNum,
+    ACTIONS(780), 1,
+      aux_sym_PubidLiteral_token2,
   [3190] = 1,
-    ACTIONS(784), 1,
-      anon_sym_GT,
+    ACTIONS(782), 1,
+      sym__S,
   [3194] = 1,
+    ACTIONS(784), 1,
+      anon_sym_LBRACK,
+  [3198] = 1,
     ACTIONS(786), 1,
       sym__S,
-  [3198] = 1,
-    ACTIONS(788), 1,
-      anon_sym_SQUOTE,
   [3202] = 1,
     ACTIONS(788), 1,
-      anon_sym_DQUOTE,
+      anon_sym_GT,
   [3206] = 1,
     ACTIONS(790), 1,
       anon_sym_STAR,
   [3210] = 1,
     ACTIONS(792), 1,
-      sym__S,
+      anon_sym_SQUOTE,
   [3214] = 1,
     ACTIONS(794), 1,
       anon_sym_QMARK_GT,
   [3218] = 1,
     ACTIONS(796), 1,
-      anon_sym_DQUOTE,
+      anon_sym_SQUOTE,
   [3222] = 1,
     ACTIONS(798), 1,
-      aux_sym_PubidLiteral_token2,
+      aux_sym_PubidLiteral_token1,
   [3226] = 1,
     ACTIONS(800), 1,
       sym_Nmtoken,
   [3230] = 1,
-    ACTIONS(669), 1,
+    ACTIONS(671), 1,
       anon_sym_PIPE,
   [3234] = 1,
-    ACTIONS(802), 1,
-      sym__S,
+    ACTIONS(796), 1,
+      anon_sym_DQUOTE,
   [3238] = 1,
-    ACTIONS(804), 1,
-      anon_sym_LBRACK,
+    ACTIONS(802), 1,
+      anon_sym_QMARK_GT,
   [3242] = 1,
-    ACTIONS(806), 1,
+    ACTIONS(804), 1,
       anon_sym_PIPE,
   [3246] = 1,
-    ACTIONS(808), 1,
-      anon_sym_GT,
+    ACTIONS(806), 1,
+      anon_sym_LPAREN,
   [3250] = 1,
-    ACTIONS(810), 1,
-      aux_sym_PubidLiteral_token1,
+    ACTIONS(808), 1,
+      aux_sym_SystemLiteral_token2,
   [3254] = 1,
-    ACTIONS(812), 1,
-      anon_sym_LPAREN,
+    ACTIONS(810), 1,
+      anon_sym_DQUOTE,
   [3258] = 1,
-    ACTIONS(814), 1,
+    ACTIONS(812), 1,
       sym_Nmtoken,
   [3262] = 1,
-    ACTIONS(816), 1,
-      anon_sym_version,
+    ACTIONS(814), 1,
+      aux_sym_SystemLiteral_token1,
   [3266] = 1,
-    ACTIONS(818), 1,
-      sym__pi_content,
+    ACTIONS(810), 1,
+      anon_sym_SQUOTE,
   [3270] = 1,
-    ACTIONS(820), 1,
-      anon_sym_GT,
+    ACTIONS(816), 1,
+      anon_sym_SQUOTE,
   [3274] = 1,
-    ACTIONS(822), 1,
-      sym_Name,
+    ACTIONS(818), 1,
+      sym_EncName,
   [3278] = 1,
-    ACTIONS(824), 1,
-      aux_sym_CharRef_token1,
+    ACTIONS(820), 1,
+      sym_EncName,
   [3282] = 1,
-    ACTIONS(824), 1,
-      aux_sym_CharRef_token2,
+    ACTIONS(822), 1,
+      anon_sym_GT,
   [3286] = 1,
-    ACTIONS(796), 1,
-      anon_sym_SQUOTE,
+    ACTIONS(792), 1,
+      anon_sym_DQUOTE,
   [3290] = 1,
-    ACTIONS(826), 1,
-      sym__S,
+    ACTIONS(824), 1,
+      sym_Name,
   [3294] = 1,
-    ACTIONS(689), 1,
-      sym__S,
+    ACTIONS(826), 1,
+      aux_sym_CharRef_token2,
   [3298] = 1,
-    ACTIONS(637), 1,
-      anon_sym_GT,
+    ACTIONS(828), 1,
+      sym_Name,
   [3302] = 1,
     ACTIONS(647), 1,
       anon_sym_RPAREN,
   [3306] = 1,
-    ACTIONS(828), 1,
-      anon_sym_DQUOTE,
+    ACTIONS(826), 1,
+      aux_sym_CharRef_token1,
   [3310] = 1,
-    ACTIONS(830), 1,
-      sym_Name,
+    ACTIONS(641), 1,
+      anon_sym_LBRACK,
   [3314] = 1,
     ACTIONS(627), 1,
       anon_sym_RPAREN,
   [3318] = 1,
-    ACTIONS(589), 1,
+    ACTIONS(597), 1,
       anon_sym_STAR,
   [3322] = 1,
-    ACTIONS(828), 1,
-      anon_sym_SQUOTE,
+    ACTIONS(830), 1,
+      anon_sym_version,
   [3326] = 1,
     ACTIONS(832), 1,
-      aux_sym_SystemLiteral_token1,
+      anon_sym_GT,
   [3330] = 1,
     ACTIONS(834), 1,
       anon_sym_RPAREN,
   [3334] = 1,
     ACTIONS(836), 1,
-      sym_EncName,
+      anon_sym_GT,
   [3338] = 1,
-    ACTIONS(623), 1,
-      anon_sym_LBRACK,
+    ACTIONS(838), 1,
+      sym__pi_content,
   [3342] = 1,
-    ACTIONS(605), 1,
+    ACTIONS(639), 1,
       sym_PITarget,
   [3346] = 1,
-    ACTIONS(838), 1,
-      anon_sym_SQUOTE,
-  [3350] = 1,
-    ACTIONS(838), 1,
-      anon_sym_DQUOTE,
-  [3354] = 1,
     ACTIONS(840), 1,
       anon_sym_SEMI,
-  [3358] = 1,
+  [3350] = 1,
     ACTIONS(842), 1,
       sym__S,
-  [3362] = 1,
+  [3354] = 1,
     ACTIONS(844), 1,
       sym__S,
-  [3366] = 1,
+  [3358] = 1,
     ACTIONS(846), 1,
       sym__S,
-  [3370] = 1,
+  [3362] = 1,
     ACTIONS(848), 1,
       sym__S,
-  [3374] = 1,
+  [3366] = 1,
     ACTIONS(850), 1,
-      anon_sym_GT,
+      sym__S,
+  [3370] = 1,
+    ACTIONS(695), 1,
+      sym__S,
+  [3374] = 1,
+    ACTIONS(816), 1,
+      anon_sym_DQUOTE,
   [3378] = 1,
     ACTIONS(852), 1,
       ts_builtin_sym_end,
   [3382] = 1,
     ACTIONS(854), 1,
-      sym__S,
+      sym_Name,
   [3386] = 1,
     ACTIONS(856), 1,
       anon_sym_SEMI,
@@ -5440,7 +5440,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(872), 1,
       anon_sym_SEMI,
   [3422] = 1,
-    ACTIONS(677), 1,
+    ACTIONS(701), 1,
       sym_Name,
   [3426] = 1,
     ACTIONS(874), 1,
@@ -5490,171 +5490,171 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(11)] = 370,
   [SMALL_STATE(12)] = 408,
   [SMALL_STATE(13)] = 436,
-  [SMALL_STATE(14)] = 464,
+  [SMALL_STATE(14)] = 458,
   [SMALL_STATE(15)] = 486,
   [SMALL_STATE(16)] = 514,
   [SMALL_STATE(17)] = 536,
-  [SMALL_STATE(18)] = 564,
-  [SMALL_STATE(19)] = 592,
-  [SMALL_STATE(20)] = 620,
+  [SMALL_STATE(18)] = 550,
+  [SMALL_STATE(19)] = 578,
+  [SMALL_STATE(20)] = 606,
   [SMALL_STATE(21)] = 634,
   [SMALL_STATE(22)] = 659,
   [SMALL_STATE(23)] = 671,
-  [SMALL_STATE(24)] = 683,
-  [SMALL_STATE(25)] = 707,
-  [SMALL_STATE(26)] = 719,
-  [SMALL_STATE(27)] = 731,
-  [SMALL_STATE(28)] = 753,
-  [SMALL_STATE(29)] = 777,
-  [SMALL_STATE(30)] = 801,
-  [SMALL_STATE(31)] = 825,
-  [SMALL_STATE(32)] = 849,
+  [SMALL_STATE(24)] = 695,
+  [SMALL_STATE(25)] = 719,
+  [SMALL_STATE(26)] = 743,
+  [SMALL_STATE(27)] = 755,
+  [SMALL_STATE(28)] = 767,
+  [SMALL_STATE(29)] = 779,
+  [SMALL_STATE(30)] = 803,
+  [SMALL_STATE(31)] = 827,
+  [SMALL_STATE(32)] = 851,
   [SMALL_STATE(33)] = 873,
-  [SMALL_STATE(34)] = 885,
+  [SMALL_STATE(34)] = 897,
   [SMALL_STATE(35)] = 909,
   [SMALL_STATE(36)] = 922,
   [SMALL_STATE(37)] = 935,
   [SMALL_STATE(38)] = 948,
   [SMALL_STATE(39)] = 961,
-  [SMALL_STATE(40)] = 986,
-  [SMALL_STATE(41)] = 999,
-  [SMALL_STATE(42)] = 1012,
-  [SMALL_STATE(43)] = 1025,
-  [SMALL_STATE(44)] = 1038,
-  [SMALL_STATE(45)] = 1059,
-  [SMALL_STATE(46)] = 1072,
-  [SMALL_STATE(47)] = 1085,
-  [SMALL_STATE(48)] = 1098,
-  [SMALL_STATE(49)] = 1119,
-  [SMALL_STATE(50)] = 1132,
-  [SMALL_STATE(51)] = 1145,
-  [SMALL_STATE(52)] = 1158,
-  [SMALL_STATE(53)] = 1171,
-  [SMALL_STATE(54)] = 1184,
-  [SMALL_STATE(55)] = 1205,
-  [SMALL_STATE(56)] = 1218,
+  [SMALL_STATE(40)] = 974,
+  [SMALL_STATE(41)] = 995,
+  [SMALL_STATE(42)] = 1008,
+  [SMALL_STATE(43)] = 1029,
+  [SMALL_STATE(44)] = 1042,
+  [SMALL_STATE(45)] = 1063,
+  [SMALL_STATE(46)] = 1076,
+  [SMALL_STATE(47)] = 1089,
+  [SMALL_STATE(48)] = 1102,
+  [SMALL_STATE(49)] = 1115,
+  [SMALL_STATE(50)] = 1128,
+  [SMALL_STATE(51)] = 1141,
+  [SMALL_STATE(52)] = 1154,
+  [SMALL_STATE(53)] = 1167,
+  [SMALL_STATE(54)] = 1180,
+  [SMALL_STATE(55)] = 1193,
+  [SMALL_STATE(56)] = 1206,
   [SMALL_STATE(57)] = 1231,
-  [SMALL_STATE(58)] = 1244,
-  [SMALL_STATE(59)] = 1257,
-  [SMALL_STATE(60)] = 1270,
-  [SMALL_STATE(61)] = 1283,
+  [SMALL_STATE(58)] = 1252,
+  [SMALL_STATE(59)] = 1265,
+  [SMALL_STATE(60)] = 1278,
+  [SMALL_STATE(61)] = 1291,
   [SMALL_STATE(62)] = 1304,
-  [SMALL_STATE(63)] = 1326,
-  [SMALL_STATE(64)] = 1348,
-  [SMALL_STATE(65)] = 1368,
+  [SMALL_STATE(63)] = 1324,
+  [SMALL_STATE(64)] = 1346,
+  [SMALL_STATE(65)] = 1366,
   [SMALL_STATE(66)] = 1388,
-  [SMALL_STATE(67)] = 1410,
-  [SMALL_STATE(68)] = 1432,
-  [SMALL_STATE(69)] = 1454,
+  [SMALL_STATE(67)] = 1408,
+  [SMALL_STATE(68)] = 1430,
+  [SMALL_STATE(69)] = 1452,
   [SMALL_STATE(70)] = 1474,
-  [SMALL_STATE(71)] = 1491,
-  [SMALL_STATE(72)] = 1502,
-  [SMALL_STATE(73)] = 1513,
-  [SMALL_STATE(74)] = 1524,
-  [SMALL_STATE(75)] = 1541,
-  [SMALL_STATE(76)] = 1558,
-  [SMALL_STATE(77)] = 1569,
-  [SMALL_STATE(78)] = 1580,
-  [SMALL_STATE(79)] = 1591,
-  [SMALL_STATE(80)] = 1602,
-  [SMALL_STATE(81)] = 1619,
-  [SMALL_STATE(82)] = 1638,
-  [SMALL_STATE(83)] = 1657,
-  [SMALL_STATE(84)] = 1668,
-  [SMALL_STATE(85)] = 1685,
-  [SMALL_STATE(86)] = 1700,
-  [SMALL_STATE(87)] = 1719,
-  [SMALL_STATE(88)] = 1730,
-  [SMALL_STATE(89)] = 1741,
-  [SMALL_STATE(90)] = 1752,
+  [SMALL_STATE(71)] = 1493,
+  [SMALL_STATE(72)] = 1512,
+  [SMALL_STATE(73)] = 1529,
+  [SMALL_STATE(74)] = 1540,
+  [SMALL_STATE(75)] = 1551,
+  [SMALL_STATE(76)] = 1562,
+  [SMALL_STATE(77)] = 1573,
+  [SMALL_STATE(78)] = 1588,
+  [SMALL_STATE(79)] = 1605,
+  [SMALL_STATE(80)] = 1616,
+  [SMALL_STATE(81)] = 1635,
+  [SMALL_STATE(82)] = 1652,
+  [SMALL_STATE(83)] = 1663,
+  [SMALL_STATE(84)] = 1680,
+  [SMALL_STATE(85)] = 1691,
+  [SMALL_STATE(86)] = 1710,
+  [SMALL_STATE(87)] = 1721,
+  [SMALL_STATE(88)] = 1732,
+  [SMALL_STATE(89)] = 1743,
+  [SMALL_STATE(90)] = 1760,
   [SMALL_STATE(91)] = 1771,
   [SMALL_STATE(92)] = 1790,
-  [SMALL_STATE(93)] = 1798,
-  [SMALL_STATE(94)] = 1808,
-  [SMALL_STATE(95)] = 1818,
-  [SMALL_STATE(96)] = 1832,
-  [SMALL_STATE(97)] = 1842,
-  [SMALL_STATE(98)] = 1856,
-  [SMALL_STATE(99)] = 1866,
-  [SMALL_STATE(100)] = 1874,
-  [SMALL_STATE(101)] = 1882,
-  [SMALL_STATE(102)] = 1892,
-  [SMALL_STATE(103)] = 1902,
-  [SMALL_STATE(104)] = 1918,
-  [SMALL_STATE(105)] = 1932,
-  [SMALL_STATE(106)] = 1940,
-  [SMALL_STATE(107)] = 1956,
-  [SMALL_STATE(108)] = 1970,
-  [SMALL_STATE(109)] = 1980,
-  [SMALL_STATE(110)] = 1994,
-  [SMALL_STATE(111)] = 2008,
-  [SMALL_STATE(112)] = 2024,
-  [SMALL_STATE(113)] = 2040,
-  [SMALL_STATE(114)] = 2054,
-  [SMALL_STATE(115)] = 2068,
-  [SMALL_STATE(116)] = 2082,
+  [SMALL_STATE(93)] = 1804,
+  [SMALL_STATE(94)] = 1818,
+  [SMALL_STATE(95)] = 1834,
+  [SMALL_STATE(96)] = 1842,
+  [SMALL_STATE(97)] = 1852,
+  [SMALL_STATE(98)] = 1862,
+  [SMALL_STATE(99)] = 1872,
+  [SMALL_STATE(100)] = 1880,
+  [SMALL_STATE(101)] = 1888,
+  [SMALL_STATE(102)] = 1902,
+  [SMALL_STATE(103)] = 1912,
+  [SMALL_STATE(104)] = 1922,
+  [SMALL_STATE(105)] = 1938,
+  [SMALL_STATE(106)] = 1952,
+  [SMALL_STATE(107)] = 1962,
+  [SMALL_STATE(108)] = 1976,
+  [SMALL_STATE(109)] = 1990,
+  [SMALL_STATE(110)] = 2004,
+  [SMALL_STATE(111)] = 2014,
+  [SMALL_STATE(112)] = 2028,
+  [SMALL_STATE(113)] = 2042,
+  [SMALL_STATE(114)] = 2058,
+  [SMALL_STATE(115)] = 2066,
+  [SMALL_STATE(116)] = 2080,
   [SMALL_STATE(117)] = 2096,
   [SMALL_STATE(118)] = 2109,
   [SMALL_STATE(119)] = 2122,
-  [SMALL_STATE(120)] = 2129,
-  [SMALL_STATE(121)] = 2142,
-  [SMALL_STATE(122)] = 2155,
-  [SMALL_STATE(123)] = 2168,
-  [SMALL_STATE(124)] = 2181,
-  [SMALL_STATE(125)] = 2190,
-  [SMALL_STATE(126)] = 2203,
-  [SMALL_STATE(127)] = 2216,
-  [SMALL_STATE(128)] = 2223,
-  [SMALL_STATE(129)] = 2234,
-  [SMALL_STATE(130)] = 2245,
-  [SMALL_STATE(131)] = 2258,
-  [SMALL_STATE(132)] = 2267,
-  [SMALL_STATE(133)] = 2280,
-  [SMALL_STATE(134)] = 2287,
-  [SMALL_STATE(135)] = 2300,
-  [SMALL_STATE(136)] = 2313,
-  [SMALL_STATE(137)] = 2326,
-  [SMALL_STATE(138)] = 2337,
-  [SMALL_STATE(139)] = 2350,
-  [SMALL_STATE(140)] = 2363,
-  [SMALL_STATE(141)] = 2374,
-  [SMALL_STATE(142)] = 2387,
-  [SMALL_STATE(143)] = 2394,
-  [SMALL_STATE(144)] = 2401,
-  [SMALL_STATE(145)] = 2414,
+  [SMALL_STATE(120)] = 2135,
+  [SMALL_STATE(121)] = 2146,
+  [SMALL_STATE(122)] = 2159,
+  [SMALL_STATE(123)] = 2166,
+  [SMALL_STATE(124)] = 2173,
+  [SMALL_STATE(125)] = 2186,
+  [SMALL_STATE(126)] = 2199,
+  [SMALL_STATE(127)] = 2212,
+  [SMALL_STATE(128)] = 2219,
+  [SMALL_STATE(129)] = 2232,
+  [SMALL_STATE(130)] = 2243,
+  [SMALL_STATE(131)] = 2256,
+  [SMALL_STATE(132)] = 2269,
+  [SMALL_STATE(133)] = 2282,
+  [SMALL_STATE(134)] = 2295,
+  [SMALL_STATE(135)] = 2308,
+  [SMALL_STATE(136)] = 2321,
+  [SMALL_STATE(137)] = 2334,
+  [SMALL_STATE(138)] = 2345,
+  [SMALL_STATE(139)] = 2352,
+  [SMALL_STATE(140)] = 2365,
+  [SMALL_STATE(141)] = 2378,
+  [SMALL_STATE(142)] = 2389,
+  [SMALL_STATE(143)] = 2402,
+  [SMALL_STATE(144)] = 2411,
+  [SMALL_STATE(145)] = 2418,
   [SMALL_STATE(146)] = 2427,
   [SMALL_STATE(147)] = 2435,
   [SMALL_STATE(148)] = 2445,
-  [SMALL_STATE(149)] = 2455,
-  [SMALL_STATE(150)] = 2465,
-  [SMALL_STATE(151)] = 2475,
-  [SMALL_STATE(152)] = 2485,
-  [SMALL_STATE(153)] = 2491,
-  [SMALL_STATE(154)] = 2501,
-  [SMALL_STATE(155)] = 2507,
-  [SMALL_STATE(156)] = 2517,
-  [SMALL_STATE(157)] = 2527,
-  [SMALL_STATE(158)] = 2537,
+  [SMALL_STATE(149)] = 2453,
+  [SMALL_STATE(150)] = 2463,
+  [SMALL_STATE(151)] = 2473,
+  [SMALL_STATE(152)] = 2479,
+  [SMALL_STATE(153)] = 2489,
+  [SMALL_STATE(154)] = 2499,
+  [SMALL_STATE(155)] = 2509,
+  [SMALL_STATE(156)] = 2519,
+  [SMALL_STATE(157)] = 2525,
+  [SMALL_STATE(158)] = 2535,
   [SMALL_STATE(159)] = 2545,
   [SMALL_STATE(160)] = 2551,
   [SMALL_STATE(161)] = 2561,
   [SMALL_STATE(162)] = 2569,
-  [SMALL_STATE(163)] = 2579,
-  [SMALL_STATE(164)] = 2589,
-  [SMALL_STATE(165)] = 2599,
-  [SMALL_STATE(166)] = 2609,
-  [SMALL_STATE(167)] = 2617,
-  [SMALL_STATE(168)] = 2623,
+  [SMALL_STATE(163)] = 2577,
+  [SMALL_STATE(164)] = 2587,
+  [SMALL_STATE(165)] = 2595,
+  [SMALL_STATE(166)] = 2605,
+  [SMALL_STATE(167)] = 2615,
+  [SMALL_STATE(168)] = 2625,
   [SMALL_STATE(169)] = 2633,
-  [SMALL_STATE(170)] = 2643,
-  [SMALL_STATE(171)] = 2653,
-  [SMALL_STATE(172)] = 2663,
-  [SMALL_STATE(173)] = 2673,
-  [SMALL_STATE(174)] = 2683,
-  [SMALL_STATE(175)] = 2693,
-  [SMALL_STATE(176)] = 2703,
-  [SMALL_STATE(177)] = 2711,
-  [SMALL_STATE(178)] = 2719,
+  [SMALL_STATE(170)] = 2639,
+  [SMALL_STATE(171)] = 2649,
+  [SMALL_STATE(172)] = 2659,
+  [SMALL_STATE(173)] = 2669,
+  [SMALL_STATE(174)] = 2679,
+  [SMALL_STATE(175)] = 2689,
+  [SMALL_STATE(176)] = 2699,
+  [SMALL_STATE(177)] = 2709,
+  [SMALL_STATE(178)] = 2717,
   [SMALL_STATE(179)] = 2727,
   [SMALL_STATE(180)] = 2732,
   [SMALL_STATE(181)] = 2737,
@@ -5662,60 +5662,60 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(183)] = 2751,
   [SMALL_STATE(184)] = 2756,
   [SMALL_STATE(185)] = 2763,
-  [SMALL_STATE(186)] = 2770,
-  [SMALL_STATE(187)] = 2775,
+  [SMALL_STATE(186)] = 2768,
+  [SMALL_STATE(187)] = 2773,
   [SMALL_STATE(188)] = 2780,
   [SMALL_STATE(189)] = 2785,
   [SMALL_STATE(190)] = 2792,
   [SMALL_STATE(191)] = 2797,
-  [SMALL_STATE(192)] = 2804,
-  [SMALL_STATE(193)] = 2811,
-  [SMALL_STATE(194)] = 2816,
-  [SMALL_STATE(195)] = 2823,
-  [SMALL_STATE(196)] = 2830,
-  [SMALL_STATE(197)] = 2835,
-  [SMALL_STATE(198)] = 2840,
-  [SMALL_STATE(199)] = 2847,
-  [SMALL_STATE(200)] = 2852,
+  [SMALL_STATE(192)] = 2802,
+  [SMALL_STATE(193)] = 2809,
+  [SMALL_STATE(194)] = 2814,
+  [SMALL_STATE(195)] = 2819,
+  [SMALL_STATE(196)] = 2824,
+  [SMALL_STATE(197)] = 2831,
+  [SMALL_STATE(198)] = 2838,
+  [SMALL_STATE(199)] = 2843,
+  [SMALL_STATE(200)] = 2850,
   [SMALL_STATE(201)] = 2857,
   [SMALL_STATE(202)] = 2862,
   [SMALL_STATE(203)] = 2867,
   [SMALL_STATE(204)] = 2872,
   [SMALL_STATE(205)] = 2877,
-  [SMALL_STATE(206)] = 2882,
+  [SMALL_STATE(206)] = 2884,
   [SMALL_STATE(207)] = 2889,
-  [SMALL_STATE(208)] = 2896,
+  [SMALL_STATE(208)] = 2894,
   [SMALL_STATE(209)] = 2901,
   [SMALL_STATE(210)] = 2906,
   [SMALL_STATE(211)] = 2913,
-  [SMALL_STATE(212)] = 2920,
+  [SMALL_STATE(212)] = 2918,
   [SMALL_STATE(213)] = 2925,
   [SMALL_STATE(214)] = 2932,
   [SMALL_STATE(215)] = 2937,
-  [SMALL_STATE(216)] = 2942,
-  [SMALL_STATE(217)] = 2947,
-  [SMALL_STATE(218)] = 2952,
-  [SMALL_STATE(219)] = 2959,
-  [SMALL_STATE(220)] = 2966,
-  [SMALL_STATE(221)] = 2973,
-  [SMALL_STATE(222)] = 2980,
-  [SMALL_STATE(223)] = 2987,
+  [SMALL_STATE(216)] = 2944,
+  [SMALL_STATE(217)] = 2949,
+  [SMALL_STATE(218)] = 2956,
+  [SMALL_STATE(219)] = 2963,
+  [SMALL_STATE(220)] = 2968,
+  [SMALL_STATE(221)] = 2975,
+  [SMALL_STATE(222)] = 2982,
+  [SMALL_STATE(223)] = 2989,
   [SMALL_STATE(224)] = 2994,
-  [SMALL_STATE(225)] = 2999,
-  [SMALL_STATE(226)] = 3006,
-  [SMALL_STATE(227)] = 3011,
-  [SMALL_STATE(228)] = 3016,
-  [SMALL_STATE(229)] = 3021,
-  [SMALL_STATE(230)] = 3028,
-  [SMALL_STATE(231)] = 3035,
-  [SMALL_STATE(232)] = 3042,
-  [SMALL_STATE(233)] = 3047,
-  [SMALL_STATE(234)] = 3054,
-  [SMALL_STATE(235)] = 3061,
-  [SMALL_STATE(236)] = 3068,
-  [SMALL_STATE(237)] = 3073,
-  [SMALL_STATE(238)] = 3078,
-  [SMALL_STATE(239)] = 3083,
+  [SMALL_STATE(225)] = 3001,
+  [SMALL_STATE(226)] = 3008,
+  [SMALL_STATE(227)] = 3013,
+  [SMALL_STATE(228)] = 3020,
+  [SMALL_STATE(229)] = 3025,
+  [SMALL_STATE(230)] = 3032,
+  [SMALL_STATE(231)] = 3039,
+  [SMALL_STATE(232)] = 3046,
+  [SMALL_STATE(233)] = 3051,
+  [SMALL_STATE(234)] = 3058,
+  [SMALL_STATE(235)] = 3065,
+  [SMALL_STATE(236)] = 3070,
+  [SMALL_STATE(237)] = 3075,
+  [SMALL_STATE(238)] = 3080,
+  [SMALL_STATE(239)] = 3085,
   [SMALL_STATE(240)] = 3090,
   [SMALL_STATE(241)] = 3095,
   [SMALL_STATE(242)] = 3100,
@@ -5815,422 +5815,422 @@ static const uint32_t ts_small_parse_table_map[] = {
 static const TSParseActionEntry ts_parse_actions[] = {
   [0] = {.entry = {.count = 0, .reusable = false}},
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
-  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [5] = {.entry = {.count = 1, .reusable = false}}, SHIFT(145),
-  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
-  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
-  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(181),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [15] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0),
-  [17] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(116),
-  [20] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(145),
-  [23] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(294),
-  [26] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(2),
-  [29] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(302),
-  [32] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(37),
-  [35] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [37] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [39] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
-  [41] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
+  [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
+  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(130),
+  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
+  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [15] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_extSubset_repeat1, 2, 0, 0),
+  [17] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_extSubset_repeat1, 2, 0, 0), SHIFT_REPEAT(302),
+  [20] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_extSubset_repeat1, 2, 0, 0), SHIFT_REPEAT(107),
+  [23] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_extSubset_repeat1, 2, 0, 0), SHIFT_REPEAT(130),
+  [26] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_extSubset_repeat1, 2, 0, 0), SHIFT_REPEAT(312),
+  [29] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_extSubset_repeat1, 2, 0, 0), SHIFT_REPEAT(2),
+  [32] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_extSubset_repeat1, 2, 0, 0), SHIFT_REPEAT(58),
+  [35] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
+  [37] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [39] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [41] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
   [43] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
-  [45] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [49] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 2, 0, 0),
-  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
-  [53] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 1, 0, 0),
-  [55] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [45] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [49] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_extSubset, 2, 0, 0),
+  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [53] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_extSubset, 1, 0, 0),
+  [55] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
   [57] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(330),
-  [61] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
-  [63] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [65] = {.entry = {.count = 1, .reusable = false}}, SHIFT(323),
-  [67] = {.entry = {.count = 1, .reusable = false}}, SHIFT(324),
-  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
-  [71] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(326),
-  [74] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0),
-  [76] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(13),
-  [79] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(285),
-  [82] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(286),
-  [85] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(287),
-  [88] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__cp, 1, 0, 0),
-  [90] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
+  [59] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(330),
+  [62] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0),
+  [64] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(12),
+  [67] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(323),
+  [70] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(324),
+  [73] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(325),
+  [76] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__cp, 1, 0, 0),
+  [78] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
+  [80] = {.entry = {.count = 1, .reusable = true}}, SHIFT(330),
+  [82] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
+  [84] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [86] = {.entry = {.count = 1, .reusable = false}}, SHIFT(323),
+  [88] = {.entry = {.count = 1, .reusable = false}}, SHIFT(324),
+  [90] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
   [92] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
-  [94] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [96] = {.entry = {.count = 1, .reusable = false}}, SHIFT(285),
-  [98] = {.entry = {.count = 1, .reusable = false}}, SHIFT(286),
-  [100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
-  [102] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(330),
-  [105] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0),
-  [107] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(17),
-  [110] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(323),
-  [113] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(324),
-  [116] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(325),
-  [119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
-  [121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
-  [123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
-  [125] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEReference, 3, 0, 0),
-  [127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
-  [129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
-  [131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
+  [94] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [96] = {.entry = {.count = 1, .reusable = false}}, SHIFT(291),
+  [98] = {.entry = {.count = 1, .reusable = false}}, SHIFT(293),
+  [100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(290),
+  [102] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEReference, 3, 0, 0),
+  [104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
+  [106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
+  [110] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(326),
+  [113] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0),
+  [115] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(20),
+  [118] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(291),
+  [121] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(293),
+  [124] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(290),
+  [127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(225),
+  [129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
+  [131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
   [133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(322),
   [135] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 5, 0, 0),
-  [137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 3, 0, 0),
-  [139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
-  [141] = {.entry = {.count = 1, .reusable = false}}, SHIFT(331),
-  [143] = {.entry = {.count = 1, .reusable = false}}, SHIFT(332),
-  [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(333),
-  [147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [149] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 6, 0, 0),
-  [151] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 4, 0, 0),
-  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
-  [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
-  [159] = {.entry = {.count = 1, .reusable = false}}, SHIFT(327),
-  [161] = {.entry = {.count = 1, .reusable = false}}, SHIFT(328),
-  [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(329),
-  [165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
-  [169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
-  [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [175] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0),
-  [177] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(331),
-  [180] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(332),
-  [183] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(333),
-  [186] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(30),
-  [189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [191] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0),
-  [193] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(327),
-  [196] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(328),
-  [199] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(329),
-  [202] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(32),
-  [205] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 7, 0, 0),
-  [207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [209] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 8, 0, 0),
-  [211] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_GEDecl, 8, 0, 0),
-  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 6, 0, 0),
-  [215] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_AttlistDecl, 6, 0, 0),
-  [217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__markupdecl, 1, 0, 0),
-  [219] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__markupdecl, 1, 0, 0),
-  [221] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 7, 0, 0),
-  [223] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_AttlistDecl, 7, 0, 0),
-  [225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
-  [227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
-  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
-  [231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
-  [233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elementdecl, 7, 0, 0),
-  [235] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elementdecl, 7, 0, 0),
-  [237] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PI, 3, 0, 0),
-  [239] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PI, 3, 0, 0),
-  [241] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PEReference, 3, 0, 0),
-  [243] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationDecl, 7, 0, 0),
-  [245] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_NotationDecl, 7, 0, 0),
-  [247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
-  [249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
-  [251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [253] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationDecl, 8, 0, 0),
-  [255] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_NotationDecl, 8, 0, 0),
-  [257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elementdecl, 8, 0, 0),
-  [259] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elementdecl, 8, 0, 0),
-  [261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
-  [265] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditionalSect, 5, 0, 0),
-  [267] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditionalSect, 5, 0, 0),
-  [269] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditionalSect, 6, 0, 0),
-  [271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditionalSect, 6, 0, 0),
+  [137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
+  [139] = {.entry = {.count = 1, .reusable = false}}, SHIFT(331),
+  [141] = {.entry = {.count = 1, .reusable = false}}, SHIFT(332),
+  [143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(333),
+  [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [147] = {.entry = {.count = 1, .reusable = false}}, SHIFT(327),
+  [149] = {.entry = {.count = 1, .reusable = false}}, SHIFT(328),
+  [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(329),
+  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
+  [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
+  [157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [159] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 6, 0, 0),
+  [161] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 7, 0, 0),
+  [163] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 3, 0, 0),
+  [165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [167] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0),
+  [169] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(331),
+  [172] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(332),
+  [175] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(333),
+  [178] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(30),
+  [181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0),
+  [183] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(327),
+  [186] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(328),
+  [189] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(329),
+  [192] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(31),
+  [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
+  [197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
+  [199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
+  [201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
+  [203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
+  [205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [207] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 4, 0, 0),
+  [209] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 7, 0, 0),
+  [211] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_AttlistDecl, 7, 0, 0),
+  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditionalSect, 6, 0, 0),
+  [215] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditionalSect, 6, 0, 0),
+  [217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationDecl, 7, 0, 0),
+  [219] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_NotationDecl, 7, 0, 0),
+  [221] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PI, 3, 0, 0),
+  [223] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PI, 3, 0, 0),
+  [225] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elementdecl, 8, 0, 0),
+  [227] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elementdecl, 8, 0, 0),
+  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
+  [231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [235] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationDecl, 8, 0, 0),
+  [237] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_NotationDecl, 8, 0, 0),
+  [239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
+  [243] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elementdecl, 7, 0, 0),
+  [245] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_elementdecl, 7, 0, 0),
+  [247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [251] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PEReference, 3, 0, 0),
+  [253] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditionalSect, 7, 0, 0),
+  [255] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditionalSect, 7, 0, 0),
+  [257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEDecl, 9, 0, 0),
+  [259] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PEDecl, 9, 0, 0),
+  [261] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditionalSect, 4, 0, 0),
+  [263] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditionalSect, 4, 0, 0),
+  [265] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 9, 0, 0),
+  [267] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_GEDecl, 9, 0, 0),
+  [269] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EntityDecl, 1, 0, 0),
+  [271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__EntityDecl, 1, 0, 0),
   [273] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 7, 0, 0),
   [275] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_GEDecl, 7, 0, 0),
-  [277] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditionalSect, 4, 0, 0),
-  [279] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditionalSect, 4, 0, 0),
-  [281] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 5, 0, 0),
-  [283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_AttlistDecl, 5, 0, 0),
-  [285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
-  [287] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
-  [289] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditionalSect, 7, 0, 0),
-  [291] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditionalSect, 7, 0, 0),
-  [293] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EntityDecl, 1, 0, 0),
-  [295] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__EntityDecl, 1, 0, 0),
-  [297] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEDecl, 9, 0, 0),
-  [299] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PEDecl, 9, 0, 0),
-  [301] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 9, 0, 0),
-  [303] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_GEDecl, 9, 0, 0),
-  [305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PI, 5, 0, 0),
-  [307] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PI, 5, 0, 0),
-  [309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEDecl, 10, 0, 0),
-  [311] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PEDecl, 10, 0, 0),
-  [313] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
-  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
-  [317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
-  [319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(296),
-  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
-  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [325] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
-  [327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
-  [329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
-  [331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
-  [333] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
-  [335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
-  [337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [339] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 6, 0, 0),
-  [341] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 6, 0, 0),
-  [343] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CharRef, 3, 0, 0),
-  [345] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_CharRef, 3, 0, 0),
-  [347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityRef, 3, 0, 0),
-  [349] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EntityRef, 3, 0, 0),
+  [277] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 8, 0, 0),
+  [279] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_GEDecl, 8, 0, 0),
+  [281] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 6, 0, 0),
+  [283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_AttlistDecl, 6, 0, 0),
+  [285] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PI, 5, 0, 0),
+  [287] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PI, 5, 0, 0),
+  [289] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [291] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
+  [295] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [297] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__markupdecl, 1, 0, 0),
+  [299] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__markupdecl, 1, 0, 0),
+  [301] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEDecl, 10, 0, 0),
+  [303] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PEDecl, 10, 0, 0),
+  [305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditionalSect, 5, 0, 0),
+  [307] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditionalSect, 5, 0, 0),
+  [309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 5, 0, 0),
+  [311] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_AttlistDecl, 5, 0, 0),
+  [313] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
+  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
+  [317] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
+  [319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
+  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
+  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
+  [325] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
+  [327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
+  [331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
+  [333] = {.entry = {.count = 1, .reusable = true}}, SHIFT(296),
+  [335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
+  [337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
+  [341] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
+  [343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(277),
+  [345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
+  [347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_TextDecl, 6, 0, 0),
+  [349] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_TextDecl, 6, 0, 0),
   [351] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Reference, 1, 0, 0),
   [353] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__Reference, 1, 0, 0),
-  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
-  [361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
-  [363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
-  [365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(277),
-  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
-  [371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 5, 0, 0),
-  [373] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 5, 0, 0),
-  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
-  [377] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0), SHIFT_REPEAT(64),
-  [380] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0),
-  [382] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0), SHIFT_REPEAT(228),
-  [385] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 4, 0, 0),
-  [387] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 4, 0, 0),
-  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
-  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(169),
-  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
-  [395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__cp, 2, 0, 0),
-  [397] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 4, 0, 0),
-  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [401] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0),
-  [403] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0), SHIFT_REPEAT(322),
-  [406] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0), SHIFT_REPEAT(229),
-  [409] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 3, 0, 0),
-  [411] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0), SHIFT_REPEAT(130),
-  [414] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0),
-  [416] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0), SHIFT_REPEAT(259),
+  [355] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_TextDecl, 5, 0, 0),
+  [357] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_TextDecl, 5, 0, 0),
+  [359] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0), SHIFT_REPEAT(66),
+  [362] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0),
+  [364] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0), SHIFT_REPEAT(228),
+  [367] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CharRef, 3, 0, 0),
+  [369] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_CharRef, 3, 0, 0),
+  [371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityRef, 3, 0, 0),
+  [373] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EntityRef, 3, 0, 0),
+  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
+  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
+  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
+  [383] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_TextDecl, 4, 0, 0),
+  [385] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_TextDecl, 4, 0, 0),
+  [387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
+  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(205),
+  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
+  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0),
+  [397] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0), SHIFT_REPEAT(322),
+  [400] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0), SHIFT_REPEAT(229),
+  [403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
+  [405] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__cp, 2, 0, 0),
+  [407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 4, 0, 0),
+  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
+  [411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
+  [413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
+  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
+  [417] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
   [419] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_children, 1, 0, 0),
-  [421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
-  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
-  [427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
-  [429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
-  [431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
-  [433] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0),
-  [435] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(124),
-  [438] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(277),
-  [441] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
-  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
-  [445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
-  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [421] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
+  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
+  [425] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0),
+  [427] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(143),
+  [430] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(277),
+  [433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
+  [435] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 3, 0, 0),
+  [437] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0), SHIFT_REPEAT(132),
+  [440] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0),
+  [442] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0), SHIFT_REPEAT(258),
+  [445] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
+  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
   [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
-  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
-  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(207),
-  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
-  [459] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 2, 0, 0),
-  [461] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 2, 0, 0), SHIFT_REPEAT(322),
-  [464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
-  [466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
-  [468] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 1, 0, 0),
-  [470] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 1, 0, 0), SHIFT_REPEAT(119),
-  [473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
-  [475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
-  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
-  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
-  [481] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0),
-  [483] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0), SHIFT_REPEAT(170),
-  [486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
-  [488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
-  [490] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(133),
-  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
-  [495] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 3, 0, 0),
-  [497] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0), SHIFT_REPEAT(231),
-  [500] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0),
-  [502] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0), SHIFT_REPEAT(274),
-  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
-  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
-  [509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
-  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
-  [517] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 4, 0, 0),
-  [519] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 3, 0, 0),
-  [521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
-  [523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
-  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(307),
-  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
+  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
+  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
+  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
+  [457] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 2, 0, 0),
+  [459] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 2, 0, 0), SHIFT_REPEAT(322),
+  [462] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 3, 0, 0),
+  [464] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 3, 0, 0),
+  [466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
+  [470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
+  [472] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0),
+  [474] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0), SHIFT_REPEAT(178),
+  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(307),
+  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
+  [481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(305),
+  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
+  [485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
+  [489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
+  [491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
+  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
+  [495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
+  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
+  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
+  [501] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 4, 0, 0),
+  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
+  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
+  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
+  [509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
+  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
+  [513] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0), SHIFT_REPEAT(231),
+  [516] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0),
+  [518] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0), SHIFT_REPEAT(274),
+  [521] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 1, 0, 0),
+  [523] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 1, 0, 0), SHIFT_REPEAT(144),
+  [526] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(122),
   [529] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 6, 0, 0),
-  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
-  [533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
-  [535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
-  [537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
-  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
-  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
-  [543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
-  [545] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
-  [547] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 4, 0, 0),
-  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
-  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
-  [553] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 3, 0, 0),
-  [555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
-  [557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(250),
-  [559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
-  [561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 1, 0, 0),
-  [563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
-  [565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [567] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 1, 0, 0),
-  [569] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
-  [571] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 3, 0, 0),
-  [573] = {.entry = {.count = 1, .reusable = true}}, SHIFT(187),
-  [575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
-  [577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
-  [579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
-  [581] = {.entry = {.count = 1, .reusable = true}}, SHIFT(237),
-  [583] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [585] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
-  [587] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 4, 0, 0),
-  [589] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
-  [591] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 5, 0, 0),
-  [593] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
-  [595] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 2, 0, 0),
-  [597] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
-  [599] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttDef, 6, 0, 0),
+  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(211),
+  [533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
+  [535] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 1, 0, 0),
+  [537] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
+  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
+  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
+  [543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
+  [545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 4, 0, 0),
+  [547] = {.entry = {.count = 1, .reusable = true}}, SHIFT(141),
+  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
+  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
+  [553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
+  [555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
+  [557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
+  [559] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 3, 0, 0),
+  [561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
+  [565] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 3, 0, 0),
+  [567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
+  [569] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 1, 0, 0),
+  [571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(235),
+  [573] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 2, 0, 0),
+  [575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
+  [577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
+  [579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
+  [581] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
+  [583] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 5, 0, 0),
+  [585] = {.entry = {.count = 1, .reusable = true}}, SHIFT(237),
+  [587] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
+  [589] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
+  [591] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [593] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
+  [595] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 4, 0, 0),
+  [597] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
+  [599] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 8, 0, 0),
   [601] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 7, 0, 0),
-  [603] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
-  [605] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
-  [607] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [609] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
-  [611] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__VersionInfo, 6, 0, 0),
-  [613] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
-  [615] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [617] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
-  [619] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 9, 0, 0),
-  [621] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 8, 0, 0),
-  [623] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [625] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
-  [627] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
+  [603] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [605] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
+  [607] = {.entry = {.count = 1, .reusable = true}}, SHIFT(297),
+  [609] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__VersionInfo, 6, 0, 0),
+  [611] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [613] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
+  [615] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 9, 0, 0),
+  [617] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EncodingDecl, 6, 0, 0),
+  [619] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [621] = {.entry = {.count = 1, .reusable = true}}, SHIFT(300),
+  [623] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
+  [625] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 8, 0, 0),
+  [627] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
   [629] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
-  [631] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttDef, 4, 0, 0),
-  [633] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [635] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 3, 0, 0),
-  [637] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [639] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
-  [641] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
-  [643] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 6, 0, 0),
-  [645] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EnumeratedType, 1, 0, 0),
+  [631] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityValue, 2, 0, 0),
+  [633] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__AttType, 1, 0, 0),
+  [635] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 6, 0, 0),
+  [637] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
+  [639] = {.entry = {.count = 1, .reusable = true}}, SHIFT(181),
+  [641] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [643] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
+  [645] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_children, 2, 0, 0),
   [647] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
   [649] = {.entry = {.count = 1, .reusable = true}}, SHIFT(295),
-  [651] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ExternalID, 3, 0, 0),
-  [653] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 6, 0, 0),
-  [655] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityValue, 2, 0, 0),
-  [657] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 8, 0, 0),
+  [651] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttDef, 4, 0, 0),
+  [653] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [655] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 6, 0, 0),
+  [657] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EnumeratedType, 1, 0, 0),
   [659] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttValue, 3, 0, 1),
-  [661] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_children, 2, 0, 0),
-  [663] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_DefaultDecl, 3, 0, 0),
-  [665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
-  [667] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
-  [669] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
-  [671] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
-  [673] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 5, 0, 0),
-  [675] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 7, 0, 0),
-  [677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
-  [679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
-  [681] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
-  [683] = {.entry = {.count = 1, .reusable = true}}, SHIFT(300),
-  [685] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttValue, 2, 0, 0),
-  [687] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PublicID, 3, 0, 0),
-  [689] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
-  [691] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EncodingDecl, 6, 0, 0),
-  [693] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [695] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
+  [661] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_DefaultDecl, 3, 0, 0),
+  [663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
+  [665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
+  [667] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 3, 0, 0),
+  [669] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ExternalID, 3, 0, 0),
+  [671] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
+  [673] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
+  [675] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 5, 0, 0),
+  [677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
+  [681] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 7, 0, 0),
+  [683] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
+  [685] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
+  [687] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttValue, 2, 0, 0),
+  [689] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [691] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
+  [693] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PublicID, 3, 0, 0),
+  [695] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170),
   [697] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
-  [699] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
-  [701] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
-  [703] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
-  [705] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
-  [707] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [709] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
-  [711] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 4, 0, 0),
-  [713] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
-  [715] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityValue, 3, 0, 1),
-  [717] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0), SHIFT(21),
-  [720] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
-  [722] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
-  [724] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 3, 0, 0),
-  [726] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
-  [728] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
-  [730] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [732] = {.entry = {.count = 1, .reusable = true}}, SHIFT(278),
-  [734] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_DefaultDecl, 1, 0, 0),
-  [736] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NDataDecl, 4, 0, 0),
-  [738] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_contentspec, 1, 0, 0),
-  [740] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
-  [742] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
-  [744] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__AttType, 1, 0, 0),
+  [699] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
+  [701] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
+  [703] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
+  [705] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0), SHIFT(21),
+  [708] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 4, 0, 0),
+  [710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [712] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
+  [714] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
+  [716] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
+  [718] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_contentspec, 1, 0, 0),
+  [720] = {.entry = {.count = 1, .reusable = true}}, SHIFT(285),
+  [722] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
+  [724] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [726] = {.entry = {.count = 1, .reusable = true}}, SHIFT(267),
+  [728] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
+  [730] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [732] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 3, 0, 0),
+  [734] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
+  [736] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
+  [738] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_DefaultDecl, 1, 0, 0),
+  [740] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityValue, 3, 0, 1),
+  [742] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NDataDecl, 4, 0, 0),
+  [744] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttDef, 6, 0, 0),
   [746] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_SystemLiteral, 3, 0, 0),
   [748] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PubidLiteral, 3, 0, 0),
   [750] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ExternalID, 5, 0, 0),
-  [752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
-  [754] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
-  [756] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
-  [758] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
-  [760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [762] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
-  [764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
-  [766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
-  [770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
-  [772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
+  [752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(278),
+  [754] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [756] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
+  [758] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
+  [760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
+  [762] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
+  [764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
+  [766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
+  [768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
+  [770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
+  [772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
+  [774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
   [776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(293),
-  [780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(297),
-  [784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
-  [786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
-  [788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
-  [790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
-  [792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
-  [794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
+  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
+  [784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
+  [786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
+  [788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
+  [790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
+  [792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
+  [794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
   [796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(241),
-  [798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
-  [800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
-  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
-  [808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(267),
-  [812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
-  [814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
-  [816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
-  [818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
-  [820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
-  [824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
-  [826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
-  [828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
-  [830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(305),
-  [832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(271),
-  [834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
-  [836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
-  [838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
-  [840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
-  [844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
-  [846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(149),
-  [848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148),
-  [850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
+  [800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
+  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
+  [806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
+  [808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(271),
+  [810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
+  [812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
+  [814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
+  [816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
+  [818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
+  [820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
+  [822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
+  [826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
+  [828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(250),
+  [830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
+  [832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
+  [836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
+  [840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
+  [842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
+  [844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
+  [846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
+  [848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
+  [850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
   [852] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
-  [856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
-  [858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [862] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
+  [856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
+  [860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
+  [862] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
   [864] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
-  [866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
-  [868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
-  [870] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
+  [866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
+  [868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
+  [870] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
+  [872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
   [874] = {.entry = {.count = 1, .reusable = true}}, SHIFT(314),
   [876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315),
   [878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(316),
diff --git a/dtd/src/scanner.c b/dtd/src/scanner.c
index 7d42c0c..7a07662 100644
--- a/dtd/src/scanner.c
+++ b/dtd/src/scanner.c
@@ -1,5 +1,13 @@
 #include "../../common/scanner.h"
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4100)
+#elif defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 /// Check if the lexer is in error recovery mode
 static inline bool in_error_recovery(const bool *valid_symbols) {
     return valid_symbols[PI_TARGET] && valid_symbols[PI_CONTENT] && valid_symbols[COMMENT];
@@ -31,3 +39,9 @@ void tree_sitter_dtd_external_scanner_destroy(void *payload) {}
 unsigned tree_sitter_dtd_external_scanner_serialize(void *payload, char *buffer) { return 0; }
 
 void tree_sitter_dtd_external_scanner_deserialize(void *payload, const char *buffer, unsigned length) {}
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#elif defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
diff --git a/dtd/src/tree_sitter/alloc.h b/dtd/src/tree_sitter/alloc.h
index 1f4466d..1abdd12 100644
--- a/dtd/src/tree_sitter/alloc.h
+++ b/dtd/src/tree_sitter/alloc.h
@@ -12,10 +12,10 @@ extern "C" {
 // Allow clients to override allocation functions
 #ifdef TREE_SITTER_REUSE_ALLOCATOR
 
-extern void *(*ts_current_malloc)(size_t);
-extern void *(*ts_current_calloc)(size_t, size_t);
-extern void *(*ts_current_realloc)(void *, size_t);
-extern void (*ts_current_free)(void *);
+extern void *(*ts_current_malloc)(size_t size);
+extern void *(*ts_current_calloc)(size_t count, size_t size);
+extern void *(*ts_current_realloc)(void *ptr, size_t size);
+extern void (*ts_current_free)(void *ptr);
 
 #ifndef ts_malloc
 #define ts_malloc  ts_current_malloc
diff --git a/dtd/src/tree_sitter/parser.h b/dtd/src/tree_sitter/parser.h
index 17f0e94..799f599 100644
--- a/dtd/src/tree_sitter/parser.h
+++ b/dtd/src/tree_sitter/parser.h
@@ -47,6 +47,7 @@ struct TSLexer {
   uint32_t (*get_column)(TSLexer *);
   bool (*is_at_included_range_start)(const TSLexer *);
   bool (*eof)(const TSLexer *);
+  void (*log)(const TSLexer *, const char *, ...);
 };
 
 typedef enum {
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..361167d
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,9 @@
+module github.com/tree-sitter-grammars/tree-sitter-xml
+
+go 1.23
+
+toolchain go1.23.0
+
+require github.com/tree-sitter/go-tree-sitter v0.23.1
+
+require github.com/mattn/go-pointer v0.0.1 // indirect
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..d775361
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,36 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0=
+github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tree-sitter/go-tree-sitter v0.23.1 h1:HCfaE19sKfG7q190xfM1loUZf6wEHa4TDqDEW46s9Lg=
+github.com/tree-sitter/go-tree-sitter v0.23.1/go.mod h1:EvIVhMvvPNvhu9x+ddSPxSnUEU5AnsSwi1LMqXIVE3A=
+github.com/tree-sitter/tree-sitter-c v0.21.5-0.20240818205408-927da1f210eb h1:A8425heRM8mylnv4H58FPUiH+aYivyitre0PzxrfmWs=
+github.com/tree-sitter/tree-sitter-c v0.21.5-0.20240818205408-927da1f210eb/go.mod h1:dOF6gtQiF9UwNh995T5OphYmtIypkjsp3ap7r9AN/iA=
+github.com/tree-sitter/tree-sitter-cpp v0.22.4-0.20240818224355-b1a4e2b25148 h1:AfFPZwtwGN01BW1jDdqBVqscTwetvMpydqYZz57RSlc=
+github.com/tree-sitter/tree-sitter-cpp v0.22.4-0.20240818224355-b1a4e2b25148/go.mod h1:Bh6U3viD57rFXRYIQ+kmiYtr+1Bx0AceypDLJJSyi9s=
+github.com/tree-sitter/tree-sitter-embedded-template v0.21.1-0.20240819044651-ffbf64942c33 h1:TwqSV3qLp3tKSqirGLRHnjFk9Tc2oy57LIl+FQ4GjI4=
+github.com/tree-sitter/tree-sitter-embedded-template v0.21.1-0.20240819044651-ffbf64942c33/go.mod h1:CvCKCt3v04Ufos1zZnNCelBDeCGRpPucaN8QczoUsN4=
+github.com/tree-sitter/tree-sitter-go v0.21.3-0.20240818010209-8c0f0e7a6012 h1:Xvxck3tE5FW7F7bTS97iNM2ADMyCMJztVqn5HYKdJGo=
+github.com/tree-sitter/tree-sitter-go v0.21.3-0.20240818010209-8c0f0e7a6012/go.mod h1:T40D0O1cPvUU/+AmiXVXy1cncYQT6wem4Z0g4SfAYvY=
+github.com/tree-sitter/tree-sitter-html v0.20.5-0.20240818004741-d11201a263d0 h1:c46K6uh5Dz00zJeU9BfjXdb8I+E4RkUdfnWJpQADXFo=
+github.com/tree-sitter/tree-sitter-html v0.20.5-0.20240818004741-d11201a263d0/go.mod h1:hcNt/kOJHcIcuMvouE7LJcYdeFUFbVpBJ6d4wmOA+tU=
+github.com/tree-sitter/tree-sitter-java v0.21.1-0.20240824015150-576d8097e495 h1:jrt4qbJVEFs4H93/ITxygHc6u0TGqAkkate7TQ4wFSA=
+github.com/tree-sitter/tree-sitter-java v0.21.1-0.20240824015150-576d8097e495/go.mod h1:oyaR7fLnRV0hT9z6qwE9GkaeTom/hTDwK3H2idcOJFc=
+github.com/tree-sitter/tree-sitter-javascript v0.21.5-0.20240818005344-15887341e5b5 h1:om4X9AVg3asL8gxNJDcz4e/Wp+VpQj1PY3uJXKr6EOg=
+github.com/tree-sitter/tree-sitter-javascript v0.21.5-0.20240818005344-15887341e5b5/go.mod h1:nNqgPoV/h9uYWk6kYEFdEAhNVOacpfpRW5SFmdaP4tU=
+github.com/tree-sitter/tree-sitter-json v0.21.1-0.20240818005659-bdd69eb8c8a5 h1:pfV3G3k7NCKqKk8THBmyuh2zA33lgYHS3GVrzRR8ry4=
+github.com/tree-sitter/tree-sitter-json v0.21.1-0.20240818005659-bdd69eb8c8a5/go.mod h1:GbMKRjLfk0H+PI7nLi1Sx5lHf5wCpLz9al8tQYSxpEk=
+github.com/tree-sitter/tree-sitter-php v0.22.9-0.20240819002312-a552625b56c1 h1:ZXZMDwE+IhUtGug4Brv6NjJWUU3rfkZBKpemf6RY8/g=
+github.com/tree-sitter/tree-sitter-php v0.22.9-0.20240819002312-a552625b56c1/go.mod h1:UKCLuYnJ312Mei+3cyTmGOHzn0YAnaPRECgJmHtzrqs=
+github.com/tree-sitter/tree-sitter-python v0.21.1-0.20240818005537-55a9b8a4fbfb h1:EXEM82lFM7JjJb6qiKZXkpIDaCcbV2obNn82ghwj9lw=
+github.com/tree-sitter/tree-sitter-python v0.21.1-0.20240818005537-55a9b8a4fbfb/go.mod h1:lXCF1nGG5Dr4J3BTS0ObN4xJCCICiSu/b+Xe/VqMV7g=
+github.com/tree-sitter/tree-sitter-ruby v0.21.1-0.20240818211811-7dbc1e2d0e2d h1:fcYCvoXdcP1uRQYXqJHRy6Hec+uKScQdKVtMwK9JeCI=
+github.com/tree-sitter/tree-sitter-ruby v0.21.1-0.20240818211811-7dbc1e2d0e2d/go.mod h1:T1nShQ4v5AJtozZ8YyAS4uzUtDAJj/iv4YfwXSbUHzg=
+github.com/tree-sitter/tree-sitter-rust v0.21.3-0.20240818005432-2b43eafe6447 h1:o9alBu1J/WjrcTKEthYtXmdkDc5OVXD+PqlvnEZ0Lzc=
+github.com/tree-sitter/tree-sitter-rust v0.21.3-0.20240818005432-2b43eafe6447/go.mod h1:1Oh95COkkTn6Ezp0vcMbvfhRP5gLeqqljR0BYnBzWvc=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/jsconfig.json b/jsconfig.json
deleted file mode 100644
index 5678daa..0000000
--- a/jsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "files": [
-    "common/index.js",
-    "xml/grammar.js",
-    "dtd/grammar.js"
-  ],
-  "exclude": ["node_modules"],
-  "compilerOptions": {
-    "checkJs": true,
-    "module": "Node16",
-    "types": ["tree-sitter-cli/dsl"]
-  }
-}
diff --git a/package-lock.json b/package-lock.json
index ae9898f..90b5ffa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,21 +1,21 @@
 {
   "name": "@tree-sitter-grammars/tree-sitter-xml",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@tree-sitter-grammars/tree-sitter-xml",
-      "version": "0.6.3",
+      "version": "0.7.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "node-addon-api": "^8.0.0",
-        "node-gyp-build": "^4.8.1"
+        "node-addon-api": "^8.2.1",
+        "node-gyp-build": "^4.8.2"
       },
       "devDependencies": {
         "prebuildify": "^6.0.1",
-        "tree-sitter-cli": "^0.22.6"
+        "tree-sitter-cli": "^0.24.3"
       },
       "funding": {
         "type": "github",
@@ -172,17 +172,19 @@
       }
     },
     "node_modules/node-addon-api": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.0.0.tgz",
-      "integrity": "sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.1.tgz",
+      "integrity": "sha512-vmEOvxwiH8tlOcv4SyE8RH34rI5/nWVaigUeAUPawC6f0+HoDthwI0vkMu4tbtsZrXq6QXFfrkhjofzKEs5tpA==",
+      "license": "MIT",
       "engines": {
         "node": "^18 || ^20 || >= 21"
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
+      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
+      "license": "MIT",
       "bin": {
         "node-gyp-build": "bin.js",
         "node-gyp-build-optional": "optional.js",
@@ -344,13 +346,17 @@
       }
     },
     "node_modules/tree-sitter-cli": {
-      "version": "0.22.6",
-      "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.22.6.tgz",
-      "integrity": "sha512-s7mYOJXi8sIFkt/nLJSqlYZP96VmKTc3BAwIX0rrrlRxWjWuCwixFqwzxWZBQz4R8Hx01iP7z3cT3ih58BUmZQ==",
+      "version": "0.24.3",
+      "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.24.3.tgz",
+      "integrity": "sha512-5vS0SiJf31tMTn9CYLsu5l18qXaw5MLFka3cuGxOB5f4TtgoUSK1Sog6rKmqBc7PvFJq37YcQBjj9giNy2cJPw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "tree-sitter": "cli.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
     "node_modules/util-deprecate": {
diff --git a/package.json b/package.json
index 479549d..4612d7a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tree-sitter-grammars/tree-sitter-xml",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "license": "MIT",
   "description": "XML & DTD grammars for tree-sitter",
   "repository": "tree-sitter-grammars/tree-sitter-xml",
@@ -42,12 +42,12 @@
     "common/**"
   ],
   "dependencies": {
-    "node-addon-api": "^8.0.0",
-    "node-gyp-build": "^4.8.1"
+    "node-addon-api": "^8.2.1",
+    "node-gyp-build": "^4.8.2"
   },
   "devDependencies": {
     "prebuildify": "^6.0.1",
-    "tree-sitter-cli": "^0.22.6"
+    "tree-sitter-cli": "^0.24.3"
   },
   "peerDependencies": {
     "tree-sitter": "^0.21.1"
@@ -64,41 +64,11 @@
   },
   "scripts": {
     "install": "node-gyp-build",
-    "build": "prebuildify --napi --strip",
-    "version": "make update"
+    "prestart": "tree-sitter build --wasm",
+    "start": "tree-sitter playground",
+    "test": "node --test bindings/node/*_test.js"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "tree-sitter": [
-    {
-      "scope": "source.xml",
-      "file-types": [
-        "xml",
-        "svg",
-        "xsd",
-        "xslt",
-        "xsl",
-        "rng"
-      ],
-      "injection-regex": "^(xml|svg|xsd|xslt|xsl|rng)$",
-      "highlights": "queries/xml/highlights.scm",
-      "path": "xml",
-      "external-files": [
-        "common/scanner.h"
-      ]
-    },
-    {
-      "scope": "source.dtd",
-      "file-types": [
-        "dtd"
-      ],
-      "injection-regex": "^dtd$",
-      "highlights": "queries/dtd/highlights.scm",
-      "path": "dtd",
-      "external-files": [
-        "common/scanner.h"
-      ]
-    }
-  ]
+  }
 }
diff --git a/pyproject.toml b/pyproject.toml
index e35ec9b..ec5d3f5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-xml"
 description = "XML & DTD grammars for tree-sitter"
-version = "0.6.4"
+version = "0.7.0"
 keywords = ["incremental", "parsing", "tree-sitter", "xml"]
 classifiers = [
   "Intended Audience :: Developers",
@@ -14,7 +14,11 @@ classifiers = [
   "Topic :: Text Processing :: Linguistic",
   "Typing :: Typed"
 ]
-requires-python = ">=3.8"
+authors = [
+  { name = "ObserverOfTime", email =  "chronobserver@disroot.org"},
+  { name = "Amaan Qureshi", email = "amaanq12@gmail.com" }
+]
+requires-python = ">=3.9"
 license.text = "MIT"
 readme = "README.md"
 
@@ -23,8 +27,8 @@ Homepage = "https://github.com/tree-sitter/tree-sitter-xml"
 Sponsor = "https://github.com/sponsors/ObserverOfTime"
 
 [project.optional-dependencies]
-core = ["tree-sitter~=0.21"]
+core = ["tree-sitter~=0.22"]
 
 [tool.cibuildwheel]
-build = "cp38-*"
+build = "cp39-*"
 build-frontend = "build"
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index 61f9028..932dc49 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -1,12 +1,12 @@
 ;; XML declaration
 
-(XMLDecl "xml" @keyword)
+(TextDecl "xml" @keyword)
 
-(XMLDecl [ "version" "encoding" ] @property)
+(TextDecl [ "version" "encoding" ] @property)
 
-(XMLDecl (EncName) @string.special)
+(TextDecl (EncName) @string.special)
 
-(XMLDecl (VersionNum) @number)
+(TextDecl (VersionNum) @number)
 
 ;; Processing instructions
 
@@ -107,7 +107,11 @@
 
 ;; Delimiters & punctuation
 
-[ "<?" "?>" "<!" ">" "]]>" ] @punctuation.delimiter
+[
+  "<?" "?>"
+  "<!" ">"
+  "<![" "]]>"
+] @punctuation.delimiter
 
 [ "(" ")" "[" ] @punctuation.bracket
 
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index d61beb6..cc363dc 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -155,10 +155,7 @@
  "</" "/>"
 ] @punctuation.delimiter
 
-[
-  "(" ")"
-  "[" "]"
-] @punctuation.bracket
+[ "(" ")" "[" "]" ] @punctuation.bracket
 
 [ "\"" "'" ] @punctuation.delimiter
 
@@ -166,8 +163,6 @@
 
 ;; Misc
 
-[ "INCLUDE" "IGNORE" ] @keyword
-
 (Comment) @comment
 
 (ERROR) @error
diff --git a/setup.py b/setup.py
index ec4c9f6..01a7431 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ class BdistWheel(bdist_wheel):
     def get_tag(self):
         python, abi, platform = super().get_tag()
         if python.startswith("cp"):
-            python, abi = "cp38", "abi3"
+            python, abi = "cp39", "abi3"
         return python, abi, platform
 
 
@@ -42,12 +42,15 @@ def get_tag(self):
             ],
             extra_compile_args=[
                 "-std=c11",
-                "-Wno-unused-parameter",
-                "-Wno-unused-value",
-            ] if system() != "Windows" else [],
+                "-fvisibility=hidden",
+            ] if system() != "Windows" else [
+                "/std:c11",
+                "/utf-8",
+            ],
             define_macros=[
-                ("Py_LIMITED_API", "0x03080000"),
-                ("PY_SSIZE_T_CLEAN", None)
+                ("Py_LIMITED_API", "0x03090000"),
+                ("PY_SSIZE_T_CLEAN", None),
+                ("TREE_SITTER_HIDE_SYMBOLS", None),
             ],
             include_dirs=["xml/src"],
             py_limited_api=True,
diff --git a/test/corpus/examples.txt b/test/corpus/examples.txt
index fd041ac..4ab2cd0 100644
--- a/test/corpus/examples.txt
+++ b/test/corpus/examples.txt
@@ -202,7 +202,7 @@ BookStore.dtd
 
 --------------------------------------------------------------------------------
 
-(document
+(extSubset
   (elementdecl
     (Name)
     (contentspec
diff --git a/test/corpus/issues.txt b/test/corpus/issues.txt
index 602bb14..f907ec7 100644
--- a/test/corpus/issues.txt
+++ b/test/corpus/issues.txt
@@ -83,7 +83,7 @@ Parameter-entity references (#10)
 
 --------------------------------------------------------------------------------
 
-(document
+(extSubset
   (Comment)
   (elementdecl
     (Name)
diff --git a/test/corpus/standard.txt b/test/corpus/standard.txt
index 04fcc66..72d3024 100644
--- a/test/corpus/standard.txt
+++ b/test/corpus/standard.txt
@@ -145,7 +145,7 @@ Element Declarations
 
 --------------------------------------------------------------------------------
 
-(document
+(extSubset
   (elementdecl
     (Name)
     (contentspec))
@@ -229,7 +229,7 @@ Attribute-List Declarations
 
 --------------------------------------------------------------------------------
 
-(document
+(extSubset
   (AttlistDecl
     (Name)
     (AttDef
@@ -278,7 +278,7 @@ Entity Declarations
 
 --------------------------------------------------------------------------------
 
-(document
+(extSubset
   (GEDecl
     (Name)
     (EntityValue))
@@ -318,7 +318,7 @@ Conditional Sections
 
 --------------------------------------------------------------------------------
 
-(document
+(extSubset
   (PEDecl
     (Name)
     (EntityValue))
diff --git a/tree-sitter.json b/tree-sitter.json
new file mode 100644
index 0000000..ff6d0fb
--- /dev/null
+++ b/tree-sitter.json
@@ -0,0 +1,55 @@
+{
+  "metadata": {
+    "version": "0.7.0",
+    "description": "XML & DTD grammars for tree-sitter",
+    "links": {
+      "repository": "https://github.com/tree-sitter-grammars/tree-sitter-xml"
+    },
+    "authors": [
+      {
+        "name": "ObserverOfTime",
+        "email": "chronobserver@disroot.org",
+        "url": "https://observeroftime.github.io/"
+      },
+      {
+        "name": "Amaan Qureshi",
+        "email": "amaanq12@gmail.com"
+      }
+    ]
+  },
+  "grammars": [
+    {
+      "name": "xml",
+      "camelcase": "XML",
+      "scope": "source.xml",
+      "file-types": [
+        "xml",
+        "svg",
+        "xsd",
+        "xslt",
+        "xsl",
+        "rng"
+      ],
+      "injection-regex": "^(xml|svg|xsd|xslt|xsl|rng)$",
+      "highlights": "queries/xml/highlights.scm",
+      "path": "xml",
+      "external-files": [
+        "common/scanner.h"
+      ]
+    },
+    {
+      "name": "dtd",
+      "camelcase": "DTD",
+      "scope": "source.dtd",
+      "file-types": [
+        "dtd"
+      ],
+      "injection-regex": "^dtd$",
+      "highlights": "queries/dtd/highlights.scm",
+      "path": "dtd",
+      "external-files": [
+        "common/scanner.h"
+      ]
+    }
+  ]
+}
diff --git a/xml/CMakeLists.txt b/xml/CMakeLists.txt
new file mode 100644
index 0000000..c1a821d
--- /dev/null
+++ b/xml/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(PROJECT_DESCRIPTION "XML grammar for tree-sitter")
+
+add_parser(xml)
diff --git a/xml/Makefile b/xml/Makefile
index 3d78297..61a2b57 100644
--- a/xml/Makefile
+++ b/xml/Makefile
@@ -1,3 +1,4 @@
 LANGUAGE_NAME := tree-sitter-xml
+DESCRIPTION := XML grammar for tree-sitter
 
 include ../common/common.mak
diff --git a/xml/grammar.js b/xml/grammar.js
index f543aa3..c36108c 100644
--- a/xml/grammar.js
+++ b/xml/grammar.js
@@ -4,13 +4,14 @@
  * @license MIT
  */
 
-const c = require('../common');
+/// <reference types="tree-sitter-cli/dsl" />
+// @ts-check
 
-const DTD = require('../dtd/grammar');
+import * as c from '../common/common.mjs';
 
 const O = optional;
 
-module.exports = grammar(DTD, {
+export default grammar({
   name: 'xml',
 
   externals: $ => [
@@ -32,12 +33,20 @@ module.exports = grammar(DTD, {
 
   extras: _ => [],
 
-  inline: $ => [
-    $._extSubsetDecl,
-    $.conditionalSect,
+  supertypes: $ => [
+    $._markupdecl,
+    $._AttType,
+    $._EnumeratedType,
+    $._EntityDecl,
+    $._Reference,
   ],
 
-  // @ts-ignore
+  conflicts: $ => [
+    [$.AttlistDecl, $.AttDef]
+  ],
+
+  word: $ => $.Name,
+
   rules: {
     document: $ => prec(2, seq(
       O($._S),
@@ -180,6 +189,8 @@ module.exports = grammar(DTD, {
     PseudoAttValue: $ => choice(
       c.att_value($, '"'),
       c.att_value($, "'")
-    )
+    ),
+
+    ...c.rules
   }
 });
diff --git a/xml/package.json b/xml/package.json
index 8aab99b..1cee999 100644
--- a/xml/package.json
+++ b/xml/package.json
@@ -1,9 +1,10 @@
 {
   "main": "../bindings/node/xml",
   "private": true,
+  "type": "module",
   "scripts": {
-    "build": "tree-sitter generate --no-bindings",
-    "prestart": "tree-sitter build --wasm -o tree-sitter-xml.wasm",
+    "build": "tree-sitter generate",
+    "prestart": "tree-sitter build --wasm",
     "start": "tree-sitter playground"
   }
 }
diff --git a/xml/src/grammar.json b/xml/src/grammar.json
index ecfafa9..1ad6842 100644
--- a/xml/src/grammar.json
+++ b/xml/src/grammar.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://tree-sitter.github.io/tree-sitter/assets/schemas/grammar.schema.json",
   "name": "xml",
   "word": "Name",
   "rules": {
@@ -50,123 +51,87 @@
         ]
       }
     },
-    "_extSubsetDecl": {
+    "prolog": {
       "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "_markupdecl"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "conditionalSect"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_DeclSep"
-        }
-      ]
-    },
-    "conditionalSect": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "<!["
-        },
-        {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
               "type": "SYMBOL",
-              "name": "_S"
+              "name": "XMLDecl"
             },
             {
-              "type": "BLANK"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_Misc"
+              }
             }
           ]
         },
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
-              "type": "STRING",
-              "value": "IGNORE"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "XMLDecl"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             },
             {
-              "type": "STRING",
-              "value": "INCLUDE"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_Misc"
+              }
             },
             {
               "type": "SYMBOL",
-              "name": "PEReference"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_S"
+              "name": "doctypedecl"
             },
             {
-              "type": "BLANK"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_Misc"
+              }
             }
           ]
         },
         {
-          "type": "STRING",
-          "value": "["
-        },
-        {
-          "type": "REPEAT",
+          "type": "REPEAT1",
           "content": {
             "type": "SYMBOL",
-            "name": "_extSubsetDecl"
+            "name": "_Misc"
           }
-        },
-        {
-          "type": "STRING",
-          "value": "]]>"
         }
       ]
     },
-    "_markupdecl": {
+    "_Misc": {
       "type": "CHOICE",
       "members": [
         {
           "type": "SYMBOL",
-          "name": "elementdecl"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "AttlistDecl"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_EntityDecl"
+          "name": "PI"
         },
         {
           "type": "SYMBOL",
-          "name": "NotationDecl"
+          "name": "StyleSheetPI"
         },
         {
           "type": "SYMBOL",
-          "name": "PI"
+          "name": "XmlModelPI"
         },
         {
           "type": "SYMBOL",
           "name": "Comment"
-        }
-      ]
-    },
-    "_DeclSep": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "PEReference"
         },
         {
           "type": "SYMBOL",
@@ -174,41 +139,44 @@
         }
       ]
     },
-    "elementdecl": {
+    "XMLDecl": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "<!"
+          "value": "<?"
         },
         {
           "type": "STRING",
-          "value": "ELEMENT"
+          "value": "xml"
         },
         {
           "type": "SYMBOL",
-          "name": "_S"
+          "name": "_VersionInfo"
         },
         {
           "type": "CHOICE",
           "members": [
             {
               "type": "SYMBOL",
-              "name": "Name"
+              "name": "_EncodingDecl"
             },
             {
-              "type": "SYMBOL",
-              "name": "PEReference"
+              "type": "BLANK"
             }
           ]
         },
         {
-          "type": "SYMBOL",
-          "name": "_S"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "contentspec"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_SDDecl"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
           "type": "CHOICE",
@@ -224,356 +192,273 @@
         },
         {
           "type": "STRING",
-          "value": ">"
+          "value": "?>"
         }
       ]
     },
-    "contentspec": {
-      "type": "CHOICE",
+    "_SDDecl": {
+      "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
-          "value": "EMPTY"
+          "type": "SYMBOL",
+          "name": "_S"
         },
         {
           "type": "STRING",
-          "value": "ANY"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "Mixed"
+          "value": "standalone"
         },
         {
           "type": "SYMBOL",
-          "name": "children"
+          "name": "_Eq"
         },
         {
-          "type": "SYMBOL",
-          "name": "PEReference"
-        }
-      ]
-    },
-    "Mixed": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SEQ",
+          "type": "CHOICE",
           "members": [
             {
-              "type": "STRING",
-              "value": "("
-            },
-            {
-              "type": "CHOICE",
+              "type": "SEQ",
               "members": [
                 {
-                  "type": "SYMBOL",
-                  "name": "_S"
+                  "type": "STRING",
+                  "value": "'"
                 },
                 {
-                  "type": "BLANK"
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "yes"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "no"
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": "'"
                 }
               ]
             },
             {
-              "type": "CHOICE",
+              "type": "SEQ",
               "members": [
                 {
                   "type": "STRING",
-                  "value": "#PCDATA"
+                  "value": "\""
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "yes"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "no"
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": "\""
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "doctypedecl": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "<!"
+        },
+        {
+          "type": "STRING",
+          "value": "DOCTYPE"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_S"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "Name"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_S"
                 },
                 {
                   "type": "SYMBOL",
-                  "name": "PEReference"
+                  "name": "ExternalID"
                 }
               ]
             },
             {
-              "type": "REPEAT",
-              "content": {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "SYMBOL",
-                        "name": "_S"
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "|"
-                  },
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "SYMBOL",
-                        "name": "_S"
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "SYMBOL",
-                        "name": "Name"
-                      },
-                      {
-                        "type": "SYMBOL",
-                        "name": "PEReference"
-                      }
-                    ]
-                  }
-                ]
-              }
-            },
-            {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_S"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "PEReference"
-                  },
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "SYMBOL",
-                        "name": "_S"
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  }
-                ]
-              }
-            },
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
             {
-              "type": "STRING",
-              "value": ")"
+              "type": "SYMBOL",
+              "name": "_S"
             },
             {
-              "type": "STRING",
-              "value": "*"
+              "type": "BLANK"
             }
           ]
         },
         {
-          "type": "PREC",
-          "value": -1,
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "("
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "#PCDATA"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "PEReference"
-                  }
-                ]
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              },
-              {
-                "type": "REPEAT",
-                "content": {
-                  "type": "SEQ",
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "["
+                },
+                {
+                  "type": "CHOICE",
                   "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "PEReference"
-                    },
                     {
                       "type": "CHOICE",
                       "members": [
                         {
                           "type": "SYMBOL",
-                          "name": "_S"
+                          "name": "_intSubset"
                         },
                         {
-                          "type": "BLANK"
+                          "type": "SYMBOL",
+                          "name": "_S"
                         }
                       ]
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": "]"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "_S"
+                    },
+                    {
+                      "type": "BLANK"
                     }
                   ]
                 }
-              },
-              {
-                "type": "STRING",
-                "value": ")"
-              }
-            ]
-          }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ">"
         }
       ]
     },
-    "children": {
-      "type": "PREC",
-      "value": 1,
+    "_intSubset": {
+      "type": "REPEAT1",
       "content": {
         "type": "SEQ",
         "members": [
-          {
-            "type": "SYMBOL",
-            "name": "_choice"
-          },
           {
             "type": "CHOICE",
             "members": [
               {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "?"
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "*"
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "+"
-                  }
-                ]
+                "type": "SYMBOL",
+                "name": "_S"
               },
               {
                 "type": "BLANK"
               }
             ]
+          },
+          {
+            "type": "SYMBOL",
+            "name": "_markupdecl"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "_DeclSep"
           }
         ]
       }
     },
-    "_cp": {
-      "type": "PREC_LEFT",
-      "value": 0,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "Name"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "_choice"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "PEReference"
-              }
-            ]
-          },
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "?"
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "*"
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "+"
-                  }
-                ]
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "_choice": {
-      "type": "SEQ",
+    "element": {
+      "type": "CHOICE",
       "members": [
         {
-          "type": "STRING",
-          "value": "("
+          "type": "SYMBOL",
+          "name": "EmptyElemTag"
         },
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
               "type": "SYMBOL",
-              "name": "_S"
+              "name": "STag"
             },
             {
-              "type": "BLANK"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "content"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "SYMBOL",
+              "name": "ETag"
             }
           ]
+        }
+      ]
+    },
+    "EmptyElemTag": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "<"
         },
         {
-          "type": "SYMBOL",
-          "name": "_cp"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_start_tag_name"
+          },
+          "named": true,
+          "value": "Name"
         },
         {
           "type": "REPEAT",
@@ -581,69 +466,79 @@
             "type": "SEQ",
             "members": [
               {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "|"
-                  },
-                  {
-                    "type": "STRING",
-                    "value": ","
-                  }
-                ]
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
+                "type": "SYMBOL",
+                "name": "_S"
               },
               {
                 "type": "SYMBOL",
-                "name": "_cp"
+                "name": "Attribute"
               }
             ]
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_S"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "/>"
+        }
+      ]
+    },
+    "Attribute": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "Name"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_Eq"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "AttValue"
+        }
+      ]
+    },
+    "STag": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "<"
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_start_tag_name"
+          },
+          "named": true,
+          "value": "Name"
+        },
         {
           "type": "REPEAT",
           "content": {
             "type": "SEQ",
             "members": [
               {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
+                "type": "SYMBOL",
+                "name": "_S"
               },
               {
                 "type": "SYMBOL",
-                "name": "PEReference"
+                "name": "Attribute"
               }
             ]
           }
@@ -662,62 +557,59 @@
         },
         {
           "type": "STRING",
-          "value": ")"
+          "value": ">"
         }
       ]
     },
-    "AttlistDecl": {
+    "ETag": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "<!"
-        },
-        {
-          "type": "STRING",
-          "value": "ATTLIST"
+          "value": "</"
         },
         {
-          "type": "SYMBOL",
-          "name": "_S"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_end_tag_name"
+          },
+          "named": true,
+          "value": "Name"
         },
         {
           "type": "CHOICE",
           "members": [
             {
               "type": "SYMBOL",
-              "name": "Name"
+              "name": "_S"
             },
             {
-              "type": "SYMBOL",
-              "name": "PEReference"
+              "type": "BLANK"
             }
           ]
         },
         {
-          "type": "REPEAT",
+          "type": "STRING",
+          "value": ">"
+        }
+      ]
+    },
+    "_ErroneousETag": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "</"
+        },
+        {
+          "type": "ALIAS",
           "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "AttDef"
-              },
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "PEReference"
-                  }
-                ]
-              }
-            ]
-          }
+            "type": "SYMBOL",
+            "name": "_erroneous_end_name"
+          },
+          "named": true,
+          "value": "ERROR"
         },
         {
           "type": "CHOICE",
@@ -737,174 +629,94 @@
         }
       ]
     },
-    "AttDef": {
-      "type": "PREC_RIGHT",
-      "value": 0,
+    "content": {
+      "type": "REPEAT1",
       "content": {
-        "type": "SEQ",
+        "type": "CHOICE",
         "members": [
           {
             "type": "SYMBOL",
-            "name": "_S"
+            "name": "CharData"
           },
           {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "Name"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "PEReference"
-              }
-            ]
+            "type": "SYMBOL",
+            "name": "element"
           },
           {
             "type": "SYMBOL",
-            "name": "_S"
+            "name": "_Reference"
           },
           {
             "type": "SYMBOL",
-            "name": "_AttType"
+            "name": "CDSect"
           },
           {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "DefaultDecl"
-                  }
-                ]
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
+            "type": "SYMBOL",
+            "name": "PI"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "Comment"
           }
         ]
       }
     },
-    "_AttType": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "StringType"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "TokenizedType"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_EnumeratedType"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "PEReference"
-        }
-      ]
-    },
-    "StringType": {
-      "type": "STRING",
-      "value": "CDATA"
-    },
-    "TokenizedType": {
-      "type": "TOKEN",
+    "CDSect": {
+      "type": "PREC_LEFT",
+      "value": 0,
       "content": {
-        "type": "CHOICE",
+        "type": "SEQ",
         "members": [
           {
-            "type": "STRING",
-            "value": "ID"
-          },
-          {
-            "type": "STRING",
-            "value": "IDREF"
-          },
-          {
-            "type": "STRING",
-            "value": "IDREFS"
-          },
-          {
-            "type": "STRING",
-            "value": "ENTITY"
-          },
-          {
-            "type": "STRING",
-            "value": "ENTITIES"
+            "type": "SYMBOL",
+            "name": "CDStart"
           },
           {
-            "type": "STRING",
-            "value": "NMTOKEN"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "CData"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
           },
           {
             "type": "STRING",
-            "value": "NMTOKENS"
+            "value": "]]>"
           }
         ]
       }
     },
-    "_EnumeratedType": {
-      "type": "CHOICE",
+    "CDStart": {
+      "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "NotationType"
+          "type": "STRING",
+          "value": "<!["
         },
         {
-          "type": "SYMBOL",
-          "name": "Enumeration"
+          "type": "STRING",
+          "value": "CDATA"
+        },
+        {
+          "type": "STRING",
+          "value": "["
         }
       ]
     },
-    "NotationType": {
+    "StyleSheetPI": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "NOTATION"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_S"
+          "value": "<?"
         },
         {
           "type": "STRING",
-          "value": "("
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_S"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "Name"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "PEReference"
-            }
-          ]
+          "value": "xml-stylesheet"
         },
         {
           "type": "REPEAT",
@@ -912,49 +724,16 @@
             "type": "SEQ",
             "members": [
               {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": "|"
+                "type": "SYMBOL",
+                "name": "_S"
               },
               {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
+                "type": "SYMBOL",
+                "name": "PseudoAtt"
               }
             ]
           }
         },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "Name"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "PEReference"
-            }
-          ]
-        },
         {
           "type": "CHOICE",
           "members": [
@@ -969,32 +748,20 @@
         },
         {
           "type": "STRING",
-          "value": ")"
+          "value": "?>"
         }
       ]
     },
-    "Enumeration": {
+    "XmlModelPI": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "("
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_S"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "value": "<?"
         },
         {
-          "type": "SYMBOL",
-          "name": "Nmtoken"
+          "type": "STRING",
+          "value": "xml-model"
         },
         {
           "type": "REPEAT",
@@ -1002,36 +769,12 @@
             "type": "SEQ",
             "members": [
               {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": "|"
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "_S"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
+                "type": "SYMBOL",
+                "name": "_S"
               },
               {
                 "type": "SYMBOL",
-                "name": "Nmtoken"
+                "name": "PseudoAtt"
               }
             ]
           }
@@ -1050,213 +793,28 @@
         },
         {
           "type": "STRING",
-          "value": ")"
+          "value": "?>"
         }
       ]
     },
-    "DefaultDecl": {
-      "type": "CHOICE",
+    "PseudoAtt": {
+      "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
-          "value": "#REQUIRED"
+          "type": "SYMBOL",
+          "name": "Name"
         },
         {
-          "type": "STRING",
-          "value": "#IMPLIED"
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "#FIXED"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_S"
-                    }
-                  ]
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
-            },
-            {
-              "type": "SYMBOL",
-              "name": "AttValue"
-            }
-          ]
-        },
-        {
-          "type": "SYMBOL",
-          "name": "PEReference"
-        }
-      ]
-    },
-    "_EntityDecl": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "GEDecl"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "PEDecl"
-        }
-      ]
-    },
-    "GEDecl": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "<!"
-        },
-        {
-          "type": "STRING",
-          "value": "ENTITY"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_S"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "Name"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "PEReference"
-            }
-          ]
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_S"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "EntityValue"
-            },
-            {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "ExternalID"
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "NDataDecl"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_S"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "STRING",
-          "value": ">"
-        }
-      ]
-    },
-    "PEDecl": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "<!"
-        },
-        {
-          "type": "STRING",
-          "value": "ENTITY"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_S"
-        },
-        {
-          "type": "STRING",
-          "value": "%"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_S"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "Name"
+          "type": "SYMBOL",
+          "name": "_Eq"
         },
         {
           "type": "SYMBOL",
-          "name": "_S"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "EntityValue"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "ExternalID"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_S"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "STRING",
-          "value": ">"
+          "name": "PseudoAttValue"
         }
       ]
     },
-    "EntityValue": {
+    "PseudoAttValue": {
       "type": "CHOICE",
       "members": [
         {
@@ -1276,11 +834,7 @@
                   "members": [
                     {
                       "type": "PATTERN",
-                      "value": "[^<%&\"]"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "PEReference"
+                      "value": "[^<&\"]"
                     },
                     {
                       "type": "SYMBOL",
@@ -1313,11 +867,7 @@
                   "members": [
                     {
                       "type": "PATTERN",
-                      "value": "[^<%&']"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "PEReference"
+                      "value": "[^<&']"
                     },
                     {
                       "type": "SYMBOL",
@@ -1335,37 +885,49 @@
         }
       ]
     },
-    "NDataDecl": {
-      "type": "SEQ",
+    "_markupdecl": {
+      "type": "CHOICE",
       "members": [
         {
           "type": "SYMBOL",
-          "name": "_S"
+          "name": "elementdecl"
         },
         {
-          "type": "STRING",
-          "value": "NDATA"
+          "type": "SYMBOL",
+          "name": "AttlistDecl"
         },
         {
           "type": "SYMBOL",
-          "name": "_S"
+          "name": "_EntityDecl"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "Name"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "PEReference"
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "NotationDecl"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "PI"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "Comment"
         }
       ]
     },
-    "NotationDecl": {
+    "_DeclSep": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "PEReference"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_S"
+        }
+      ]
+    },
+    "elementdecl": {
       "type": "SEQ",
       "members": [
         {
@@ -1374,7 +936,7 @@
         },
         {
           "type": "STRING",
-          "value": "NOTATION"
+          "value": "ELEMENT"
         },
         {
           "type": "SYMBOL",
@@ -1397,28 +959,19 @@
           "type": "SYMBOL",
           "name": "_S"
         },
+        {
+          "type": "SYMBOL",
+          "name": "contentspec"
+        },
         {
           "type": "CHOICE",
           "members": [
             {
               "type": "SYMBOL",
-              "name": "ExternalID"
+              "name": "_S"
             },
             {
-              "type": "SYMBOL",
-              "name": "PublicID"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_S"
-            },
-            {
-              "type": "BLANK"
+              "type": "BLANK"
             }
           ]
         },
@@ -1428,66 +981,32 @@
         }
       ]
     },
-    "PEReference": {
-      "type": "SEQ",
+    "contentspec": {
+      "type": "CHOICE",
       "members": [
         {
           "type": "STRING",
-          "value": "%"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "Name"
+          "value": "EMPTY"
         },
         {
           "type": "STRING",
-          "value": ";"
-        }
-      ]
-    },
-    "_S": {
-      "type": "PATTERN",
-      "value": "[ \\t\\r\\n]+"
-    },
-    "Name": {
-      "type": "PATTERN",
-      "value": "[a-zA-Z_][a-zA-Z0-9_:.·-]*"
-    },
-    "Nmtoken": {
-      "type": "PATTERN",
-      "value": "[a-zA-Z0-9_:.·-]+"
-    },
-    "_Reference": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "EntityRef"
+          "value": "ANY"
         },
         {
           "type": "SYMBOL",
-          "name": "CharRef"
-        }
-      ]
-    },
-    "EntityRef": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "&"
+          "name": "Mixed"
         },
         {
           "type": "SYMBOL",
-          "name": "Name"
+          "name": "children"
         },
         {
-          "type": "STRING",
-          "value": ";"
+          "type": "SYMBOL",
+          "name": "PEReference"
         }
       ]
     },
-    "CharRef": {
+    "Mixed": {
       "type": "CHOICE",
       "members": [
         {
@@ -1495,167 +1014,498 @@
           "members": [
             {
               "type": "STRING",
-              "value": "&#"
+              "value": "("
             },
             {
-              "type": "PATTERN",
-              "value": "[0-9]+"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_S"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             },
             {
-              "type": "STRING",
-              "value": ";"
-            }
-          ]
-        },
-        {
-          "type": "SEQ",
-          "members": [
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "#PCDATA"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "PEReference"
+                }
+              ]
+            },
             {
-              "type": "STRING",
-              "value": "&#x"
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_S"
+                      },
+                      {
+                        "type": "BLANK"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "|"
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_S"
+                      },
+                      {
+                        "type": "BLANK"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "Name"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "PEReference"
+                      }
+                    ]
+                  }
+                ]
+              }
             },
             {
-              "type": "PATTERN",
-              "value": "[0-9a-fA-F]+"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_S"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             },
             {
-              "type": "STRING",
-              "value": ";"
-            }
-          ]
-        }
-      ]
-    },
-    "AttValue": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SEQ",
-          "members": [
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "PEReference"
+                  },
+                  {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_S"
+                      },
+                      {
+                        "type": "BLANK"
+                      }
+                    ]
+                  }
+                ]
+              }
+            },
             {
               "type": "STRING",
-              "value": "\""
+              "value": ")"
             },
             {
-              "type": "FIELD",
-              "name": "content",
-              "content": {
+              "type": "STRING",
+              "value": "*"
+            }
+          ]
+        },
+        {
+          "type": "PREC",
+          "value": -1,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "("
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "#PCDATA"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "PEReference"
+                  }
+                ]
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
                 "type": "REPEAT",
                 "content": {
-                  "type": "CHOICE",
+                  "type": "SEQ",
                   "members": [
                     {
-                      "type": "PATTERN",
-                      "value": "[^<&\"]"
+                      "type": "SYMBOL",
+                      "name": "PEReference"
                     },
                     {
-                      "type": "SYMBOL",
-                      "name": "_Reference"
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "SYMBOL",
+                          "name": "_S"
+                        },
+                        {
+                          "type": "BLANK"
+                        }
+                      ]
                     }
                   ]
                 }
+              },
+              {
+                "type": "STRING",
+                "value": ")"
               }
-            },
-            {
-              "type": "STRING",
-              "value": "\""
-            }
-          ]
+            ]
+          }
+        }
+      ]
+    },
+    "children": {
+      "type": "PREC",
+      "value": 1,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "_choice"
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "?"
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "*"
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "+"
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "_cp": {
+      "type": "PREC_LEFT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "Name"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_choice"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "PEReference"
+              }
+            ]
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "?"
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "*"
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "+"
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "_choice": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
         },
         {
-          "type": "SEQ",
+          "type": "CHOICE",
           "members": [
             {
-              "type": "STRING",
-              "value": "'"
+              "type": "SYMBOL",
+              "name": "_S"
             },
             {
-              "type": "FIELD",
-              "name": "content",
-              "content": {
-                "type": "REPEAT",
-                "content": {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "PATTERN",
-                      "value": "[^<&']"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_Reference"
-                    }
-                  ]
-                }
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_cp"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "|"
+                  },
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  }
+                ]
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_cp"
+              }
+            ]
+          }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "SYMBOL",
+                "name": "PEReference"
               }
+            ]
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_S"
             },
             {
-              "type": "STRING",
-              "value": "'"
+              "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
         }
       ]
     },
-    "ExternalID": {
-      "type": "CHOICE",
+    "AttlistDecl": {
+      "type": "SEQ",
       "members": [
         {
-          "type": "SEQ",
+          "type": "STRING",
+          "value": "<!"
+        },
+        {
+          "type": "STRING",
+          "value": "ATTLIST"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_S"
+        },
+        {
+          "type": "CHOICE",
           "members": [
-            {
-              "type": "STRING",
-              "value": "SYSTEM"
-            },
             {
               "type": "SYMBOL",
-              "name": "_S"
+              "name": "Name"
             },
             {
               "type": "SYMBOL",
-              "name": "SystemLiteral"
+              "name": "PEReference"
             }
           ]
         },
         {
-          "type": "SEQ",
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "AttDef"
+              },
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "PEReference"
+                  }
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "type": "CHOICE",
           "members": [
-            {
-              "type": "STRING",
-              "value": "PUBLIC"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "_S"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "PubidLiteral"
-            },
             {
               "type": "SYMBOL",
               "name": "_S"
             },
             {
-              "type": "SYMBOL",
-              "name": "SystemLiteral"
+              "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "STRING",
+          "value": ">"
         }
       ]
     },
-    "PublicID": {
+    "AttDef": {
       "type": "PREC_RIGHT",
       "value": 0,
       "content": {
         "type": "SEQ",
         "members": [
+          {
+            "type": "SYMBOL",
+            "name": "_S"
+          },
           {
             "type": "CHOICE",
             "members": [
               {
-                "type": "STRING",
-                "value": "PUBLIC"
+                "type": "SYMBOL",
+                "name": "Name"
               },
               {
                 "type": "SYMBOL",
@@ -1669,137 +1519,120 @@
           },
           {
             "type": "SYMBOL",
-            "name": "PubidLiteral"
+            "name": "_AttType"
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "DefaultDecl"
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
           }
         ]
       }
     },
-    "SystemLiteral": {
+    "_AttType": {
       "type": "CHOICE",
       "members": [
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "\""
-            },
-            {
-              "type": "ALIAS",
-              "content": {
-                "type": "PATTERN",
-                "value": "[^\"]*"
-              },
-              "named": true,
-              "value": "URI"
-            },
-            {
-              "type": "STRING",
-              "value": "\""
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "StringType"
         },
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "'"
-            },
-            {
-              "type": "ALIAS",
-              "content": {
-                "type": "PATTERN",
-                "value": "[^']*"
-              },
-              "named": true,
-              "value": "URI"
-            },
-            {
-              "type": "STRING",
-              "value": "'"
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "TokenizedType"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_EnumeratedType"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "PEReference"
         }
       ]
     },
-    "PubidLiteral": {
+    "StringType": {
+      "type": "STRING",
+      "value": "CDATA"
+    },
+    "TokenizedType": {
+      "type": "TOKEN",
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "ID"
+          },
+          {
+            "type": "STRING",
+            "value": "IDREF"
+          },
+          {
+            "type": "STRING",
+            "value": "IDREFS"
+          },
+          {
+            "type": "STRING",
+            "value": "ENTITY"
+          },
+          {
+            "type": "STRING",
+            "value": "ENTITIES"
+          },
+          {
+            "type": "STRING",
+            "value": "NMTOKEN"
+          },
+          {
+            "type": "STRING",
+            "value": "NMTOKENS"
+          }
+        ]
+      }
+    },
+    "_EnumeratedType": {
       "type": "CHOICE",
       "members": [
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "\""
-            },
-            {
-              "type": "PATTERN",
-              "value": "[ \\r\\na-zA-Z0-9\\-'()+,./:=?;!*#@$_%]*"
-            },
-            {
-              "type": "STRING",
-              "value": "\""
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "NotationType"
         },
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "'"
-            },
-            {
-              "type": "PATTERN",
-              "value": "[ \\r\\na-zA-Z0-9\\-()+,./:=?;!*#@$_%]*"
-            },
-            {
-              "type": "STRING",
-              "value": "'"
-            }
-          ]
+          "type": "SYMBOL",
+          "name": "Enumeration"
         }
       ]
     },
-    "XMLDecl": {
+    "NotationType": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "<?"
-        },
-        {
-          "type": "STRING",
-          "value": "xml"
+          "value": "NOTATION"
         },
         {
           "type": "SYMBOL",
-          "name": "_VersionInfo"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_EncodingDecl"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "name": "_S"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_SDDecl"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "STRING",
+          "value": "("
         },
         {
           "type": "CHOICE",
@@ -1813,158 +1646,74 @@
             }
           ]
         },
-        {
-          "type": "STRING",
-          "value": "?>"
-        }
-      ]
-    },
-    "_VersionInfo": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_S"
-        },
-        {
-          "type": "STRING",
-          "value": "version"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_Eq"
-        },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "'"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "VersionNum"
-                },
-                {
-                  "type": "STRING",
-                  "value": "'"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "Name"
             },
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "\""
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "VersionNum"
-                },
-                {
-                  "type": "STRING",
-                  "value": "\""
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "PEReference"
             }
           ]
-        }
-      ]
-    },
-    "VersionNum": {
-      "type": "PATTERN",
-      "value": "1\\.[0-9]+"
-    },
-    "_EncodingDecl": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_S"
-        },
-        {
-          "type": "STRING",
-          "value": "encoding"
         },
         {
-          "type": "SYMBOL",
-          "name": "_Eq"
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "STRING",
+                "value": "|"
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
+            ]
+          }
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "'"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "EncName"
-                },
-                {
-                  "type": "STRING",
-                  "value": "'"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "Name"
             },
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "\""
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "EncName"
-                },
-                {
-                  "type": "STRING",
-                  "value": "\""
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "PEReference"
             }
           ]
-        }
-      ]
-    },
-    "EncName": {
-      "type": "PATTERN",
-      "value": "[A-Za-z][A-Za-z0-9._\\-]*"
-    },
-    "PI": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "<?"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "PITarget"
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_S"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "_pi_content"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "_S"
             },
             {
               "type": "BLANK"
@@ -1973,13 +1722,17 @@
         },
         {
           "type": "STRING",
-          "value": "?>"
+          "value": ")"
         }
       ]
     },
-    "_Eq": {
+    "Enumeration": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
         {
           "type": "CHOICE",
           "members": [
@@ -1993,8 +1746,48 @@
           ]
         },
         {
-          "type": "STRING",
-          "value": "="
+          "type": "SYMBOL",
+          "name": "Nmtoken"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "STRING",
+                "value": "|"
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_S"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "SYMBOL",
+                "name": "Nmtoken"
+              }
+            ]
+          }
         },
         {
           "type": "CHOICE",
@@ -2007,27 +1800,23 @@
               "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
         }
       ]
     },
-    "prolog": {
+    "DefaultDecl": {
       "type": "CHOICE",
       "members": [
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "XMLDecl"
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SYMBOL",
-                "name": "_Misc"
-              }
-            }
-          ]
+          "type": "STRING",
+          "value": "#REQUIRED"
+        },
+        {
+          "type": "STRING",
+          "value": "#IMPLIED"
         },
         {
           "type": "SEQ",
@@ -2036,143 +1825,129 @@
               "type": "CHOICE",
               "members": [
                 {
-                  "type": "SYMBOL",
-                  "name": "XMLDecl"
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "#FIXED"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "_S"
+                    }
+                  ]
                 },
                 {
                   "type": "BLANK"
                 }
               ]
             },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SYMBOL",
-                "name": "_Misc"
-              }
-            },
             {
               "type": "SYMBOL",
-              "name": "doctypedecl"
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SYMBOL",
-                "name": "_Misc"
-              }
+              "name": "AttValue"
             }
           ]
         },
         {
-          "type": "REPEAT1",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_Misc"
-          }
+          "type": "SYMBOL",
+          "name": "PEReference"
         }
       ]
     },
-    "_Misc": {
+    "_EntityDecl": {
       "type": "CHOICE",
       "members": [
         {
           "type": "SYMBOL",
-          "name": "PI"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "StyleSheetPI"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "XmlModelPI"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "Comment"
+          "name": "GEDecl"
         },
         {
           "type": "SYMBOL",
-          "name": "_S"
+          "name": "PEDecl"
         }
       ]
     },
-    "_SDDecl": {
+    "GEDecl": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "STRING",
+          "value": "<!"
+        },
+        {
+          "type": "STRING",
+          "value": "ENTITY"
+        },
         {
           "type": "SYMBOL",
           "name": "_S"
         },
         {
-          "type": "STRING",
-          "value": "standalone"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "Name"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "PEReference"
+            }
+          ]
         },
         {
           "type": "SYMBOL",
-          "name": "_Eq"
+          "name": "_S"
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "'"
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "yes"
-                    },
-                    {
-                      "type": "STRING",
-                      "value": "no"
-                    }
-                  ]
-                },
-                {
-                  "type": "STRING",
-                  "value": "'"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "EntityValue"
             },
             {
               "type": "SEQ",
               "members": [
                 {
-                  "type": "STRING",
-                  "value": "\""
+                  "type": "SYMBOL",
+                  "name": "ExternalID"
                 },
                 {
                   "type": "CHOICE",
                   "members": [
                     {
-                      "type": "STRING",
-                      "value": "yes"
+                      "type": "SYMBOL",
+                      "name": "NDataDecl"
                     },
                     {
-                      "type": "STRING",
-                      "value": "no"
+                      "type": "BLANK"
                     }
                   ]
-                },
-                {
-                  "type": "STRING",
-                  "value": "\""
                 }
               ]
             }
           ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_S"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ">"
         }
       ]
     },
-    "doctypedecl": {
+    "PEDecl": {
       "type": "SEQ",
       "members": [
         {
@@ -2181,7 +1956,15 @@
         },
         {
           "type": "STRING",
-          "value": "DOCTYPE"
+          "value": "ENTITY"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_S"
+        },
+        {
+          "type": "STRING",
+          "value": "%"
         },
         {
           "type": "SYMBOL",
@@ -2191,24 +1974,20 @@
           "type": "SYMBOL",
           "name": "Name"
         },
+        {
+          "type": "SYMBOL",
+          "name": "_S"
+        },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_S"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "ExternalID"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "EntityValue"
             },
             {
-              "type": "BLANK"
+              "type": "SYMBOL",
+              "name": "ExternalID"
             }
           ]
         },
@@ -2225,158 +2004,164 @@
           ]
         },
         {
-          "type": "CHOICE",
+          "type": "STRING",
+          "value": ">"
+        }
+      ]
+    },
+    "EntityValue": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
           "members": [
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "["
-                },
-                {
+              "type": "STRING",
+              "value": "\""
+            },
+            {
+              "type": "FIELD",
+              "name": "content",
+              "content": {
+                "type": "REPEAT",
+                "content": {
                   "type": "CHOICE",
                   "members": [
                     {
-                      "type": "CHOICE",
-                      "members": [
-                        {
-                          "type": "SYMBOL",
-                          "name": "_intSubset"
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "_S"
-                        }
-                      ]
+                      "type": "PATTERN",
+                      "value": "[^<%&\"]"
                     },
                     {
-                      "type": "BLANK"
+                      "type": "SYMBOL",
+                      "name": "PEReference"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "_Reference"
                     }
                   ]
-                },
-                {
-                  "type": "STRING",
-                  "value": "]"
-                },
-                {
+                }
+              }
+            },
+            {
+              "type": "STRING",
+              "value": "\""
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "'"
+            },
+            {
+              "type": "FIELD",
+              "name": "content",
+              "content": {
+                "type": "REPEAT",
+                "content": {
                   "type": "CHOICE",
                   "members": [
+                    {
+                      "type": "PATTERN",
+                      "value": "[^<%&']"
+                    },
                     {
                       "type": "SYMBOL",
-                      "name": "_S"
+                      "name": "PEReference"
                     },
                     {
-                      "type": "BLANK"
+                      "type": "SYMBOL",
+                      "name": "_Reference"
                     }
                   ]
                 }
-              ]
+              }
             },
             {
-              "type": "BLANK"
+              "type": "STRING",
+              "value": "'"
             }
           ]
-        },
-        {
-          "type": "STRING",
-          "value": ">"
         }
       ]
     },
-    "_intSubset": {
-      "type": "REPEAT1",
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_S"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          },
-          {
-            "type": "SYMBOL",
-            "name": "_markupdecl"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "_DeclSep"
-          }
-        ]
-      }
-    },
-    "element": {
-      "type": "CHOICE",
+    "NDataDecl": {
+      "type": "SEQ",
       "members": [
         {
           "type": "SYMBOL",
-          "name": "EmptyElemTag"
+          "name": "_S"
         },
         {
-          "type": "SEQ",
+          "type": "STRING",
+          "value": "NDATA"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_S"
+        },
+        {
+          "type": "CHOICE",
           "members": [
             {
               "type": "SYMBOL",
-              "name": "STag"
-            },
-            {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "content"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "name": "Name"
             },
             {
               "type": "SYMBOL",
-              "name": "ETag"
+              "name": "PEReference"
             }
           ]
         }
       ]
     },
-    "EmptyElemTag": {
+    "NotationDecl": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "<"
+          "value": "<!"
         },
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_start_tag_name"
-          },
-          "named": true,
-          "value": "Name"
+          "type": "STRING",
+          "value": "NOTATION"
         },
         {
-          "type": "REPEAT",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_S"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "Attribute"
-              }
-            ]
-          }
+          "type": "SYMBOL",
+          "name": "_S"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "Name"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "PEReference"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_S"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "ExternalID"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "PublicID"
+            }
+          ]
         },
         {
           "type": "CHOICE",
@@ -2392,269 +2177,465 @@
         },
         {
           "type": "STRING",
-          "value": "/>"
+          "value": ">"
         }
       ]
     },
-    "Attribute": {
+    "PEReference": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "STRING",
+          "value": "%"
+        },
         {
           "type": "SYMBOL",
           "name": "Name"
         },
+        {
+          "type": "STRING",
+          "value": ";"
+        }
+      ]
+    },
+    "_S": {
+      "type": "PATTERN",
+      "value": "[ \\t\\r\\n]+"
+    },
+    "Name": {
+      "type": "PATTERN",
+      "value": "[a-zA-Z_][a-zA-Z0-9_:.·-]*"
+    },
+    "Nmtoken": {
+      "type": "PATTERN",
+      "value": "[a-zA-Z0-9_:.·-]+"
+    },
+    "_Reference": {
+      "type": "CHOICE",
+      "members": [
         {
           "type": "SYMBOL",
-          "name": "_Eq"
+          "name": "EntityRef"
         },
         {
           "type": "SYMBOL",
-          "name": "AttValue"
+          "name": "CharRef"
         }
       ]
     },
-    "STag": {
+    "EntityRef": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "<"
+          "value": "&"
         },
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_start_tag_name"
-          },
-          "named": true,
-          "value": "Name"
+          "type": "SYMBOL",
+          "name": "Name"
         },
         {
-          "type": "REPEAT",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_S"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "Attribute"
-              }
-            ]
-          }
+          "type": "STRING",
+          "value": ";"
+        }
+      ]
+    },
+    "CharRef": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "&#"
+            },
+            {
+              "type": "PATTERN",
+              "value": "[0-9]+"
+            },
+            {
+              "type": "STRING",
+              "value": ";"
+            }
+          ]
         },
         {
-          "type": "CHOICE",
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "&#x"
+            },
+            {
+              "type": "PATTERN",
+              "value": "[0-9a-fA-F]+"
+            },
+            {
+              "type": "STRING",
+              "value": ";"
+            }
+          ]
+        }
+      ]
+    },
+    "AttValue": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "_S"
+              "type": "STRING",
+              "value": "\""
             },
             {
-              "type": "BLANK"
+              "type": "FIELD",
+              "name": "content",
+              "content": {
+                "type": "REPEAT",
+                "content": {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "PATTERN",
+                      "value": "[^<&\"]"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "_Reference"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "type": "STRING",
+              "value": "\""
             }
           ]
         },
         {
-          "type": "STRING",
-          "value": ">"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "'"
+            },
+            {
+              "type": "FIELD",
+              "name": "content",
+              "content": {
+                "type": "REPEAT",
+                "content": {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "PATTERN",
+                      "value": "[^<&']"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "_Reference"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "type": "STRING",
+              "value": "'"
+            }
+          ]
         }
       ]
     },
-    "ETag": {
-      "type": "SEQ",
+    "ExternalID": {
+      "type": "CHOICE",
       "members": [
         {
-          "type": "STRING",
-          "value": "</"
-        },
-        {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_end_tag_name"
-          },
-          "named": true,
-          "value": "Name"
-        },
-        {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
+            {
+              "type": "STRING",
+              "value": "SYSTEM"
+            },
             {
               "type": "SYMBOL",
               "name": "_S"
             },
             {
-              "type": "BLANK"
+              "type": "SYMBOL",
+              "name": "SystemLiteral"
             }
           ]
         },
         {
-          "type": "STRING",
-          "value": ">"
-        }
-      ]
-    },
-    "_ErroneousETag": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "</"
-        },
-        {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_erroneous_end_name"
-          },
-          "named": true,
-          "value": "ERROR"
-        },
-        {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
+            {
+              "type": "STRING",
+              "value": "PUBLIC"
+            },
             {
               "type": "SYMBOL",
               "name": "_S"
             },
             {
-              "type": "BLANK"
+              "type": "SYMBOL",
+              "name": "PubidLiteral"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_S"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "SystemLiteral"
             }
           ]
-        },
-        {
-          "type": "STRING",
-          "value": ">"
         }
       ]
     },
-    "content": {
-      "type": "REPEAT1",
-      "content": {
-        "type": "CHOICE",
-        "members": [
-          {
-            "type": "SYMBOL",
-            "name": "CharData"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "element"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "_Reference"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "CDSect"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "PI"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "Comment"
-          }
-        ]
-      }
-    },
-    "CDSect": {
-      "type": "PREC_LEFT",
+    "PublicID": {
+      "type": "PREC_RIGHT",
       "value": 0,
       "content": {
         "type": "SEQ",
         "members": [
-          {
-            "type": "SYMBOL",
-            "name": "CDStart"
-          },
           {
             "type": "CHOICE",
             "members": [
               {
-                "type": "SYMBOL",
-                "name": "CData"
+                "type": "STRING",
+                "value": "PUBLIC"
               },
               {
-                "type": "BLANK"
+                "type": "SYMBOL",
+                "name": "PEReference"
               }
             ]
           },
           {
-            "type": "STRING",
-            "value": "]]>"
+            "type": "SYMBOL",
+            "name": "_S"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "PubidLiteral"
           }
         ]
       }
     },
-    "CDStart": {
+    "SystemLiteral": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "\""
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "[^\"]*"
+              },
+              "named": true,
+              "value": "URI"
+            },
+            {
+              "type": "STRING",
+              "value": "\""
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "'"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "[^']*"
+              },
+              "named": true,
+              "value": "URI"
+            },
+            {
+              "type": "STRING",
+              "value": "'"
+            }
+          ]
+        }
+      ]
+    },
+    "PubidLiteral": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "\""
+            },
+            {
+              "type": "PATTERN",
+              "value": "[ \\r\\na-zA-Z0-9\\-'()+,./:=?;!*#@$_%]*"
+            },
+            {
+              "type": "STRING",
+              "value": "\""
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "'"
+            },
+            {
+              "type": "PATTERN",
+              "value": "[ \\r\\na-zA-Z0-9\\-()+,./:=?;!*#@$_%]*"
+            },
+            {
+              "type": "STRING",
+              "value": "'"
+            }
+          ]
+        }
+      ]
+    },
+    "_VersionInfo": {
       "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
-          "value": "<!["
+          "type": "SYMBOL",
+          "name": "_S"
         },
         {
           "type": "STRING",
-          "value": "CDATA"
+          "value": "version"
         },
         {
-          "type": "STRING",
-          "value": "["
+          "type": "SYMBOL",
+          "name": "_Eq"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "'"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "VersionNum"
+                },
+                {
+                  "type": "STRING",
+                  "value": "'"
+                }
+              ]
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "\""
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "VersionNum"
+                },
+                {
+                  "type": "STRING",
+                  "value": "\""
+                }
+              ]
+            }
+          ]
         }
       ]
     },
-    "StyleSheetPI": {
+    "VersionNum": {
+      "type": "PATTERN",
+      "value": "1\\.[0-9]+"
+    },
+    "_EncodingDecl": {
       "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
-          "value": "<?"
+          "type": "SYMBOL",
+          "name": "_S"
         },
         {
           "type": "STRING",
-          "value": "xml-stylesheet"
+          "value": "encoding"
         },
         {
-          "type": "REPEAT",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_S"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "PseudoAtt"
-              }
-            ]
-          }
+          "type": "SYMBOL",
+          "name": "_Eq"
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "_S"
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "'"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "EncName"
+                },
+                {
+                  "type": "STRING",
+                  "value": "'"
+                }
+              ]
             },
             {
-              "type": "BLANK"
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "\""
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "EncName"
+                },
+                {
+                  "type": "STRING",
+                  "value": "\""
+                }
+              ]
             }
           ]
-        },
-        {
-          "type": "STRING",
-          "value": "?>"
         }
       ]
     },
-    "XmlModelPI": {
+    "EncName": {
+      "type": "PATTERN",
+      "value": "[A-Za-z][A-Za-z0-9._\\-]*"
+    },
+    "PI": {
       "type": "SEQ",
       "members": [
         {
@@ -2662,31 +2643,24 @@
           "value": "<?"
         },
         {
-          "type": "STRING",
-          "value": "xml-model"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_S"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "PseudoAtt"
-              }
-            ]
-          }
+          "type": "SYMBOL",
+          "name": "PITarget"
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "_S"
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_S"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_pi_content"
+                }
+              ]
             },
             {
               "type": "BLANK"
@@ -2699,89 +2673,34 @@
         }
       ]
     },
-    "PseudoAtt": {
+    "_Eq": {
       "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "Name"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_Eq"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "PseudoAttValue"
-        }
-      ]
-    },
-    "PseudoAttValue": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SEQ",
+          "type": "CHOICE",
           "members": [
             {
-              "type": "STRING",
-              "value": "\""
-            },
-            {
-              "type": "FIELD",
-              "name": "content",
-              "content": {
-                "type": "REPEAT",
-                "content": {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "PATTERN",
-                      "value": "[^<&\"]"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_Reference"
-                    }
-                  ]
-                }
-              }
+              "type": "SYMBOL",
+              "name": "_S"
             },
             {
-              "type": "STRING",
-              "value": "\""
+              "type": "BLANK"
             }
           ]
         },
         {
-          "type": "SEQ",
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "CHOICE",
           "members": [
             {
-              "type": "STRING",
-              "value": "'"
-            },
-            {
-              "type": "FIELD",
-              "name": "content",
-              "content": {
-                "type": "REPEAT",
-                "content": {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "PATTERN",
-                      "value": "[^<&']"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_Reference"
-                    }
-                  ]
-                }
-              }
+              "type": "SYMBOL",
+              "name": "_S"
             },
             {
-              "type": "STRING",
-              "value": "'"
+              "type": "BLANK"
             }
           ]
         }
@@ -2842,10 +2761,7 @@
       "value": "/>"
     }
   ],
-  "inline": [
-    "_extSubsetDecl",
-    "conditionalSect"
-  ],
+  "inline": [],
   "supertypes": [
     "_markupdecl",
     "_AttType",
diff --git a/xml/src/node-types.json b/xml/src/node-types.json
index 6707f21..472c1a8 100644
--- a/xml/src/node-types.json
+++ b/xml/src/node-types.json
@@ -747,6 +747,7 @@
   {
     "type": "document",
     "named": true,
+    "root": true,
     "fields": {
       "root": {
         "multiple": false,
@@ -1015,22 +1016,10 @@
     "type": "ENTITY",
     "named": false
   },
-  {
-    "type": "ERROR",
-    "named": true
-  },
   {
     "type": "EncName",
     "named": true
   },
-  {
-    "type": "IGNORE",
-    "named": false
-  },
-  {
-    "type": "INCLUDE",
-    "named": false
-  },
   {
     "type": "NDATA",
     "named": false
diff --git a/xml/src/parser.c b/xml/src/parser.c
index 66bf647..74085ea 100644
--- a/xml/src/parser.c
+++ b/xml/src/parser.c
@@ -7,9 +7,9 @@
 #define LANGUAGE_VERSION 14
 #define STATE_COUNT 495
 #define LARGE_STATE_COUNT 2
-#define SYMBOL_COUNT 145
+#define SYMBOL_COUNT 143
 #define ALIAS_COUNT 0
-#define TOKEN_COUNT 76
+#define TOKEN_COUNT 74
 #define EXTERNAL_TOKEN_COUNT 11
 #define FIELD_COUNT 2
 #define MAX_ALIAS_SEQUENCE_LENGTH 12
@@ -17,162 +17,176 @@
 
 enum ts_symbol_identifiers {
   sym_Name = 1,
-  anon_sym_LT_BANG_LBRACK = 2,
-  anon_sym_IGNORE = 3,
-  anon_sym_INCLUDE = 4,
-  anon_sym_LBRACK = 5,
-  anon_sym_RBRACK_RBRACK_GT = 6,
-  anon_sym_LT_BANG = 7,
-  anon_sym_ELEMENT = 8,
-  anon_sym_GT = 9,
-  anon_sym_EMPTY = 10,
-  anon_sym_ANY = 11,
-  anon_sym_LPAREN = 12,
-  anon_sym_POUNDPCDATA = 13,
-  anon_sym_PIPE = 14,
-  anon_sym_RPAREN = 15,
-  anon_sym_STAR = 16,
-  anon_sym_QMARK = 17,
-  anon_sym_PLUS = 18,
-  anon_sym_COMMA = 19,
-  anon_sym_ATTLIST = 20,
-  anon_sym_CDATA = 21,
-  sym_TokenizedType = 22,
-  anon_sym_NOTATION = 23,
-  anon_sym_POUNDREQUIRED = 24,
-  anon_sym_POUNDIMPLIED = 25,
-  anon_sym_POUNDFIXED = 26,
-  anon_sym_ENTITY = 27,
-  anon_sym_PERCENT = 28,
-  anon_sym_DQUOTE = 29,
-  aux_sym_EntityValue_token1 = 30,
-  anon_sym_SQUOTE = 31,
-  aux_sym_EntityValue_token2 = 32,
-  anon_sym_NDATA = 33,
-  anon_sym_SEMI = 34,
-  sym__S = 35,
-  sym_Nmtoken = 36,
-  anon_sym_AMP = 37,
-  anon_sym_AMP_POUND = 38,
-  aux_sym_CharRef_token1 = 39,
-  anon_sym_AMP_POUNDx = 40,
-  aux_sym_CharRef_token2 = 41,
-  aux_sym_AttValue_token1 = 42,
-  aux_sym_AttValue_token2 = 43,
-  anon_sym_SYSTEM = 44,
-  anon_sym_PUBLIC = 45,
-  aux_sym_SystemLiteral_token1 = 46,
-  aux_sym_SystemLiteral_token2 = 47,
-  aux_sym_PubidLiteral_token1 = 48,
-  aux_sym_PubidLiteral_token2 = 49,
-  anon_sym_LT_QMARK = 50,
-  anon_sym_xml = 51,
-  anon_sym_QMARK_GT = 52,
-  anon_sym_version = 53,
-  sym_VersionNum = 54,
-  anon_sym_encoding = 55,
-  sym_EncName = 56,
-  anon_sym_EQ = 57,
-  anon_sym_standalone = 58,
-  anon_sym_yes = 59,
-  anon_sym_no = 60,
-  anon_sym_DOCTYPE = 61,
-  anon_sym_RBRACK = 62,
-  anon_sym_LT = 63,
-  anon_sym_SLASH_GT = 64,
-  anon_sym_LT_SLASH = 65,
-  anon_sym_xml_DASHstylesheet = 66,
-  anon_sym_xml_DASHmodel = 67,
-  sym_PITarget = 68,
-  sym__pi_content = 69,
-  sym_Comment = 70,
-  sym_CharData = 71,
-  sym_CData = 72,
-  sym__start_tag_name = 73,
-  sym__end_tag_name = 74,
-  sym__erroneous_end_name = 75,
-  sym_document = 76,
-  sym__markupdecl = 77,
-  sym__DeclSep = 78,
-  sym_elementdecl = 79,
-  sym_contentspec = 80,
-  sym_Mixed = 81,
-  sym_children = 82,
-  sym__cp = 83,
-  sym__choice = 84,
-  sym_AttlistDecl = 85,
-  sym_AttDef = 86,
-  sym__AttType = 87,
-  sym_StringType = 88,
-  sym__EnumeratedType = 89,
-  sym_NotationType = 90,
-  sym_Enumeration = 91,
-  sym_DefaultDecl = 92,
-  sym__EntityDecl = 93,
-  sym_GEDecl = 94,
-  sym_PEDecl = 95,
-  sym_EntityValue = 96,
-  sym_NDataDecl = 97,
-  sym_NotationDecl = 98,
-  sym_PEReference = 99,
-  sym__Reference = 100,
-  sym_EntityRef = 101,
-  sym_CharRef = 102,
-  sym_AttValue = 103,
-  sym_ExternalID = 104,
-  sym_PublicID = 105,
-  sym_SystemLiteral = 106,
-  sym_PubidLiteral = 107,
-  sym_XMLDecl = 108,
-  sym__VersionInfo = 109,
-  sym__EncodingDecl = 110,
-  sym_PI = 111,
-  sym__Eq = 112,
-  sym_prolog = 113,
-  sym__Misc = 114,
-  sym__SDDecl = 115,
-  sym_doctypedecl = 116,
-  aux_sym__intSubset = 117,
-  sym_element = 118,
-  sym_EmptyElemTag = 119,
-  sym_Attribute = 120,
-  sym_STag = 121,
-  sym_ETag = 122,
-  sym_content = 123,
-  sym_CDSect = 124,
-  sym_CDStart = 125,
-  sym_StyleSheetPI = 126,
-  sym_XmlModelPI = 127,
-  sym_PseudoAtt = 128,
-  sym_PseudoAttValue = 129,
-  aux_sym_document_repeat1 = 130,
-  aux_sym_Mixed_repeat1 = 131,
-  aux_sym_Mixed_repeat2 = 132,
-  aux_sym__choice_repeat1 = 133,
-  aux_sym__choice_repeat2 = 134,
-  aux_sym_AttlistDecl_repeat1 = 135,
-  aux_sym_NotationType_repeat1 = 136,
-  aux_sym_Enumeration_repeat1 = 137,
-  aux_sym_EntityValue_repeat1 = 138,
-  aux_sym_EntityValue_repeat2 = 139,
-  aux_sym_AttValue_repeat1 = 140,
-  aux_sym_AttValue_repeat2 = 141,
-  aux_sym_EmptyElemTag_repeat1 = 142,
-  aux_sym_content_repeat1 = 143,
-  aux_sym_StyleSheetPI_repeat1 = 144,
+  anon_sym_LT_QMARK = 2,
+  anon_sym_xml = 3,
+  anon_sym_QMARK_GT = 4,
+  anon_sym_standalone = 5,
+  anon_sym_SQUOTE = 6,
+  anon_sym_yes = 7,
+  anon_sym_no = 8,
+  anon_sym_DQUOTE = 9,
+  anon_sym_LT_BANG = 10,
+  anon_sym_DOCTYPE = 11,
+  anon_sym_LBRACK = 12,
+  anon_sym_RBRACK = 13,
+  anon_sym_GT = 14,
+  anon_sym_LT = 15,
+  anon_sym_SLASH_GT = 16,
+  anon_sym_LT_SLASH = 17,
+  anon_sym_RBRACK_RBRACK_GT = 18,
+  anon_sym_LT_BANG_LBRACK = 19,
+  anon_sym_CDATA = 20,
+  anon_sym_xml_DASHstylesheet = 21,
+  anon_sym_xml_DASHmodel = 22,
+  aux_sym_PseudoAttValue_token1 = 23,
+  aux_sym_PseudoAttValue_token2 = 24,
+  anon_sym_ELEMENT = 25,
+  anon_sym_EMPTY = 26,
+  anon_sym_ANY = 27,
+  anon_sym_LPAREN = 28,
+  anon_sym_POUNDPCDATA = 29,
+  anon_sym_PIPE = 30,
+  anon_sym_RPAREN = 31,
+  anon_sym_STAR = 32,
+  anon_sym_QMARK = 33,
+  anon_sym_PLUS = 34,
+  anon_sym_COMMA = 35,
+  anon_sym_ATTLIST = 36,
+  sym_TokenizedType = 37,
+  anon_sym_NOTATION = 38,
+  anon_sym_POUNDREQUIRED = 39,
+  anon_sym_POUNDIMPLIED = 40,
+  anon_sym_POUNDFIXED = 41,
+  anon_sym_ENTITY = 42,
+  anon_sym_PERCENT = 43,
+  aux_sym_EntityValue_token1 = 44,
+  aux_sym_EntityValue_token2 = 45,
+  anon_sym_NDATA = 46,
+  anon_sym_SEMI = 47,
+  sym__S = 48,
+  sym_Nmtoken = 49,
+  anon_sym_AMP = 50,
+  anon_sym_AMP_POUND = 51,
+  aux_sym_CharRef_token1 = 52,
+  anon_sym_AMP_POUNDx = 53,
+  aux_sym_CharRef_token2 = 54,
+  anon_sym_SYSTEM = 55,
+  anon_sym_PUBLIC = 56,
+  aux_sym_SystemLiteral_token1 = 57,
+  aux_sym_SystemLiteral_token2 = 58,
+  aux_sym_PubidLiteral_token1 = 59,
+  aux_sym_PubidLiteral_token2 = 60,
+  anon_sym_version = 61,
+  sym_VersionNum = 62,
+  anon_sym_encoding = 63,
+  sym_EncName = 64,
+  anon_sym_EQ = 65,
+  sym_PITarget = 66,
+  sym__pi_content = 67,
+  sym_Comment = 68,
+  sym_CharData = 69,
+  sym_CData = 70,
+  sym__start_tag_name = 71,
+  sym__end_tag_name = 72,
+  sym__erroneous_end_name = 73,
+  sym_document = 74,
+  sym_prolog = 75,
+  sym__Misc = 76,
+  sym_XMLDecl = 77,
+  sym__SDDecl = 78,
+  sym_doctypedecl = 79,
+  aux_sym__intSubset = 80,
+  sym_element = 81,
+  sym_EmptyElemTag = 82,
+  sym_Attribute = 83,
+  sym_STag = 84,
+  sym_ETag = 85,
+  sym_content = 86,
+  sym_CDSect = 87,
+  sym_CDStart = 88,
+  sym_StyleSheetPI = 89,
+  sym_XmlModelPI = 90,
+  sym_PseudoAtt = 91,
+  sym_PseudoAttValue = 92,
+  sym__markupdecl = 93,
+  sym__DeclSep = 94,
+  sym_elementdecl = 95,
+  sym_contentspec = 96,
+  sym_Mixed = 97,
+  sym_children = 98,
+  sym__cp = 99,
+  sym__choice = 100,
+  sym_AttlistDecl = 101,
+  sym_AttDef = 102,
+  sym__AttType = 103,
+  sym_StringType = 104,
+  sym__EnumeratedType = 105,
+  sym_NotationType = 106,
+  sym_Enumeration = 107,
+  sym_DefaultDecl = 108,
+  sym__EntityDecl = 109,
+  sym_GEDecl = 110,
+  sym_PEDecl = 111,
+  sym_EntityValue = 112,
+  sym_NDataDecl = 113,
+  sym_NotationDecl = 114,
+  sym_PEReference = 115,
+  sym__Reference = 116,
+  sym_EntityRef = 117,
+  sym_CharRef = 118,
+  sym_AttValue = 119,
+  sym_ExternalID = 120,
+  sym_PublicID = 121,
+  sym_SystemLiteral = 122,
+  sym_PubidLiteral = 123,
+  sym__VersionInfo = 124,
+  sym__EncodingDecl = 125,
+  sym_PI = 126,
+  sym__Eq = 127,
+  aux_sym_document_repeat1 = 128,
+  aux_sym_EmptyElemTag_repeat1 = 129,
+  aux_sym_content_repeat1 = 130,
+  aux_sym_StyleSheetPI_repeat1 = 131,
+  aux_sym_PseudoAttValue_repeat1 = 132,
+  aux_sym_PseudoAttValue_repeat2 = 133,
+  aux_sym_Mixed_repeat1 = 134,
+  aux_sym_Mixed_repeat2 = 135,
+  aux_sym__choice_repeat1 = 136,
+  aux_sym__choice_repeat2 = 137,
+  aux_sym_AttlistDecl_repeat1 = 138,
+  aux_sym_NotationType_repeat1 = 139,
+  aux_sym_Enumeration_repeat1 = 140,
+  aux_sym_EntityValue_repeat1 = 141,
+  aux_sym_EntityValue_repeat2 = 142,
 };
 
 static const char * const ts_symbol_names[] = {
   [ts_builtin_sym_end] = "end",
   [sym_Name] = "Name",
-  [anon_sym_LT_BANG_LBRACK] = "<![",
-  [anon_sym_IGNORE] = "IGNORE",
-  [anon_sym_INCLUDE] = "INCLUDE",
+  [anon_sym_LT_QMARK] = "<\?",
+  [anon_sym_xml] = "xml",
+  [anon_sym_QMARK_GT] = "\?>",
+  [anon_sym_standalone] = "standalone",
+  [anon_sym_SQUOTE] = "'",
+  [anon_sym_yes] = "yes",
+  [anon_sym_no] = "no",
+  [anon_sym_DQUOTE] = "\"",
+  [anon_sym_LT_BANG] = "<!",
+  [anon_sym_DOCTYPE] = "DOCTYPE",
   [anon_sym_LBRACK] = "[",
+  [anon_sym_RBRACK] = "]",
+  [anon_sym_GT] = ">",
+  [anon_sym_LT] = "<",
+  [anon_sym_SLASH_GT] = "/>",
+  [anon_sym_LT_SLASH] = "</",
   [anon_sym_RBRACK_RBRACK_GT] = "]]>",
-  [anon_sym_LT_BANG] = "<!",
+  [anon_sym_LT_BANG_LBRACK] = "<![",
+  [anon_sym_CDATA] = "CDATA",
+  [anon_sym_xml_DASHstylesheet] = "xml-stylesheet",
+  [anon_sym_xml_DASHmodel] = "xml-model",
+  [aux_sym_PseudoAttValue_token1] = "PseudoAttValue_token1",
+  [aux_sym_PseudoAttValue_token2] = "PseudoAttValue_token2",
   [anon_sym_ELEMENT] = "ELEMENT",
-  [anon_sym_GT] = ">",
   [anon_sym_EMPTY] = "EMPTY",
   [anon_sym_ANY] = "ANY",
   [anon_sym_LPAREN] = "(",
@@ -184,7 +198,6 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_PLUS] = "+",
   [anon_sym_COMMA] = ",",
   [anon_sym_ATTLIST] = "ATTLIST",
-  [anon_sym_CDATA] = "CDATA",
   [sym_TokenizedType] = "TokenizedType",
   [anon_sym_NOTATION] = "NOTATION",
   [anon_sym_POUNDREQUIRED] = "#REQUIRED",
@@ -192,9 +205,7 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_POUNDFIXED] = "#FIXED",
   [anon_sym_ENTITY] = "ENTITY",
   [anon_sym_PERCENT] = "%",
-  [anon_sym_DQUOTE] = "\"",
   [aux_sym_EntityValue_token1] = "EntityValue_token1",
-  [anon_sym_SQUOTE] = "'",
   [aux_sym_EntityValue_token2] = "EntityValue_token2",
   [anon_sym_NDATA] = "NDATA",
   [anon_sym_SEMI] = ";",
@@ -205,32 +216,17 @@ static const char * const ts_symbol_names[] = {
   [aux_sym_CharRef_token1] = "CharRef_token1",
   [anon_sym_AMP_POUNDx] = "&#x",
   [aux_sym_CharRef_token2] = "CharRef_token2",
-  [aux_sym_AttValue_token1] = "AttValue_token1",
-  [aux_sym_AttValue_token2] = "AttValue_token2",
   [anon_sym_SYSTEM] = "SYSTEM",
   [anon_sym_PUBLIC] = "PUBLIC",
   [aux_sym_SystemLiteral_token1] = "URI",
   [aux_sym_SystemLiteral_token2] = "URI",
   [aux_sym_PubidLiteral_token1] = "PubidLiteral_token1",
   [aux_sym_PubidLiteral_token2] = "PubidLiteral_token2",
-  [anon_sym_LT_QMARK] = "<\?",
-  [anon_sym_xml] = "xml",
-  [anon_sym_QMARK_GT] = "\?>",
   [anon_sym_version] = "version",
   [sym_VersionNum] = "VersionNum",
   [anon_sym_encoding] = "encoding",
   [sym_EncName] = "EncName",
   [anon_sym_EQ] = "=",
-  [anon_sym_standalone] = "standalone",
-  [anon_sym_yes] = "yes",
-  [anon_sym_no] = "no",
-  [anon_sym_DOCTYPE] = "DOCTYPE",
-  [anon_sym_RBRACK] = "]",
-  [anon_sym_LT] = "<",
-  [anon_sym_SLASH_GT] = "/>",
-  [anon_sym_LT_SLASH] = "</",
-  [anon_sym_xml_DASHstylesheet] = "xml-stylesheet",
-  [anon_sym_xml_DASHmodel] = "xml-model",
   [sym_PITarget] = "PITarget",
   [sym__pi_content] = "_pi_content",
   [sym_Comment] = "Comment",
@@ -238,8 +234,26 @@ static const char * const ts_symbol_names[] = {
   [sym_CData] = "CData",
   [sym__start_tag_name] = "Name",
   [sym__end_tag_name] = "Name",
-  [sym__erroneous_end_name] = "ERROR",
+  [sym__erroneous_end_name] = "_erroneous_end_name",
   [sym_document] = "document",
+  [sym_prolog] = "prolog",
+  [sym__Misc] = "_Misc",
+  [sym_XMLDecl] = "XMLDecl",
+  [sym__SDDecl] = "_SDDecl",
+  [sym_doctypedecl] = "doctypedecl",
+  [aux_sym__intSubset] = "_intSubset",
+  [sym_element] = "element",
+  [sym_EmptyElemTag] = "EmptyElemTag",
+  [sym_Attribute] = "Attribute",
+  [sym_STag] = "STag",
+  [sym_ETag] = "ETag",
+  [sym_content] = "content",
+  [sym_CDSect] = "CDSect",
+  [sym_CDStart] = "CDStart",
+  [sym_StyleSheetPI] = "StyleSheetPI",
+  [sym_XmlModelPI] = "XmlModelPI",
+  [sym_PseudoAtt] = "PseudoAtt",
+  [sym_PseudoAttValue] = "PseudoAttValue",
   [sym__markupdecl] = "_markupdecl",
   [sym__DeclSep] = "_DeclSep",
   [sym_elementdecl] = "elementdecl",
@@ -271,29 +285,16 @@ static const char * const ts_symbol_names[] = {
   [sym_PublicID] = "PublicID",
   [sym_SystemLiteral] = "SystemLiteral",
   [sym_PubidLiteral] = "PubidLiteral",
-  [sym_XMLDecl] = "XMLDecl",
   [sym__VersionInfo] = "_VersionInfo",
   [sym__EncodingDecl] = "_EncodingDecl",
   [sym_PI] = "PI",
   [sym__Eq] = "_Eq",
-  [sym_prolog] = "prolog",
-  [sym__Misc] = "_Misc",
-  [sym__SDDecl] = "_SDDecl",
-  [sym_doctypedecl] = "doctypedecl",
-  [aux_sym__intSubset] = "_intSubset",
-  [sym_element] = "element",
-  [sym_EmptyElemTag] = "EmptyElemTag",
-  [sym_Attribute] = "Attribute",
-  [sym_STag] = "STag",
-  [sym_ETag] = "ETag",
-  [sym_content] = "content",
-  [sym_CDSect] = "CDSect",
-  [sym_CDStart] = "CDStart",
-  [sym_StyleSheetPI] = "StyleSheetPI",
-  [sym_XmlModelPI] = "XmlModelPI",
-  [sym_PseudoAtt] = "PseudoAtt",
-  [sym_PseudoAttValue] = "PseudoAttValue",
   [aux_sym_document_repeat1] = "document_repeat1",
+  [aux_sym_EmptyElemTag_repeat1] = "EmptyElemTag_repeat1",
+  [aux_sym_content_repeat1] = "content_repeat1",
+  [aux_sym_StyleSheetPI_repeat1] = "StyleSheetPI_repeat1",
+  [aux_sym_PseudoAttValue_repeat1] = "PseudoAttValue_repeat1",
+  [aux_sym_PseudoAttValue_repeat2] = "PseudoAttValue_repeat2",
   [aux_sym_Mixed_repeat1] = "Mixed_repeat1",
   [aux_sym_Mixed_repeat2] = "Mixed_repeat2",
   [aux_sym__choice_repeat1] = "_choice_repeat1",
@@ -303,24 +304,35 @@ static const char * const ts_symbol_names[] = {
   [aux_sym_Enumeration_repeat1] = "Enumeration_repeat1",
   [aux_sym_EntityValue_repeat1] = "EntityValue_repeat1",
   [aux_sym_EntityValue_repeat2] = "EntityValue_repeat2",
-  [aux_sym_AttValue_repeat1] = "AttValue_repeat1",
-  [aux_sym_AttValue_repeat2] = "AttValue_repeat2",
-  [aux_sym_EmptyElemTag_repeat1] = "EmptyElemTag_repeat1",
-  [aux_sym_content_repeat1] = "content_repeat1",
-  [aux_sym_StyleSheetPI_repeat1] = "StyleSheetPI_repeat1",
 };
 
 static const TSSymbol ts_symbol_map[] = {
   [ts_builtin_sym_end] = ts_builtin_sym_end,
   [sym_Name] = sym_Name,
-  [anon_sym_LT_BANG_LBRACK] = anon_sym_LT_BANG_LBRACK,
-  [anon_sym_IGNORE] = anon_sym_IGNORE,
-  [anon_sym_INCLUDE] = anon_sym_INCLUDE,
+  [anon_sym_LT_QMARK] = anon_sym_LT_QMARK,
+  [anon_sym_xml] = anon_sym_xml,
+  [anon_sym_QMARK_GT] = anon_sym_QMARK_GT,
+  [anon_sym_standalone] = anon_sym_standalone,
+  [anon_sym_SQUOTE] = anon_sym_SQUOTE,
+  [anon_sym_yes] = anon_sym_yes,
+  [anon_sym_no] = anon_sym_no,
+  [anon_sym_DQUOTE] = anon_sym_DQUOTE,
+  [anon_sym_LT_BANG] = anon_sym_LT_BANG,
+  [anon_sym_DOCTYPE] = anon_sym_DOCTYPE,
   [anon_sym_LBRACK] = anon_sym_LBRACK,
+  [anon_sym_RBRACK] = anon_sym_RBRACK,
+  [anon_sym_GT] = anon_sym_GT,
+  [anon_sym_LT] = anon_sym_LT,
+  [anon_sym_SLASH_GT] = anon_sym_SLASH_GT,
+  [anon_sym_LT_SLASH] = anon_sym_LT_SLASH,
   [anon_sym_RBRACK_RBRACK_GT] = anon_sym_RBRACK_RBRACK_GT,
-  [anon_sym_LT_BANG] = anon_sym_LT_BANG,
+  [anon_sym_LT_BANG_LBRACK] = anon_sym_LT_BANG_LBRACK,
+  [anon_sym_CDATA] = anon_sym_CDATA,
+  [anon_sym_xml_DASHstylesheet] = anon_sym_xml_DASHstylesheet,
+  [anon_sym_xml_DASHmodel] = anon_sym_xml_DASHmodel,
+  [aux_sym_PseudoAttValue_token1] = aux_sym_PseudoAttValue_token1,
+  [aux_sym_PseudoAttValue_token2] = aux_sym_PseudoAttValue_token2,
   [anon_sym_ELEMENT] = anon_sym_ELEMENT,
-  [anon_sym_GT] = anon_sym_GT,
   [anon_sym_EMPTY] = anon_sym_EMPTY,
   [anon_sym_ANY] = anon_sym_ANY,
   [anon_sym_LPAREN] = anon_sym_LPAREN,
@@ -332,7 +344,6 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_PLUS] = anon_sym_PLUS,
   [anon_sym_COMMA] = anon_sym_COMMA,
   [anon_sym_ATTLIST] = anon_sym_ATTLIST,
-  [anon_sym_CDATA] = anon_sym_CDATA,
   [sym_TokenizedType] = sym_TokenizedType,
   [anon_sym_NOTATION] = anon_sym_NOTATION,
   [anon_sym_POUNDREQUIRED] = anon_sym_POUNDREQUIRED,
@@ -340,9 +351,7 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_POUNDFIXED] = anon_sym_POUNDFIXED,
   [anon_sym_ENTITY] = anon_sym_ENTITY,
   [anon_sym_PERCENT] = anon_sym_PERCENT,
-  [anon_sym_DQUOTE] = anon_sym_DQUOTE,
   [aux_sym_EntityValue_token1] = aux_sym_EntityValue_token1,
-  [anon_sym_SQUOTE] = anon_sym_SQUOTE,
   [aux_sym_EntityValue_token2] = aux_sym_EntityValue_token2,
   [anon_sym_NDATA] = anon_sym_NDATA,
   [anon_sym_SEMI] = anon_sym_SEMI,
@@ -353,32 +362,17 @@ static const TSSymbol ts_symbol_map[] = {
   [aux_sym_CharRef_token1] = aux_sym_CharRef_token1,
   [anon_sym_AMP_POUNDx] = anon_sym_AMP_POUNDx,
   [aux_sym_CharRef_token2] = aux_sym_CharRef_token2,
-  [aux_sym_AttValue_token1] = aux_sym_AttValue_token1,
-  [aux_sym_AttValue_token2] = aux_sym_AttValue_token2,
   [anon_sym_SYSTEM] = anon_sym_SYSTEM,
   [anon_sym_PUBLIC] = anon_sym_PUBLIC,
   [aux_sym_SystemLiteral_token1] = aux_sym_SystemLiteral_token1,
   [aux_sym_SystemLiteral_token2] = aux_sym_SystemLiteral_token1,
   [aux_sym_PubidLiteral_token1] = aux_sym_PubidLiteral_token1,
   [aux_sym_PubidLiteral_token2] = aux_sym_PubidLiteral_token2,
-  [anon_sym_LT_QMARK] = anon_sym_LT_QMARK,
-  [anon_sym_xml] = anon_sym_xml,
-  [anon_sym_QMARK_GT] = anon_sym_QMARK_GT,
   [anon_sym_version] = anon_sym_version,
   [sym_VersionNum] = sym_VersionNum,
   [anon_sym_encoding] = anon_sym_encoding,
   [sym_EncName] = sym_EncName,
   [anon_sym_EQ] = anon_sym_EQ,
-  [anon_sym_standalone] = anon_sym_standalone,
-  [anon_sym_yes] = anon_sym_yes,
-  [anon_sym_no] = anon_sym_no,
-  [anon_sym_DOCTYPE] = anon_sym_DOCTYPE,
-  [anon_sym_RBRACK] = anon_sym_RBRACK,
-  [anon_sym_LT] = anon_sym_LT,
-  [anon_sym_SLASH_GT] = anon_sym_SLASH_GT,
-  [anon_sym_LT_SLASH] = anon_sym_LT_SLASH,
-  [anon_sym_xml_DASHstylesheet] = anon_sym_xml_DASHstylesheet,
-  [anon_sym_xml_DASHmodel] = anon_sym_xml_DASHmodel,
   [sym_PITarget] = sym_PITarget,
   [sym__pi_content] = sym__pi_content,
   [sym_Comment] = sym_Comment,
@@ -388,6 +382,24 @@ static const TSSymbol ts_symbol_map[] = {
   [sym__end_tag_name] = sym_Name,
   [sym__erroneous_end_name] = sym__erroneous_end_name,
   [sym_document] = sym_document,
+  [sym_prolog] = sym_prolog,
+  [sym__Misc] = sym__Misc,
+  [sym_XMLDecl] = sym_XMLDecl,
+  [sym__SDDecl] = sym__SDDecl,
+  [sym_doctypedecl] = sym_doctypedecl,
+  [aux_sym__intSubset] = aux_sym__intSubset,
+  [sym_element] = sym_element,
+  [sym_EmptyElemTag] = sym_EmptyElemTag,
+  [sym_Attribute] = sym_Attribute,
+  [sym_STag] = sym_STag,
+  [sym_ETag] = sym_ETag,
+  [sym_content] = sym_content,
+  [sym_CDSect] = sym_CDSect,
+  [sym_CDStart] = sym_CDStart,
+  [sym_StyleSheetPI] = sym_StyleSheetPI,
+  [sym_XmlModelPI] = sym_XmlModelPI,
+  [sym_PseudoAtt] = sym_PseudoAtt,
+  [sym_PseudoAttValue] = sym_PseudoAttValue,
   [sym__markupdecl] = sym__markupdecl,
   [sym__DeclSep] = sym__DeclSep,
   [sym_elementdecl] = sym_elementdecl,
@@ -419,29 +431,16 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_PublicID] = sym_PublicID,
   [sym_SystemLiteral] = sym_SystemLiteral,
   [sym_PubidLiteral] = sym_PubidLiteral,
-  [sym_XMLDecl] = sym_XMLDecl,
   [sym__VersionInfo] = sym__VersionInfo,
   [sym__EncodingDecl] = sym__EncodingDecl,
   [sym_PI] = sym_PI,
   [sym__Eq] = sym__Eq,
-  [sym_prolog] = sym_prolog,
-  [sym__Misc] = sym__Misc,
-  [sym__SDDecl] = sym__SDDecl,
-  [sym_doctypedecl] = sym_doctypedecl,
-  [aux_sym__intSubset] = aux_sym__intSubset,
-  [sym_element] = sym_element,
-  [sym_EmptyElemTag] = sym_EmptyElemTag,
-  [sym_Attribute] = sym_Attribute,
-  [sym_STag] = sym_STag,
-  [sym_ETag] = sym_ETag,
-  [sym_content] = sym_content,
-  [sym_CDSect] = sym_CDSect,
-  [sym_CDStart] = sym_CDStart,
-  [sym_StyleSheetPI] = sym_StyleSheetPI,
-  [sym_XmlModelPI] = sym_XmlModelPI,
-  [sym_PseudoAtt] = sym_PseudoAtt,
-  [sym_PseudoAttValue] = sym_PseudoAttValue,
   [aux_sym_document_repeat1] = aux_sym_document_repeat1,
+  [aux_sym_EmptyElemTag_repeat1] = aux_sym_EmptyElemTag_repeat1,
+  [aux_sym_content_repeat1] = aux_sym_content_repeat1,
+  [aux_sym_StyleSheetPI_repeat1] = aux_sym_StyleSheetPI_repeat1,
+  [aux_sym_PseudoAttValue_repeat1] = aux_sym_PseudoAttValue_repeat1,
+  [aux_sym_PseudoAttValue_repeat2] = aux_sym_PseudoAttValue_repeat2,
   [aux_sym_Mixed_repeat1] = aux_sym_Mixed_repeat1,
   [aux_sym_Mixed_repeat2] = aux_sym_Mixed_repeat2,
   [aux_sym__choice_repeat1] = aux_sym__choice_repeat1,
@@ -451,11 +450,6 @@ static const TSSymbol ts_symbol_map[] = {
   [aux_sym_Enumeration_repeat1] = aux_sym_Enumeration_repeat1,
   [aux_sym_EntityValue_repeat1] = aux_sym_EntityValue_repeat1,
   [aux_sym_EntityValue_repeat2] = aux_sym_EntityValue_repeat2,
-  [aux_sym_AttValue_repeat1] = aux_sym_AttValue_repeat1,
-  [aux_sym_AttValue_repeat2] = aux_sym_AttValue_repeat2,
-  [aux_sym_EmptyElemTag_repeat1] = aux_sym_EmptyElemTag_repeat1,
-  [aux_sym_content_repeat1] = aux_sym_content_repeat1,
-  [aux_sym_StyleSheetPI_repeat1] = aux_sym_StyleSheetPI_repeat1,
 };
 
 static const TSSymbolMetadata ts_symbol_metadata[] = {
@@ -467,23 +461,35 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [anon_sym_LT_BANG_LBRACK] = {
+  [anon_sym_LT_QMARK] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_IGNORE] = {
+  [anon_sym_xml] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_INCLUDE] = {
+  [anon_sym_QMARK_GT] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_LBRACK] = {
+  [anon_sym_standalone] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_RBRACK_RBRACK_GT] = {
+  [anon_sym_SQUOTE] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_yes] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_no] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_DQUOTE] = {
     .visible = true,
     .named = false,
   },
@@ -491,7 +497,15 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_ELEMENT] = {
+  [anon_sym_DOCTYPE] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_LBRACK] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_RBRACK] = {
     .visible = true,
     .named = false,
   },
@@ -499,6 +513,50 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
+  [anon_sym_LT] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_SLASH_GT] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_LT_SLASH] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_RBRACK_RBRACK_GT] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_LT_BANG_LBRACK] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_CDATA] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_xml_DASHstylesheet] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_xml_DASHmodel] = {
+    .visible = true,
+    .named = false,
+  },
+  [aux_sym_PseudoAttValue_token1] = {
+    .visible = false,
+    .named = false,
+  },
+  [aux_sym_PseudoAttValue_token2] = {
+    .visible = false,
+    .named = false,
+  },
+  [anon_sym_ELEMENT] = {
+    .visible = true,
+    .named = false,
+  },
   [anon_sym_EMPTY] = {
     .visible = true,
     .named = false,
@@ -543,10 +601,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_CDATA] = {
-    .visible = true,
-    .named = false,
-  },
   [sym_TokenizedType] = {
     .visible = true,
     .named = true,
@@ -575,18 +629,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_DQUOTE] = {
-    .visible = true,
-    .named = false,
-  },
   [aux_sym_EntityValue_token1] = {
     .visible = false,
     .named = false,
   },
-  [anon_sym_SQUOTE] = {
-    .visible = true,
-    .named = false,
-  },
   [aux_sym_EntityValue_token2] = {
     .visible = false,
     .named = false,
@@ -627,14 +673,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_AttValue_token1] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_AttValue_token2] = {
-    .visible = false,
-    .named = false,
-  },
   [anon_sym_SYSTEM] = {
     .visible = true,
     .named = false,
@@ -659,111 +697,131 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
-  [anon_sym_LT_QMARK] = {
+  [anon_sym_version] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_xml] = {
+  [sym_VersionNum] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_QMARK_GT] = {
+  [anon_sym_encoding] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_version] = {
+  [sym_EncName] = {
+    .visible = true,
+    .named = true,
+  },
+  [anon_sym_EQ] = {
     .visible = true,
     .named = false,
   },
-  [sym_VersionNum] = {
+  [sym_PITarget] = {
     .visible = true,
     .named = true,
   },
-  [anon_sym_encoding] = {
-    .visible = true,
-    .named = false,
+  [sym__pi_content] = {
+    .visible = false,
+    .named = true,
   },
-  [sym_EncName] = {
+  [sym_Comment] = {
     .visible = true,
     .named = true,
   },
-  [anon_sym_EQ] = {
+  [sym_CharData] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_standalone] = {
+  [sym_CData] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_yes] = {
+  [sym__start_tag_name] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_no] = {
+  [sym__end_tag_name] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_DOCTYPE] = {
+  [sym__erroneous_end_name] = {
+    .visible = false,
+    .named = true,
+  },
+  [sym_document] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_RBRACK] = {
+  [sym_prolog] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_LT] = {
+  [sym__Misc] = {
+    .visible = false,
+    .named = true,
+  },
+  [sym_XMLDecl] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_SLASH_GT] = {
+  [sym__SDDecl] = {
+    .visible = false,
+    .named = true,
+  },
+  [sym_doctypedecl] = {
     .visible = true,
+    .named = true,
+  },
+  [aux_sym__intSubset] = {
+    .visible = false,
     .named = false,
   },
-  [anon_sym_LT_SLASH] = {
+  [sym_element] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_xml_DASHstylesheet] = {
+  [sym_EmptyElemTag] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [anon_sym_xml_DASHmodel] = {
+  [sym_Attribute] = {
     .visible = true,
-    .named = false,
+    .named = true,
   },
-  [sym_PITarget] = {
+  [sym_STag] = {
     .visible = true,
     .named = true,
   },
-  [sym__pi_content] = {
-    .visible = false,
+  [sym_ETag] = {
+    .visible = true,
     .named = true,
   },
-  [sym_Comment] = {
+  [sym_content] = {
     .visible = true,
     .named = true,
   },
-  [sym_CharData] = {
+  [sym_CDSect] = {
     .visible = true,
     .named = true,
   },
-  [sym_CData] = {
+  [sym_CDStart] = {
     .visible = true,
     .named = true,
   },
-  [sym__start_tag_name] = {
+  [sym_StyleSheetPI] = {
     .visible = true,
     .named = true,
   },
-  [sym__end_tag_name] = {
+  [sym_XmlModelPI] = {
     .visible = true,
     .named = true,
   },
-  [sym__erroneous_end_name] = {
+  [sym_PseudoAtt] = {
     .visible = true,
     .named = true,
   },
-  [sym_document] = {
+  [sym_PseudoAttValue] = {
     .visible = true,
     .named = true,
   },
@@ -896,10 +954,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [sym_XMLDecl] = {
-    .visible = true,
-    .named = true,
-  },
   [sym__VersionInfo] = {
     .visible = false,
     .named = true,
@@ -916,75 +970,27 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = true,
   },
-  [sym_prolog] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym__Misc] = {
+  [aux_sym_document_repeat1] = {
     .visible = false,
-    .named = true,
+    .named = false,
   },
-  [sym__SDDecl] = {
+  [aux_sym_EmptyElemTag_repeat1] = {
     .visible = false,
-    .named = true,
-  },
-  [sym_doctypedecl] = {
-    .visible = true,
-    .named = true,
+    .named = false,
   },
-  [aux_sym__intSubset] = {
+  [aux_sym_content_repeat1] = {
     .visible = false,
     .named = false,
   },
-  [sym_element] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_EmptyElemTag] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_Attribute] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_STag] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_ETag] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_content] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_CDSect] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_CDStart] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_StyleSheetPI] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_XmlModelPI] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_PseudoAtt] = {
-    .visible = true,
-    .named = true,
+  [aux_sym_StyleSheetPI_repeat1] = {
+    .visible = false,
+    .named = false,
   },
-  [sym_PseudoAttValue] = {
-    .visible = true,
-    .named = true,
+  [aux_sym_PseudoAttValue_repeat1] = {
+    .visible = false,
+    .named = false,
   },
-  [aux_sym_document_repeat1] = {
+  [aux_sym_PseudoAttValue_repeat2] = {
     .visible = false,
     .named = false,
   },
@@ -1024,26 +1030,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_AttValue_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_AttValue_repeat2] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_EmptyElemTag_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_content_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_StyleSheetPI_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
 };
 
 enum ts_field_identifiers {
@@ -1132,8 +1118,8 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [45] = 45,
   [46] = 46,
   [47] = 47,
-  [48] = 48,
-  [49] = 49,
+  [48] = 46,
+  [49] = 45,
   [50] = 50,
   [51] = 51,
   [52] = 52,
@@ -1147,11 +1133,11 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [60] = 60,
   [61] = 61,
   [62] = 62,
-  [63] = 63,
+  [63] = 41,
   [64] = 64,
   [65] = 65,
   [66] = 66,
-  [67] = 67,
+  [67] = 65,
   [68] = 68,
   [69] = 69,
   [70] = 70,
@@ -1161,13 +1147,13 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [74] = 74,
   [75] = 75,
   [76] = 76,
-  [77] = 53,
-  [78] = 52,
+  [77] = 77,
+  [78] = 78,
   [79] = 79,
-  [80] = 48,
+  [80] = 80,
   [81] = 81,
   [82] = 82,
-  [83] = 76,
+  [83] = 83,
   [84] = 84,
   [85] = 85,
   [86] = 86,
@@ -1185,21 +1171,21 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [98] = 98,
   [99] = 99,
   [100] = 100,
-  [101] = 101,
-  [102] = 72,
-  [103] = 42,
-  [104] = 34,
-  [105] = 68,
-  [106] = 72,
-  [107] = 42,
-  [108] = 50,
-  [109] = 34,
-  [110] = 68,
-  [111] = 111,
-  [112] = 60,
-  [113] = 113,
-  [114] = 114,
-  [115] = 115,
+  [101] = 40,
+  [102] = 40,
+  [103] = 79,
+  [104] = 77,
+  [105] = 105,
+  [106] = 106,
+  [107] = 107,
+  [108] = 108,
+  [109] = 109,
+  [110] = 34,
+  [111] = 76,
+  [112] = 112,
+  [113] = 34,
+  [114] = 79,
+  [115] = 77,
   [116] = 116,
   [117] = 117,
   [118] = 118,
@@ -1210,7 +1196,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [123] = 123,
   [124] = 124,
   [125] = 125,
-  [126] = 126,
+  [126] = 38,
   [127] = 127,
   [128] = 128,
   [129] = 129,
@@ -1220,22 +1206,22 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [133] = 133,
   [134] = 134,
   [135] = 135,
-  [136] = 42,
+  [136] = 136,
   [137] = 137,
   [138] = 138,
-  [139] = 72,
-  [140] = 68,
+  [139] = 139,
+  [140] = 140,
   [141] = 141,
-  [142] = 142,
+  [142] = 34,
   [143] = 143,
-  [144] = 144,
-  [145] = 34,
-  [146] = 42,
-  [147] = 72,
-  [148] = 68,
+  [144] = 77,
+  [145] = 79,
+  [146] = 40,
+  [147] = 77,
+  [148] = 79,
   [149] = 149,
   [150] = 150,
-  [151] = 151,
+  [151] = 40,
   [152] = 152,
   [153] = 153,
   [154] = 154,
@@ -1243,65 +1229,65 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [156] = 156,
   [157] = 157,
   [158] = 158,
-  [159] = 159,
+  [159] = 36,
   [160] = 160,
   [161] = 161,
   [162] = 162,
   [163] = 163,
   [164] = 164,
-  [165] = 161,
+  [165] = 165,
   [166] = 166,
   [167] = 167,
-  [168] = 47,
+  [168] = 168,
   [169] = 169,
   [170] = 170,
-  [171] = 49,
-  [172] = 65,
-  [173] = 63,
+  [171] = 171,
+  [172] = 66,
+  [173] = 165,
   [174] = 174,
-  [175] = 175,
+  [175] = 70,
   [176] = 176,
-  [177] = 177,
+  [177] = 78,
   [178] = 178,
   [179] = 179,
   [180] = 180,
   [181] = 181,
   [182] = 182,
   [183] = 183,
-  [184] = 164,
-  [185] = 51,
-  [186] = 59,
-  [187] = 163,
+  [184] = 184,
+  [185] = 185,
+  [186] = 186,
+  [187] = 187,
   [188] = 188,
-  [189] = 58,
+  [189] = 189,
   [190] = 190,
   [191] = 191,
   [192] = 192,
   [193] = 193,
-  [194] = 162,
+  [194] = 194,
   [195] = 195,
   [196] = 196,
   [197] = 197,
-  [198] = 198,
+  [198] = 37,
   [199] = 199,
-  [200] = 200,
-  [201] = 201,
+  [200] = 42,
+  [201] = 81,
   [202] = 202,
-  [203] = 203,
+  [203] = 178,
   [204] = 204,
-  [205] = 205,
+  [205] = 39,
   [206] = 206,
   [207] = 207,
   [208] = 208,
-  [209] = 209,
+  [209] = 186,
   [210] = 210,
   [211] = 211,
-  [212] = 56,
+  [212] = 212,
   [213] = 213,
   [214] = 214,
   [215] = 215,
   [216] = 216,
-  [217] = 217,
+  [217] = 169,
   [218] = 218,
   [219] = 219,
   [220] = 220,
@@ -1361,7 +1347,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [274] = 274,
   [275] = 275,
   [276] = 276,
-  [277] = 50,
+  [277] = 76,
   [278] = 278,
   [279] = 279,
   [280] = 280,
@@ -1391,37 +1377,37 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [304] = 304,
   [305] = 305,
   [306] = 306,
-  [307] = 279,
-  [308] = 308,
-  [309] = 309,
+  [307] = 307,
+  [308] = 280,
+  [309] = 280,
   [310] = 310,
   [311] = 311,
   [312] = 312,
   [313] = 313,
-  [314] = 296,
+  [314] = 314,
   [315] = 315,
   [316] = 316,
   [317] = 317,
-  [318] = 60,
-  [319] = 238,
-  [320] = 320,
+  [318] = 318,
+  [319] = 319,
+  [320] = 38,
   [321] = 321,
-  [322] = 322,
-  [323] = 269,
+  [322] = 235,
+  [323] = 323,
   [324] = 324,
-  [325] = 289,
+  [325] = 253,
   [326] = 326,
   [327] = 327,
   [328] = 328,
   [329] = 329,
-  [330] = 330,
-  [331] = 331,
+  [330] = 307,
+  [331] = 291,
   [332] = 332,
   [333] = 333,
   [334] = 334,
   [335] = 335,
   [336] = 336,
-  [337] = 279,
+  [337] = 337,
   [338] = 338,
   [339] = 339,
   [340] = 340,
@@ -1538,47 +1524,47 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [451] = 451,
   [452] = 452,
   [453] = 453,
-  [454] = 421,
-  [455] = 420,
-  [456] = 456,
-  [457] = 390,
+  [454] = 454,
+  [455] = 427,
+  [456] = 432,
+  [457] = 452,
   [458] = 458,
-  [459] = 418,
+  [459] = 454,
   [460] = 460,
   [461] = 461,
   [462] = 462,
   [463] = 463,
-  [464] = 429,
+  [464] = 436,
   [465] = 465,
-  [466] = 421,
-  [467] = 420,
-  [468] = 390,
-  [469] = 429,
-  [470] = 421,
-  [471] = 420,
-  [472] = 429,
-  [473] = 421,
-  [474] = 420,
-  [475] = 416,
-  [476] = 445,
-  [477] = 444,
-  [478] = 443,
-  [479] = 442,
-  [480] = 441,
-  [481] = 434,
-  [482] = 415,
-  [483] = 445,
-  [484] = 444,
-  [485] = 443,
-  [486] = 434,
-  [487] = 415,
-  [488] = 445,
-  [489] = 444,
-  [490] = 443,
-  [491] = 415,
-  [492] = 445,
-  [493] = 444,
-  [494] = 443,
+  [466] = 427,
+  [467] = 432,
+  [468] = 452,
+  [469] = 436,
+  [470] = 427,
+  [471] = 432,
+  [472] = 436,
+  [473] = 427,
+  [474] = 432,
+  [475] = 462,
+  [476] = 434,
+  [477] = 435,
+  [478] = 429,
+  [479] = 426,
+  [480] = 425,
+  [481] = 420,
+  [482] = 396,
+  [483] = 429,
+  [484] = 426,
+  [485] = 425,
+  [486] = 420,
+  [487] = 396,
+  [488] = 429,
+  [489] = 426,
+  [490] = 425,
+  [491] = 396,
+  [492] = 429,
+  [493] = 426,
+  [494] = 425,
 };
 
 static TSCharacterRange aux_sym_PubidLiteral_token1_character_set_1[] = {
@@ -1598,126 +1584,126 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 0:
       if (eof) ADVANCE(42);
       ADVANCE_MAP(
-        '"', 67,
-        '#', 72,
-        '%', 66,
-        '&', 121,
-        '\'', 81,
-        '(', 49,
-        ')', 52,
-        '*', 53,
-        '+', 55,
-        ',', 56,
-        '/', 70,
-        '1', 69,
-        ';', 83,
-        '<', 139,
-        '=', 136,
-        '>', 48,
-        '?', 54,
-        'E', 74,
-        'I', 71,
-        'N', 73,
-        '[', 44,
-        ']', 138,
-        '_', 80,
-        '|', 51,
-        '\t', 77,
-        '\n', 77,
-        '\r', 77,
-        ' ', 77,
-        '-', 79,
-        '.', 79,
-        ':', 79,
-        0xb7, 79,
+        '"', 46,
+        '#', 64,
+        '%', 91,
+        '&', 132,
+        '\'', 45,
+        '(', 74,
+        ')', 77,
+        '*', 78,
+        '+', 80,
+        ',', 81,
+        '/', 62,
+        '1', 61,
+        ';', 94,
+        '<', 53,
+        '=', 143,
+        '>', 52,
+        '?', 79,
+        'E', 66,
+        'I', 63,
+        'N', 65,
+        '[', 49,
+        ']', 51,
+        '_', 72,
+        '|', 76,
+        '\t', 69,
+        '\n', 69,
+        '\r', 69,
+        ' ', 69,
+        '-', 71,
+        '.', 71,
+        ':', 71,
+        0xb7, 71,
       );
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(78);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(70);
       if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(75);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(67);
       if (('G' <= lookahead && lookahead <= 'Z') ||
-          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(76);
-      if (lookahead != 0) ADVANCE(68);
+          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(68);
+      if (lookahead != 0) ADVANCE(60);
       END_STATE();
     case 1:
       ADVANCE_MAP(
-        '"', 67,
+        '"', 46,
         '#', 28,
-        '%', 66,
-        '\'', 81,
-        '(', 49,
-        ')', 52,
-        '*', 53,
-        '+', 55,
-        ',', 56,
+        '%', 91,
+        '\'', 45,
+        '(', 74,
+        ')', 77,
+        '*', 78,
+        '+', 80,
+        ',', 81,
         '/', 7,
-        '>', 48,
-        '?', 54,
-        '[', 44,
+        '>', 52,
+        '?', 79,
+        '[', 49,
         ']', 36,
-        '|', 51,
-        '\t', 84,
-        '\n', 84,
-        '\r', 84,
-        ' ', 84,
+        '|', 76,
+        '\t', 95,
+        '\n', 95,
+        '\r', 95,
+        ' ', 95,
       );
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(123);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(134);
       if (('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(116);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(127);
       END_STATE();
     case 2:
-      if (lookahead == '"') ADVANCE(67);
-      if (lookahead == '%') ADVANCE(66);
-      if (lookahead == '&') ADVANCE(121);
+      if (lookahead == '"') ADVANCE(46);
+      if (lookahead == '%') ADVANCE(91);
+      if (lookahead == '&') ADVANCE(132);
       if (lookahead != 0 &&
-          lookahead != '<') ADVANCE(68);
+          lookahead != '<') ADVANCE(92);
       END_STATE();
     case 3:
-      if (lookahead == '"') ADVANCE(67);
-      if (lookahead == '&') ADVANCE(121);
+      if (lookahead == '"') ADVANCE(46);
+      if (lookahead == '&') ADVANCE(132);
       if (lookahead != 0 &&
-          lookahead != '<') ADVANCE(126);
+          lookahead != '<') ADVANCE(60);
       END_STATE();
     case 4:
-      if (lookahead == '%') ADVANCE(66);
-      if (lookahead == '&') ADVANCE(121);
-      if (lookahead == '\'') ADVANCE(81);
-      if (lookahead == '<') ADVANCE(141);
-      if (lookahead != 0) ADVANCE(82);
+      if (lookahead == '%') ADVANCE(91);
+      if (lookahead == '&') ADVANCE(132);
+      if (lookahead == '\'') ADVANCE(45);
+      if (lookahead == '<') ADVANCE(55);
+      if (lookahead != 0) ADVANCE(93);
       END_STATE();
     case 5:
-      if (lookahead == '&') ADVANCE(121);
-      if (lookahead == '\'') ADVANCE(81);
+      if (lookahead == '&') ADVANCE(132);
+      if (lookahead == '\'') ADVANCE(45);
       if (lookahead != 0 &&
-          lookahead != '<') ADVANCE(127);
+          lookahead != '<') ADVANCE(73);
       END_STATE();
     case 6:
       if (lookahead == '.') ADVANCE(38);
       END_STATE();
     case 7:
-      if (lookahead == '>') ADVANCE(142);
+      if (lookahead == '>') ADVANCE(56);
       END_STATE();
     case 8:
-      if (lookahead == '>') ADVANCE(45);
+      if (lookahead == '>') ADVANCE(58);
       END_STATE();
     case 9:
-      if (lookahead == '>') ADVANCE(133);
+      if (lookahead == '>') ADVANCE(44);
       END_STATE();
     case 10:
       if (lookahead == '?') ADVANCE(9);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(84);
+          lookahead == ' ') ADVANCE(95);
       if (('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(116);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(127);
       END_STATE();
     case 11:
       if (lookahead == 'A') ADVANCE(32);
       END_STATE();
     case 12:
-      if (lookahead == 'A') ADVANCE(50);
+      if (lookahead == 'A') ADVANCE(75);
       END_STATE();
     case 13:
       if (lookahead == 'C') ADVANCE(14);
@@ -1726,13 +1712,13 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == 'D') ADVANCE(11);
       END_STATE();
     case 15:
-      if (lookahead == 'D') ADVANCE(65);
+      if (lookahead == 'D') ADVANCE(90);
       END_STATE();
     case 16:
-      if (lookahead == 'D') ADVANCE(64);
+      if (lookahead == 'D') ADVANCE(89);
       END_STATE();
     case 17:
-      if (lookahead == 'D') ADVANCE(63);
+      if (lookahead == 'D') ADVANCE(88);
       END_STATE();
     case 18:
       if (lookahead == 'E') ADVANCE(30);
@@ -1788,7 +1774,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == 'X') ADVANCE(19);
       END_STATE();
     case 35:
-      if (lookahead == '[') ADVANCE(43);
+      if (lookahead == '[') ADVANCE(59);
       END_STATE();
     case 36:
       if (lookahead == ']') ADVANCE(8);
@@ -1797,693 +1783,735 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(84);
+          lookahead == ' ') ADVANCE(95);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(120);
+          lookahead == 0xb7) ADVANCE(131);
       END_STATE();
     case 38:
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(134);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(141);
       END_STATE();
     case 39:
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(125);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(136);
       END_STATE();
     case 40:
       if (('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(135);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(142);
       END_STATE();
     case 41:
       if (eof) ADVANCE(42);
       ADVANCE_MAP(
-        '"', 67,
+        '"', 46,
         '#', 22,
-        '%', 66,
-        '\'', 81,
-        '(', 49,
-        ')', 52,
-        '*', 53,
-        '+', 55,
-        ',', 56,
+        '%', 91,
+        '\'', 45,
+        '(', 74,
+        ')', 77,
+        '*', 78,
+        '+', 80,
+        ',', 81,
         '/', 7,
         '1', 6,
-        ';', 83,
-        '<', 140,
-        '=', 136,
-        '>', 48,
-        '?', 54,
-        'E', 102,
-        'I', 85,
-        'N', 100,
-        '[', 44,
-        ']', 137,
-        '|', 51,
-        '\t', 84,
-        '\n', 84,
-        '\r', 84,
-        ' ', 84,
+        ';', 94,
+        '<', 54,
+        '=', 143,
+        '>', 52,
+        '?', 79,
+        'E', 113,
+        'I', 96,
+        'N', 111,
+        '[', 49,
+        ']', 50,
+        '|', 76,
+        '\t', 95,
+        '\n', 95,
+        '\r', 95,
+        ' ', 95,
       );
       if (('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(116);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(127);
       END_STATE();
     case 42:
       ACCEPT_TOKEN(ts_builtin_sym_end);
       END_STATE();
     case 43:
-      ACCEPT_TOKEN(anon_sym_LT_BANG_LBRACK);
+      ACCEPT_TOKEN(anon_sym_LT_QMARK);
       END_STATE();
     case 44:
-      ACCEPT_TOKEN(anon_sym_LBRACK);
+      ACCEPT_TOKEN(anon_sym_QMARK_GT);
       END_STATE();
     case 45:
-      ACCEPT_TOKEN(anon_sym_RBRACK_RBRACK_GT);
+      ACCEPT_TOKEN(anon_sym_SQUOTE);
       END_STATE();
     case 46:
-      ACCEPT_TOKEN(anon_sym_LT_BANG);
+      ACCEPT_TOKEN(anon_sym_DQUOTE);
       END_STATE();
     case 47:
       ACCEPT_TOKEN(anon_sym_LT_BANG);
-      if (lookahead == '[') ADVANCE(43);
       END_STATE();
     case 48:
-      ACCEPT_TOKEN(anon_sym_GT);
+      ACCEPT_TOKEN(anon_sym_LT_BANG);
+      if (lookahead == '[') ADVANCE(59);
       END_STATE();
     case 49:
-      ACCEPT_TOKEN(anon_sym_LPAREN);
+      ACCEPT_TOKEN(anon_sym_LBRACK);
       END_STATE();
     case 50:
-      ACCEPT_TOKEN(anon_sym_POUNDPCDATA);
+      ACCEPT_TOKEN(anon_sym_RBRACK);
       END_STATE();
     case 51:
-      ACCEPT_TOKEN(anon_sym_PIPE);
+      ACCEPT_TOKEN(anon_sym_RBRACK);
+      if (lookahead == ']') ADVANCE(8);
       END_STATE();
     case 52:
-      ACCEPT_TOKEN(anon_sym_RPAREN);
+      ACCEPT_TOKEN(anon_sym_GT);
       END_STATE();
     case 53:
-      ACCEPT_TOKEN(anon_sym_STAR);
+      ACCEPT_TOKEN(anon_sym_LT);
+      if (lookahead == '!') ADVANCE(48);
+      if (lookahead == '/') ADVANCE(57);
+      if (lookahead == '?') ADVANCE(43);
       END_STATE();
     case 54:
-      ACCEPT_TOKEN(anon_sym_QMARK);
+      ACCEPT_TOKEN(anon_sym_LT);
+      if (lookahead == '!') ADVANCE(47);
+      if (lookahead == '?') ADVANCE(43);
       END_STATE();
     case 55:
-      ACCEPT_TOKEN(anon_sym_PLUS);
+      ACCEPT_TOKEN(anon_sym_LT);
+      if (lookahead == '!') ADVANCE(35);
+      if (lookahead == '/') ADVANCE(57);
+      if (lookahead == '?') ADVANCE(43);
       END_STATE();
     case 56:
-      ACCEPT_TOKEN(anon_sym_COMMA);
+      ACCEPT_TOKEN(anon_sym_SLASH_GT);
       END_STATE();
     case 57:
-      ACCEPT_TOKEN(sym_TokenizedType);
-      if (lookahead == 'R') ADVANCE(86);
-      if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
-      if (lookahead == '-' ||
-          lookahead == '.' ||
-          ('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+      ACCEPT_TOKEN(anon_sym_LT_SLASH);
       END_STATE();
     case 58:
-      ACCEPT_TOKEN(sym_TokenizedType);
-      if (lookahead == 'R') ADVANCE(89);
+      ACCEPT_TOKEN(anon_sym_RBRACK_RBRACK_GT);
+      END_STATE();
+    case 59:
+      ACCEPT_TOKEN(anon_sym_LT_BANG_LBRACK);
+      END_STATE();
+    case 60:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      END_STATE();
+    case 61:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == '.') ADVANCE(128);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(129);
+      if (('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(130);
       if (lookahead == '-' ||
-          lookahead == '.' ||
-          ('0' <= lookahead && lookahead <= ':') ||
-          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == ':' ||
+          ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          ('g' <= lookahead && lookahead <= 'z') ||
+          lookahead == 0xb7) ADVANCE(131);
       END_STATE();
-    case 59:
-      ACCEPT_TOKEN(sym_TokenizedType);
-      if (lookahead == 'S') ADVANCE(61);
+    case 62:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == '>') ADVANCE(56);
+      END_STATE();
+    case 63:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == 'D') ADVANCE(82);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 60:
-      ACCEPT_TOKEN(sym_TokenizedType);
-      if (lookahead == 'S') ADVANCE(62);
-      if (lookahead == '-' ||
-          lookahead == '.' ||
-          ('0' <= lookahead && lookahead <= ':') ||
-          ('A' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+    case 64:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == 'F') ADVANCE(23);
+      if (lookahead == 'I') ADVANCE(27);
+      if (lookahead == 'P') ADVANCE(13);
+      if (lookahead == 'R') ADVANCE(18);
       END_STATE();
-    case 61:
-      ACCEPT_TOKEN(sym_TokenizedType);
+    case 65:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == 'M') ADVANCE(120);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 62:
-      ACCEPT_TOKEN(sym_TokenizedType);
+    case 66:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == 'N') ADVANCE(119);
+      if (lookahead == ':' ||
+          lookahead == 0xb7) ADVANCE(127);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(125);
       if (lookahead == '-' ||
           lookahead == '.' ||
-          ('0' <= lookahead && lookahead <= ':') ||
-          ('A' <= lookahead && lookahead <= 'Z') ||
+          ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
-      END_STATE();
-    case 63:
-      ACCEPT_TOKEN(anon_sym_POUNDREQUIRED);
-      END_STATE();
-    case 64:
-      ACCEPT_TOKEN(anon_sym_POUNDIMPLIED);
-      END_STATE();
-    case 65:
-      ACCEPT_TOKEN(anon_sym_POUNDFIXED);
-      END_STATE();
-    case 66:
-      ACCEPT_TOKEN(anon_sym_PERCENT);
+          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
     case 67:
-      ACCEPT_TOKEN(anon_sym_DQUOTE);
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == ':' ||
+          lookahead == 0xb7) ADVANCE(127);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(125);
+      if (lookahead == '-' ||
+          lookahead == '.' ||
+          ('G' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
+          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
     case 68:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == ':' ||
+          lookahead == 0xb7) ADVANCE(127);
+      if (lookahead == '-' ||
+          lookahead == '.' ||
+          ('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
     case 69:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == '.') ADVANCE(117);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(118);
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\r' ||
+          lookahead == ' ') ADVANCE(95);
+      END_STATE();
+    case 70:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(129);
       if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(119);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(130);
       if (lookahead == '-' ||
+          lookahead == '.' ||
           lookahead == ':' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('g' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(120);
-      END_STATE();
-    case 70:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == '>') ADVANCE(142);
+          lookahead == 0xb7) ADVANCE(131);
       END_STATE();
     case 71:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == 'D') ADVANCE(57);
-      if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
       if (lookahead == '-' ||
           lookahead == '.' ||
-          ('0' <= lookahead && lookahead <= '9') ||
+          ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z') ||
+          lookahead == 0xb7) ADVANCE(131);
       END_STATE();
     case 72:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == 'F') ADVANCE(23);
-      if (lookahead == 'I') ADVANCE(27);
-      if (lookahead == 'P') ADVANCE(13);
-      if (lookahead == 'R') ADVANCE(18);
-      END_STATE();
-    case 73:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == 'M') ADVANCE(109);
-      if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token1);
       if (lookahead == '-' ||
           lookahead == '.' ||
-          ('0' <= lookahead && lookahead <= '9') ||
+          ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z') ||
+          lookahead == 0xb7) ADVANCE(127);
+      END_STATE();
+    case 73:
+      ACCEPT_TOKEN(aux_sym_PseudoAttValue_token2);
       END_STATE();
     case 74:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == 'N') ADVANCE(108);
+      ACCEPT_TOKEN(anon_sym_LPAREN);
+      END_STATE();
+    case 75:
+      ACCEPT_TOKEN(anon_sym_POUNDPCDATA);
+      END_STATE();
+    case 76:
+      ACCEPT_TOKEN(anon_sym_PIPE);
+      END_STATE();
+    case 77:
+      ACCEPT_TOKEN(anon_sym_RPAREN);
+      END_STATE();
+    case 78:
+      ACCEPT_TOKEN(anon_sym_STAR);
+      END_STATE();
+    case 79:
+      ACCEPT_TOKEN(anon_sym_QMARK);
+      END_STATE();
+    case 80:
+      ACCEPT_TOKEN(anon_sym_PLUS);
+      END_STATE();
+    case 81:
+      ACCEPT_TOKEN(anon_sym_COMMA);
+      END_STATE();
+    case 82:
+      ACCEPT_TOKEN(sym_TokenizedType);
+      if (lookahead == 'R') ADVANCE(97);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(114);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
-          ('G' <= lookahead && lookahead <= 'Z') ||
+          ('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 75:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(114);
+    case 83:
+      ACCEPT_TOKEN(sym_TokenizedType);
+      if (lookahead == 'R') ADVANCE(100);
       if (lookahead == '-' ||
           lookahead == '.' ||
-          ('G' <= lookahead && lookahead <= 'Z') ||
+          ('0' <= lookahead && lookahead <= ':') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z') ||
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 76:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
+    case 84:
+      ACCEPT_TOKEN(sym_TokenizedType);
+      if (lookahead == 'S') ADVANCE(86);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
-      END_STATE();
-    case 77:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(84);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 78:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(118);
-      if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(119);
+    case 85:
+      ACCEPT_TOKEN(sym_TokenizedType);
+      if (lookahead == 'S') ADVANCE(87);
       if (lookahead == '-' ||
           lookahead == '.' ||
-          lookahead == ':' ||
-          ('G' <= lookahead && lookahead <= 'Z') ||
+          ('0' <= lookahead && lookahead <= ':') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('g' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(120);
+          ('a' <= lookahead && lookahead <= 'z') ||
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 79:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
+    case 86:
+      ACCEPT_TOKEN(sym_TokenizedType);
+      if (lookahead == ':' ||
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
-          ('0' <= lookahead && lookahead <= ':') ||
+          ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(120);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 80:
-      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
+    case 87:
+      ACCEPT_TOKEN(sym_TokenizedType);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 81:
-      ACCEPT_TOKEN(anon_sym_SQUOTE);
+    case 88:
+      ACCEPT_TOKEN(anon_sym_POUNDREQUIRED);
       END_STATE();
-    case 82:
+    case 89:
+      ACCEPT_TOKEN(anon_sym_POUNDIMPLIED);
+      END_STATE();
+    case 90:
+      ACCEPT_TOKEN(anon_sym_POUNDFIXED);
+      END_STATE();
+    case 91:
+      ACCEPT_TOKEN(anon_sym_PERCENT);
+      END_STATE();
+    case 92:
+      ACCEPT_TOKEN(aux_sym_EntityValue_token1);
+      END_STATE();
+    case 93:
       ACCEPT_TOKEN(aux_sym_EntityValue_token2);
       END_STATE();
-    case 83:
+    case 94:
       ACCEPT_TOKEN(anon_sym_SEMI);
       END_STATE();
-    case 84:
+    case 95:
       ACCEPT_TOKEN(sym__S);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(84);
+          lookahead == ' ') ADVANCE(95);
       END_STATE();
-    case 85:
+    case 96:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'D') ADVANCE(58);
+      if (lookahead == 'D') ADVANCE(83);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 86:
+    case 97:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(92);
+      if (lookahead == 'E') ADVANCE(103);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 87:
+    case 98:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(101);
+      if (lookahead == 'E') ADVANCE(112);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 88:
+    case 99:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(106);
+      if (lookahead == 'E') ADVANCE(117);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 89:
+    case 100:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(93);
+      if (lookahead == 'E') ADVANCE(104);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 90:
+    case 101:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(107);
+      if (lookahead == 'E') ADVANCE(118);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 91:
+    case 102:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'E') ADVANCE(103);
+      if (lookahead == 'E') ADVANCE(114);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 92:
+    case 103:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'F') ADVANCE(59);
+      if (lookahead == 'F') ADVANCE(84);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 93:
+    case 104:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'F') ADVANCE(60);
+      if (lookahead == 'F') ADVANCE(85);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 94:
+    case 105:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'I') ADVANCE(110);
+      if (lookahead == 'I') ADVANCE(121);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 95:
+    case 106:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'I') ADVANCE(88);
-      if (lookahead == 'Y') ADVANCE(61);
+      if (lookahead == 'I') ADVANCE(99);
+      if (lookahead == 'Y') ADVANCE(86);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 96:
+    case 107:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'I') ADVANCE(113);
+      if (lookahead == 'I') ADVANCE(124);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 97:
+    case 108:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'I') ADVANCE(90);
-      if (lookahead == 'Y') ADVANCE(62);
+      if (lookahead == 'I') ADVANCE(101);
+      if (lookahead == 'Y') ADVANCE(87);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 98:
+    case 109:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'K') ADVANCE(87);
+      if (lookahead == 'K') ADVANCE(98);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 99:
+    case 110:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'K') ADVANCE(91);
+      if (lookahead == 'K') ADVANCE(102);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 100:
+    case 111:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'M') ADVANCE(112);
+      if (lookahead == 'M') ADVANCE(123);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 101:
+    case 112:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'N') ADVANCE(59);
+      if (lookahead == 'N') ADVANCE(84);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 102:
+    case 113:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'N') ADVANCE(111);
+      if (lookahead == 'N') ADVANCE(122);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 103:
+    case 114:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'N') ADVANCE(60);
+      if (lookahead == 'N') ADVANCE(85);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 104:
+    case 115:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'O') ADVANCE(98);
+      if (lookahead == 'O') ADVANCE(109);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 105:
+    case 116:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'O') ADVANCE(99);
+      if (lookahead == 'O') ADVANCE(110);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 106:
+    case 117:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'S') ADVANCE(61);
+      if (lookahead == 'S') ADVANCE(86);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 107:
+    case 118:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'S') ADVANCE(62);
+      if (lookahead == 'S') ADVANCE(87);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 108:
+    case 119:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(94);
+      if (lookahead == 'T') ADVANCE(105);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 109:
+    case 120:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(104);
+      if (lookahead == 'T') ADVANCE(115);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 110:
+    case 121:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(95);
+      if (lookahead == 'T') ADVANCE(106);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 111:
+    case 122:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(96);
+      if (lookahead == 'T') ADVANCE(107);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 112:
+    case 123:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(105);
+      if (lookahead == 'T') ADVANCE(116);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 113:
+    case 124:
       ACCEPT_TOKEN(sym_Name);
-      if (lookahead == 'T') ADVANCE(97);
+      if (lookahead == 'T') ADVANCE(108);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= ':') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 114:
+    case 125:
       ACCEPT_TOKEN(sym_Name);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(114);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(125);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('g' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 115:
+    case 126:
       ACCEPT_TOKEN(sym_Name);
       if (lookahead == ':' ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(115);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(126);
       END_STATE();
-    case 116:
+    case 127:
       ACCEPT_TOKEN(sym_Name);
       if (lookahead == '-' ||
           lookahead == '.' ||
@@ -2491,46 +2519,46 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(116);
+          lookahead == 0xb7) ADVANCE(127);
       END_STATE();
-    case 117:
+    case 128:
       ACCEPT_TOKEN(sym_Nmtoken);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(117);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(128);
       if (lookahead == '-' ||
           lookahead == '.' ||
           lookahead == ':' ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(120);
+          lookahead == 0xb7) ADVANCE(131);
       END_STATE();
-    case 118:
+    case 129:
       ACCEPT_TOKEN(sym_Nmtoken);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(118);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(129);
       if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(119);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(130);
       if (lookahead == '-' ||
           lookahead == '.' ||
           lookahead == ':' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('g' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(120);
+          lookahead == 0xb7) ADVANCE(131);
       END_STATE();
-    case 119:
+    case 130:
       ACCEPT_TOKEN(sym_Nmtoken);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(119);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(130);
       if (lookahead == '-' ||
           lookahead == '.' ||
           lookahead == ':' ||
           ('G' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('g' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(120);
+          lookahead == 0xb7) ADVANCE(131);
       END_STATE();
-    case 120:
+    case 131:
       ACCEPT_TOKEN(sym_Nmtoken);
       if (lookahead == '-' ||
           lookahead == '.' ||
@@ -2538,104 +2566,62 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
           ('a' <= lookahead && lookahead <= 'z') ||
-          lookahead == 0xb7) ADVANCE(120);
+          lookahead == 0xb7) ADVANCE(131);
       END_STATE();
-    case 121:
+    case 132:
       ACCEPT_TOKEN(anon_sym_AMP);
-      if (lookahead == '#') ADVANCE(122);
+      if (lookahead == '#') ADVANCE(133);
       END_STATE();
-    case 122:
+    case 133:
       ACCEPT_TOKEN(anon_sym_AMP_POUND);
-      if (lookahead == 'x') ADVANCE(124);
+      if (lookahead == 'x') ADVANCE(135);
       END_STATE();
-    case 123:
+    case 134:
       ACCEPT_TOKEN(aux_sym_CharRef_token1);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(123);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(134);
       END_STATE();
-    case 124:
+    case 135:
       ACCEPT_TOKEN(anon_sym_AMP_POUNDx);
       END_STATE();
-    case 125:
+    case 136:
       ACCEPT_TOKEN(aux_sym_CharRef_token2);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(125);
-      END_STATE();
-    case 126:
-      ACCEPT_TOKEN(aux_sym_AttValue_token1);
-      END_STATE();
-    case 127:
-      ACCEPT_TOKEN(aux_sym_AttValue_token2);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(136);
       END_STATE();
-    case 128:
+    case 137:
       ACCEPT_TOKEN(aux_sym_SystemLiteral_token1);
       if (lookahead != 0 &&
-          lookahead != '"') ADVANCE(128);
+          lookahead != '"') ADVANCE(137);
       END_STATE();
-    case 129:
+    case 138:
       ACCEPT_TOKEN(aux_sym_SystemLiteral_token2);
       if (lookahead != 0 &&
-          lookahead != '\'') ADVANCE(129);
+          lookahead != '\'') ADVANCE(138);
       END_STATE();
-    case 130:
+    case 139:
       ACCEPT_TOKEN(aux_sym_PubidLiteral_token1);
-      if (set_contains(aux_sym_PubidLiteral_token1_character_set_1, 9, lookahead)) ADVANCE(130);
+      if (set_contains(aux_sym_PubidLiteral_token1_character_set_1, 9, lookahead)) ADVANCE(139);
       END_STATE();
-    case 131:
+    case 140:
       ACCEPT_TOKEN(aux_sym_PubidLiteral_token2);
-      if (set_contains(aux_sym_PubidLiteral_token2_character_set_1, 9, lookahead)) ADVANCE(131);
-      END_STATE();
-    case 132:
-      ACCEPT_TOKEN(anon_sym_LT_QMARK);
+      if (set_contains(aux_sym_PubidLiteral_token2_character_set_1, 9, lookahead)) ADVANCE(140);
       END_STATE();
-    case 133:
-      ACCEPT_TOKEN(anon_sym_QMARK_GT);
-      END_STATE();
-    case 134:
+    case 141:
       ACCEPT_TOKEN(sym_VersionNum);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(134);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(141);
       END_STATE();
-    case 135:
+    case 142:
       ACCEPT_TOKEN(sym_EncName);
       if (lookahead == '-' ||
           lookahead == '.' ||
           ('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(135);
-      END_STATE();
-    case 136:
-      ACCEPT_TOKEN(anon_sym_EQ);
-      END_STATE();
-    case 137:
-      ACCEPT_TOKEN(anon_sym_RBRACK);
-      END_STATE();
-    case 138:
-      ACCEPT_TOKEN(anon_sym_RBRACK);
-      if (lookahead == ']') ADVANCE(8);
-      END_STATE();
-    case 139:
-      ACCEPT_TOKEN(anon_sym_LT);
-      if (lookahead == '!') ADVANCE(47);
-      if (lookahead == '/') ADVANCE(143);
-      if (lookahead == '?') ADVANCE(132);
-      END_STATE();
-    case 140:
-      ACCEPT_TOKEN(anon_sym_LT);
-      if (lookahead == '!') ADVANCE(46);
-      if (lookahead == '?') ADVANCE(132);
-      END_STATE();
-    case 141:
-      ACCEPT_TOKEN(anon_sym_LT);
-      if (lookahead == '!') ADVANCE(35);
-      if (lookahead == '/') ADVANCE(143);
-      if (lookahead == '?') ADVANCE(132);
-      END_STATE();
-    case 142:
-      ACCEPT_TOKEN(anon_sym_SLASH_GT);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(142);
       END_STATE();
     case 143:
-      ACCEPT_TOKEN(anon_sym_LT_SLASH);
+      ACCEPT_TOKEN(anon_sym_EQ);
       END_STATE();
     default:
       return false;
@@ -2652,389 +2638,351 @@ static bool ts_lex_keywords(TSLexer *lexer, TSStateId state) {
         'C', 2,
         'D', 3,
         'E', 4,
-        'I', 5,
-        'N', 6,
-        'P', 7,
-        'S', 8,
-        'e', 9,
-        'n', 10,
-        's', 11,
-        'v', 12,
-        'x', 13,
-        'y', 14,
+        'N', 5,
+        'P', 6,
+        'S', 7,
+        'e', 8,
+        'n', 9,
+        's', 10,
+        'v', 11,
+        'x', 12,
+        'y', 13,
       );
       END_STATE();
     case 1:
-      if (lookahead == 'N') ADVANCE(15);
-      if (lookahead == 'T') ADVANCE(16);
+      if (lookahead == 'N') ADVANCE(14);
+      if (lookahead == 'T') ADVANCE(15);
       END_STATE();
     case 2:
-      if (lookahead == 'D') ADVANCE(17);
+      if (lookahead == 'D') ADVANCE(16);
       END_STATE();
     case 3:
-      if (lookahead == 'O') ADVANCE(18);
+      if (lookahead == 'O') ADVANCE(17);
       END_STATE();
     case 4:
-      if (lookahead == 'L') ADVANCE(19);
-      if (lookahead == 'M') ADVANCE(20);
-      if (lookahead == 'N') ADVANCE(21);
+      if (lookahead == 'L') ADVANCE(18);
+      if (lookahead == 'M') ADVANCE(19);
+      if (lookahead == 'N') ADVANCE(20);
       END_STATE();
     case 5:
-      if (lookahead == 'G') ADVANCE(22);
-      if (lookahead == 'N') ADVANCE(23);
+      if (lookahead == 'D') ADVANCE(21);
+      if (lookahead == 'O') ADVANCE(22);
       END_STATE();
     case 6:
-      if (lookahead == 'D') ADVANCE(24);
-      if (lookahead == 'O') ADVANCE(25);
+      if (lookahead == 'U') ADVANCE(23);
       END_STATE();
     case 7:
-      if (lookahead == 'U') ADVANCE(26);
+      if (lookahead == 'Y') ADVANCE(24);
       END_STATE();
     case 8:
-      if (lookahead == 'Y') ADVANCE(27);
+      if (lookahead == 'n') ADVANCE(25);
       END_STATE();
     case 9:
-      if (lookahead == 'n') ADVANCE(28);
+      if (lookahead == 'o') ADVANCE(26);
       END_STATE();
     case 10:
-      if (lookahead == 'o') ADVANCE(29);
+      if (lookahead == 't') ADVANCE(27);
       END_STATE();
     case 11:
-      if (lookahead == 't') ADVANCE(30);
+      if (lookahead == 'e') ADVANCE(28);
       END_STATE();
     case 12:
-      if (lookahead == 'e') ADVANCE(31);
+      if (lookahead == 'm') ADVANCE(29);
       END_STATE();
     case 13:
-      if (lookahead == 'm') ADVANCE(32);
+      if (lookahead == 'e') ADVANCE(30);
       END_STATE();
     case 14:
-      if (lookahead == 'e') ADVANCE(33);
+      if (lookahead == 'Y') ADVANCE(31);
       END_STATE();
     case 15:
-      if (lookahead == 'Y') ADVANCE(34);
+      if (lookahead == 'T') ADVANCE(32);
       END_STATE();
     case 16:
-      if (lookahead == 'T') ADVANCE(35);
+      if (lookahead == 'A') ADVANCE(33);
       END_STATE();
     case 17:
-      if (lookahead == 'A') ADVANCE(36);
+      if (lookahead == 'C') ADVANCE(34);
       END_STATE();
     case 18:
-      if (lookahead == 'C') ADVANCE(37);
+      if (lookahead == 'E') ADVANCE(35);
       END_STATE();
     case 19:
-      if (lookahead == 'E') ADVANCE(38);
+      if (lookahead == 'P') ADVANCE(36);
       END_STATE();
     case 20:
-      if (lookahead == 'P') ADVANCE(39);
+      if (lookahead == 'T') ADVANCE(37);
       END_STATE();
     case 21:
-      if (lookahead == 'T') ADVANCE(40);
+      if (lookahead == 'A') ADVANCE(38);
       END_STATE();
     case 22:
-      if (lookahead == 'N') ADVANCE(41);
+      if (lookahead == 'T') ADVANCE(39);
       END_STATE();
     case 23:
-      if (lookahead == 'C') ADVANCE(42);
+      if (lookahead == 'B') ADVANCE(40);
       END_STATE();
     case 24:
-      if (lookahead == 'A') ADVANCE(43);
+      if (lookahead == 'S') ADVANCE(41);
       END_STATE();
     case 25:
-      if (lookahead == 'T') ADVANCE(44);
+      if (lookahead == 'c') ADVANCE(42);
       END_STATE();
     case 26:
-      if (lookahead == 'B') ADVANCE(45);
+      ACCEPT_TOKEN(anon_sym_no);
       END_STATE();
     case 27:
-      if (lookahead == 'S') ADVANCE(46);
+      if (lookahead == 'a') ADVANCE(43);
       END_STATE();
     case 28:
-      if (lookahead == 'c') ADVANCE(47);
+      if (lookahead == 'r') ADVANCE(44);
       END_STATE();
     case 29:
-      ACCEPT_TOKEN(anon_sym_no);
+      if (lookahead == 'l') ADVANCE(45);
       END_STATE();
     case 30:
-      if (lookahead == 'a') ADVANCE(48);
+      if (lookahead == 's') ADVANCE(46);
       END_STATE();
     case 31:
-      if (lookahead == 'r') ADVANCE(49);
+      ACCEPT_TOKEN(anon_sym_ANY);
       END_STATE();
     case 32:
-      if (lookahead == 'l') ADVANCE(50);
+      if (lookahead == 'L') ADVANCE(47);
       END_STATE();
     case 33:
-      if (lookahead == 's') ADVANCE(51);
+      if (lookahead == 'T') ADVANCE(48);
       END_STATE();
     case 34:
-      ACCEPT_TOKEN(anon_sym_ANY);
+      if (lookahead == 'T') ADVANCE(49);
       END_STATE();
     case 35:
-      if (lookahead == 'L') ADVANCE(52);
+      if (lookahead == 'M') ADVANCE(50);
       END_STATE();
     case 36:
-      if (lookahead == 'T') ADVANCE(53);
+      if (lookahead == 'T') ADVANCE(51);
       END_STATE();
     case 37:
-      if (lookahead == 'T') ADVANCE(54);
+      if (lookahead == 'I') ADVANCE(52);
       END_STATE();
     case 38:
-      if (lookahead == 'M') ADVANCE(55);
+      if (lookahead == 'T') ADVANCE(53);
       END_STATE();
     case 39:
-      if (lookahead == 'T') ADVANCE(56);
+      if (lookahead == 'A') ADVANCE(54);
       END_STATE();
     case 40:
-      if (lookahead == 'I') ADVANCE(57);
+      if (lookahead == 'L') ADVANCE(55);
       END_STATE();
     case 41:
-      if (lookahead == 'O') ADVANCE(58);
+      if (lookahead == 'T') ADVANCE(56);
       END_STATE();
     case 42:
-      if (lookahead == 'L') ADVANCE(59);
+      if (lookahead == 'o') ADVANCE(57);
       END_STATE();
     case 43:
-      if (lookahead == 'T') ADVANCE(60);
+      if (lookahead == 'n') ADVANCE(58);
       END_STATE();
     case 44:
-      if (lookahead == 'A') ADVANCE(61);
+      if (lookahead == 's') ADVANCE(59);
       END_STATE();
     case 45:
-      if (lookahead == 'L') ADVANCE(62);
+      ACCEPT_TOKEN(anon_sym_xml);
+      if (lookahead == '-') ADVANCE(60);
       END_STATE();
     case 46:
-      if (lookahead == 'T') ADVANCE(63);
+      ACCEPT_TOKEN(anon_sym_yes);
       END_STATE();
     case 47:
-      if (lookahead == 'o') ADVANCE(64);
+      if (lookahead == 'I') ADVANCE(61);
       END_STATE();
     case 48:
-      if (lookahead == 'n') ADVANCE(65);
+      if (lookahead == 'A') ADVANCE(62);
       END_STATE();
     case 49:
-      if (lookahead == 's') ADVANCE(66);
+      if (lookahead == 'Y') ADVANCE(63);
       END_STATE();
     case 50:
-      ACCEPT_TOKEN(anon_sym_xml);
-      if (lookahead == '-') ADVANCE(67);
+      if (lookahead == 'E') ADVANCE(64);
       END_STATE();
     case 51:
-      ACCEPT_TOKEN(anon_sym_yes);
+      if (lookahead == 'Y') ADVANCE(65);
       END_STATE();
     case 52:
-      if (lookahead == 'I') ADVANCE(68);
+      if (lookahead == 'T') ADVANCE(66);
       END_STATE();
     case 53:
-      if (lookahead == 'A') ADVANCE(69);
+      if (lookahead == 'A') ADVANCE(67);
       END_STATE();
     case 54:
-      if (lookahead == 'Y') ADVANCE(70);
+      if (lookahead == 'T') ADVANCE(68);
       END_STATE();
     case 55:
-      if (lookahead == 'E') ADVANCE(71);
+      if (lookahead == 'I') ADVANCE(69);
       END_STATE();
     case 56:
-      if (lookahead == 'Y') ADVANCE(72);
+      if (lookahead == 'E') ADVANCE(70);
       END_STATE();
     case 57:
-      if (lookahead == 'T') ADVANCE(73);
+      if (lookahead == 'd') ADVANCE(71);
       END_STATE();
     case 58:
-      if (lookahead == 'R') ADVANCE(74);
+      if (lookahead == 'd') ADVANCE(72);
       END_STATE();
     case 59:
-      if (lookahead == 'U') ADVANCE(75);
+      if (lookahead == 'i') ADVANCE(73);
       END_STATE();
     case 60:
-      if (lookahead == 'A') ADVANCE(76);
+      if (lookahead == 'm') ADVANCE(74);
+      if (lookahead == 's') ADVANCE(75);
       END_STATE();
     case 61:
-      if (lookahead == 'T') ADVANCE(77);
+      if (lookahead == 'S') ADVANCE(76);
       END_STATE();
     case 62:
-      if (lookahead == 'I') ADVANCE(78);
+      ACCEPT_TOKEN(anon_sym_CDATA);
       END_STATE();
     case 63:
-      if (lookahead == 'E') ADVANCE(79);
+      if (lookahead == 'P') ADVANCE(77);
       END_STATE();
     case 64:
-      if (lookahead == 'd') ADVANCE(80);
+      if (lookahead == 'N') ADVANCE(78);
       END_STATE();
     case 65:
-      if (lookahead == 'd') ADVANCE(81);
+      ACCEPT_TOKEN(anon_sym_EMPTY);
       END_STATE();
     case 66:
-      if (lookahead == 'i') ADVANCE(82);
+      if (lookahead == 'Y') ADVANCE(79);
       END_STATE();
     case 67:
-      if (lookahead == 'm') ADVANCE(83);
-      if (lookahead == 's') ADVANCE(84);
+      ACCEPT_TOKEN(anon_sym_NDATA);
       END_STATE();
     case 68:
-      if (lookahead == 'S') ADVANCE(85);
+      if (lookahead == 'I') ADVANCE(80);
       END_STATE();
     case 69:
-      ACCEPT_TOKEN(anon_sym_CDATA);
+      if (lookahead == 'C') ADVANCE(81);
       END_STATE();
     case 70:
-      if (lookahead == 'P') ADVANCE(86);
+      if (lookahead == 'M') ADVANCE(82);
       END_STATE();
     case 71:
-      if (lookahead == 'N') ADVANCE(87);
+      if (lookahead == 'i') ADVANCE(83);
       END_STATE();
     case 72:
-      ACCEPT_TOKEN(anon_sym_EMPTY);
+      if (lookahead == 'a') ADVANCE(84);
       END_STATE();
     case 73:
-      if (lookahead == 'Y') ADVANCE(88);
+      if (lookahead == 'o') ADVANCE(85);
       END_STATE();
     case 74:
-      if (lookahead == 'E') ADVANCE(89);
+      if (lookahead == 'o') ADVANCE(86);
       END_STATE();
     case 75:
-      if (lookahead == 'D') ADVANCE(90);
+      if (lookahead == 't') ADVANCE(87);
       END_STATE();
     case 76:
-      ACCEPT_TOKEN(anon_sym_NDATA);
+      if (lookahead == 'T') ADVANCE(88);
       END_STATE();
     case 77:
-      if (lookahead == 'I') ADVANCE(91);
+      if (lookahead == 'E') ADVANCE(89);
       END_STATE();
     case 78:
-      if (lookahead == 'C') ADVANCE(92);
+      if (lookahead == 'T') ADVANCE(90);
       END_STATE();
     case 79:
-      if (lookahead == 'M') ADVANCE(93);
+      ACCEPT_TOKEN(anon_sym_ENTITY);
       END_STATE();
     case 80:
-      if (lookahead == 'i') ADVANCE(94);
+      if (lookahead == 'O') ADVANCE(91);
       END_STATE();
     case 81:
-      if (lookahead == 'a') ADVANCE(95);
+      ACCEPT_TOKEN(anon_sym_PUBLIC);
       END_STATE();
     case 82:
-      if (lookahead == 'o') ADVANCE(96);
+      ACCEPT_TOKEN(anon_sym_SYSTEM);
       END_STATE();
     case 83:
-      if (lookahead == 'o') ADVANCE(97);
+      if (lookahead == 'n') ADVANCE(92);
       END_STATE();
     case 84:
-      if (lookahead == 't') ADVANCE(98);
+      if (lookahead == 'l') ADVANCE(93);
       END_STATE();
     case 85:
-      if (lookahead == 'T') ADVANCE(99);
+      if (lookahead == 'n') ADVANCE(94);
       END_STATE();
     case 86:
-      if (lookahead == 'E') ADVANCE(100);
+      if (lookahead == 'd') ADVANCE(95);
       END_STATE();
     case 87:
-      if (lookahead == 'T') ADVANCE(101);
+      if (lookahead == 'y') ADVANCE(96);
       END_STATE();
     case 88:
-      ACCEPT_TOKEN(anon_sym_ENTITY);
+      ACCEPT_TOKEN(anon_sym_ATTLIST);
       END_STATE();
     case 89:
-      ACCEPT_TOKEN(anon_sym_IGNORE);
+      ACCEPT_TOKEN(anon_sym_DOCTYPE);
       END_STATE();
     case 90:
-      if (lookahead == 'E') ADVANCE(102);
+      ACCEPT_TOKEN(anon_sym_ELEMENT);
       END_STATE();
     case 91:
-      if (lookahead == 'O') ADVANCE(103);
+      if (lookahead == 'N') ADVANCE(97);
       END_STATE();
     case 92:
-      ACCEPT_TOKEN(anon_sym_PUBLIC);
+      if (lookahead == 'g') ADVANCE(98);
       END_STATE();
     case 93:
-      ACCEPT_TOKEN(anon_sym_SYSTEM);
+      if (lookahead == 'o') ADVANCE(99);
       END_STATE();
     case 94:
-      if (lookahead == 'n') ADVANCE(104);
+      ACCEPT_TOKEN(anon_sym_version);
       END_STATE();
     case 95:
-      if (lookahead == 'l') ADVANCE(105);
+      if (lookahead == 'e') ADVANCE(100);
       END_STATE();
     case 96:
-      if (lookahead == 'n') ADVANCE(106);
+      if (lookahead == 'l') ADVANCE(101);
       END_STATE();
     case 97:
-      if (lookahead == 'd') ADVANCE(107);
+      ACCEPT_TOKEN(anon_sym_NOTATION);
       END_STATE();
     case 98:
-      if (lookahead == 'y') ADVANCE(108);
+      ACCEPT_TOKEN(anon_sym_encoding);
       END_STATE();
     case 99:
-      ACCEPT_TOKEN(anon_sym_ATTLIST);
+      if (lookahead == 'n') ADVANCE(102);
       END_STATE();
     case 100:
-      ACCEPT_TOKEN(anon_sym_DOCTYPE);
+      if (lookahead == 'l') ADVANCE(103);
       END_STATE();
     case 101:
-      ACCEPT_TOKEN(anon_sym_ELEMENT);
+      if (lookahead == 'e') ADVANCE(104);
       END_STATE();
     case 102:
-      ACCEPT_TOKEN(anon_sym_INCLUDE);
+      if (lookahead == 'e') ADVANCE(105);
       END_STATE();
     case 103:
-      if (lookahead == 'N') ADVANCE(109);
+      ACCEPT_TOKEN(anon_sym_xml_DASHmodel);
       END_STATE();
     case 104:
-      if (lookahead == 'g') ADVANCE(110);
+      if (lookahead == 's') ADVANCE(106);
       END_STATE();
     case 105:
-      if (lookahead == 'o') ADVANCE(111);
+      ACCEPT_TOKEN(anon_sym_standalone);
       END_STATE();
     case 106:
-      ACCEPT_TOKEN(anon_sym_version);
+      if (lookahead == 'h') ADVANCE(107);
       END_STATE();
     case 107:
-      if (lookahead == 'e') ADVANCE(112);
+      if (lookahead == 'e') ADVANCE(108);
       END_STATE();
     case 108:
-      if (lookahead == 'l') ADVANCE(113);
+      if (lookahead == 'e') ADVANCE(109);
       END_STATE();
     case 109:
-      ACCEPT_TOKEN(anon_sym_NOTATION);
+      if (lookahead == 't') ADVANCE(110);
       END_STATE();
     case 110:
-      ACCEPT_TOKEN(anon_sym_encoding);
-      END_STATE();
-    case 111:
-      if (lookahead == 'n') ADVANCE(114);
-      END_STATE();
-    case 112:
-      if (lookahead == 'l') ADVANCE(115);
-      END_STATE();
-    case 113:
-      if (lookahead == 'e') ADVANCE(116);
-      END_STATE();
-    case 114:
-      if (lookahead == 'e') ADVANCE(117);
-      END_STATE();
-    case 115:
-      ACCEPT_TOKEN(anon_sym_xml_DASHmodel);
-      END_STATE();
-    case 116:
-      if (lookahead == 's') ADVANCE(118);
-      END_STATE();
-    case 117:
-      ACCEPT_TOKEN(anon_sym_standalone);
-      END_STATE();
-    case 118:
-      if (lookahead == 'h') ADVANCE(119);
-      END_STATE();
-    case 119:
-      if (lookahead == 'e') ADVANCE(120);
-      END_STATE();
-    case 120:
-      if (lookahead == 'e') ADVANCE(121);
-      END_STATE();
-    case 121:
-      if (lookahead == 't') ADVANCE(122);
-      END_STATE();
-    case 122:
       ACCEPT_TOKEN(anon_sym_xml_DASHstylesheet);
       END_STATE();
     default:
@@ -3063,71 +3011,71 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [17] = {.lex_state = 41, .external_lex_state = 2},
   [18] = {.lex_state = 41, .external_lex_state = 2},
   [19] = {.lex_state = 41, .external_lex_state = 2},
-  [20] = {.lex_state = 4},
-  [21] = {.lex_state = 41, .external_lex_state = 2},
-  [22] = {.lex_state = 4},
-  [23] = {.lex_state = 41},
-  [24] = {.lex_state = 4},
-  [25] = {.lex_state = 2},
-  [26] = {.lex_state = 41},
-  [27] = {.lex_state = 41},
-  [28] = {.lex_state = 2},
-  [29] = {.lex_state = 41, .external_lex_state = 2},
+  [20] = {.lex_state = 41, .external_lex_state = 2},
+  [21] = {.lex_state = 4},
+  [22] = {.lex_state = 2},
+  [23] = {.lex_state = 41, .external_lex_state = 2},
+  [24] = {.lex_state = 41},
+  [25] = {.lex_state = 41},
+  [26] = {.lex_state = 4},
+  [27] = {.lex_state = 2},
+  [28] = {.lex_state = 41},
+  [29] = {.lex_state = 4},
   [30] = {.lex_state = 41, .external_lex_state = 2},
   [31] = {.lex_state = 2},
   [32] = {.lex_state = 41, .external_lex_state = 2},
   [33] = {.lex_state = 41, .external_lex_state = 2},
   [34] = {.lex_state = 1},
-  [35] = {.lex_state = 3},
+  [35] = {.lex_state = 41},
   [36] = {.lex_state = 4, .external_lex_state = 3},
-  [37] = {.lex_state = 41, .external_lex_state = 2},
-  [38] = {.lex_state = 41, .external_lex_state = 2},
-  [39] = {.lex_state = 3},
-  [40] = {.lex_state = 41, .external_lex_state = 2},
-  [41] = {.lex_state = 41, .external_lex_state = 2},
+  [37] = {.lex_state = 4, .external_lex_state = 3},
+  [38] = {.lex_state = 4, .external_lex_state = 3},
+  [39] = {.lex_state = 4, .external_lex_state = 3},
+  [40] = {.lex_state = 4, .external_lex_state = 3},
+  [41] = {.lex_state = 5},
   [42] = {.lex_state = 4, .external_lex_state = 3},
-  [43] = {.lex_state = 5},
-  [44] = {.lex_state = 1},
-  [45] = {.lex_state = 41, .external_lex_state = 2},
-  [46] = {.lex_state = 41, .external_lex_state = 2},
-  [47] = {.lex_state = 4, .external_lex_state = 3},
+  [43] = {.lex_state = 3},
+  [44] = {.lex_state = 5},
+  [45] = {.lex_state = 3},
+  [46] = {.lex_state = 5},
+  [47] = {.lex_state = 41},
   [48] = {.lex_state = 5},
-  [49] = {.lex_state = 4, .external_lex_state = 3},
-  [50] = {.lex_state = 4, .external_lex_state = 3},
-  [51] = {.lex_state = 4, .external_lex_state = 3},
-  [52] = {.lex_state = 5},
-  [53] = {.lex_state = 3},
-  [54] = {.lex_state = 5},
+  [49] = {.lex_state = 3},
+  [50] = {.lex_state = 41},
+  [51] = {.lex_state = 5},
+  [52] = {.lex_state = 4, .external_lex_state = 3},
+  [53] = {.lex_state = 41},
+  [54] = {.lex_state = 41},
   [55] = {.lex_state = 3},
-  [56] = {.lex_state = 4, .external_lex_state = 3},
-  [57] = {.lex_state = 4, .external_lex_state = 3},
-  [58] = {.lex_state = 4, .external_lex_state = 3},
-  [59] = {.lex_state = 4, .external_lex_state = 3},
-  [60] = {.lex_state = 4, .external_lex_state = 3},
+  [56] = {.lex_state = 41, .external_lex_state = 2},
+  [57] = {.lex_state = 41, .external_lex_state = 2},
+  [58] = {.lex_state = 41, .external_lex_state = 2},
+  [59] = {.lex_state = 41, .external_lex_state = 2},
+  [60] = {.lex_state = 41, .external_lex_state = 2},
   [61] = {.lex_state = 41, .external_lex_state = 2},
-  [62] = {.lex_state = 41, .external_lex_state = 2},
-  [63] = {.lex_state = 4, .external_lex_state = 3},
-  [64] = {.lex_state = 41, .external_lex_state = 2},
-  [65] = {.lex_state = 4, .external_lex_state = 3},
-  [66] = {.lex_state = 41},
-  [67] = {.lex_state = 4, .external_lex_state = 3},
-  [68] = {.lex_state = 4, .external_lex_state = 3},
-  [69] = {.lex_state = 4, .external_lex_state = 3},
-  [70] = {.lex_state = 41},
-  [71] = {.lex_state = 41, .external_lex_state = 2},
-  [72] = {.lex_state = 4, .external_lex_state = 3},
-  [73] = {.lex_state = 41, .external_lex_state = 2},
-  [74] = {.lex_state = 41},
-  [75] = {.lex_state = 5},
-  [76] = {.lex_state = 3},
-  [77] = {.lex_state = 3},
-  [78] = {.lex_state = 5},
-  [79] = {.lex_state = 41},
-  [80] = {.lex_state = 5},
+  [62] = {.lex_state = 4, .external_lex_state = 3},
+  [63] = {.lex_state = 5},
+  [64] = {.lex_state = 4, .external_lex_state = 3},
+  [65] = {.lex_state = 3},
+  [66] = {.lex_state = 4, .external_lex_state = 3},
+  [67] = {.lex_state = 3},
+  [68] = {.lex_state = 41},
+  [69] = {.lex_state = 5},
+  [70] = {.lex_state = 4, .external_lex_state = 3},
+  [71] = {.lex_state = 3},
+  [72] = {.lex_state = 41, .external_lex_state = 2},
+  [73] = {.lex_state = 1},
+  [74] = {.lex_state = 41, .external_lex_state = 2},
+  [75] = {.lex_state = 4, .external_lex_state = 3},
+  [76] = {.lex_state = 4, .external_lex_state = 3},
+  [77] = {.lex_state = 4, .external_lex_state = 3},
+  [78] = {.lex_state = 4, .external_lex_state = 3},
+  [79] = {.lex_state = 4, .external_lex_state = 3},
+  [80] = {.lex_state = 4, .external_lex_state = 3},
   [81] = {.lex_state = 4, .external_lex_state = 3},
-  [82] = {.lex_state = 41},
-  [83] = {.lex_state = 3},
-  [84] = {.lex_state = 41},
+  [82] = {.lex_state = 41, .external_lex_state = 2},
+  [83] = {.lex_state = 41, .external_lex_state = 2},
+  [84] = {.lex_state = 41, .external_lex_state = 2},
   [85] = {.lex_state = 41, .external_lex_state = 2},
   [86] = {.lex_state = 41},
   [87] = {.lex_state = 41},
@@ -3135,211 +3083,211 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [89] = {.lex_state = 41},
   [90] = {.lex_state = 41},
   [91] = {.lex_state = 1},
-  [92] = {.lex_state = 1},
-  [93] = {.lex_state = 41},
+  [92] = {.lex_state = 41},
+  [93] = {.lex_state = 1},
   [94] = {.lex_state = 1},
   [95] = {.lex_state = 41},
-  [96] = {.lex_state = 1},
-  [97] = {.lex_state = 41},
+  [96] = {.lex_state = 41},
+  [97] = {.lex_state = 1},
   [98] = {.lex_state = 1},
   [99] = {.lex_state = 41},
-  [100] = {.lex_state = 41},
-  [101] = {.lex_state = 1},
+  [100] = {.lex_state = 1},
+  [101] = {.lex_state = 2},
   [102] = {.lex_state = 4},
   [103] = {.lex_state = 4},
   [104] = {.lex_state = 4},
-  [105] = {.lex_state = 2},
-  [106] = {.lex_state = 2},
-  [107] = {.lex_state = 2},
+  [105] = {.lex_state = 41, .external_lex_state = 2},
+  [106] = {.lex_state = 1},
+  [107] = {.lex_state = 41, .external_lex_state = 2},
   [108] = {.lex_state = 41, .external_lex_state = 2},
-  [109] = {.lex_state = 2},
-  [110] = {.lex_state = 4},
+  [109] = {.lex_state = 1},
+  [110] = {.lex_state = 2},
   [111] = {.lex_state = 41, .external_lex_state = 2},
-  [112] = {.lex_state = 41, .external_lex_state = 2},
-  [113] = {.lex_state = 41, .external_lex_state = 2},
-  [114] = {.lex_state = 1},
-  [115] = {.lex_state = 1},
+  [112] = {.lex_state = 1},
+  [113] = {.lex_state = 4},
+  [114] = {.lex_state = 2},
+  [115] = {.lex_state = 2},
   [116] = {.lex_state = 1},
   [117] = {.lex_state = 41, .external_lex_state = 2},
-  [118] = {.lex_state = 41, .external_lex_state = 2},
-  [119] = {.lex_state = 41, .external_lex_state = 2},
+  [118] = {.lex_state = 41},
+  [119] = {.lex_state = 1},
   [120] = {.lex_state = 1},
-  [121] = {.lex_state = 1},
+  [121] = {.lex_state = 41, .external_lex_state = 2},
   [122] = {.lex_state = 1},
-  [123] = {.lex_state = 1},
-  [124] = {.lex_state = 41, .external_lex_state = 2},
+  [123] = {.lex_state = 41, .external_lex_state = 2},
+  [124] = {.lex_state = 1},
   [125] = {.lex_state = 1},
-  [126] = {.lex_state = 1},
-  [127] = {.lex_state = 41},
+  [126] = {.lex_state = 41, .external_lex_state = 2},
+  [127] = {.lex_state = 41, .external_lex_state = 2},
   [128] = {.lex_state = 41},
-  [129] = {.lex_state = 41, .external_lex_state = 2},
+  [129] = {.lex_state = 41},
   [130] = {.lex_state = 41},
-  [131] = {.lex_state = 41},
+  [131] = {.lex_state = 41, .external_lex_state = 2},
   [132] = {.lex_state = 41},
   [133] = {.lex_state = 41},
-  [134] = {.lex_state = 41, .external_lex_state = 2},
-  [135] = {.lex_state = 1},
-  [136] = {.lex_state = 3},
+  [134] = {.lex_state = 41},
+  [135] = {.lex_state = 41},
+  [136] = {.lex_state = 41},
   [137] = {.lex_state = 41},
   [138] = {.lex_state = 41},
-  [139] = {.lex_state = 3},
-  [140] = {.lex_state = 3},
+  [139] = {.lex_state = 41},
+  [140] = {.lex_state = 41, .external_lex_state = 2},
   [141] = {.lex_state = 41},
-  [142] = {.lex_state = 41},
+  [142] = {.lex_state = 41, .external_lex_state = 2},
   [143] = {.lex_state = 41},
-  [144] = {.lex_state = 41},
-  [145] = {.lex_state = 41, .external_lex_state = 2},
-  [146] = {.lex_state = 5},
+  [144] = {.lex_state = 3},
+  [145] = {.lex_state = 3},
+  [146] = {.lex_state = 3},
   [147] = {.lex_state = 5},
   [148] = {.lex_state = 5},
-  [149] = {.lex_state = 41},
-  [150] = {.lex_state = 41, .external_lex_state = 2},
-  [151] = {.lex_state = 41, .external_lex_state = 2},
-  [152] = {.lex_state = 41},
+  [149] = {.lex_state = 41, .external_lex_state = 2},
+  [150] = {.lex_state = 41},
+  [151] = {.lex_state = 5},
+  [152] = {.lex_state = 41, .external_lex_state = 2},
   [153] = {.lex_state = 1},
   [154] = {.lex_state = 41},
-  [155] = {.lex_state = 41, .external_lex_state = 2},
-  [156] = {.lex_state = 41},
+  [155] = {.lex_state = 41},
+  [156] = {.lex_state = 1},
   [157] = {.lex_state = 41, .external_lex_state = 2},
   [158] = {.lex_state = 41},
-  [159] = {.lex_state = 41},
-  [160] = {.lex_state = 41},
-  [161] = {.lex_state = 41, .external_lex_state = 4},
-  [162] = {.lex_state = 1, .external_lex_state = 4},
-  [163] = {.lex_state = 41, .external_lex_state = 4},
-  [164] = {.lex_state = 1, .external_lex_state = 4},
-  [165] = {.lex_state = 41, .external_lex_state = 4},
-  [166] = {.lex_state = 41, .external_lex_state = 2},
-  [167] = {.lex_state = 1},
-  [168] = {.lex_state = 41, .external_lex_state = 2},
-  [169] = {.lex_state = 41},
-  [170] = {.lex_state = 41},
+  [159] = {.lex_state = 41, .external_lex_state = 2},
+  [160] = {.lex_state = 1},
+  [161] = {.lex_state = 1},
+  [162] = {.lex_state = 1},
+  [163] = {.lex_state = 10},
+  [164] = {.lex_state = 41, .external_lex_state = 2},
+  [165] = {.lex_state = 1, .external_lex_state = 4},
+  [166] = {.lex_state = 41},
+  [167] = {.lex_state = 41},
+  [168] = {.lex_state = 1},
+  [169] = {.lex_state = 41, .external_lex_state = 4},
+  [170] = {.lex_state = 1},
   [171] = {.lex_state = 41, .external_lex_state = 2},
   [172] = {.lex_state = 41, .external_lex_state = 2},
-  [173] = {.lex_state = 41, .external_lex_state = 2},
-  [174] = {.lex_state = 1},
-  [175] = {.lex_state = 41},
-  [176] = {.lex_state = 1},
-  [177] = {.lex_state = 41},
-  [178] = {.lex_state = 41, .external_lex_state = 2},
-  [179] = {.lex_state = 10},
+  [173] = {.lex_state = 1, .external_lex_state = 4},
+  [174] = {.lex_state = 41, .external_lex_state = 4},
+  [175] = {.lex_state = 41, .external_lex_state = 2},
+  [176] = {.lex_state = 41},
+  [177] = {.lex_state = 41, .external_lex_state = 2},
+  [178] = {.lex_state = 1, .external_lex_state = 4},
+  [179] = {.lex_state = 41, .external_lex_state = 2},
   [180] = {.lex_state = 41},
   [181] = {.lex_state = 41},
-  [182] = {.lex_state = 41, .external_lex_state = 2},
-  [183] = {.lex_state = 41, .external_lex_state = 2},
-  [184] = {.lex_state = 1, .external_lex_state = 4},
-  [185] = {.lex_state = 41, .external_lex_state = 2},
-  [186] = {.lex_state = 41, .external_lex_state = 2},
-  [187] = {.lex_state = 41, .external_lex_state = 4},
-  [188] = {.lex_state = 1},
+  [182] = {.lex_state = 1},
+  [183] = {.lex_state = 41},
+  [184] = {.lex_state = 41, .external_lex_state = 2},
+  [185] = {.lex_state = 41},
+  [186] = {.lex_state = 41, .external_lex_state = 4},
+  [187] = {.lex_state = 41},
+  [188] = {.lex_state = 0},
   [189] = {.lex_state = 41, .external_lex_state = 2},
   [190] = {.lex_state = 1},
-  [191] = {.lex_state = 0},
-  [192] = {.lex_state = 1},
-  [193] = {.lex_state = 41, .external_lex_state = 4},
-  [194] = {.lex_state = 1, .external_lex_state = 4},
-  [195] = {.lex_state = 1},
+  [191] = {.lex_state = 41},
+  [192] = {.lex_state = 41, .external_lex_state = 2},
+  [193] = {.lex_state = 41},
+  [194] = {.lex_state = 1},
+  [195] = {.lex_state = 41},
   [196] = {.lex_state = 41},
-  [197] = {.lex_state = 1},
+  [197] = {.lex_state = 41},
   [198] = {.lex_state = 41, .external_lex_state = 2},
   [199] = {.lex_state = 41},
-  [200] = {.lex_state = 41},
-  [201] = {.lex_state = 41},
-  [202] = {.lex_state = 41},
-  [203] = {.lex_state = 41},
+  [200] = {.lex_state = 41, .external_lex_state = 2},
+  [201] = {.lex_state = 41, .external_lex_state = 2},
+  [202] = {.lex_state = 0},
+  [203] = {.lex_state = 1, .external_lex_state = 4},
   [204] = {.lex_state = 41},
-  [205] = {.lex_state = 41},
-  [206] = {.lex_state = 41, .external_lex_state = 2},
+  [205] = {.lex_state = 41, .external_lex_state = 2},
+  [206] = {.lex_state = 41},
   [207] = {.lex_state = 41},
   [208] = {.lex_state = 41, .external_lex_state = 2},
-  [209] = {.lex_state = 41},
-  [210] = {.lex_state = 1},
-  [211] = {.lex_state = 0},
-  [212] = {.lex_state = 41, .external_lex_state = 2},
-  [213] = {.lex_state = 41, .external_lex_state = 2},
-  [214] = {.lex_state = 41},
-  [215] = {.lex_state = 1, .external_lex_state = 5},
-  [216] = {.lex_state = 1},
-  [217] = {.lex_state = 41},
-  [218] = {.lex_state = 41},
+  [209] = {.lex_state = 41, .external_lex_state = 4},
+  [210] = {.lex_state = 41, .external_lex_state = 2},
+  [211] = {.lex_state = 41},
+  [212] = {.lex_state = 41},
+  [213] = {.lex_state = 1},
+  [214] = {.lex_state = 1, .external_lex_state = 5},
+  [215] = {.lex_state = 1},
+  [216] = {.lex_state = 41},
+  [217] = {.lex_state = 41, .external_lex_state = 4},
+  [218] = {.lex_state = 1},
   [219] = {.lex_state = 41},
   [220] = {.lex_state = 41},
-  [221] = {.lex_state = 10},
-  [222] = {.lex_state = 41},
+  [221] = {.lex_state = 41},
+  [222] = {.lex_state = 1},
   [223] = {.lex_state = 41},
-  [224] = {.lex_state = 10},
-  [225] = {.lex_state = 10},
-  [226] = {.lex_state = 10},
+  [224] = {.lex_state = 41},
+  [225] = {.lex_state = 41, .external_lex_state = 4},
+  [226] = {.lex_state = 1},
   [227] = {.lex_state = 41},
-  [228] = {.lex_state = 10},
+  [228] = {.lex_state = 41},
   [229] = {.lex_state = 41},
   [230] = {.lex_state = 41},
-  [231] = {.lex_state = 41},
-  [232] = {.lex_state = 1},
-  [233] = {.lex_state = 41},
-  [234] = {.lex_state = 1},
+  [231] = {.lex_state = 10},
+  [232] = {.lex_state = 41},
+  [233] = {.lex_state = 1, .external_lex_state = 5},
+  [234] = {.lex_state = 10},
   [235] = {.lex_state = 41, .external_lex_state = 4},
   [236] = {.lex_state = 41},
-  [237] = {.lex_state = 1},
-  [238] = {.lex_state = 41, .external_lex_state = 4},
+  [237] = {.lex_state = 41},
+  [238] = {.lex_state = 41},
   [239] = {.lex_state = 41},
   [240] = {.lex_state = 41},
-  [241] = {.lex_state = 41, .external_lex_state = 4},
-  [242] = {.lex_state = 41},
+  [241] = {.lex_state = 1},
+  [242] = {.lex_state = 1},
   [243] = {.lex_state = 41},
-  [244] = {.lex_state = 41},
+  [244] = {.lex_state = 1},
   [245] = {.lex_state = 41},
   [246] = {.lex_state = 41},
-  [247] = {.lex_state = 10},
+  [247] = {.lex_state = 1},
   [248] = {.lex_state = 41},
-  [249] = {.lex_state = 10},
+  [249] = {.lex_state = 1},
   [250] = {.lex_state = 41},
-  [251] = {.lex_state = 41},
-  [252] = {.lex_state = 10},
-  [253] = {.lex_state = 10},
+  [251] = {.lex_state = 10},
+  [252] = {.lex_state = 41},
+  [253] = {.lex_state = 41, .external_lex_state = 4},
   [254] = {.lex_state = 41},
-  [255] = {.lex_state = 1},
-  [256] = {.lex_state = 41},
-  [257] = {.lex_state = 1},
+  [255] = {.lex_state = 10},
+  [256] = {.lex_state = 41, .external_lex_state = 4},
+  [257] = {.lex_state = 41},
   [258] = {.lex_state = 1},
-  [259] = {.lex_state = 1},
+  [259] = {.lex_state = 41},
   [260] = {.lex_state = 41},
   [261] = {.lex_state = 41},
-  [262] = {.lex_state = 1},
-  [263] = {.lex_state = 41},
+  [262] = {.lex_state = 41},
+  [263] = {.lex_state = 10},
   [264] = {.lex_state = 41},
-  [265] = {.lex_state = 41},
-  [266] = {.lex_state = 1},
+  [265] = {.lex_state = 10},
+  [266] = {.lex_state = 41},
   [267] = {.lex_state = 41},
   [268] = {.lex_state = 41},
-  [269] = {.lex_state = 41, .external_lex_state = 4},
-  [270] = {.lex_state = 41},
-  [271] = {.lex_state = 41},
+  [269] = {.lex_state = 41},
+  [270] = {.lex_state = 10},
+  [271] = {.lex_state = 10},
   [272] = {.lex_state = 41},
-  [273] = {.lex_state = 1, .external_lex_state = 5},
+  [273] = {.lex_state = 10},
   [274] = {.lex_state = 10},
   [275] = {.lex_state = 10},
   [276] = {.lex_state = 41},
   [277] = {.lex_state = 41},
   [278] = {.lex_state = 41},
-  [279] = {.lex_state = 10},
-  [280] = {.lex_state = 41},
+  [279] = {.lex_state = 41},
+  [280] = {.lex_state = 10},
   [281] = {.lex_state = 41},
-  [282] = {.lex_state = 1},
-  [283] = {.lex_state = 1},
-  [284] = {.lex_state = 41},
-  [285] = {.lex_state = 41},
+  [282] = {.lex_state = 41},
+  [283] = {.lex_state = 10},
+  [284] = {.lex_state = 10},
+  [285] = {.lex_state = 1},
   [286] = {.lex_state = 41},
-  [287] = {.lex_state = 41},
-  [288] = {.lex_state = 1},
+  [287] = {.lex_state = 10},
+  [288] = {.lex_state = 41},
   [289] = {.lex_state = 41},
-  [290] = {.lex_state = 1},
+  [290] = {.lex_state = 41},
   [291] = {.lex_state = 41},
   [292] = {.lex_state = 41},
-  [293] = {.lex_state = 37},
-  [294] = {.lex_state = 1},
+  [293] = {.lex_state = 41},
+  [294] = {.lex_state = 37},
   [295] = {.lex_state = 41},
-  [296] = {.lex_state = 0},
+  [296] = {.lex_state = 41},
   [297] = {.lex_state = 41},
   [298] = {.lex_state = 41},
   [299] = {.lex_state = 41},
@@ -3347,21 +3295,21 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [301] = {.lex_state = 41},
   [302] = {.lex_state = 41},
   [303] = {.lex_state = 41},
-  [304] = {.lex_state = 10},
+  [304] = {.lex_state = 1, .external_lex_state = 6},
   [305] = {.lex_state = 10},
   [306] = {.lex_state = 41},
-  [307] = {.lex_state = 10},
-  [308] = {.lex_state = 41},
-  [309] = {.lex_state = 41},
+  [307] = {.lex_state = 0},
+  [308] = {.lex_state = 10},
+  [309] = {.lex_state = 10},
   [310] = {.lex_state = 41},
   [311] = {.lex_state = 41},
   [312] = {.lex_state = 41},
   [313] = {.lex_state = 41},
-  [314] = {.lex_state = 0},
+  [314] = {.lex_state = 41},
   [315] = {.lex_state = 41},
-  [316] = {.lex_state = 1, .external_lex_state = 6},
-  [317] = {.lex_state = 10},
-  [318] = {.lex_state = 41},
+  [316] = {.lex_state = 41},
+  [317] = {.lex_state = 1},
+  [318] = {.lex_state = 1},
   [319] = {.lex_state = 41},
   [320] = {.lex_state = 41},
   [321] = {.lex_state = 41},
@@ -3370,17 +3318,17 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [324] = {.lex_state = 41},
   [325] = {.lex_state = 41},
   [326] = {.lex_state = 41},
-  [327] = {.lex_state = 41},
-  [328] = {.lex_state = 1, .external_lex_state = 6},
+  [327] = {.lex_state = 10},
+  [328] = {.lex_state = 41},
   [329] = {.lex_state = 41},
-  [330] = {.lex_state = 10},
+  [330] = {.lex_state = 0},
   [331] = {.lex_state = 41},
   [332] = {.lex_state = 41},
   [333] = {.lex_state = 41},
-  [334] = {.lex_state = 41},
-  [335] = {.lex_state = 10},
+  [334] = {.lex_state = 1, .external_lex_state = 6},
+  [335] = {.lex_state = 41},
   [336] = {.lex_state = 41},
-  [337] = {.lex_state = 10},
+  [337] = {.lex_state = 41},
   [338] = {.lex_state = 41},
   [339] = {.lex_state = 41},
   [340] = {.lex_state = 41},
@@ -3393,53 +3341,53 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [347] = {.lex_state = 41},
   [348] = {.lex_state = 41},
   [349] = {.lex_state = 41},
-  [350] = {.lex_state = 41},
-  [351] = {.lex_state = 10},
-  [352] = {.lex_state = 41},
-  [353] = {.lex_state = 41},
-  [354] = {.lex_state = 41},
+  [350] = {.lex_state = 1},
+  [351] = {.lex_state = 41},
+  [352] = {.lex_state = 1},
+  [353] = {.lex_state = 10},
+  [354] = {.lex_state = 10},
   [355] = {.lex_state = 10},
-  [356] = {.lex_state = 41},
+  [356] = {.lex_state = 1},
   [357] = {.lex_state = 41},
   [358] = {.lex_state = 41},
   [359] = {.lex_state = 41},
   [360] = {.lex_state = 37},
   [361] = {.lex_state = 41},
   [362] = {.lex_state = 41},
-  [363] = {.lex_state = 10},
-  [364] = {.lex_state = 10},
+  [363] = {.lex_state = 41},
+  [364] = {.lex_state = 41},
   [365] = {.lex_state = 41},
-  [366] = {.lex_state = 10},
+  [366] = {.lex_state = 41},
   [367] = {.lex_state = 41},
   [368] = {.lex_state = 41},
   [369] = {.lex_state = 41},
-  [370] = {.lex_state = 1},
+  [370] = {.lex_state = 10},
   [371] = {.lex_state = 41},
   [372] = {.lex_state = 37},
-  [373] = {.lex_state = 41},
+  [373] = {.lex_state = 10},
   [374] = {.lex_state = 41},
   [375] = {.lex_state = 41},
   [376] = {.lex_state = 41},
-  [377] = {.lex_state = 1},
+  [377] = {.lex_state = 40},
   [378] = {.lex_state = 41},
-  [379] = {.lex_state = 41},
-  [380] = {.lex_state = 41},
+  [379] = {.lex_state = 1},
+  [380] = {.lex_state = 138},
   [381] = {.lex_state = 37},
   [382] = {.lex_state = 41},
   [383] = {.lex_state = 41},
   [384] = {.lex_state = 41},
-  [385] = {.lex_state = 0},
+  [385] = {.lex_state = 41},
   [386] = {.lex_state = 41},
-  [387] = {.lex_state = 41},
+  [387] = {.lex_state = 137},
   [388] = {.lex_state = 41},
   [389] = {.lex_state = 41},
-  [390] = {.lex_state = 10},
-  [391] = {.lex_state = 1},
+  [390] = {.lex_state = 140},
+  [391] = {.lex_state = 139},
   [392] = {.lex_state = 41},
   [393] = {.lex_state = 41},
   [394] = {.lex_state = 37},
   [395] = {.lex_state = 41},
-  [396] = {.lex_state = 41},
+  [396] = {.lex_state = 1},
   [397] = {.lex_state = 41},
   [398] = {.lex_state = 41},
   [399] = {.lex_state = 41},
@@ -3449,64 +3397,64 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [403] = {.lex_state = 41},
   [404] = {.lex_state = 41},
   [405] = {.lex_state = 41},
-  [406] = {.lex_state = 1},
+  [406] = {.lex_state = 41},
   [407] = {.lex_state = 41},
   [408] = {.lex_state = 41},
-  [409] = {.lex_state = 37},
+  [409] = {.lex_state = 41},
   [410] = {.lex_state = 41},
   [411] = {.lex_state = 41},
   [412] = {.lex_state = 41},
   [413] = {.lex_state = 41},
   [414] = {.lex_state = 41},
-  [415] = {.lex_state = 1},
-  [416] = {.lex_state = 0, .external_lex_state = 7},
+  [415] = {.lex_state = 41},
+  [416] = {.lex_state = 41},
   [417] = {.lex_state = 41},
-  [418] = {.lex_state = 41},
-  [419] = {.lex_state = 41},
-  [420] = {.lex_state = 41},
+  [418] = {.lex_state = 10},
+  [419] = {.lex_state = 1},
+  [420] = {.lex_state = 0, .external_lex_state = 7},
   [421] = {.lex_state = 41},
-  [422] = {.lex_state = 41},
+  [422] = {.lex_state = 37},
   [423] = {.lex_state = 41},
-  [424] = {.lex_state = 131},
-  [425] = {.lex_state = 130},
-  [426] = {.lex_state = 129},
-  [427] = {.lex_state = 128},
-  [428] = {.lex_state = 41},
-  [429] = {.lex_state = 41},
-  [430] = {.lex_state = 41},
+  [424] = {.lex_state = 41},
+  [425] = {.lex_state = 39},
+  [426] = {.lex_state = 1},
+  [427] = {.lex_state = 41},
+  [428] = {.lex_state = 40},
+  [429] = {.lex_state = 1},
+  [430] = {.lex_state = 1},
   [431] = {.lex_state = 41},
-  [432] = {.lex_state = 10},
-  [433] = {.lex_state = 41},
+  [432] = {.lex_state = 41},
+  [433] = {.lex_state = 1},
   [434] = {.lex_state = 0, .external_lex_state = 8},
-  [435] = {.lex_state = 1},
+  [435] = {.lex_state = 0, .external_lex_state = 9},
   [436] = {.lex_state = 41},
   [437] = {.lex_state = 41},
   [438] = {.lex_state = 41},
   [439] = {.lex_state = 41},
   [440] = {.lex_state = 41},
-  [441] = {.lex_state = 0, .external_lex_state = 9},
-  [442] = {.lex_state = 0, .external_lex_state = 10},
-  [443] = {.lex_state = 39},
-  [444] = {.lex_state = 1},
-  [445] = {.lex_state = 1},
-  [446] = {.lex_state = 1},
+  [441] = {.lex_state = 41},
+  [442] = {.lex_state = 41},
+  [443] = {.lex_state = 41},
+  [444] = {.lex_state = 41},
+  [445] = {.lex_state = 10},
+  [446] = {.lex_state = 41},
   [447] = {.lex_state = 41},
-  [448] = {.lex_state = 1},
+  [448] = {.lex_state = 41},
   [449] = {.lex_state = 41},
-  [450] = {.lex_state = 10},
+  [450] = {.lex_state = 41},
   [451] = {.lex_state = 41},
-  [452] = {.lex_state = 41},
+  [452] = {.lex_state = 10},
   [453] = {.lex_state = 41},
   [454] = {.lex_state = 41},
   [455] = {.lex_state = 41},
   [456] = {.lex_state = 41},
   [457] = {.lex_state = 10},
-  [458] = {.lex_state = 41},
+  [458] = {.lex_state = 1},
   [459] = {.lex_state = 41},
-  [460] = {.lex_state = 40},
-  [461] = {.lex_state = 40},
-  [462] = {.lex_state = 41},
-  [463] = {.lex_state = 41},
+  [460] = {.lex_state = 41},
+  [461] = {.lex_state = 0},
+  [462] = {.lex_state = 0, .external_lex_state = 10},
+  [463] = {.lex_state = 1},
   [464] = {.lex_state = 41},
   [465] = {.lex_state = 41},
   [466] = {.lex_state = 41},
@@ -3518,18 +3466,18 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [472] = {.lex_state = 41},
   [473] = {.lex_state = 41},
   [474] = {.lex_state = 41},
-  [475] = {.lex_state = 0, .external_lex_state = 7},
-  [476] = {.lex_state = 1},
-  [477] = {.lex_state = 1},
-  [478] = {.lex_state = 39},
-  [479] = {.lex_state = 0, .external_lex_state = 10},
-  [480] = {.lex_state = 0, .external_lex_state = 9},
-  [481] = {.lex_state = 0, .external_lex_state = 8},
+  [475] = {.lex_state = 0, .external_lex_state = 10},
+  [476] = {.lex_state = 0, .external_lex_state = 8},
+  [477] = {.lex_state = 0, .external_lex_state = 9},
+  [478] = {.lex_state = 1},
+  [479] = {.lex_state = 1},
+  [480] = {.lex_state = 39},
+  [481] = {.lex_state = 0, .external_lex_state = 7},
   [482] = {.lex_state = 1},
   [483] = {.lex_state = 1},
   [484] = {.lex_state = 1},
   [485] = {.lex_state = 39},
-  [486] = {.lex_state = 0, .external_lex_state = 8},
+  [486] = {.lex_state = 0, .external_lex_state = 7},
   [487] = {.lex_state = 1},
   [488] = {.lex_state = 1},
   [489] = {.lex_state = 1},
@@ -3544,14 +3492,29 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [0] = {
     [ts_builtin_sym_end] = ACTIONS(1),
     [sym_Name] = ACTIONS(1),
-    [anon_sym_LT_BANG_LBRACK] = ACTIONS(1),
-    [anon_sym_IGNORE] = ACTIONS(1),
-    [anon_sym_INCLUDE] = ACTIONS(1),
+    [anon_sym_LT_QMARK] = ACTIONS(1),
+    [anon_sym_xml] = ACTIONS(1),
+    [anon_sym_standalone] = ACTIONS(1),
+    [anon_sym_SQUOTE] = ACTIONS(1),
+    [anon_sym_yes] = ACTIONS(1),
+    [anon_sym_no] = ACTIONS(1),
+    [anon_sym_DQUOTE] = ACTIONS(1),
+    [anon_sym_LT_BANG] = ACTIONS(1),
+    [anon_sym_DOCTYPE] = ACTIONS(1),
     [anon_sym_LBRACK] = ACTIONS(1),
+    [anon_sym_RBRACK] = ACTIONS(1),
+    [anon_sym_GT] = ACTIONS(1),
+    [anon_sym_LT] = ACTIONS(1),
+    [anon_sym_SLASH_GT] = ACTIONS(1),
+    [anon_sym_LT_SLASH] = ACTIONS(1),
     [anon_sym_RBRACK_RBRACK_GT] = ACTIONS(1),
-    [anon_sym_LT_BANG] = ACTIONS(1),
+    [anon_sym_LT_BANG_LBRACK] = ACTIONS(1),
+    [anon_sym_CDATA] = ACTIONS(1),
+    [anon_sym_xml_DASHstylesheet] = ACTIONS(1),
+    [anon_sym_xml_DASHmodel] = ACTIONS(1),
+    [aux_sym_PseudoAttValue_token1] = ACTIONS(1),
+    [aux_sym_PseudoAttValue_token2] = ACTIONS(1),
     [anon_sym_ELEMENT] = ACTIONS(1),
-    [anon_sym_GT] = ACTIONS(1),
     [anon_sym_EMPTY] = ACTIONS(1),
     [anon_sym_ANY] = ACTIONS(1),
     [anon_sym_LPAREN] = ACTIONS(1),
@@ -3563,7 +3526,6 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_PLUS] = ACTIONS(1),
     [anon_sym_COMMA] = ACTIONS(1),
     [anon_sym_ATTLIST] = ACTIONS(1),
-    [anon_sym_CDATA] = ACTIONS(1),
     [sym_TokenizedType] = ACTIONS(1),
     [anon_sym_NOTATION] = ACTIONS(1),
     [anon_sym_POUNDREQUIRED] = ACTIONS(1),
@@ -3571,9 +3533,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_POUNDFIXED] = ACTIONS(1),
     [anon_sym_ENTITY] = ACTIONS(1),
     [anon_sym_PERCENT] = ACTIONS(1),
-    [anon_sym_DQUOTE] = ACTIONS(1),
     [aux_sym_EntityValue_token1] = ACTIONS(1),
-    [anon_sym_SQUOTE] = ACTIONS(1),
     [aux_sym_EntityValue_token2] = ACTIONS(1),
     [anon_sym_NDATA] = ACTIONS(1),
     [anon_sym_SEMI] = ACTIONS(1),
@@ -3584,27 +3544,13 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [aux_sym_CharRef_token1] = ACTIONS(1),
     [anon_sym_AMP_POUNDx] = ACTIONS(1),
     [aux_sym_CharRef_token2] = ACTIONS(1),
-    [aux_sym_AttValue_token1] = ACTIONS(1),
-    [aux_sym_AttValue_token2] = ACTIONS(1),
     [anon_sym_SYSTEM] = ACTIONS(1),
     [anon_sym_PUBLIC] = ACTIONS(1),
-    [anon_sym_LT_QMARK] = ACTIONS(1),
-    [anon_sym_xml] = ACTIONS(1),
     [anon_sym_version] = ACTIONS(1),
     [sym_VersionNum] = ACTIONS(1),
     [anon_sym_encoding] = ACTIONS(1),
     [sym_EncName] = ACTIONS(1),
     [anon_sym_EQ] = ACTIONS(1),
-    [anon_sym_standalone] = ACTIONS(1),
-    [anon_sym_yes] = ACTIONS(1),
-    [anon_sym_no] = ACTIONS(1),
-    [anon_sym_DOCTYPE] = ACTIONS(1),
-    [anon_sym_RBRACK] = ACTIONS(1),
-    [anon_sym_LT] = ACTIONS(1),
-    [anon_sym_SLASH_GT] = ACTIONS(1),
-    [anon_sym_LT_SLASH] = ACTIONS(1),
-    [anon_sym_xml_DASHstylesheet] = ACTIONS(1),
-    [anon_sym_xml_DASHmodel] = ACTIONS(1),
     [sym_PITarget] = ACTIONS(1),
     [sym__pi_content] = ACTIONS(1),
     [sym_Comment] = ACTIONS(1),
@@ -3615,22 +3561,22 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym__erroneous_end_name] = ACTIONS(1),
   },
   [1] = {
-    [sym_document] = STATE(385),
-    [sym_XMLDecl] = STATE(21),
-    [sym_PI] = STATE(33),
-    [sym_prolog] = STATE(191),
-    [sym__Misc] = STATE(33),
-    [sym_doctypedecl] = STATE(41),
-    [sym_element] = STATE(40),
-    [sym_EmptyElemTag] = STATE(172),
+    [sym_document] = STATE(461),
+    [sym_prolog] = STATE(202),
+    [sym__Misc] = STATE(32),
+    [sym_XMLDecl] = STATE(20),
+    [sym_doctypedecl] = STATE(60),
+    [sym_element] = STATE(61),
+    [sym_EmptyElemTag] = STATE(200),
     [sym_STag] = STATE(3),
-    [sym_StyleSheetPI] = STATE(33),
-    [sym_XmlModelPI] = STATE(33),
-    [aux_sym_document_repeat1] = STATE(33),
-    [anon_sym_LT_BANG] = ACTIONS(3),
-    [sym__S] = ACTIONS(5),
-    [anon_sym_LT_QMARK] = ACTIONS(7),
-    [anon_sym_LT] = ACTIONS(9),
+    [sym_StyleSheetPI] = STATE(32),
+    [sym_XmlModelPI] = STATE(32),
+    [sym_PI] = STATE(32),
+    [aux_sym_document_repeat1] = STATE(32),
+    [anon_sym_LT_QMARK] = ACTIONS(3),
+    [anon_sym_LT_BANG] = ACTIONS(5),
+    [anon_sym_LT] = ACTIONS(7),
+    [sym__S] = ACTIONS(9),
     [sym_Comment] = ACTIONS(11),
   },
 };
@@ -3638,191 +3584,191 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
 static const uint16_t ts_small_parse_table[] = {
   [0] = 15,
     ACTIONS(13), 1,
-      anon_sym_LT_BANG_LBRACK,
+      anon_sym_LT_QMARK,
     ACTIONS(15), 1,
-      anon_sym_AMP,
+      anon_sym_LT,
     ACTIONS(17), 1,
-      anon_sym_AMP_POUND,
+      anon_sym_LT_SLASH,
     ACTIONS(19), 1,
-      anon_sym_AMP_POUNDx,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(21), 1,
-      anon_sym_LT_QMARK,
+      anon_sym_AMP,
     ACTIONS(23), 1,
-      anon_sym_LT,
+      anon_sym_AMP_POUND,
     ACTIONS(25), 1,
-      anon_sym_LT_SLASH,
+      anon_sym_AMP_POUNDx,
     STATE(2), 1,
       sym_STag,
-    STATE(63), 1,
+    STATE(39), 1,
       sym_ETag,
-    STATE(65), 1,
+    STATE(42), 1,
       sym_EmptyElemTag,
-    STATE(296), 1,
+    STATE(307), 1,
       sym_content,
-    STATE(316), 1,
+    STATE(334), 1,
       sym_CDStart,
     ACTIONS(27), 2,
       sym_Comment,
       sym_CharData,
-    STATE(42), 2,
+    STATE(40), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(5), 5,
-      sym__Reference,
-      sym_PI,
+    STATE(4), 5,
       sym_element,
       sym_CDSect,
+      sym__Reference,
+      sym_PI,
       aux_sym_content_repeat1,
   [52] = 15,
     ACTIONS(13), 1,
-      anon_sym_LT_BANG_LBRACK,
+      anon_sym_LT_QMARK,
     ACTIONS(15), 1,
-      anon_sym_AMP,
-    ACTIONS(17), 1,
-      anon_sym_AMP_POUND,
+      anon_sym_LT,
     ACTIONS(19), 1,
-      anon_sym_AMP_POUNDx,
+      anon_sym_LT_BANG_LBRACK,
     ACTIONS(21), 1,
-      anon_sym_LT_QMARK,
+      anon_sym_AMP,
     ACTIONS(23), 1,
-      anon_sym_LT,
+      anon_sym_AMP_POUND,
+    ACTIONS(25), 1,
+      anon_sym_AMP_POUNDx,
     ACTIONS(29), 1,
       anon_sym_LT_SLASH,
     STATE(2), 1,
       sym_STag,
-    STATE(65), 1,
+    STATE(42), 1,
       sym_EmptyElemTag,
-    STATE(173), 1,
+    STATE(205), 1,
       sym_ETag,
-    STATE(314), 1,
+    STATE(330), 1,
       sym_content,
-    STATE(316), 1,
+    STATE(334), 1,
       sym_CDStart,
     ACTIONS(27), 2,
       sym_Comment,
       sym_CharData,
-    STATE(42), 2,
+    STATE(40), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(5), 5,
-      sym__Reference,
-      sym_PI,
+    STATE(4), 5,
       sym_element,
       sym_CDSect,
+      sym__Reference,
+      sym_PI,
       aux_sym_content_repeat1,
   [104] = 13,
-    ACTIONS(31), 1,
+    ACTIONS(13), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(15), 1,
+      anon_sym_LT,
+    ACTIONS(19), 1,
       anon_sym_LT_BANG_LBRACK,
-    ACTIONS(34), 1,
+    ACTIONS(21), 1,
       anon_sym_AMP,
-    ACTIONS(37), 1,
+    ACTIONS(23), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(40), 1,
+    ACTIONS(25), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(43), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(46), 1,
-      anon_sym_LT,
-    ACTIONS(49), 1,
+    ACTIONS(31), 1,
       anon_sym_LT_SLASH,
     STATE(2), 1,
       sym_STag,
-    STATE(65), 1,
+    STATE(42), 1,
       sym_EmptyElemTag,
-    STATE(316), 1,
+    STATE(334), 1,
       sym_CDStart,
-    ACTIONS(51), 2,
+    ACTIONS(33), 2,
       sym_Comment,
       sym_CharData,
-    STATE(42), 2,
+    STATE(40), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(4), 5,
-      sym__Reference,
-      sym_PI,
+    STATE(5), 5,
       sym_element,
       sym_CDSect,
+      sym__Reference,
+      sym_PI,
       aux_sym_content_repeat1,
   [150] = 13,
-    ACTIONS(13), 1,
+    ACTIONS(35), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(38), 1,
+      anon_sym_LT,
+    ACTIONS(41), 1,
+      anon_sym_LT_SLASH,
+    ACTIONS(43), 1,
       anon_sym_LT_BANG_LBRACK,
-    ACTIONS(15), 1,
+    ACTIONS(46), 1,
       anon_sym_AMP,
-    ACTIONS(17), 1,
+    ACTIONS(49), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(19), 1,
+    ACTIONS(52), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(21), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(23), 1,
-      anon_sym_LT,
-    ACTIONS(54), 1,
-      anon_sym_LT_SLASH,
     STATE(2), 1,
       sym_STag,
-    STATE(65), 1,
+    STATE(42), 1,
       sym_EmptyElemTag,
-    STATE(316), 1,
+    STATE(334), 1,
       sym_CDStart,
-    ACTIONS(56), 2,
+    ACTIONS(55), 2,
       sym_Comment,
       sym_CharData,
-    STATE(42), 2,
+    STATE(40), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(4), 5,
-      sym__Reference,
-      sym_PI,
+    STATE(5), 5,
       sym_element,
       sym_CDSect,
+      sym__Reference,
+      sym_PI,
       aux_sym_content_repeat1,
   [196] = 11,
     ACTIONS(3), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(5), 1,
       anon_sym_LT_BANG,
     ACTIONS(7), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(9), 1,
       anon_sym_LT,
     STATE(3), 1,
       sym_STag,
-    STATE(21), 1,
+    STATE(20), 1,
       sym_XMLDecl,
-    STATE(41), 1,
+    STATE(60), 1,
       sym_doctypedecl,
-    STATE(64), 1,
+    STATE(72), 1,
       sym_element,
-    STATE(172), 1,
-      sym_EmptyElemTag,
-    STATE(211), 1,
+    STATE(188), 1,
       sym_prolog,
+    STATE(200), 1,
+      sym_EmptyElemTag,
     ACTIONS(11), 2,
       sym_Comment,
       sym__S,
-    STATE(33), 5,
-      sym_PI,
+    STATE(32), 5,
       sym__Misc,
       sym_StyleSheetPI,
       sym_XmlModelPI,
+      sym_PI,
       aux_sym_document_repeat1,
   [235] = 9,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_QMARK,
     ACTIONS(60), 1,
-      sym__S,
+      anon_sym_LT_BANG,
     ACTIONS(62), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(64), 1,
       anon_sym_RBRACK,
+    ACTIONS(64), 1,
+      sym__S,
     ACTIONS(66), 1,
       sym_Comment,
-    STATE(13), 1,
+    STATE(10), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3830,23 +3776,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [268] = 9,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
+      anon_sym_LT_QMARK,
     ACTIONS(60), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(64), 1,
       sym__S,
-    ACTIONS(62), 1,
-      anon_sym_LT_QMARK,
     ACTIONS(66), 1,
       sym_Comment,
     ACTIONS(68), 1,
       anon_sym_RBRACK,
-    STATE(13), 1,
+    STATE(10), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3854,47 +3800,47 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [301] = 9,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
     ACTIONS(66), 1,
       sym_Comment,
+    ACTIONS(68), 1,
+      anon_sym_RBRACK,
     ACTIONS(70), 1,
       sym__S,
-    ACTIONS(72), 1,
-      anon_sym_RBRACK,
-    STATE(8), 1,
+    STATE(11), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
       sym_NotationDecl,
       sym_PI,
   [334] = 9,
-    ACTIONS(58), 1,
+    ACTIONS(72), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(75), 1,
       anon_sym_LT_BANG,
-    ACTIONS(60), 1,
+    ACTIONS(78), 1,
+      anon_sym_RBRACK,
+    ACTIONS(80), 1,
       sym__S,
-    ACTIONS(62), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(66), 1,
+    ACTIONS(83), 1,
       sym_Comment,
-    ACTIONS(72), 1,
-      anon_sym_RBRACK,
-    STATE(13), 1,
+    STATE(10), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3902,23 +3848,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [367] = 9,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(64), 1,
+      sym__S,
     ACTIONS(66), 1,
       sym_Comment,
-    ACTIONS(74), 1,
-      sym__S,
-    ACTIONS(76), 1,
+    ACTIONS(86), 1,
       anon_sym_RBRACK,
     STATE(10), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3926,47 +3872,47 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [400] = 9,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(60), 1,
-      sym__S,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
     ACTIONS(66), 1,
       sym_Comment,
-    ACTIONS(76), 1,
+    ACTIONS(86), 1,
       anon_sym_RBRACK,
-    STATE(13), 1,
+    ACTIONS(88), 1,
+      sym__S,
+    STATE(14), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
       sym_NotationDecl,
       sym_PI,
   [433] = 9,
-    ACTIONS(78), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(81), 1,
-      sym__S,
-    ACTIONS(84), 1,
+    ACTIONS(58), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(87), 1,
-      anon_sym_RBRACK,
-    ACTIONS(89), 1,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(66), 1,
       sym_Comment,
-    STATE(13), 1,
+    ACTIONS(90), 1,
+      anon_sym_RBRACK,
+    ACTIONS(92), 1,
+      sym__S,
+    STATE(8), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3974,23 +3920,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [466] = 9,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(64), 1,
+      sym__S,
     ACTIONS(66), 1,
       sym_Comment,
-    ACTIONS(92), 1,
-      sym__S,
     ACTIONS(94), 1,
       anon_sym_RBRACK,
-    STATE(7), 1,
+    STATE(10), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -3998,23 +3944,23 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [499] = 9,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(64), 1,
-      anon_sym_RBRACK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
     ACTIONS(66), 1,
       sym_Comment,
+    ACTIONS(94), 1,
+      anon_sym_RBRACK,
     ACTIONS(96), 1,
       sym__S,
-    STATE(12), 1,
+    STATE(7), 1,
       aux_sym__intSubset,
-    STATE(170), 1,
+    STATE(176), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -4022,19 +3968,19 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [532] = 7,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
     ACTIONS(66), 1,
       sym_Comment,
     ACTIONS(68), 1,
       anon_sym_RBRACK,
-    STATE(199), 1,
+    STATE(167), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -4042,19 +3988,19 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [559] = 7,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
     ACTIONS(66), 1,
       sym_Comment,
-    ACTIONS(72), 1,
+    ACTIONS(86), 1,
       anon_sym_RBRACK,
-    STATE(199), 1,
+    STATE(167), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -4062,19 +4008,19 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [586] = 7,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
     ACTIONS(66), 1,
       sym_Comment,
-    ACTIONS(76), 1,
+    ACTIONS(94), 1,
       anon_sym_RBRACK,
-    STATE(199), 1,
+    STATE(167), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
@@ -4082,237 +4028,237 @@ static const uint16_t ts_small_parse_table[] = {
       sym_PI,
   [613] = 7,
     ACTIONS(58), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
       anon_sym_LT_BANG,
     ACTIONS(62), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(64), 1,
       anon_sym_RBRACK,
     ACTIONS(66), 1,
       sym_Comment,
-    STATE(199), 1,
+    STATE(167), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
       sym_NotationDecl,
       sym_PI,
-  [640] = 8,
+  [640] = 6,
+    ACTIONS(5), 1,
+      anon_sym_LT_BANG,
     ACTIONS(98), 1,
-      anon_sym_PERCENT,
+      anon_sym_LT_QMARK,
     ACTIONS(100), 1,
+      anon_sym_LT,
+    STATE(74), 1,
+      sym_doctypedecl,
+    ACTIONS(102), 2,
+      sym_Comment,
+      sym__S,
+    STATE(23), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
+      sym_PI,
+      aux_sym_document_repeat1,
+  [664] = 8,
+    ACTIONS(104), 1,
       anon_sym_SQUOTE,
-    ACTIONS(102), 1,
+    ACTIONS(106), 1,
+      anon_sym_PERCENT,
+    ACTIONS(108), 1,
       aux_sym_EntityValue_token2,
-    ACTIONS(104), 1,
+    ACTIONS(110), 1,
       anon_sym_AMP,
-    ACTIONS(106), 1,
+    ACTIONS(112), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(108), 1,
+    ACTIONS(114), 1,
       anon_sym_AMP_POUNDx,
-    STATE(103), 2,
+    STATE(102), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(24), 3,
+    STATE(26), 3,
       sym_PEReference,
       sym__Reference,
       aux_sym_EntityValue_repeat2,
-  [668] = 6,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(112), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(114), 1,
-      anon_sym_LT,
-    STATE(85), 1,
-      sym_doctypedecl,
-    ACTIONS(110), 2,
-      sym_Comment,
-      sym__S,
-    STATE(30), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
   [692] = 8,
+    ACTIONS(104), 1,
+      anon_sym_DQUOTE,
     ACTIONS(116), 1,
       anon_sym_PERCENT,
-    ACTIONS(119), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(121), 1,
-      aux_sym_EntityValue_token2,
-    ACTIONS(124), 1,
+    ACTIONS(118), 1,
+      aux_sym_EntityValue_token1,
+    ACTIONS(120), 1,
       anon_sym_AMP,
-    ACTIONS(127), 1,
+    ACTIONS(122), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(130), 1,
+    ACTIONS(124), 1,
       anon_sym_AMP_POUNDx,
-    STATE(103), 2,
+    STATE(101), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(22), 3,
+    STATE(27), 3,
       sym_PEReference,
       sym__Reference,
-      aux_sym_EntityValue_repeat2,
-  [720] = 5,
-    STATE(99), 1,
+      aux_sym_EntityValue_repeat1,
+  [720] = 6,
+    ACTIONS(5), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(98), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(126), 1,
+      anon_sym_LT,
+    STATE(59), 1,
+      sym_doctypedecl,
+    ACTIONS(128), 2,
+      sym_Comment,
+      sym__S,
+    STATE(33), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
+      sym_PI,
+      aux_sym_document_repeat1,
+  [744] = 5,
+    STATE(96), 1,
       aux_sym_Mixed_repeat1,
-    STATE(177), 1,
+    STATE(166), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-    ACTIONS(135), 3,
+    ACTIONS(132), 3,
       anon_sym_STAR,
       anon_sym_QMARK,
       anon_sym_PLUS,
-    ACTIONS(133), 5,
+    ACTIONS(130), 5,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [742] = 8,
-    ACTIONS(98), 1,
+  [766] = 8,
+    ACTIONS(134), 1,
+      anon_sym_CDATA,
+    ACTIONS(136), 1,
+      anon_sym_LPAREN,
+    ACTIONS(138), 1,
+      sym_TokenizedType,
+    ACTIONS(140), 1,
+      anon_sym_NOTATION,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(104), 1,
-      anon_sym_AMP,
+    STATE(297), 1,
+      sym__AttType,
+    STATE(298), 2,
+      sym_NotationType,
+      sym_Enumeration,
+    STATE(295), 3,
+      sym_StringType,
+      sym__EnumeratedType,
+      sym_PEReference,
+  [794] = 8,
     ACTIONS(106), 1,
+      anon_sym_PERCENT,
+    ACTIONS(110), 1,
+      anon_sym_AMP,
+    ACTIONS(112), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(108), 1,
+    ACTIONS(114), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(137), 1,
+    ACTIONS(144), 1,
       anon_sym_SQUOTE,
-    ACTIONS(139), 1,
+    ACTIONS(146), 1,
       aux_sym_EntityValue_token2,
-    STATE(103), 2,
+    STATE(102), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(22), 3,
+    STATE(29), 3,
       sym_PEReference,
       sym__Reference,
       aux_sym_EntityValue_repeat2,
-  [770] = 8,
-    ACTIONS(137), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(141), 1,
+  [822] = 8,
+    ACTIONS(116), 1,
       anon_sym_PERCENT,
-    ACTIONS(143), 1,
-      aux_sym_EntityValue_token1,
-    ACTIONS(145), 1,
+    ACTIONS(120), 1,
       anon_sym_AMP,
-    ACTIONS(147), 1,
+    ACTIONS(122), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(149), 1,
+    ACTIONS(124), 1,
       anon_sym_AMP_POUNDx,
-    STATE(107), 2,
+    ACTIONS(144), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(148), 1,
+      aux_sym_EntityValue_token1,
+    STATE(101), 2,
       sym_EntityRef,
       sym_CharRef,
     STATE(31), 3,
       sym_PEReference,
       sym__Reference,
       aux_sym_EntityValue_repeat1,
-  [798] = 5,
+  [850] = 5,
     STATE(95), 1,
       aux_sym_Mixed_repeat1,
-    STATE(169), 1,
+    STATE(185), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-    ACTIONS(135), 3,
+    ACTIONS(132), 3,
       anon_sym_STAR,
       anon_sym_QMARK,
       anon_sym_PLUS,
-    ACTIONS(133), 5,
+    ACTIONS(130), 5,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [820] = 8,
-    ACTIONS(151), 1,
-      anon_sym_LPAREN,
-    ACTIONS(153), 1,
-      anon_sym_CDATA,
-    ACTIONS(155), 1,
-      sym_TokenizedType,
-    ACTIONS(157), 1,
-      anon_sym_NOTATION,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    STATE(297), 1,
-      sym__AttType,
-    STATE(298), 2,
-      sym_NotationType,
-      sym_Enumeration,
-    STATE(295), 3,
-      sym_StringType,
-      sym__EnumeratedType,
-      sym_PEReference,
-  [848] = 8,
-    ACTIONS(100), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(141), 1,
+  [872] = 8,
+    ACTIONS(150), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(152), 1,
       anon_sym_PERCENT,
-    ACTIONS(145), 1,
+    ACTIONS(155), 1,
+      aux_sym_EntityValue_token2,
+    ACTIONS(158), 1,
       anon_sym_AMP,
-    ACTIONS(147), 1,
+    ACTIONS(161), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(149), 1,
+    ACTIONS(164), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(161), 1,
-      aux_sym_EntityValue_token1,
-    STATE(107), 2,
+    STATE(102), 2,
       sym_EntityRef,
       sym_CharRef,
-    STATE(25), 3,
+    STATE(29), 3,
       sym_PEReference,
       sym__Reference,
-      aux_sym_EntityValue_repeat1,
-  [876] = 6,
+      aux_sym_EntityValue_repeat2,
+  [900] = 6,
     ACTIONS(58), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(62), 1,
       anon_sym_LT_QMARK,
+    ACTIONS(60), 1,
+      anon_sym_LT_BANG,
     ACTIONS(66), 1,
       sym_Comment,
-    STATE(199), 1,
+    STATE(167), 1,
       sym__markupdecl,
-    STATE(285), 2,
+    STATE(296), 2,
       sym_GEDecl,
       sym_PEDecl,
-    STATE(287), 5,
+    STATE(290), 5,
       sym_elementdecl,
       sym_AttlistDecl,
       sym__EntityDecl,
       sym_NotationDecl,
       sym_PI,
-  [900] = 6,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(112), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(165), 1,
-      anon_sym_LT,
-    STATE(62), 1,
-      sym_doctypedecl,
-    ACTIONS(163), 2,
-      sym_Comment,
-      sym__S,
-    STATE(32), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
   [924] = 8,
     ACTIONS(167), 1,
-      anon_sym_PERCENT,
-    ACTIONS(170), 1,
       anon_sym_DQUOTE,
+    ACTIONS(169), 1,
+      anon_sym_PERCENT,
     ACTIONS(172), 1,
       aux_sym_EntityValue_token1,
     ACTIONS(175), 1,
@@ -4321,47 +4267,47 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_AMP_POUND,
     ACTIONS(181), 1,
       anon_sym_AMP_POUNDx,
-    STATE(107), 2,
+    STATE(101), 2,
       sym_EntityRef,
       sym_CharRef,
     STATE(31), 3,
       sym_PEReference,
       sym__Reference,
       aux_sym_EntityValue_repeat1,
-  [952] = 5,
-    ACTIONS(189), 1,
+  [952] = 6,
+    ACTIONS(5), 1,
+      anon_sym_LT_BANG,
+    ACTIONS(98), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(192), 1,
+    ACTIONS(100), 1,
       anon_sym_LT,
-    ACTIONS(184), 2,
-      ts_builtin_sym_end,
-      anon_sym_LT_BANG,
-    ACTIONS(186), 2,
+    STATE(74), 1,
+      sym_doctypedecl,
+    ACTIONS(128), 2,
       sym_Comment,
       sym__S,
-    STATE(32), 5,
-      sym_PI,
+    STATE(33), 5,
       sym__Misc,
       sym_StyleSheetPI,
       sym_XmlModelPI,
+      sym_PI,
       aux_sym_document_repeat1,
-  [974] = 6,
-    ACTIONS(3), 1,
-      anon_sym_LT_BANG,
-    ACTIONS(112), 1,
+  [976] = 5,
+    ACTIONS(186), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(114), 1,
+    ACTIONS(189), 1,
       anon_sym_LT,
-    STATE(85), 1,
-      sym_doctypedecl,
-    ACTIONS(163), 2,
+    ACTIONS(184), 2,
+      ts_builtin_sym_end,
+      anon_sym_LT_BANG,
+    ACTIONS(191), 2,
       sym_Comment,
       sym__S,
-    STATE(32), 5,
-      sym_PI,
+    STATE(33), 5,
       sym__Misc,
       sym_StyleSheetPI,
       sym_XmlModelPI,
+      sym_PI,
       aux_sym_document_repeat1,
   [998] = 1,
     ACTIONS(194), 10,
@@ -4375,619 +4321,477 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENT,
       sym__S,
       sym_Name,
-  [1011] = 7,
-    ACTIONS(196), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(198), 1,
-      anon_sym_AMP,
-    ACTIONS(201), 1,
-      anon_sym_AMP_POUND,
-    ACTIONS(204), 1,
-      anon_sym_AMP_POUNDx,
-    ACTIONS(207), 1,
-      aux_sym_AttValue_token1,
-    STATE(35), 2,
-      sym__Reference,
-      aux_sym_AttValue_repeat1,
-    STATE(136), 2,
-      sym_EntityRef,
-      sym_CharRef,
-  [1035] = 2,
-    ACTIONS(212), 3,
+  [1011] = 1,
+    ACTIONS(196), 9,
+      anon_sym_GT,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_STAR,
+      anon_sym_QMARK,
+      anon_sym_PLUS,
+      anon_sym_COMMA,
+      anon_sym_PERCENT,
+      sym__S,
+  [1023] = 2,
+    ACTIONS(200), 3,
+      anon_sym_LT,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(210), 6,
+    ACTIONS(198), 6,
       sym_Comment,
       sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
       anon_sym_LT_QMARK,
       anon_sym_LT_SLASH,
-  [1049] = 4,
-    ACTIONS(112), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(165), 1,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1037] = 2,
+    ACTIONS(204), 3,
       anon_sym_LT,
-    ACTIONS(163), 2,
-      sym_Comment,
-      sym__S,
-    STATE(32), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
-  [1067] = 4,
-    ACTIONS(112), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(214), 1,
-      ts_builtin_sym_end,
-    ACTIONS(163), 2,
-      sym_Comment,
-      sym__S,
-    STATE(32), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
-  [1085] = 7,
-    ACTIONS(216), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(218), 1,
       anon_sym_AMP,
-    ACTIONS(220), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(222), 1,
-      anon_sym_AMP_POUNDx,
-    ACTIONS(224), 1,
-      aux_sym_AttValue_token1,
-    STATE(35), 2,
-      sym__Reference,
-      aux_sym_AttValue_repeat1,
-    STATE(136), 2,
-      sym_EntityRef,
-      sym_CharRef,
-  [1109] = 4,
-    ACTIONS(112), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(226), 1,
-      ts_builtin_sym_end,
-    ACTIONS(228), 2,
+    ACTIONS(202), 6,
       sym_Comment,
-      sym__S,
-    STATE(38), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
-  [1127] = 4,
-    ACTIONS(112), 1,
+      sym_CharData,
       anon_sym_LT_QMARK,
-    ACTIONS(114), 1,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1051] = 2,
+    ACTIONS(208), 3,
       anon_sym_LT,
-    ACTIONS(230), 2,
-      sym_Comment,
-      sym__S,
-    STATE(37), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
-  [1145] = 2,
-    ACTIONS(234), 3,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(232), 6,
+    ACTIONS(206), 6,
       sym_Comment,
       sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
       anon_sym_LT_QMARK,
       anon_sym_LT_SLASH,
-  [1159] = 7,
-    ACTIONS(236), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(238), 1,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1065] = 2,
+    ACTIONS(212), 3,
+      anon_sym_LT,
       anon_sym_AMP,
-    ACTIONS(241), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(244), 1,
-      anon_sym_AMP_POUNDx,
-    ACTIONS(247), 1,
-      aux_sym_AttValue_token2,
-    STATE(43), 2,
-      sym__Reference,
-      aux_sym_AttValue_repeat2,
-    STATE(146), 2,
-      sym_EntityRef,
-      sym_CharRef,
-  [1183] = 6,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(252), 1,
-      anon_sym_LPAREN,
-    STATE(138), 1,
-      sym__choice,
-    STATE(345), 1,
-      sym_contentspec,
-    ACTIONS(250), 2,
-      anon_sym_EMPTY,
-      anon_sym_ANY,
-    STATE(349), 3,
-      sym_Mixed,
-      sym_children,
-      sym_PEReference,
-  [1205] = 4,
-    ACTIONS(112), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(254), 1,
-      ts_builtin_sym_end,
-    ACTIONS(256), 2,
+    ACTIONS(210), 6,
       sym_Comment,
-      sym__S,
-    STATE(71), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
-  [1223] = 4,
-    ACTIONS(112), 1,
+      sym_CharData,
       anon_sym_LT_QMARK,
-    ACTIONS(258), 1,
-      ts_builtin_sym_end,
-    ACTIONS(163), 2,
-      sym_Comment,
-      sym__S,
-    STATE(32), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
-  [1241] = 2,
-    ACTIONS(262), 3,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1079] = 2,
+    ACTIONS(216), 3,
+      anon_sym_LT,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(260), 6,
+    ACTIONS(214), 6,
       sym_Comment,
       sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
       anon_sym_LT_QMARK,
       anon_sym_LT_SLASH,
-  [1255] = 7,
-    ACTIONS(264), 1,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1093] = 7,
+    ACTIONS(218), 1,
       anon_sym_SQUOTE,
-    ACTIONS(266), 1,
+    ACTIONS(220), 1,
+      aux_sym_PseudoAttValue_token2,
+    ACTIONS(222), 1,
       anon_sym_AMP,
-    ACTIONS(268), 1,
+    ACTIONS(224), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(270), 1,
+    ACTIONS(226), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(272), 1,
-      aux_sym_AttValue_token2,
-    STATE(43), 2,
+    STATE(69), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat2,
-    STATE(146), 2,
+      aux_sym_PseudoAttValue_repeat2,
+    STATE(151), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1279] = 2,
-    ACTIONS(276), 3,
+  [1117] = 2,
+    ACTIONS(230), 3,
+      anon_sym_LT,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(274), 6,
+    ACTIONS(228), 6,
       sym_Comment,
       sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
       anon_sym_LT_QMARK,
       anon_sym_LT_SLASH,
-  [1293] = 2,
-    ACTIONS(280), 3,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(278), 6,
-      sym_Comment,
-      sym_CharData,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_AMP_POUNDx,
-      anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1307] = 2,
-    ACTIONS(284), 3,
+  [1131] = 7,
+    ACTIONS(232), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(234), 1,
+      aux_sym_PseudoAttValue_token1,
+    ACTIONS(236), 1,
       anon_sym_AMP,
+    ACTIONS(238), 1,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(282), 6,
-      sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
+    ACTIONS(240), 1,
       anon_sym_AMP_POUNDx,
-      anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1321] = 7,
-    ACTIONS(266), 1,
+    STATE(55), 2,
+      sym__Reference,
+      aux_sym_PseudoAttValue_repeat1,
+    STATE(146), 2,
+      sym_EntityRef,
+      sym_CharRef,
+  [1155] = 7,
+    ACTIONS(222), 1,
       anon_sym_AMP,
-    ACTIONS(268), 1,
+    ACTIONS(224), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(270), 1,
+    ACTIONS(226), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(286), 1,
+    ACTIONS(232), 1,
       anon_sym_SQUOTE,
-    ACTIONS(288), 1,
-      aux_sym_AttValue_token2,
-    STATE(80), 2,
+    ACTIONS(242), 1,
+      aux_sym_PseudoAttValue_token2,
+    STATE(51), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat2,
-    STATE(146), 2,
+      aux_sym_PseudoAttValue_repeat2,
+    STATE(151), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1345] = 7,
-    ACTIONS(218), 1,
+  [1179] = 7,
+    ACTIONS(236), 1,
       anon_sym_AMP,
-    ACTIONS(220), 1,
+    ACTIONS(238), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(222), 1,
+    ACTIONS(240), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(286), 1,
+    ACTIONS(244), 1,
       anon_sym_DQUOTE,
-    ACTIONS(290), 1,
-      aux_sym_AttValue_token1,
-    STATE(76), 2,
+    ACTIONS(246), 1,
+      aux_sym_PseudoAttValue_token1,
+    STATE(65), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat1,
-    STATE(136), 2,
+      aux_sym_PseudoAttValue_repeat1,
+    STATE(146), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1369] = 7,
-    ACTIONS(266), 1,
+  [1203] = 7,
+    ACTIONS(222), 1,
       anon_sym_AMP,
-    ACTIONS(268), 1,
+    ACTIONS(224), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(270), 1,
+    ACTIONS(226), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(292), 1,
+    ACTIONS(244), 1,
       anon_sym_SQUOTE,
-    ACTIONS(294), 1,
-      aux_sym_AttValue_token2,
-    STATE(75), 2,
+    ACTIONS(248), 1,
+      aux_sym_PseudoAttValue_token2,
+    STATE(41), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat2,
-    STATE(146), 2,
+      aux_sym_PseudoAttValue_repeat2,
+    STATE(151), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1393] = 7,
-    ACTIONS(218), 1,
+  [1227] = 1,
+    ACTIONS(250), 9,
+      anon_sym_GT,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_STAR,
+      anon_sym_QMARK,
+      anon_sym_PLUS,
+      anon_sym_COMMA,
+      anon_sym_PERCENT,
+      sym__S,
+  [1239] = 7,
+    ACTIONS(222), 1,
       anon_sym_AMP,
-    ACTIONS(220), 1,
+    ACTIONS(224), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(222), 1,
+    ACTIONS(226), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(292), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(296), 1,
-      aux_sym_AttValue_token1,
-    STATE(39), 2,
+    ACTIONS(252), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(254), 1,
+      aux_sym_PseudoAttValue_token2,
+    STATE(63), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat1,
-    STATE(136), 2,
+      aux_sym_PseudoAttValue_repeat2,
+    STATE(151), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1417] = 2,
-    ACTIONS(300), 3,
+  [1263] = 7,
+    ACTIONS(236), 1,
       anon_sym_AMP,
+    ACTIONS(238), 1,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(298), 6,
-      sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
+    ACTIONS(240), 1,
       anon_sym_AMP_POUNDx,
-      anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1431] = 2,
-    ACTIONS(304), 3,
+    ACTIONS(252), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(256), 1,
+      aux_sym_PseudoAttValue_token1,
+    STATE(67), 2,
+      sym__Reference,
+      aux_sym_PseudoAttValue_repeat1,
+    STATE(146), 2,
+      sym_EntityRef,
+      sym_CharRef,
+  [1287] = 1,
+    ACTIONS(258), 9,
+      anon_sym_GT,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_STAR,
+      anon_sym_QMARK,
+      anon_sym_PLUS,
+      anon_sym_COMMA,
+      anon_sym_PERCENT,
+      sym__S,
+  [1299] = 7,
+    ACTIONS(220), 1,
+      aux_sym_PseudoAttValue_token2,
+    ACTIONS(222), 1,
       anon_sym_AMP,
+    ACTIONS(224), 1,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(302), 6,
-      sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
+    ACTIONS(226), 1,
       anon_sym_AMP_POUNDx,
-      anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1445] = 2,
-    ACTIONS(308), 3,
+    ACTIONS(260), 1,
+      anon_sym_SQUOTE,
+    STATE(69), 2,
+      sym__Reference,
+      aux_sym_PseudoAttValue_repeat2,
+    STATE(151), 2,
+      sym_EntityRef,
+      sym_CharRef,
+  [1323] = 2,
+    ACTIONS(264), 3,
+      anon_sym_LT,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(306), 6,
+    ACTIONS(262), 6,
       sym_Comment,
       sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
       anon_sym_LT_QMARK,
       anon_sym_LT_SLASH,
-  [1459] = 2,
-    ACTIONS(312), 3,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(310), 6,
-      sym_Comment,
-      sym_CharData,
       anon_sym_LT_BANG_LBRACK,
       anon_sym_AMP_POUNDx,
-      anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1473] = 2,
-    ACTIONS(316), 3,
+  [1337] = 1,
+    ACTIONS(266), 9,
+      anon_sym_GT,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_STAR,
+      anon_sym_QMARK,
+      anon_sym_PLUS,
+      anon_sym_COMMA,
+      anon_sym_PERCENT,
+      sym__S,
+  [1349] = 7,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(268), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(270), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(274), 1,
+      anon_sym_POUNDFIXED,
+    STATE(367), 1,
+      sym_DefaultDecl,
+    ACTIONS(272), 2,
+      anon_sym_POUNDREQUIRED,
+      anon_sym_POUNDIMPLIED,
+    STATE(365), 2,
+      sym_PEReference,
+      sym_AttValue,
+  [1373] = 7,
+    ACTIONS(236), 1,
       anon_sym_AMP,
+    ACTIONS(238), 1,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(314), 6,
-      sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
+    ACTIONS(240), 1,
       anon_sym_AMP_POUNDx,
+    ACTIONS(260), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(276), 1,
+      aux_sym_PseudoAttValue_token1,
+    STATE(71), 2,
+      sym__Reference,
+      aux_sym_PseudoAttValue_repeat1,
+    STATE(146), 2,
+      sym_EntityRef,
+      sym_CharRef,
+  [1397] = 4,
+    ACTIONS(98), 1,
       anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1487] = 4,
-    ACTIONS(112), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(318), 1,
-      anon_sym_LT,
-    ACTIONS(163), 2,
+    ACTIONS(278), 1,
+      ts_builtin_sym_end,
+    ACTIONS(280), 2,
       sym_Comment,
       sym__S,
-    STATE(32), 5,
-      sym_PI,
+    STATE(85), 5,
       sym__Misc,
       sym_StyleSheetPI,
       sym_XmlModelPI,
+      sym_PI,
       aux_sym_document_repeat1,
-  [1505] = 4,
-    ACTIONS(112), 1,
+  [1415] = 4,
+    ACTIONS(98), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(318), 1,
-      anon_sym_LT,
-    ACTIONS(320), 2,
+    ACTIONS(282), 1,
+      ts_builtin_sym_end,
+    ACTIONS(128), 2,
       sym_Comment,
       sym__S,
-    STATE(73), 5,
-      sym_PI,
+    STATE(33), 5,
       sym__Misc,
       sym_StyleSheetPI,
       sym_XmlModelPI,
+      sym_PI,
       aux_sym_document_repeat1,
-  [1523] = 2,
-    ACTIONS(324), 3,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(322), 6,
-      sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
-      anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1537] = 4,
-    ACTIONS(112), 1,
+  [1433] = 4,
+    ACTIONS(98), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(326), 1,
-      ts_builtin_sym_end,
-    ACTIONS(328), 2,
+    ACTIONS(284), 1,
+      anon_sym_LT,
+    ACTIONS(128), 2,
       sym_Comment,
       sym__S,
-    STATE(46), 5,
-      sym_PI,
+    STATE(33), 5,
       sym__Misc,
       sym_StyleSheetPI,
       sym_XmlModelPI,
+      sym_PI,
       aux_sym_document_repeat1,
-  [1555] = 2,
-    ACTIONS(332), 3,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(330), 6,
-      sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
-      anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1569] = 1,
-    ACTIONS(334), 9,
-      anon_sym_GT,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_STAR,
-      anon_sym_QMARK,
-      anon_sym_PLUS,
-      anon_sym_COMMA,
-      anon_sym_PERCENT,
-      sym__S,
-  [1581] = 2,
-    ACTIONS(338), 3,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(336), 6,
-      sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
+  [1451] = 4,
+    ACTIONS(98), 1,
       anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1595] = 2,
-    ACTIONS(342), 3,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
+    ACTIONS(284), 1,
       anon_sym_LT,
-    ACTIONS(340), 6,
+    ACTIONS(286), 2,
       sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
+      sym__S,
+    STATE(84), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
+      sym_PI,
+      aux_sym_document_repeat1,
+  [1469] = 4,
+    ACTIONS(98), 1,
       anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1609] = 2,
-    ACTIONS(346), 3,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
+    ACTIONS(100), 1,
       anon_sym_LT,
-    ACTIONS(344), 6,
+    ACTIONS(288), 2,
       sym_Comment,
-      sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
-      anon_sym_LT_QMARK,
-      anon_sym_LT_SLASH,
-  [1623] = 1,
-    ACTIONS(348), 9,
-      anon_sym_GT,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_STAR,
-      anon_sym_QMARK,
-      anon_sym_PLUS,
-      anon_sym_COMMA,
-      anon_sym_PERCENT,
       sym__S,
-  [1635] = 4,
-    ACTIONS(112), 1,
+    STATE(83), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
+      sym_PI,
+      aux_sym_document_repeat1,
+  [1487] = 4,
+    ACTIONS(98), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(350), 1,
+    ACTIONS(290), 1,
       ts_builtin_sym_end,
-    ACTIONS(163), 2,
+    ACTIONS(292), 2,
       sym_Comment,
       sym__S,
-    STATE(32), 5,
-      sym_PI,
+    STATE(82), 5,
       sym__Misc,
       sym_StyleSheetPI,
       sym_XmlModelPI,
+      sym_PI,
       aux_sym_document_repeat1,
-  [1653] = 2,
-    ACTIONS(354), 3,
+  [1505] = 2,
+    ACTIONS(296), 3,
+      anon_sym_LT,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(352), 6,
+    ACTIONS(294), 6,
       sym_Comment,
       sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
       anon_sym_LT_QMARK,
       anon_sym_LT_SLASH,
-  [1667] = 4,
-    ACTIONS(112), 1,
-      anon_sym_LT_QMARK,
-    ACTIONS(356), 1,
-      anon_sym_LT,
-    ACTIONS(163), 2,
-      sym_Comment,
-      sym__S,
-    STATE(32), 5,
-      sym_PI,
-      sym__Misc,
-      sym_StyleSheetPI,
-      sym_XmlModelPI,
-      aux_sym_document_repeat1,
-  [1685] = 1,
-    ACTIONS(358), 9,
-      anon_sym_GT,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_STAR,
-      anon_sym_QMARK,
-      anon_sym_PLUS,
-      anon_sym_COMMA,
-      anon_sym_PERCENT,
-      sym__S,
-  [1697] = 7,
-    ACTIONS(216), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(266), 1,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1519] = 7,
+    ACTIONS(220), 1,
+      aux_sym_PseudoAttValue_token2,
+    ACTIONS(222), 1,
       anon_sym_AMP,
-    ACTIONS(268), 1,
+    ACTIONS(224), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(270), 1,
+    ACTIONS(226), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(272), 1,
-      aux_sym_AttValue_token2,
-    STATE(43), 2,
+    ACTIONS(298), 1,
+      anon_sym_SQUOTE,
+    STATE(69), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat2,
-    STATE(146), 2,
+      aux_sym_PseudoAttValue_repeat2,
+    STATE(151), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1721] = 7,
-    ACTIONS(218), 1,
+  [1543] = 2,
+    ACTIONS(302), 3,
+      anon_sym_LT,
       anon_sym_AMP,
-    ACTIONS(220), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(222), 1,
+    ACTIONS(300), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
       anon_sym_AMP_POUNDx,
-    ACTIONS(224), 1,
-      aux_sym_AttValue_token1,
-    ACTIONS(360), 1,
-      anon_sym_DQUOTE,
-    STATE(35), 2,
-      sym__Reference,
-      aux_sym_AttValue_repeat1,
-    STATE(136), 2,
-      sym_EntityRef,
-      sym_CharRef,
-  [1745] = 7,
+  [1557] = 7,
     ACTIONS(218), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(236), 1,
       anon_sym_AMP,
-    ACTIONS(220), 1,
+    ACTIONS(238), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(222), 1,
+    ACTIONS(240), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(362), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(364), 1,
-      aux_sym_AttValue_token1,
-    STATE(83), 2,
+    ACTIONS(276), 1,
+      aux_sym_PseudoAttValue_token1,
+    STATE(71), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat1,
-    STATE(136), 2,
+      aux_sym_PseudoAttValue_repeat1,
+    STATE(146), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1769] = 7,
-    ACTIONS(266), 1,
+  [1581] = 2,
+    ACTIONS(306), 3,
+      anon_sym_LT,
       anon_sym_AMP,
-    ACTIONS(268), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(270), 1,
+    ACTIONS(304), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
       anon_sym_AMP_POUNDx,
-    ACTIONS(362), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(366), 1,
-      aux_sym_AttValue_token2,
-    STATE(48), 2,
+  [1595] = 7,
+    ACTIONS(236), 1,
+      anon_sym_AMP,
+    ACTIONS(238), 1,
+      anon_sym_AMP_POUND,
+    ACTIONS(240), 1,
+      anon_sym_AMP_POUNDx,
+    ACTIONS(276), 1,
+      aux_sym_PseudoAttValue_token1,
+    ACTIONS(298), 1,
+      anon_sym_DQUOTE,
+    STATE(71), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat2,
+      aux_sym_PseudoAttValue_repeat1,
     STATE(146), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1793] = 1,
-    ACTIONS(368), 9,
+  [1619] = 1,
+    ACTIONS(308), 9,
       anon_sym_GT,
       anon_sym_PIPE,
       anon_sym_RPAREN,
@@ -4997,167 +4801,309 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [1805] = 7,
-    ACTIONS(266), 1,
+  [1631] = 7,
+    ACTIONS(310), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(312), 1,
+      aux_sym_PseudoAttValue_token2,
+    ACTIONS(315), 1,
       anon_sym_AMP,
-    ACTIONS(268), 1,
+    ACTIONS(318), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(270), 1,
+    ACTIONS(321), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(272), 1,
-      aux_sym_AttValue_token2,
-    ACTIONS(360), 1,
-      anon_sym_SQUOTE,
-    STATE(43), 2,
+    STATE(69), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat2,
-    STATE(146), 2,
+      aux_sym_PseudoAttValue_repeat2,
+    STATE(151), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1829] = 2,
-    ACTIONS(372), 3,
+  [1655] = 2,
+    ACTIONS(326), 3,
+      anon_sym_LT,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-      anon_sym_LT,
-    ACTIONS(370), 6,
+    ACTIONS(324), 6,
       sym_Comment,
       sym_CharData,
-      anon_sym_LT_BANG_LBRACK,
-      anon_sym_AMP_POUNDx,
       anon_sym_LT_QMARK,
       anon_sym_LT_SLASH,
-  [1843] = 1,
-    ACTIONS(374), 9,
-      anon_sym_GT,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_STAR,
-      anon_sym_QMARK,
-      anon_sym_PLUS,
-      anon_sym_COMMA,
-      anon_sym_PERCENT,
-      sym__S,
-  [1855] = 7,
-    ACTIONS(218), 1,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1669] = 7,
+    ACTIONS(328), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(330), 1,
+      aux_sym_PseudoAttValue_token1,
+    ACTIONS(333), 1,
       anon_sym_AMP,
-    ACTIONS(220), 1,
+    ACTIONS(336), 1,
       anon_sym_AMP_POUND,
-    ACTIONS(222), 1,
+    ACTIONS(339), 1,
       anon_sym_AMP_POUNDx,
-    ACTIONS(224), 1,
-      aux_sym_AttValue_token1,
-    ACTIONS(264), 1,
-      anon_sym_DQUOTE,
-    STATE(35), 2,
+    STATE(71), 2,
       sym__Reference,
-      aux_sym_AttValue_repeat1,
-    STATE(136), 2,
+      aux_sym_PseudoAttValue_repeat1,
+    STATE(146), 2,
       sym_EntityRef,
       sym_CharRef,
-  [1879] = 7,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(378), 1,
-      anon_sym_POUNDFIXED,
-    ACTIONS(380), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(382), 1,
-      anon_sym_SQUOTE,
-    STATE(367), 1,
-      sym_DefaultDecl,
-    ACTIONS(376), 2,
-      anon_sym_POUNDREQUIRED,
-      anon_sym_POUNDIMPLIED,
-    STATE(365), 2,
+  [1693] = 4,
+    ACTIONS(98), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(342), 1,
+      ts_builtin_sym_end,
+    ACTIONS(344), 2,
+      sym_Comment,
+      sym__S,
+    STATE(57), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
+      sym_PI,
+      aux_sym_document_repeat1,
+  [1711] = 6,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(348), 1,
+      anon_sym_LPAREN,
+    STATE(135), 1,
+      sym__choice,
+    STATE(323), 1,
+      sym_contentspec,
+    ACTIONS(346), 2,
+      anon_sym_EMPTY,
+      anon_sym_ANY,
+    STATE(326), 3,
+      sym_Mixed,
+      sym_children,
       sym_PEReference,
-      sym_AttValue,
-  [1903] = 4,
-    ACTIONS(112), 1,
+  [1733] = 4,
+    ACTIONS(98), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(126), 1,
+      anon_sym_LT,
+    ACTIONS(350), 2,
+      sym_Comment,
+      sym__S,
+    STATE(58), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
+      sym_PI,
+      aux_sym_document_repeat1,
+  [1751] = 2,
+    ACTIONS(354), 3,
+      anon_sym_LT,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(352), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1765] = 2,
+    ACTIONS(358), 3,
+      anon_sym_LT,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(356), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1779] = 2,
+    ACTIONS(362), 3,
+      anon_sym_LT,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(360), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1793] = 2,
+    ACTIONS(366), 3,
+      anon_sym_LT,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(364), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1807] = 2,
+    ACTIONS(370), 3,
+      anon_sym_LT,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(368), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1821] = 2,
+    ACTIONS(374), 3,
+      anon_sym_LT,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(372), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1835] = 2,
+    ACTIONS(378), 3,
+      anon_sym_LT,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(376), 6,
+      sym_Comment,
+      sym_CharData,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_SLASH,
+      anon_sym_LT_BANG_LBRACK,
+      anon_sym_AMP_POUNDx,
+  [1849] = 4,
+    ACTIONS(98), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(380), 1,
+      ts_builtin_sym_end,
+    ACTIONS(128), 2,
+      sym_Comment,
+      sym__S,
+    STATE(33), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
+      sym_PI,
+      aux_sym_document_repeat1,
+  [1867] = 4,
+    ACTIONS(98), 1,
       anon_sym_LT_QMARK,
-    ACTIONS(165), 1,
+    ACTIONS(126), 1,
       anon_sym_LT,
-    ACTIONS(384), 2,
+    ACTIONS(128), 2,
       sym_Comment,
       sym__S,
-    STATE(61), 5,
+    STATE(33), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
+      sym_PI,
+      aux_sym_document_repeat1,
+  [1885] = 4,
+    ACTIONS(98), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(382), 1,
+      anon_sym_LT,
+    ACTIONS(128), 2,
+      sym_Comment,
+      sym__S,
+    STATE(33), 5,
+      sym__Misc,
+      sym_StyleSheetPI,
+      sym_XmlModelPI,
       sym_PI,
+      aux_sym_document_repeat1,
+  [1903] = 4,
+    ACTIONS(98), 1,
+      anon_sym_LT_QMARK,
+    ACTIONS(384), 1,
+      ts_builtin_sym_end,
+    ACTIONS(128), 2,
+      sym_Comment,
+      sym__S,
+    STATE(33), 5,
       sym__Misc,
       sym_StyleSheetPI,
       sym_XmlModelPI,
+      sym_PI,
       aux_sym_document_repeat1,
   [1921] = 6,
-    ACTIONS(159), 1,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
     ACTIONS(388), 1,
       anon_sym_RPAREN,
     ACTIONS(390), 1,
       sym__S,
-    STATE(90), 1,
+    STATE(89), 1,
       aux_sym__choice_repeat1,
     ACTIONS(386), 2,
       anon_sym_PIPE,
       anon_sym_COMMA,
-    STATE(144), 2,
+    STATE(138), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [1942] = 6,
-    ACTIONS(159), 1,
+  [1942] = 2,
+    ACTIONS(132), 3,
+      anon_sym_STAR,
+      anon_sym_QMARK,
+      anon_sym_PLUS,
+    ACTIONS(130), 5,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_PERCENT,
+      sym__S,
+  [1955] = 6,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
     ACTIONS(392), 1,
       anon_sym_RPAREN,
     ACTIONS(394), 1,
       sym__S,
-    STATE(88), 1,
+    STATE(90), 1,
       aux_sym__choice_repeat1,
     ACTIONS(386), 2,
       anon_sym_PIPE,
       anon_sym_COMMA,
-    STATE(152), 2,
+    STATE(132), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [1963] = 6,
-    ACTIONS(159), 1,
+  [1976] = 6,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(388), 1,
+    ACTIONS(396), 1,
       anon_sym_RPAREN,
-    ACTIONS(390), 1,
+    ACTIONS(398), 1,
       sym__S,
-    STATE(100), 1,
+    STATE(118), 1,
       aux_sym__choice_repeat1,
     ACTIONS(386), 2,
       anon_sym_PIPE,
       anon_sym_COMMA,
-    STATE(144), 2,
+    STATE(158), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [1984] = 2,
-    ACTIONS(135), 3,
-      anon_sym_STAR,
-      anon_sym_QMARK,
-      anon_sym_PLUS,
-    ACTIONS(133), 5,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-      anon_sym_PERCENT,
-      sym__S,
   [1997] = 6,
-    ACTIONS(159), 1,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(396), 1,
+    ACTIONS(388), 1,
       anon_sym_RPAREN,
-    ACTIONS(398), 1,
+    ACTIONS(390), 1,
       sym__S,
-    STATE(100), 1,
+    STATE(118), 1,
       aux_sym__choice_repeat1,
     ACTIONS(386), 2,
       anon_sym_PIPE,
       anon_sym_COMMA,
-    STATE(133), 2,
+    STATE(138), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
   [2018] = 8,
-    ACTIONS(159), 1,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
     ACTIONS(400), 1,
       sym_Name,
@@ -5167,43 +5113,43 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_POUNDPCDATA,
     ACTIONS(406), 1,
       sym__S,
-    STATE(26), 1,
+    STATE(24), 1,
       sym_PEReference,
     STATE(87), 1,
-      sym__cp,
-    STATE(89), 1,
       sym__choice,
-  [2043] = 6,
-    ACTIONS(159), 1,
+    STATE(88), 1,
+      sym__cp,
+  [2043] = 7,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(408), 1,
+      anon_sym_PIPE,
+    ACTIONS(410), 1,
+      anon_sym_RPAREN,
+    ACTIONS(412), 1,
+      sym__S,
+    STATE(96), 1,
+      aux_sym_Mixed_repeat1,
+    STATE(166), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(269), 1,
+      sym_PEReference,
+  [2065] = 6,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
     ACTIONS(400), 1,
       sym_Name,
     ACTIONS(402), 1,
       anon_sym_LPAREN,
-    ACTIONS(408), 1,
+    ACTIONS(414), 1,
       sym__S,
-    STATE(127), 1,
+    STATE(88), 1,
       sym__cp,
-    STATE(89), 2,
+    STATE(87), 2,
       sym__choice,
       sym_PEReference,
-  [2063] = 7,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(410), 1,
-      anon_sym_PIPE,
-    ACTIONS(412), 1,
-      anon_sym_RPAREN,
-    ACTIONS(414), 1,
-      sym__S,
-    STATE(99), 1,
-      aux_sym_Mixed_repeat1,
-    STATE(177), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(270), 1,
-      sym_PEReference,
   [2085] = 6,
-    ACTIONS(159), 1,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
     ACTIONS(400), 1,
       sym_Name,
@@ -5211,1932 +5157,1932 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LPAREN,
     ACTIONS(416), 1,
       sym__S,
-    STATE(142), 1,
+    STATE(154), 1,
       sym__cp,
-    STATE(89), 2,
+    STATE(87), 2,
       sym__choice,
       sym_PEReference,
   [2105] = 7,
-    ACTIONS(159), 1,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(410), 1,
+    ACTIONS(408), 1,
       anon_sym_PIPE,
     ACTIONS(418), 1,
       anon_sym_RPAREN,
     ACTIONS(420), 1,
       sym__S,
-    STATE(156), 1,
+    STATE(134), 1,
       aux_sym_Mixed_repeat1,
-    STATE(180), 1,
+    STATE(207), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
   [2127] = 7,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(400), 1,
-      sym_Name,
-    ACTIONS(402), 1,
-      anon_sym_LPAREN,
-    ACTIONS(422), 1,
-      anon_sym_POUNDPCDATA,
-    STATE(23), 1,
-      sym_PEReference,
-    STATE(86), 1,
-      sym__cp,
-    STATE(89), 1,
-      sym__choice,
-  [2149] = 7,
-    ACTIONS(159), 1,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(410), 1,
+    ACTIONS(408), 1,
       anon_sym_PIPE,
-    ACTIONS(424), 1,
+    ACTIONS(422), 1,
       anon_sym_RPAREN,
-    ACTIONS(426), 1,
+    ACTIONS(424), 1,
       sym__S,
-    STATE(95), 1,
+    STATE(134), 1,
       aux_sym_Mixed_repeat1,
-    STATE(169), 1,
+    STATE(195), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-  [2171] = 6,
-    ACTIONS(159), 1,
+  [2149] = 6,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
     ACTIONS(400), 1,
       sym_Name,
     ACTIONS(402), 1,
       anon_sym_LPAREN,
-    ACTIONS(428), 1,
+    ACTIONS(426), 1,
       sym__S,
-    STATE(87), 1,
+    STATE(139), 1,
       sym__cp,
-    STATE(89), 2,
+    STATE(87), 2,
       sym__choice,
       sym_PEReference,
+  [2169] = 7,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(400), 1,
+      sym_Name,
+    ACTIONS(402), 1,
+      anon_sym_LPAREN,
+    ACTIONS(428), 1,
+      anon_sym_POUNDPCDATA,
+    STATE(28), 1,
+      sym_PEReference,
+    STATE(86), 1,
+      sym__cp,
+    STATE(87), 1,
+      sym__choice,
   [2191] = 7,
-    ACTIONS(159), 1,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(410), 1,
+    ACTIONS(408), 1,
       anon_sym_PIPE,
     ACTIONS(430), 1,
       anon_sym_RPAREN,
     ACTIONS(432), 1,
       sym__S,
-    STATE(156), 1,
+    STATE(95), 1,
       aux_sym_Mixed_repeat1,
-    STATE(203), 1,
+    STATE(185), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
-      sym_PEReference,
-  [2213] = 4,
-    ACTIONS(439), 1,
-      sym__S,
-    STATE(100), 1,
-      aux_sym__choice_repeat1,
-    ACTIONS(434), 2,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-    ACTIONS(437), 2,
-      anon_sym_RPAREN,
-      anon_sym_PERCENT,
-  [2228] = 5,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(400), 1,
-      sym_Name,
-    ACTIONS(402), 1,
-      anon_sym_LPAREN,
-    STATE(130), 1,
-      sym__cp,
-    STATE(89), 2,
-      sym__choice,
+    STATE(269), 1,
       sym_PEReference,
-  [2245] = 2,
-    ACTIONS(354), 2,
+  [2213] = 6,
+    ACTIONS(434), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(436), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(438), 1,
+      anon_sym_SYSTEM,
+    ACTIONS(440), 1,
+      anon_sym_PUBLIC,
+    STATE(248), 1,
+      sym_ExternalID,
+    STATE(310), 1,
+      sym_EntityValue,
+  [2232] = 2,
+    ACTIONS(216), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(352), 4,
+    ACTIONS(214), 4,
+      anon_sym_DQUOTE,
       anon_sym_PERCENT,
-      anon_sym_SQUOTE,
-      aux_sym_EntityValue_token2,
+      aux_sym_EntityValue_token1,
       anon_sym_AMP_POUNDx,
-  [2256] = 2,
-    ACTIONS(234), 2,
+  [2243] = 2,
+    ACTIONS(216), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(232), 4,
-      anon_sym_PERCENT,
+    ACTIONS(214), 4,
       anon_sym_SQUOTE,
+      anon_sym_PERCENT,
       aux_sym_EntityValue_token2,
       anon_sym_AMP_POUNDx,
-  [2267] = 2,
-    ACTIONS(442), 2,
+  [2254] = 2,
+    ACTIONS(370), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(194), 4,
-      anon_sym_PERCENT,
+    ACTIONS(368), 4,
       anon_sym_SQUOTE,
+      anon_sym_PERCENT,
       aux_sym_EntityValue_token2,
       anon_sym_AMP_POUNDx,
-  [2278] = 2,
-    ACTIONS(342), 2,
+  [2265] = 2,
+    ACTIONS(362), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(340), 4,
+    ACTIONS(360), 4,
+      anon_sym_SQUOTE,
       anon_sym_PERCENT,
-      anon_sym_DQUOTE,
-      aux_sym_EntityValue_token1,
+      aux_sym_EntityValue_token2,
       anon_sym_AMP_POUNDx,
-  [2289] = 2,
-    ACTIONS(354), 2,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-    ACTIONS(352), 4,
-      anon_sym_PERCENT,
+  [2276] = 2,
+    ACTIONS(444), 1,
+      anon_sym_LT,
+    ACTIONS(442), 5,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG,
+      sym__S,
+  [2287] = 5,
+    ACTIONS(434), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(436), 1,
       anon_sym_DQUOTE,
-      aux_sym_EntityValue_token1,
-      anon_sym_AMP_POUNDx,
-  [2300] = 2,
-    ACTIONS(234), 2,
+    ACTIONS(438), 1,
+      anon_sym_SYSTEM,
+    ACTIONS(440), 1,
+      anon_sym_PUBLIC,
+    STATE(302), 2,
+      sym_EntityValue,
+      sym_ExternalID,
+  [2304] = 2,
+    ACTIONS(448), 1,
+      anon_sym_LT,
+    ACTIONS(446), 5,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG,
+      sym__S,
+  [2315] = 2,
+    ACTIONS(452), 1,
+      anon_sym_LT,
+    ACTIONS(450), 5,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG,
+      sym__S,
+  [2326] = 5,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(438), 1,
+      anon_sym_SYSTEM,
+    ACTIONS(454), 1,
+      anon_sym_PUBLIC,
+    STATE(438), 1,
+      sym_PEReference,
+    STATE(314), 2,
+      sym_ExternalID,
+      sym_PublicID,
+  [2343] = 2,
+    ACTIONS(456), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(232), 4,
-      anon_sym_PERCENT,
+    ACTIONS(194), 4,
       anon_sym_DQUOTE,
+      anon_sym_PERCENT,
       aux_sym_EntityValue_token1,
       anon_sym_AMP_POUNDx,
-  [2311] = 2,
-    ACTIONS(280), 1,
+  [2354] = 2,
+    ACTIONS(358), 1,
       anon_sym_LT,
-    ACTIONS(278), 5,
+    ACTIONS(356), 5,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG,
       sym__S,
-      anon_sym_LT_QMARK,
-  [2322] = 2,
-    ACTIONS(442), 2,
+  [2365] = 5,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(400), 1,
+      sym_Name,
+    ACTIONS(402), 1,
+      anon_sym_LPAREN,
+    STATE(86), 1,
+      sym__cp,
+    STATE(87), 2,
+      sym__choice,
+      sym_PEReference,
+  [2382] = 2,
+    ACTIONS(456), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
     ACTIONS(194), 4,
+      anon_sym_SQUOTE,
       anon_sym_PERCENT,
+      aux_sym_EntityValue_token2,
+      anon_sym_AMP_POUNDx,
+  [2393] = 2,
+    ACTIONS(370), 2,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(368), 4,
       anon_sym_DQUOTE,
+      anon_sym_PERCENT,
       aux_sym_EntityValue_token1,
       anon_sym_AMP_POUNDx,
-  [2333] = 2,
-    ACTIONS(342), 2,
+  [2404] = 2,
+    ACTIONS(362), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(340), 4,
+    ACTIONS(360), 4,
+      anon_sym_DQUOTE,
       anon_sym_PERCENT,
-      anon_sym_SQUOTE,
-      aux_sym_EntityValue_token2,
+      aux_sym_EntityValue_token1,
       anon_sym_AMP_POUNDx,
-  [2344] = 2,
-    ACTIONS(446), 1,
+  [2415] = 5,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(400), 1,
+      sym_Name,
+    ACTIONS(402), 1,
+      anon_sym_LPAREN,
+    STATE(154), 1,
+      sym__cp,
+    STATE(87), 2,
+      sym__choice,
+      sym_PEReference,
+  [2432] = 2,
+    ACTIONS(460), 1,
       anon_sym_LT,
-    ACTIONS(444), 5,
+    ACTIONS(458), 5,
       sym_Comment,
       ts_builtin_sym_end,
-      anon_sym_LT_BANG,
-      sym__S,
       anon_sym_LT_QMARK,
-  [2355] = 2,
-    ACTIONS(316), 1,
-      anon_sym_LT,
-    ACTIONS(314), 5,
-      sym_Comment,
-      ts_builtin_sym_end,
       anon_sym_LT_BANG,
       sym__S,
-      anon_sym_LT_QMARK,
-  [2366] = 2,
-    ACTIONS(450), 1,
-      anon_sym_LT,
-    ACTIONS(448), 5,
-      sym_Comment,
-      ts_builtin_sym_end,
-      anon_sym_LT_BANG,
+  [2443] = 4,
+    ACTIONS(467), 1,
       sym__S,
-      anon_sym_LT_QMARK,
-  [2377] = 5,
-    ACTIONS(159), 1,
+    STATE(118), 1,
+      aux_sym__choice_repeat1,
+    ACTIONS(462), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+    ACTIONS(465), 2,
+      anon_sym_RPAREN,
+      anon_sym_PERCENT,
+  [2458] = 5,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
     ACTIONS(400), 1,
       sym_Name,
     ACTIONS(402), 1,
       anon_sym_LPAREN,
-    STATE(142), 1,
+    STATE(155), 1,
       sym__cp,
-    STATE(89), 2,
+    STATE(87), 2,
       sym__choice,
       sym_PEReference,
-  [2394] = 5,
-    ACTIONS(159), 1,
+  [2475] = 6,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(452), 1,
-      anon_sym_SYSTEM,
-    ACTIONS(454), 1,
-      anon_sym_PUBLIC,
-    STATE(412), 1,
+    ACTIONS(470), 1,
+      sym_Name,
+    ACTIONS(472), 1,
+      anon_sym_PIPE,
+    ACTIONS(474), 1,
+      sym__S,
+    STATE(124), 1,
+      aux_sym_NotationType_repeat1,
+    STATE(349), 1,
       sym_PEReference,
-    STATE(332), 2,
-      sym_ExternalID,
-      sym_PublicID,
-  [2411] = 6,
-    ACTIONS(452), 1,
-      anon_sym_SYSTEM,
-    ACTIONS(456), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(458), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(460), 1,
-      anon_sym_PUBLIC,
-    STATE(248), 1,
-      sym_ExternalID,
-    STATE(327), 1,
-      sym_EntityValue,
-  [2430] = 2,
-    ACTIONS(464), 1,
+  [2494] = 2,
+    ACTIONS(478), 1,
       anon_sym_LT,
-    ACTIONS(462), 5,
+    ACTIONS(476), 5,
       sym_Comment,
       ts_builtin_sym_end,
-      anon_sym_LT_BANG,
-      sym__S,
       anon_sym_LT_QMARK,
-  [2441] = 2,
-    ACTIONS(468), 1,
-      anon_sym_LT,
-    ACTIONS(466), 5,
-      sym_Comment,
-      ts_builtin_sym_end,
       anon_sym_LT_BANG,
       sym__S,
-      anon_sym_LT_QMARK,
-  [2452] = 2,
+  [2505] = 6,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
     ACTIONS(472), 1,
+      anon_sym_PIPE,
+    ACTIONS(474), 1,
+      sym__S,
+    ACTIONS(480), 1,
+      sym_Name,
+    STATE(125), 1,
+      aux_sym_NotationType_repeat1,
+    STATE(343), 1,
+      sym_PEReference,
+  [2524] = 2,
+    ACTIONS(484), 1,
       anon_sym_LT,
-    ACTIONS(470), 5,
+    ACTIONS(482), 5,
       sym_Comment,
       ts_builtin_sym_end,
-      anon_sym_LT_BANG,
-      sym__S,
       anon_sym_LT_QMARK,
-  [2463] = 6,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(474), 1,
-      sym_Name,
-    ACTIONS(476), 1,
-      anon_sym_PIPE,
-    ACTIONS(478), 1,
+      anon_sym_LT_BANG,
       sym__S,
-    STATE(135), 1,
-      aux_sym_NotationType_repeat1,
-    STATE(331), 1,
-      sym_PEReference,
-  [2482] = 6,
-    ACTIONS(159), 1,
+  [2535] = 6,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(476), 1,
+    ACTIONS(472), 1,
       anon_sym_PIPE,
-    ACTIONS(478), 1,
+    ACTIONS(474), 1,
       sym__S,
     ACTIONS(480), 1,
       sym_Name,
-    STATE(135), 1,
+    STATE(153), 1,
       aux_sym_NotationType_repeat1,
-    STATE(336), 1,
+    STATE(343), 1,
       sym_PEReference,
-  [2501] = 6,
-    ACTIONS(159), 1,
+  [2554] = 6,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(476), 1,
+    ACTIONS(472), 1,
       anon_sym_PIPE,
-    ACTIONS(478), 1,
+    ACTIONS(474), 1,
       sym__S,
-    ACTIONS(482), 1,
+    ACTIONS(486), 1,
       sym_Name,
-    STATE(121), 1,
+    STATE(153), 1,
       aux_sym_NotationType_repeat1,
-    STATE(347), 1,
-      sym_PEReference,
-  [2520] = 5,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(400), 1,
-      sym_Name,
-    ACTIONS(402), 1,
-      anon_sym_LPAREN,
-    STATE(86), 1,
-      sym__cp,
-    STATE(89), 2,
-      sym__choice,
+    STATE(339), 1,
       sym_PEReference,
-  [2537] = 2,
-    ACTIONS(486), 1,
+  [2573] = 2,
+    ACTIONS(208), 1,
       anon_sym_LT,
-    ACTIONS(484), 5,
+    ACTIONS(206), 5,
       sym_Comment,
       ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       anon_sym_LT_BANG,
       sym__S,
+  [2584] = 2,
+    ACTIONS(490), 1,
+      anon_sym_LT,
+    ACTIONS(488), 4,
+      sym_Comment,
       anon_sym_LT_QMARK,
-  [2548] = 6,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(476), 1,
-      anon_sym_PIPE,
-    ACTIONS(478), 1,
+      anon_sym_LT_BANG,
       sym__S,
-    ACTIONS(480), 1,
-      sym_Name,
-    STATE(120), 1,
-      aux_sym_NotationType_repeat1,
-    STATE(336), 1,
-      sym_PEReference,
-  [2567] = 5,
-    ACTIONS(452), 1,
-      anon_sym_SYSTEM,
-    ACTIONS(456), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(458), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(460), 1,
-      anon_sym_PUBLIC,
-    STATE(302), 2,
-      sym_EntityValue,
-      sym_ExternalID,
-  [2584] = 1,
-    ACTIONS(437), 5,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
+  [2594] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-      sym__S,
-  [2592] = 1,
-    ACTIONS(488), 5,
-      anon_sym_PIPE,
+    ACTIONS(388), 1,
       anon_sym_RPAREN,
+    STATE(228), 1,
+      sym_PEReference,
+    ACTIONS(492), 2,
+      anon_sym_PIPE,
       anon_sym_COMMA,
-      anon_sym_PERCENT,
-      sym__S,
-  [2600] = 2,
-    ACTIONS(492), 1,
-      anon_sym_LT,
-    ACTIONS(490), 4,
-      sym_Comment,
-      anon_sym_LT_BANG,
-      sym__S,
-      anon_sym_LT_QMARK,
-  [2610] = 1,
+  [2608] = 1,
     ACTIONS(494), 5,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_COMMA,
       anon_sym_PERCENT,
       sym__S,
-  [2618] = 4,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(396), 1,
-      anon_sym_RPAREN,
-    STATE(244), 1,
-      sym_PEReference,
-    ACTIONS(496), 2,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-  [2632] = 5,
-    ACTIONS(159), 1,
+  [2616] = 5,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(412), 1,
+    ACTIONS(430), 1,
       anon_sym_RPAREN,
-    ACTIONS(498), 1,
+    ACTIONS(496), 1,
       anon_sym_PIPE,
-    STATE(177), 1,
+    STATE(185), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-  [2648] = 4,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
+  [2632] = 2,
     ACTIONS(500), 1,
+      anon_sym_LT,
+    ACTIONS(498), 4,
+      sym_Comment,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG,
+      sym__S,
+  [2642] = 4,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(388), 1,
       anon_sym_RPAREN,
     ACTIONS(502), 1,
       sym__S,
-    STATE(143), 2,
+    STATE(141), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [2662] = 2,
-    ACTIONS(506), 1,
-      anon_sym_LT,
-    ACTIONS(504), 4,
-      sym_Comment,
-      anon_sym_LT_BANG,
-      sym__S,
-      anon_sym_LT_QMARK,
+  [2656] = 5,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(418), 1,
+      anon_sym_RPAREN,
+    ACTIONS(496), 1,
+      anon_sym_PIPE,
+    STATE(207), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(269), 1,
+      sym_PEReference,
   [2672] = 4,
-    ACTIONS(510), 1,
+    ACTIONS(504), 1,
       anon_sym_PIPE,
-    ACTIONS(513), 1,
+    ACTIONS(509), 1,
       sym__S,
-    STATE(135), 1,
-      aux_sym_NotationType_repeat1,
-    ACTIONS(508), 2,
+    STATE(134), 1,
+      aux_sym_Mixed_repeat1,
+    ACTIONS(507), 2,
+      anon_sym_RPAREN,
       anon_sym_PERCENT,
-      sym_Name,
   [2686] = 2,
-    ACTIONS(234), 2,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-    ACTIONS(232), 3,
-      anon_sym_DQUOTE,
-      anon_sym_AMP_POUNDx,
-      aux_sym_AttValue_token1,
-  [2696] = 4,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(500), 1,
-      anon_sym_RPAREN,
-    STATE(244), 1,
-      sym_PEReference,
-    ACTIONS(496), 2,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-  [2710] = 2,
-    ACTIONS(516), 2,
+    ACTIONS(512), 2,
       anon_sym_GT,
       sym__S,
-    ACTIONS(518), 3,
+    ACTIONS(514), 3,
       anon_sym_STAR,
       anon_sym_QMARK,
       anon_sym_PLUS,
-  [2720] = 2,
-    ACTIONS(354), 2,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-    ACTIONS(352), 3,
-      anon_sym_DQUOTE,
-      anon_sym_AMP_POUNDx,
-      aux_sym_AttValue_token1,
-  [2730] = 2,
-    ACTIONS(342), 2,
-      anon_sym_AMP,
-      anon_sym_AMP_POUND,
-    ACTIONS(340), 3,
-      anon_sym_DQUOTE,
-      anon_sym_AMP_POUNDx,
-      aux_sym_AttValue_token1,
-  [2740] = 5,
-    ACTIONS(159), 1,
+  [2696] = 5,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(498), 1,
+    ACTIONS(496), 1,
       anon_sym_PIPE,
-    ACTIONS(520), 1,
+    ACTIONS(516), 1,
       anon_sym_RPAREN,
-    STATE(159), 1,
+    STATE(206), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-  [2756] = 1,
-    ACTIONS(522), 5,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
+  [2712] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-      sym__S,
-  [2764] = 4,
-    ACTIONS(524), 1,
+    ACTIONS(396), 1,
       anon_sym_RPAREN,
-    ACTIONS(526), 1,
+    STATE(228), 1,
+      sym_PEReference,
+    ACTIONS(492), 2,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+  [2726] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(529), 1,
+    ACTIONS(396), 1,
+      anon_sym_RPAREN,
+    ACTIONS(518), 1,
       sym__S,
-    STATE(143), 2,
+    STATE(141), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [2778] = 4,
-    ACTIONS(159), 1,
+  [2740] = 1,
+    ACTIONS(465), 5,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
       anon_sym_PERCENT,
-    ACTIONS(396), 1,
+      sym__S,
+  [2748] = 2,
+    ACTIONS(522), 1,
+      anon_sym_LT,
+    ACTIONS(520), 4,
+      sym_Comment,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG,
+      sym__S,
+  [2758] = 4,
+    ACTIONS(524), 1,
       anon_sym_RPAREN,
-    ACTIONS(532), 1,
+    ACTIONS(526), 1,
+      anon_sym_PERCENT,
+    ACTIONS(529), 1,
       sym__S,
-    STATE(143), 2,
+    STATE(141), 2,
       sym_PEReference,
       aux_sym__choice_repeat2,
-  [2792] = 1,
+  [2772] = 1,
     ACTIONS(194), 5,
       sym_Comment,
-      anon_sym_LT_BANG,
-      sym__S,
       anon_sym_LT_QMARK,
+      anon_sym_LT_BANG,
       anon_sym_RBRACK,
-  [2800] = 2,
-    ACTIONS(234), 2,
+      sym__S,
+  [2780] = 5,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(496), 1,
+      anon_sym_PIPE,
+    ACTIONS(532), 1,
+      anon_sym_RPAREN,
+    STATE(191), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(269), 1,
+      sym_PEReference,
+  [2796] = 2,
+    ACTIONS(362), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(232), 3,
-      anon_sym_SQUOTE,
+    ACTIONS(360), 3,
+      anon_sym_DQUOTE,
+      aux_sym_PseudoAttValue_token1,
+      anon_sym_AMP_POUNDx,
+  [2806] = 2,
+    ACTIONS(370), 2,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(368), 3,
+      anon_sym_DQUOTE,
+      aux_sym_PseudoAttValue_token1,
       anon_sym_AMP_POUNDx,
-      aux_sym_AttValue_token2,
-  [2810] = 2,
-    ACTIONS(354), 2,
+  [2816] = 2,
+    ACTIONS(216), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(352), 3,
+    ACTIONS(214), 3,
+      anon_sym_DQUOTE,
+      aux_sym_PseudoAttValue_token1,
+      anon_sym_AMP_POUNDx,
+  [2826] = 2,
+    ACTIONS(362), 2,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(360), 3,
       anon_sym_SQUOTE,
+      aux_sym_PseudoAttValue_token2,
       anon_sym_AMP_POUNDx,
-      aux_sym_AttValue_token2,
-  [2820] = 2,
-    ACTIONS(342), 2,
+  [2836] = 2,
+    ACTIONS(370), 2,
       anon_sym_AMP,
       anon_sym_AMP_POUND,
-    ACTIONS(340), 3,
+    ACTIONS(368), 3,
       anon_sym_SQUOTE,
+      aux_sym_PseudoAttValue_token2,
       anon_sym_AMP_POUNDx,
-      aux_sym_AttValue_token2,
-  [2830] = 4,
-    ACTIONS(159), 1,
+  [2846] = 2,
+    ACTIONS(536), 1,
+      anon_sym_LT,
+    ACTIONS(534), 4,
+      sym_Comment,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG,
+      sym__S,
+  [2856] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(388), 1,
+    ACTIONS(538), 1,
       anon_sym_RPAREN,
-    STATE(244), 1,
+    STATE(228), 1,
       sym_PEReference,
-    ACTIONS(496), 2,
+    ACTIONS(492), 2,
       anon_sym_PIPE,
       anon_sym_COMMA,
-  [2844] = 1,
-    ACTIONS(534), 5,
+  [2870] = 2,
+    ACTIONS(216), 2,
+      anon_sym_AMP,
+      anon_sym_AMP_POUND,
+    ACTIONS(214), 3,
+      anon_sym_SQUOTE,
+      aux_sym_PseudoAttValue_token2,
+      anon_sym_AMP_POUNDx,
+  [2880] = 1,
+    ACTIONS(540), 5,
       sym_Comment,
-      anon_sym_LT_BANG,
-      sym__S,
       anon_sym_LT_QMARK,
-      anon_sym_RBRACK,
-  [2852] = 1,
-    ACTIONS(87), 5,
-      sym_Comment,
       anon_sym_LT_BANG,
-      sym__S,
-      anon_sym_LT_QMARK,
       anon_sym_RBRACK,
-  [2860] = 4,
-    ACTIONS(159), 1,
+      sym__S,
+  [2888] = 4,
+    ACTIONS(544), 1,
+      anon_sym_PIPE,
+    ACTIONS(547), 1,
+      sym__S,
+    STATE(153), 1,
+      aux_sym_NotationType_repeat1,
+    ACTIONS(542), 2,
       anon_sym_PERCENT,
-    ACTIONS(388), 1,
+      sym_Name,
+  [2902] = 1,
+    ACTIONS(550), 5,
+      anon_sym_PIPE,
       anon_sym_RPAREN,
-    ACTIONS(536), 1,
+      anon_sym_COMMA,
+      anon_sym_PERCENT,
       sym__S,
-    STATE(143), 2,
-      sym_PEReference,
-      aux_sym__choice_repeat2,
-  [2874] = 5,
-    ACTIONS(452), 1,
+  [2910] = 1,
+    ACTIONS(552), 5,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+      anon_sym_PERCENT,
+      sym__S,
+  [2918] = 5,
+    ACTIONS(438), 1,
       anon_sym_SYSTEM,
-    ACTIONS(460), 1,
+    ACTIONS(440), 1,
       anon_sym_PUBLIC,
-    ACTIONS(538), 1,
+    ACTIONS(554), 1,
       anon_sym_LBRACK,
-    ACTIONS(540), 1,
+    ACTIONS(556), 1,
       anon_sym_GT,
-    STATE(267), 1,
+    STATE(232), 1,
       sym_ExternalID,
-  [2890] = 5,
-    ACTIONS(159), 1,
+  [2934] = 1,
+    ACTIONS(78), 5,
+      sym_Comment,
+      anon_sym_LT_QMARK,
+      anon_sym_LT_BANG,
+      anon_sym_RBRACK,
+      sym__S,
+  [2942] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(430), 1,
+    ACTIONS(538), 1,
       anon_sym_RPAREN,
-    ACTIONS(498), 1,
-      anon_sym_PIPE,
-    STATE(203), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    ACTIONS(558), 1,
+      sym__S,
+    STATE(141), 2,
       sym_PEReference,
-  [2906] = 2,
-    ACTIONS(544), 1,
-      anon_sym_LT,
-    ACTIONS(542), 4,
+      aux_sym__choice_repeat2,
+  [2956] = 1,
+    ACTIONS(198), 4,
       sym_Comment,
-      anon_sym_LT_BANG,
-      sym__S,
+      ts_builtin_sym_end,
       anon_sym_LT_QMARK,
-  [2916] = 4,
-    ACTIONS(546), 1,
+      sym__S,
+  [2963] = 1,
+    ACTIONS(560), 4,
       anon_sym_PIPE,
-    ACTIONS(551), 1,
+      anon_sym_PERCENT,
       sym__S,
-    STATE(156), 1,
-      aux_sym_Mixed_repeat1,
-    ACTIONS(549), 2,
-      anon_sym_RPAREN,
+      sym_Name,
+  [2970] = 2,
+    ACTIONS(562), 1,
+      sym__S,
+    ACTIONS(542), 3,
+      anon_sym_PIPE,
       anon_sym_PERCENT,
-  [2930] = 2,
-    ACTIONS(556), 1,
+      sym_Name,
+  [2979] = 1,
+    ACTIONS(542), 4,
+      anon_sym_PIPE,
+      anon_sym_PERCENT,
+      sym__S,
+      sym_Name,
+  [2986] = 4,
+    ACTIONS(565), 1,
+      anon_sym_QMARK_GT,
+    ACTIONS(567), 1,
+      sym__S,
+    STATE(273), 1,
+      sym__EncodingDecl,
+    STATE(287), 1,
+      sym__SDDecl,
+  [2999] = 2,
+    ACTIONS(571), 1,
       anon_sym_LT,
-    ACTIONS(554), 4,
+    ACTIONS(569), 3,
       sym_Comment,
-      anon_sym_LT_BANG,
-      sym__S,
       anon_sym_LT_QMARK,
-  [2940] = 5,
-    ACTIONS(159), 1,
+      sym__S,
+  [3008] = 4,
+    ACTIONS(573), 1,
+      sym_Name,
+    ACTIONS(575), 1,
+      anon_sym_GT,
+    ACTIONS(577), 1,
+      anon_sym_SLASH_GT,
+    STATE(256), 1,
+      sym_Attribute,
+  [3021] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(498), 1,
-      anon_sym_PIPE,
-    ACTIONS(558), 1,
+    ACTIONS(430), 1,
       anon_sym_RPAREN,
-    STATE(205), 1,
+    STATE(199), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-  [2956] = 4,
-    ACTIONS(159), 1,
+  [3034] = 3,
+    ACTIONS(579), 1,
       anon_sym_PERCENT,
-    ACTIONS(560), 1,
-      anon_sym_RPAREN,
-    STATE(181), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(270), 1,
-      sym_PEReference,
-  [2969] = 4,
-    ACTIONS(562), 1,
-      anon_sym_PIPE,
-    ACTIONS(564), 1,
-      anon_sym_RPAREN,
-    ACTIONS(566), 1,
+    ACTIONS(581), 1,
       sym__S,
-    STATE(207), 1,
-      aux_sym_Enumeration_repeat1,
-  [2982] = 4,
-    ACTIONS(568), 1,
-      anon_sym_GT,
-    ACTIONS(570), 1,
+    STATE(152), 2,
+      sym__DeclSep,
+      sym_PEReference,
+  [3045] = 2,
+    ACTIONS(585), 1,
       sym__S,
-    ACTIONS(572), 1,
-      anon_sym_SLASH_GT,
-    STATE(187), 1,
-      aux_sym_EmptyElemTag_repeat1,
-  [2995] = 4,
-    ACTIONS(574), 1,
+    ACTIONS(583), 3,
+      anon_sym_PIPE,
+      anon_sym_PERCENT,
       sym_Name,
-    ACTIONS(576), 1,
+  [3054] = 4,
+    ACTIONS(588), 1,
       anon_sym_GT,
-    ACTIONS(578), 1,
+    ACTIONS(590), 1,
       anon_sym_SLASH_GT,
-    STATE(241), 1,
-      sym_Attribute,
-  [3008] = 4,
-    ACTIONS(580), 1,
-      anon_sym_GT,
-    ACTIONS(582), 1,
+    ACTIONS(592), 1,
       sym__S,
-    ACTIONS(584), 1,
-      anon_sym_SLASH_GT,
-    STATE(193), 1,
+    STATE(174), 1,
       aux_sym_EmptyElemTag_repeat1,
-  [3021] = 4,
-    ACTIONS(574), 1,
+  [3067] = 4,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(594), 1,
       sym_Name,
-    ACTIONS(580), 1,
-      anon_sym_GT,
-    ACTIONS(584), 1,
-      anon_sym_SLASH_GT,
-    STATE(241), 1,
-      sym_Attribute,
-  [3034] = 4,
-    ACTIONS(568), 1,
-      anon_sym_GT,
-    ACTIONS(586), 1,
+    ACTIONS(596), 1,
       sym__S,
-    ACTIONS(588), 1,
-      anon_sym_SLASH_GT,
-    STATE(163), 1,
-      aux_sym_EmptyElemTag_repeat1,
-  [3047] = 2,
-    ACTIONS(592), 1,
+    STATE(180), 1,
+      sym_PEReference,
+  [3080] = 2,
+    ACTIONS(600), 1,
       anon_sym_LT,
-    ACTIONS(590), 3,
+    ACTIONS(598), 3,
       sym_Comment,
-      sym__S,
       anon_sym_LT_QMARK,
-  [3056] = 4,
-    ACTIONS(594), 1,
-      anon_sym_ELEMENT,
-    ACTIONS(596), 1,
-      anon_sym_ATTLIST,
-    ACTIONS(598), 1,
-      anon_sym_NOTATION,
-    ACTIONS(600), 1,
-      anon_sym_ENTITY,
-  [3069] = 1,
-    ACTIONS(260), 4,
+      sym__S,
+  [3089] = 1,
+    ACTIONS(304), 4,
       sym_Comment,
       ts_builtin_sym_end,
-      sym__S,
       anon_sym_LT_QMARK,
-  [3076] = 4,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(412), 1,
-      anon_sym_RPAREN,
-    STATE(181), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(270), 1,
-      sym_PEReference,
-  [3089] = 3,
+      sym__S,
+  [3096] = 4,
+    ACTIONS(573), 1,
+      sym_Name,
+    ACTIONS(575), 1,
+      anon_sym_GT,
     ACTIONS(602), 1,
+      anon_sym_SLASH_GT,
+    STATE(256), 1,
+      sym_Attribute,
+  [3109] = 3,
+    ACTIONS(606), 1,
+      sym__S,
+    STATE(174), 1,
+      aux_sym_EmptyElemTag_repeat1,
+    ACTIONS(604), 2,
+      anon_sym_GT,
+      anon_sym_SLASH_GT,
+  [3120] = 1,
+    ACTIONS(324), 4,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
+      sym__S,
+  [3127] = 3,
+    ACTIONS(579), 1,
       anon_sym_PERCENT,
-    ACTIONS(604), 1,
+    ACTIONS(609), 1,
       sym__S,
-    STATE(151), 2,
+    STATE(157), 2,
       sym__DeclSep,
       sym_PEReference,
-  [3100] = 1,
-    ACTIONS(274), 4,
+  [3138] = 1,
+    ACTIONS(364), 4,
       sym_Comment,
       ts_builtin_sym_end,
-      sym__S,
       anon_sym_LT_QMARK,
-  [3107] = 1,
-    ACTIONS(330), 4,
-      sym_Comment,
-      ts_builtin_sym_end,
       sym__S,
-      anon_sym_LT_QMARK,
-  [3114] = 1,
-    ACTIONS(322), 4,
+  [3145] = 4,
+    ACTIONS(573), 1,
+      sym_Name,
+    ACTIONS(588), 1,
+      anon_sym_GT,
+    ACTIONS(590), 1,
+      anon_sym_SLASH_GT,
+    STATE(256), 1,
+      sym_Attribute,
+  [3158] = 2,
+    ACTIONS(613), 1,
+      anon_sym_LT,
+    ACTIONS(611), 3,
       sym_Comment,
-      ts_builtin_sym_end,
-      sym__S,
       anon_sym_LT_QMARK,
-  [3121] = 4,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(606), 1,
-      sym_Name,
-    ACTIONS(608), 1,
       sym__S,
-    STATE(175), 1,
-      sym_PEReference,
-  [3134] = 1,
-    ACTIONS(549), 4,
+  [3167] = 1,
+    ACTIONS(507), 4,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       anon_sym_PERCENT,
       sym__S,
-  [3141] = 4,
-    ACTIONS(159), 1,
+  [3174] = 4,
+    ACTIONS(615), 1,
+      anon_sym_PIPE,
+    ACTIONS(618), 1,
+      anon_sym_RPAREN,
+    ACTIONS(620), 1,
+      sym__S,
+    STATE(181), 1,
+      aux_sym_Enumeration_repeat1,
+  [3187] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(610), 1,
+    ACTIONS(623), 1,
       sym_Name,
-    ACTIONS(612), 1,
+    ACTIONS(625), 1,
       sym__S,
-    STATE(201), 1,
+    STATE(212), 1,
       sym_PEReference,
-  [3154] = 4,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(558), 1,
+  [3200] = 4,
+    ACTIONS(627), 1,
+      anon_sym_PIPE,
+    ACTIONS(629), 1,
       anon_sym_RPAREN,
+    ACTIONS(631), 1,
+      sym__S,
     STATE(181), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(270), 1,
-      sym_PEReference,
-  [3167] = 2,
-    ACTIONS(616), 1,
+      aux_sym_Enumeration_repeat1,
+  [3213] = 2,
+    ACTIONS(635), 1,
       anon_sym_LT,
-    ACTIONS(614), 3,
+    ACTIONS(633), 3,
       sym_Comment,
-      sym__S,
       anon_sym_LT_QMARK,
-  [3176] = 4,
-    ACTIONS(618), 1,
       sym__S,
-    ACTIONS(620), 1,
-      anon_sym_QMARK_GT,
-    STATE(221), 1,
-      sym__EncodingDecl,
-    STATE(366), 1,
-      sym__SDDecl,
-  [3189] = 4,
-    ACTIONS(159), 1,
+  [3222] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(430), 1,
-      anon_sym_RPAREN,
-    STATE(181), 1,
-      aux_sym_Mixed_repeat2,
-    STATE(270), 1,
-      sym_PEReference,
-  [3202] = 4,
-    ACTIONS(622), 1,
+    ACTIONS(516), 1,
       anon_sym_RPAREN,
-    ACTIONS(624), 1,
-      anon_sym_PERCENT,
-    STATE(181), 1,
+    STATE(199), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-  [3215] = 2,
-    ACTIONS(629), 1,
-      anon_sym_LT,
-    ACTIONS(627), 3,
-      sym_Comment,
-      sym__S,
-      anon_sym_LT_QMARK,
-  [3224] = 2,
-    ACTIONS(633), 1,
-      anon_sym_LT,
-    ACTIONS(631), 3,
-      sym_Comment,
-      sym__S,
-      anon_sym_LT_QMARK,
-  [3233] = 4,
-    ACTIONS(574), 1,
-      sym_Name,
-    ACTIONS(580), 1,
-      anon_sym_GT,
-    ACTIONS(635), 1,
-      anon_sym_SLASH_GT,
-    STATE(241), 1,
-      sym_Attribute,
-  [3246] = 1,
-    ACTIONS(282), 4,
-      sym_Comment,
-      ts_builtin_sym_end,
-      sym__S,
-      anon_sym_LT_QMARK,
-  [3253] = 1,
-    ACTIONS(310), 4,
-      sym_Comment,
-      ts_builtin_sym_end,
-      sym__S,
-      anon_sym_LT_QMARK,
-  [3260] = 4,
-    ACTIONS(580), 1,
+  [3235] = 4,
+    ACTIONS(637), 1,
       anon_sym_GT,
-    ACTIONS(635), 1,
+    ACTIONS(639), 1,
       anon_sym_SLASH_GT,
-    ACTIONS(637), 1,
+    ACTIONS(641), 1,
       sym__S,
-    STATE(193), 1,
+    STATE(169), 1,
       aux_sym_EmptyElemTag_repeat1,
-  [3273] = 1,
-    ACTIONS(639), 4,
-      anon_sym_PIPE,
-      anon_sym_PERCENT,
-      sym__S,
-      sym_Name,
-  [3280] = 1,
-    ACTIONS(306), 4,
-      sym_Comment,
-      ts_builtin_sym_end,
-      sym__S,
-      anon_sym_LT_QMARK,
-  [3287] = 2,
-    ACTIONS(641), 1,
+  [3248] = 3,
+    ACTIONS(643), 1,
+      anon_sym_GT,
+    ACTIONS(645), 1,
       sym__S,
-    ACTIONS(508), 3,
-      anon_sym_PIPE,
-      anon_sym_PERCENT,
-      sym_Name,
-  [3296] = 4,
-    ACTIONS(644), 1,
+    STATE(187), 2,
+      sym_AttDef,
+      aux_sym_AttlistDecl_repeat1,
+  [3259] = 4,
+    ACTIONS(648), 1,
       anon_sym_LT,
     STATE(3), 1,
       sym_STag,
-    STATE(64), 1,
+    STATE(56), 1,
       sym_element,
-    STATE(172), 1,
+    STATE(200), 1,
       sym_EmptyElemTag,
-  [3309] = 1,
-    ACTIONS(508), 4,
-      anon_sym_PIPE,
-      anon_sym_PERCENT,
-      sym__S,
-      sym_Name,
-  [3316] = 3,
-    ACTIONS(648), 1,
-      sym__S,
-    STATE(193), 1,
-      aux_sym_EmptyElemTag_repeat1,
-    ACTIONS(646), 2,
-      anon_sym_GT,
-      anon_sym_SLASH_GT,
-  [3327] = 4,
-    ACTIONS(574), 1,
-      sym_Name,
-    ACTIONS(576), 1,
-      anon_sym_GT,
-    ACTIONS(651), 1,
-      anon_sym_SLASH_GT,
-    STATE(241), 1,
-      sym_Attribute,
-  [3340] = 2,
-    ACTIONS(655), 1,
+  [3272] = 2,
+    ACTIONS(652), 1,
+      anon_sym_LT,
+    ACTIONS(650), 3,
+      sym_Comment,
+      anon_sym_LT_QMARK,
       sym__S,
-    ACTIONS(653), 3,
-      anon_sym_PIPE,
+  [3281] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
+    ACTIONS(654), 1,
       sym_Name,
-  [3349] = 3,
-    ACTIONS(658), 1,
+    ACTIONS(656), 1,
       anon_sym_GT,
-    ACTIONS(660), 1,
-      sym__S,
-    STATE(196), 2,
-      sym_AttDef,
-      aux_sym_AttlistDecl_repeat1,
-  [3360] = 4,
-    ACTIONS(159), 1,
+    STATE(319), 1,
+      sym_PEReference,
+  [3294] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(663), 1,
-      sym_Name,
-    ACTIONS(665), 1,
-      anon_sym_GT,
-    STATE(340), 1,
+    ACTIONS(658), 1,
+      anon_sym_RPAREN,
+    STATE(199), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(269), 1,
       sym_PEReference,
-  [3373] = 2,
-    ACTIONS(669), 1,
+  [3307] = 2,
+    ACTIONS(662), 1,
       anon_sym_LT,
-    ACTIONS(667), 3,
+    ACTIONS(660), 3,
       sym_Comment,
-      sym__S,
       anon_sym_LT_QMARK,
-  [3382] = 3,
-    ACTIONS(602), 1,
+      sym__S,
+  [3316] = 1,
+    ACTIONS(664), 4,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
       anon_sym_PERCENT,
-    ACTIONS(671), 1,
       sym__S,
-    STATE(150), 2,
-      sym__DeclSep,
+  [3323] = 4,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(666), 1,
+      sym_Name,
+    ACTIONS(668), 1,
+      sym__S,
+    STATE(120), 1,
       sym_PEReference,
-  [3393] = 4,
-    ACTIONS(562), 1,
+  [3336] = 4,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(418), 1,
+      anon_sym_RPAREN,
+    STATE(199), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(269), 1,
+      sym_PEReference,
+  [3349] = 4,
+    ACTIONS(627), 1,
       anon_sym_PIPE,
-    ACTIONS(673), 1,
+    ACTIONS(670), 1,
       anon_sym_RPAREN,
-    ACTIONS(675), 1,
+    ACTIONS(672), 1,
       sym__S,
-    STATE(217), 1,
+    STATE(181), 1,
       aux_sym_Enumeration_repeat1,
-  [3406] = 1,
-    ACTIONS(677), 4,
+  [3362] = 4,
+    ACTIONS(627), 1,
       anon_sym_PIPE,
+    ACTIONS(670), 1,
+      anon_sym_RPAREN,
+    ACTIONS(672), 1,
+      sym__S,
+    STATE(183), 1,
+      aux_sym_Enumeration_repeat1,
+  [3375] = 1,
+    ACTIONS(202), 4,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
+      sym__S,
+  [3382] = 4,
+    ACTIONS(674), 1,
       anon_sym_RPAREN,
+    ACTIONS(676), 1,
       anon_sym_PERCENT,
+    STATE(199), 1,
+      aux_sym_Mixed_repeat2,
+    STATE(269), 1,
+      sym_PEReference,
+  [3395] = 1,
+    ACTIONS(228), 4,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
       sym__S,
-  [3413] = 3,
-    ACTIONS(679), 1,
+  [3402] = 1,
+    ACTIONS(376), 4,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
+      sym__S,
+  [3409] = 4,
+    ACTIONS(648), 1,
+      anon_sym_LT,
+    STATE(3), 1,
+      sym_STag,
+    STATE(72), 1,
+      sym_element,
+    STATE(200), 1,
+      sym_EmptyElemTag,
+  [3422] = 4,
+    ACTIONS(573), 1,
+      sym_Name,
+    ACTIONS(588), 1,
       anon_sym_GT,
+    ACTIONS(679), 1,
+      anon_sym_SLASH_GT,
+    STATE(256), 1,
+      sym_Attribute,
+  [3435] = 3,
     ACTIONS(681), 1,
+      anon_sym_GT,
+    ACTIONS(683), 1,
       sym__S,
-    STATE(209), 2,
+    STATE(211), 2,
       sym_AttDef,
       aux_sym_AttlistDecl_repeat1,
-  [3424] = 4,
-    ACTIONS(159), 1,
+  [3446] = 1,
+    ACTIONS(210), 4,
+      sym_Comment,
+      ts_builtin_sym_end,
+      anon_sym_LT_QMARK,
+      sym__S,
+  [3453] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(520), 1,
+    ACTIONS(685), 1,
       anon_sym_RPAREN,
-    STATE(181), 1,
+    STATE(199), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-  [3437] = 4,
-    ACTIONS(683), 1,
-      anon_sym_PIPE,
-    ACTIONS(686), 1,
-      anon_sym_RPAREN,
-    ACTIONS(688), 1,
-      sym__S,
-    STATE(204), 1,
-      aux_sym_Enumeration_repeat1,
-  [3450] = 4,
-    ACTIONS(159), 1,
+  [3466] = 4,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(691), 1,
+    ACTIONS(532), 1,
       anon_sym_RPAREN,
-    STATE(181), 1,
+    STATE(199), 1,
       aux_sym_Mixed_repeat2,
-    STATE(270), 1,
+    STATE(269), 1,
       sym_PEReference,
-  [3463] = 2,
-    ACTIONS(695), 1,
+  [3479] = 2,
+    ACTIONS(689), 1,
       anon_sym_LT,
-    ACTIONS(693), 3,
+    ACTIONS(687), 3,
       sym_Comment,
-      sym__S,
       anon_sym_LT_QMARK,
-  [3472] = 4,
-    ACTIONS(562), 1,
-      anon_sym_PIPE,
-    ACTIONS(697), 1,
-      anon_sym_RPAREN,
-    ACTIONS(699), 1,
       sym__S,
-    STATE(204), 1,
-      aux_sym_Enumeration_repeat1,
-  [3485] = 2,
-    ACTIONS(703), 1,
+  [3488] = 4,
+    ACTIONS(637), 1,
+      anon_sym_GT,
+    ACTIONS(691), 1,
+      anon_sym_SLASH_GT,
+    ACTIONS(693), 1,
+      sym__S,
+    STATE(217), 1,
+      aux_sym_EmptyElemTag_repeat1,
+  [3501] = 2,
+    ACTIONS(697), 1,
       anon_sym_LT,
-    ACTIONS(701), 3,
+    ACTIONS(695), 3,
       sym_Comment,
-      sym__S,
       anon_sym_LT_QMARK,
-  [3494] = 3,
-    ACTIONS(705), 1,
+      sym__S,
+  [3510] = 3,
+    ACTIONS(699), 1,
       anon_sym_GT,
-    ACTIONS(707), 1,
+    ACTIONS(701), 1,
       sym__S,
-    STATE(196), 2,
+    STATE(187), 2,
       sym_AttDef,
       aux_sym_AttlistDecl_repeat1,
-  [3505] = 4,
-    ACTIONS(159), 1,
+  [3521] = 1,
+    ACTIONS(703), 4,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
       anon_sym_PERCENT,
-    ACTIONS(663), 1,
+      sym__S,
+  [3528] = 4,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(654), 1,
       sym_Name,
-    ACTIONS(705), 1,
+    ACTIONS(699), 1,
       anon_sym_GT,
-    STATE(340), 1,
+    STATE(319), 1,
       sym_PEReference,
-  [3518] = 4,
-    ACTIONS(644), 1,
-      anon_sym_LT,
-    STATE(3), 1,
-      sym_STag,
-    STATE(45), 1,
-      sym_element,
-    STATE(172), 1,
-      sym_EmptyElemTag,
-  [3531] = 1,
-    ACTIONS(298), 4,
-      sym_Comment,
-      ts_builtin_sym_end,
-      sym__S,
-      anon_sym_LT_QMARK,
-  [3538] = 2,
+  [3541] = 4,
+    ACTIONS(705), 1,
+      anon_sym_xml,
+    ACTIONS(707), 1,
+      anon_sym_xml_DASHstylesheet,
+    ACTIONS(709), 1,
+      anon_sym_xml_DASHmodel,
     ACTIONS(711), 1,
-      anon_sym_LT,
-    ACTIONS(709), 3,
-      sym_Comment,
-      sym__S,
-      anon_sym_LT_QMARK,
-  [3547] = 1,
-    ACTIONS(713), 4,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      anon_sym_PERCENT,
-      sym__S,
+      sym_PITarget,
   [3554] = 4,
+    ACTIONS(713), 1,
+      anon_sym_ELEMENT,
     ACTIONS(715), 1,
-      anon_sym_xml,
+      anon_sym_ATTLIST,
     ACTIONS(717), 1,
-      anon_sym_xml_DASHstylesheet,
+      anon_sym_NOTATION,
     ACTIONS(719), 1,
-      anon_sym_xml_DASHmodel,
-    ACTIONS(721), 1,
-      sym_PITarget,
+      anon_sym_ENTITY,
   [3567] = 4,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(723), 1,
-      sym_Name,
-    ACTIONS(725), 1,
-      sym__S,
-    STATE(122), 1,
-      sym_PEReference,
-  [3580] = 4,
-    ACTIONS(562), 1,
+    ACTIONS(627), 1,
       anon_sym_PIPE,
-    ACTIONS(564), 1,
+    ACTIONS(721), 1,
       anon_sym_RPAREN,
-    ACTIONS(566), 1,
+    ACTIONS(723), 1,
       sym__S,
-    STATE(204), 1,
+    STATE(196), 1,
       aux_sym_Enumeration_repeat1,
+  [3580] = 4,
+    ACTIONS(588), 1,
+      anon_sym_GT,
+    ACTIONS(679), 1,
+      anon_sym_SLASH_GT,
+    ACTIONS(725), 1,
+      sym__S,
+    STATE(174), 1,
+      aux_sym_EmptyElemTag_repeat1,
   [3593] = 3,
     ACTIONS(727), 1,
-      anon_sym_DQUOTE,
+      sym_Name,
     ACTIONS(729), 1,
+      anon_sym_PERCENT,
+    STATE(399), 1,
+      sym_PEReference,
+  [3603] = 3,
+    ACTIONS(731), 1,
+      sym__S,
+    ACTIONS(733), 1,
+      anon_sym_EQ,
+    STATE(313), 1,
+      sym__Eq,
+  [3613] = 1,
+    ACTIONS(735), 3,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
+      sym__S,
+  [3619] = 3,
+    ACTIONS(737), 1,
       anon_sym_SQUOTE,
+    ACTIONS(739), 1,
+      anon_sym_DQUOTE,
     STATE(229), 1,
       sym_SystemLiteral,
-  [3603] = 2,
-    ACTIONS(733), 1,
-      anon_sym_STAR,
-    ACTIONS(731), 2,
-      anon_sym_GT,
-      sym__S,
-  [3611] = 3,
-    ACTIONS(735), 1,
+  [3629] = 3,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(741), 1,
+      sym_Name,
+    STATE(369), 1,
+      sym_PEReference,
+  [3639] = 3,
+    ACTIONS(731), 1,
       sym__S,
-    ACTIONS(737), 1,
+    ACTIONS(733), 1,
       anon_sym_EQ,
-    STATE(261), 1,
+    STATE(329), 1,
       sym__Eq,
-  [3621] = 3,
-    ACTIONS(739), 1,
-      sym__S,
-    ACTIONS(741), 1,
-      anon_sym_QMARK_GT,
-    STATE(305), 1,
-      sym__SDDecl,
-  [3631] = 3,
-    ACTIONS(159), 1,
+  [3649] = 3,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(743), 1,
+    ACTIONS(396), 1,
       anon_sym_RPAREN,
-    STATE(244), 1,
+    STATE(228), 1,
       sym_PEReference,
-  [3641] = 3,
-    ACTIONS(159), 1,
+  [3659] = 1,
+    ACTIONS(743), 3,
+      anon_sym_GT,
+      anon_sym_SLASH_GT,
+      sym__S,
+  [3665] = 3,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(500), 1,
-      anon_sym_RPAREN,
-    STATE(244), 1,
-      sym_PEReference,
-  [3651] = 3,
     ACTIONS(745), 1,
       sym_Name,
-    ACTIONS(747), 1,
-      anon_sym_QMARK_GT,
-    STATE(355), 1,
-      sym_PseudoAtt,
-  [3661] = 3,
-    ACTIONS(749), 1,
+    STATE(193), 1,
+      sym_PEReference,
+  [3675] = 1,
+    ACTIONS(747), 3,
+      anon_sym_LBRACK,
+      anon_sym_GT,
       sym__S,
-    ACTIONS(752), 1,
-      anon_sym_QMARK_GT,
-    STATE(225), 1,
-      aux_sym_StyleSheetPI_repeat1,
-  [3671] = 3,
-    ACTIONS(741), 1,
-      anon_sym_QMARK_GT,
-    ACTIONS(754), 1,
-      anon_sym_encoding,
-    ACTIONS(756), 1,
-      anon_sym_standalone,
   [3681] = 1,
-    ACTIONS(758), 3,
+    ACTIONS(524), 3,
+      anon_sym_RPAREN,
+      anon_sym_PERCENT,
+      sym__S,
+  [3687] = 1,
+    ACTIONS(749), 3,
       anon_sym_LBRACK,
       anon_sym_GT,
       sym__S,
-  [3687] = 3,
-    ACTIONS(745), 1,
-      sym_Name,
-    ACTIONS(760), 1,
+  [3693] = 2,
+    ACTIONS(753), 1,
+      anon_sym_STAR,
+    ACTIONS(751), 2,
+      anon_sym_GT,
+      sym__S,
+  [3701] = 3,
+    ACTIONS(755), 1,
       anon_sym_QMARK_GT,
-    STATE(355), 1,
-      sym_PseudoAtt,
-  [3697] = 1,
-    ACTIONS(762), 3,
+    ACTIONS(757), 1,
+      sym__S,
+    STATE(251), 1,
+      aux_sym_StyleSheetPI_repeat1,
+  [3711] = 3,
+    ACTIONS(759), 1,
       anon_sym_LBRACK,
+    ACTIONS(761), 1,
       anon_sym_GT,
+    ACTIONS(763), 1,
       sym__S,
-  [3703] = 3,
-    ACTIONS(735), 1,
+  [3721] = 3,
+    ACTIONS(707), 1,
+      anon_sym_xml_DASHstylesheet,
+    ACTIONS(709), 1,
+      anon_sym_xml_DASHmodel,
+    ACTIONS(711), 1,
+      sym_PITarget,
+  [3731] = 3,
+    ACTIONS(765), 1,
+      anon_sym_QMARK_GT,
+    ACTIONS(767), 1,
       sym__S,
-    ACTIONS(737), 1,
-      anon_sym_EQ,
-    STATE(265), 1,
-      sym__Eq,
-  [3713] = 1,
-    ACTIONS(686), 3,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
+    STATE(271), 1,
+      aux_sym_StyleSheetPI_repeat1,
+  [3741] = 1,
+    ACTIONS(769), 3,
+      anon_sym_GT,
+      anon_sym_SLASH_GT,
       sym__S,
-  [3719] = 3,
-    ACTIONS(159), 1,
+  [3747] = 3,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(764), 1,
-      sym_Name,
-    STATE(125), 1,
+    ACTIONS(538), 1,
+      anon_sym_RPAREN,
+    STATE(228), 1,
       sym_PEReference,
-  [3729] = 2,
-    ACTIONS(768), 1,
+  [3757] = 3,
+    ACTIONS(771), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(773), 1,
+      anon_sym_DQUOTE,
+    STATE(305), 1,
+      sym_PseudoAttValue,
+  [3767] = 1,
+    ACTIONS(775), 3,
+      anon_sym_LBRACK,
+      anon_sym_GT,
+      sym__S,
+  [3773] = 2,
+    ACTIONS(779), 1,
       anon_sym_STAR,
-    ACTIONS(766), 2,
+    ACTIONS(777), 2,
       anon_sym_GT,
       sym__S,
-  [3737] = 3,
-    ACTIONS(159), 1,
+  [3781] = 3,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(781), 1,
+      anon_sym_RPAREN,
+    STATE(228), 1,
+      sym_PEReference,
+  [3791] = 3,
+    ACTIONS(142), 1,
+      anon_sym_PERCENT,
+    ACTIONS(783), 1,
+      sym_Name,
+    STATE(397), 1,
+      sym_PEReference,
+  [3801] = 3,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(770), 1,
+    ACTIONS(785), 1,
       sym_Name,
-    STATE(214), 1,
+    STATE(204), 1,
       sym_PEReference,
-  [3747] = 1,
-    ACTIONS(772), 3,
+  [3811] = 2,
+    ACTIONS(789), 1,
+      anon_sym_STAR,
+    ACTIONS(787), 2,
       anon_sym_GT,
       sym__S,
-      anon_sym_SLASH_GT,
-  [3753] = 3,
-    ACTIONS(735), 1,
-      sym__S,
-    ACTIONS(737), 1,
-      anon_sym_EQ,
-    STATE(322), 1,
-      sym__Eq,
-  [3763] = 3,
-    ACTIONS(159), 1,
+  [3819] = 3,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(774), 1,
+    ACTIONS(791), 1,
       sym_Name,
-    STATE(369), 1,
+    STATE(378), 1,
       sym_PEReference,
-  [3773] = 1,
-    ACTIONS(776), 3,
-      anon_sym_GT,
+  [3829] = 2,
+    ACTIONS(795), 1,
       sym__S,
-      anon_sym_SLASH_GT,
-  [3779] = 3,
-    ACTIONS(380), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(382), 1,
+    ACTIONS(793), 2,
       anon_sym_SQUOTE,
-    STATE(346), 1,
-      sym_AttValue,
-  [3789] = 1,
-    ACTIONS(778), 3,
+      anon_sym_DQUOTE,
+  [3837] = 1,
+    ACTIONS(618), 3,
       anon_sym_PIPE,
       anon_sym_RPAREN,
       sym__S,
-  [3795] = 1,
-    ACTIONS(646), 3,
-      anon_sym_GT,
-      sym__S,
-      anon_sym_SLASH_GT,
-  [3801] = 3,
-    ACTIONS(159), 1,
+  [3843] = 3,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(396), 1,
-      anon_sym_RPAREN,
-    STATE(244), 1,
+    ACTIONS(623), 1,
+      sym_Name,
+    STATE(212), 1,
       sym_PEReference,
-  [3811] = 3,
-    ACTIONS(780), 1,
-      anon_sym_LBRACK,
-    ACTIONS(782), 1,
+  [3853] = 3,
+    ACTIONS(797), 1,
       anon_sym_GT,
-    ACTIONS(784), 1,
+    ACTIONS(799), 1,
       sym__S,
-  [3821] = 1,
-    ACTIONS(524), 3,
-      anon_sym_RPAREN,
+    STATE(286), 1,
+      sym_NDataDecl,
+  [3863] = 3,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
+    ACTIONS(801), 1,
+      sym_Name,
+    STATE(122), 1,
+      sym_PEReference,
+  [3873] = 3,
+    ACTIONS(731), 1,
       sym__S,
-  [3827] = 1,
-    ACTIONS(786), 3,
-      anon_sym_PIPE,
-      anon_sym_RPAREN,
-      sym__S,
-  [3833] = 1,
-    ACTIONS(788), 3,
-      anon_sym_LBRACK,
-      anon_sym_GT,
-      sym__S,
-  [3839] = 3,
-    ACTIONS(790), 1,
-      sym__S,
-    ACTIONS(792), 1,
+    ACTIONS(733), 1,
+      anon_sym_EQ,
+    STATE(324), 1,
+      sym__Eq,
+  [3883] = 3,
+    ACTIONS(803), 1,
       anon_sym_QMARK_GT,
-    STATE(225), 1,
+    ACTIONS(805), 1,
+      sym__S,
+    STATE(265), 1,
       aux_sym_StyleSheetPI_repeat1,
-  [3849] = 3,
-    ACTIONS(794), 1,
+  [3893] = 3,
+    ACTIONS(807), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(809), 1,
+      anon_sym_DQUOTE,
+    STATE(225), 1,
+      sym_AttValue,
+  [3903] = 1,
+    ACTIONS(811), 3,
       anon_sym_GT,
-    ACTIONS(796), 1,
-      sym__S,
-    STATE(284), 1,
-      sym_NDataDecl,
-  [3859] = 3,
-    ACTIONS(745), 1,
-      sym_Name,
-    ACTIONS(792), 1,
-      anon_sym_QMARK_GT,
-    STATE(355), 1,
-      sym_PseudoAtt,
-  [3869] = 2,
-    ACTIONS(800), 1,
+      anon_sym_SLASH_GT,
       sym__S,
-    ACTIONS(798), 2,
-      anon_sym_DQUOTE,
+  [3909] = 3,
+    ACTIONS(268), 1,
       anon_sym_SQUOTE,
-  [3877] = 3,
-    ACTIONS(735), 1,
-      sym__S,
-    ACTIONS(737), 1,
-      anon_sym_EQ,
-    STATE(320), 1,
-      sym__Eq,
-  [3887] = 3,
-    ACTIONS(802), 1,
-      sym__S,
-    ACTIONS(804), 1,
+    ACTIONS(270), 1,
+      anon_sym_DQUOTE,
+    STATE(348), 1,
+      sym_AttValue,
+  [3919] = 3,
+    ACTIONS(803), 1,
       anon_sym_QMARK_GT,
-    STATE(225), 1,
-      aux_sym_StyleSheetPI_repeat1,
-  [3897] = 3,
-    ACTIONS(745), 1,
+    ACTIONS(813), 1,
       sym_Name,
-    ACTIONS(804), 1,
-      anon_sym_QMARK_GT,
-    STATE(355), 1,
+    STATE(283), 1,
       sym_PseudoAtt,
-  [3907] = 3,
-    ACTIONS(735), 1,
-      sym__S,
-    ACTIONS(737), 1,
-      anon_sym_EQ,
-    STATE(321), 1,
-      sym__Eq,
-  [3917] = 3,
-    ACTIONS(806), 1,
-      sym_Name,
-    ACTIONS(808), 1,
-      anon_sym_PERCENT,
-    STATE(384), 1,
-      sym_PEReference,
-  [3927] = 2,
-    ACTIONS(812), 1,
-      anon_sym_STAR,
-    ACTIONS(810), 2,
+  [3929] = 1,
+    ACTIONS(604), 3,
       anon_sym_GT,
+      anon_sym_SLASH_GT,
       sym__S,
   [3935] = 3,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(814), 1,
-      sym_Name,
-    STATE(437), 1,
-      sym_PEReference,
+    ACTIONS(731), 1,
+      sym__S,
+    ACTIONS(733), 1,
+      anon_sym_EQ,
+    STATE(252), 1,
+      sym__Eq,
   [3945] = 3,
-    ACTIONS(159), 1,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    ACTIONS(816), 1,
+    ACTIONS(654), 1,
       sym_Name,
-    STATE(202), 1,
+    STATE(319), 1,
       sym_PEReference,
   [3955] = 3,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(610), 1,
-      sym_Name,
-    STATE(201), 1,
-      sym_PEReference,
-  [3965] = 2,
-    ACTIONS(820), 1,
-      sym__S,
-    ACTIONS(818), 2,
-      anon_sym_DQUOTE,
+    ACTIONS(815), 1,
       anon_sym_SQUOTE,
-  [3973] = 3,
-    ACTIONS(822), 1,
+    ACTIONS(817), 1,
       anon_sym_DQUOTE,
-    ACTIONS(824), 1,
-      anon_sym_SQUOTE,
-    STATE(330), 1,
-      sym_PseudoAttValue,
-  [3983] = 3,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(663), 1,
-      sym_Name,
-    STATE(340), 1,
-      sym_PEReference,
-  [3993] = 3,
-    ACTIONS(826), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(828), 1,
-      anon_sym_SQUOTE,
     STATE(299), 1,
       sym_PubidLiteral,
-  [4003] = 3,
-    ACTIONS(826), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(828), 1,
+  [3965] = 3,
+    ACTIONS(815), 1,
       anon_sym_SQUOTE,
+    ACTIONS(817), 1,
+      anon_sym_DQUOTE,
     STATE(300), 1,
       sym_PubidLiteral,
-  [4013] = 3,
-    ACTIONS(830), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(832), 1,
+  [3975] = 3,
+    ACTIONS(815), 1,
       anon_sym_SQUOTE,
-    STATE(235), 1,
-      sym_AttValue,
-  [4023] = 3,
-    ACTIONS(159), 1,
-      anon_sym_PERCENT,
-    ACTIONS(834), 1,
-      sym_Name,
-    STATE(387), 1,
-      sym_PEReference,
-  [4033] = 3,
-    ACTIONS(836), 1,
+    ACTIONS(817), 1,
+      anon_sym_DQUOTE,
+    STATE(392), 1,
+      sym_PubidLiteral,
+  [3985] = 3,
+    ACTIONS(819), 1,
       anon_sym_LBRACK,
-    ACTIONS(838), 1,
+    ACTIONS(821), 1,
       anon_sym_GT,
-    ACTIONS(840), 1,
+    ACTIONS(823), 1,
       sym__S,
-  [4043] = 2,
-    ACTIONS(844), 1,
+  [3995] = 3,
+    ACTIONS(813), 1,
+      sym_Name,
+    ACTIONS(825), 1,
+      anon_sym_QMARK_GT,
+    STATE(283), 1,
+      sym_PseudoAtt,
+  [4005] = 3,
+    ACTIONS(737), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(739), 1,
+      anon_sym_DQUOTE,
+    STATE(238), 1,
+      sym_SystemLiteral,
+  [4015] = 3,
+    ACTIONS(827), 1,
+      anon_sym_QMARK_GT,
+    ACTIONS(829), 1,
+      sym__S,
+    STATE(265), 1,
+      aux_sym_StyleSheetPI_repeat1,
+  [4025] = 2,
+    ACTIONS(834), 1,
+      sym__S,
+    ACTIONS(832), 2,
+      anon_sym_SQUOTE,
+      anon_sym_DQUOTE,
+  [4033] = 2,
+    ACTIONS(838), 1,
       anon_sym_STAR,
-    ACTIONS(842), 2,
+    ACTIONS(836), 2,
       anon_sym_GT,
       sym__S,
-  [4051] = 1,
-    ACTIONS(846), 3,
-      anon_sym_GT,
+  [4041] = 1,
+    ACTIONS(840), 3,
+      anon_sym_PIPE,
+      anon_sym_RPAREN,
       sym__S,
-      anon_sym_SLASH_GT,
-  [4057] = 2,
-    ACTIONS(850), 1,
+  [4047] = 2,
+    ACTIONS(844), 1,
       sym__S,
-    ACTIONS(848), 2,
+    ACTIONS(842), 2,
       anon_sym_RPAREN,
       anon_sym_PERCENT,
+  [4055] = 3,
+    ACTIONS(813), 1,
+      sym_Name,
+    ACTIONS(846), 1,
+      anon_sym_QMARK_GT,
+    STATE(283), 1,
+      sym_PseudoAtt,
   [4065] = 3,
-    ACTIONS(826), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(828), 1,
-      anon_sym_SQUOTE,
-    STATE(423), 1,
-      sym_PubidLiteral,
+    ACTIONS(848), 1,
+      anon_sym_QMARK_GT,
+    ACTIONS(850), 1,
+      sym__S,
+    STATE(265), 1,
+      aux_sym_StyleSheetPI_repeat1,
   [4075] = 3,
-    ACTIONS(727), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(729), 1,
-      anon_sym_SQUOTE,
-    STATE(246), 1,
-      sym_SystemLiteral,
+    ACTIONS(731), 1,
+      sym__S,
+    ACTIONS(733), 1,
+      anon_sym_EQ,
+    STATE(237), 1,
+      sym__Eq,
   [4085] = 3,
-    ACTIONS(717), 1,
-      anon_sym_xml_DASHstylesheet,
-    ACTIONS(719), 1,
-      anon_sym_xml_DASHmodel,
-    ACTIONS(721), 1,
-      sym_PITarget,
-  [4095] = 3,
     ACTIONS(852), 1,
-      sym__S,
+      anon_sym_QMARK_GT,
     ACTIONS(854), 1,
+      sym__S,
+    STATE(355), 1,
+      sym__SDDecl,
+  [4095] = 3,
+    ACTIONS(813), 1,
+      sym_Name,
+    ACTIONS(848), 1,
       anon_sym_QMARK_GT,
-    STATE(247), 1,
-      aux_sym_StyleSheetPI_repeat1,
+    STATE(283), 1,
+      sym_PseudoAtt,
   [4105] = 3,
+    ACTIONS(852), 1,
+      anon_sym_QMARK_GT,
     ACTIONS(856), 1,
-      sym__S,
+      anon_sym_standalone,
     ACTIONS(858), 1,
-      anon_sym_QMARK_GT,
-    STATE(252), 1,
-      aux_sym_StyleSheetPI_repeat1,
+      anon_sym_encoding,
   [4115] = 1,
     ACTIONS(860), 2,
-      anon_sym_GT,
+      anon_sym_PERCENT,
       sym__S,
   [4120] = 1,
-    ACTIONS(278), 2,
+    ACTIONS(356), 2,
       anon_sym_PERCENT,
       sym__S,
   [4125] = 1,
     ACTIONS(862), 2,
-      anon_sym_GT,
+      anon_sym_PERCENT,
       sym__S,
-  [4130] = 2,
-    ACTIONS(864), 1,
+  [4130] = 1,
+    ACTIONS(864), 2,
+      anon_sym_GT,
       sym__S,
+  [4135] = 2,
     ACTIONS(866), 1,
       anon_sym_QMARK_GT,
-  [4137] = 2,
     ACTIONS(868), 1,
       sym__S,
-    STATE(179), 1,
-      sym__VersionInfo,
-  [4144] = 1,
+  [4142] = 1,
     ACTIONS(870), 2,
-      anon_sym_PERCENT,
+      anon_sym_GT,
       sym__S,
-  [4149] = 1,
+  [4147] = 1,
     ACTIONS(872), 2,
-      anon_sym_yes,
-      anon_sym_no,
-  [4154] = 2,
+      anon_sym_PERCENT,
+      sym__S,
+  [4152] = 1,
+    ACTIONS(827), 2,
+      anon_sym_QMARK_GT,
+      sym__S,
+  [4157] = 2,
+    ACTIONS(856), 1,
+      anon_sym_standalone,
     ACTIONS(874), 1,
-      anon_sym_GT,
+      anon_sym_QMARK_GT,
+  [4164] = 2,
     ACTIONS(876), 1,
-      anon_sym_NDATA,
-  [4161] = 2,
-    ACTIONS(874), 1,
       anon_sym_GT,
     ACTIONS(878), 1,
-      sym__S,
-  [4168] = 1,
-    ACTIONS(880), 2,
-      anon_sym_PERCENT,
-      sym__S,
-  [4173] = 2,
-    ACTIONS(838), 1,
+      anon_sym_NDATA,
+  [4171] = 2,
+    ACTIONS(876), 1,
       anon_sym_GT,
+    ACTIONS(880), 1,
+      sym__S,
+  [4178] = 2,
+    ACTIONS(852), 1,
+      anon_sym_QMARK_GT,
     ACTIONS(882), 1,
       sym__S,
-  [4180] = 1,
+  [4185] = 1,
     ACTIONS(884), 2,
       anon_sym_PERCENT,
       sym__S,
-  [4185] = 2,
-    ACTIONS(574), 1,
-      sym_Name,
-    STATE(241), 1,
-      sym_Attribute,
-  [4192] = 2,
-    ACTIONS(886), 1,
-      anon_sym_GT,
-    ACTIONS(888), 1,
+  [4190] = 1,
+    ACTIONS(886), 2,
+      anon_sym_PERCENT,
       sym__S,
-  [4199] = 2,
-    ACTIONS(745), 1,
-      sym_Name,
-    STATE(355), 1,
-      sym_PseudoAtt,
-  [4206] = 1,
-    ACTIONS(890), 2,
+  [4195] = 1,
+    ACTIONS(888), 2,
       anon_sym_PERCENT,
       sym__S,
-  [4211] = 1,
-    ACTIONS(892), 2,
+  [4200] = 2,
+    ACTIONS(890), 1,
+      anon_sym_GT,
+    ACTIONS(892), 1,
+      sym__S,
+  [4207] = 1,
+    ACTIONS(894), 2,
       anon_sym_PERCENT,
       sym__S,
-  [4216] = 2,
-    ACTIONS(894), 1,
+  [4212] = 1,
+    ACTIONS(896), 2,
+      anon_sym_GT,
+      sym__S,
+  [4217] = 2,
+    ACTIONS(898), 1,
       sym__S,
-    ACTIONS(896), 1,
+    ACTIONS(900), 1,
       sym_Nmtoken,
-  [4223] = 1,
-    ACTIONS(898), 2,
-      anon_sym_yes,
-      anon_sym_no,
-  [4228] = 1,
-    ACTIONS(900), 2,
+  [4224] = 1,
+    ACTIONS(902), 2,
       anon_sym_GT,
       sym__S,
-  [4233] = 2,
-    ACTIONS(25), 1,
-      anon_sym_LT_SLASH,
-    STATE(58), 1,
-      sym_ETag,
-  [4240] = 2,
-    ACTIONS(902), 1,
-      anon_sym_GT,
-    ACTIONS(904), 1,
+  [4229] = 1,
+    ACTIONS(904), 2,
+      anon_sym_PERCENT,
       sym__S,
-  [4247] = 1,
-    ACTIONS(906), 2,
+  [4234] = 2,
+    ACTIONS(906), 1,
       anon_sym_GT,
-      sym__S,
-  [4252] = 2,
     ACTIONS(908), 1,
+      sym__S,
+  [4241] = 1,
+    ACTIONS(910), 2,
       anon_sym_GT,
-    ACTIONS(910), 1,
       sym__S,
-  [4259] = 1,
-    ACTIONS(908), 2,
+  [4246] = 2,
+    ACTIONS(912), 1,
       anon_sym_GT,
+    ACTIONS(914), 1,
       sym__S,
-  [4264] = 1,
+  [4253] = 1,
     ACTIONS(912), 2,
+      anon_sym_GT,
+      sym__S,
+  [4258] = 1,
+    ACTIONS(916), 2,
       anon_sym_PERCENT,
       sym__S,
-  [4269] = 2,
-    ACTIONS(914), 1,
+  [4263] = 2,
+    ACTIONS(918), 1,
       anon_sym_GT,
-    ACTIONS(916), 1,
+    ACTIONS(920), 1,
       sym__S,
-  [4276] = 1,
-    ACTIONS(918), 2,
+  [4270] = 1,
+    ACTIONS(922), 2,
       anon_sym_GT,
       sym__S,
-  [4281] = 1,
-    ACTIONS(920), 2,
-      sym__S,
+  [4275] = 1,
+    ACTIONS(924), 2,
+      sym_CData,
+      anon_sym_RBRACK_RBRACK_GT,
+  [4280] = 1,
+    ACTIONS(926), 2,
       anon_sym_QMARK_GT,
-  [4286] = 2,
-    ACTIONS(922), 1,
       sym__S,
-    ACTIONS(924), 1,
-      anon_sym_QMARK_GT,
-  [4293] = 1,
-    ACTIONS(926), 2,
+  [4285] = 1,
+    ACTIONS(928), 2,
       anon_sym_PERCENT,
       sym__S,
-  [4298] = 2,
-    ACTIONS(928), 1,
-      sym__S,
+  [4290] = 2,
+    ACTIONS(17), 1,
+      anon_sym_LT_SLASH,
+    STATE(81), 1,
+      sym_ETag,
+  [4297] = 2,
     ACTIONS(930), 1,
       anon_sym_QMARK_GT,
-  [4305] = 2,
     ACTIONS(932), 1,
-      anon_sym_LBRACK,
+      sym__S,
+  [4304] = 2,
     ACTIONS(934), 1,
-      anon_sym_GT,
-  [4312] = 1,
-    ACTIONS(936), 2,
-      anon_sym_PERCENT,
+      anon_sym_QMARK_GT,
+    ACTIONS(936), 1,
       sym__S,
-  [4317] = 1,
-    ACTIONS(938), 2,
+  [4311] = 2,
+    ACTIONS(797), 1,
       anon_sym_GT,
+    ACTIONS(938), 1,
       sym__S,
-  [4322] = 1,
-    ACTIONS(810), 2,
+  [4318] = 1,
+    ACTIONS(787), 2,
       anon_sym_GT,
       sym__S,
-  [4327] = 1,
-    ACTIONS(940), 2,
-      anon_sym_GT,
+  [4323] = 2,
+    ACTIONS(940), 1,
       sym__S,
-  [4332] = 1,
-    ACTIONS(818), 2,
-      anon_sym_DQUOTE,
+    STATE(163), 1,
+      sym__VersionInfo,
+  [4330] = 2,
+    ACTIONS(942), 1,
       anon_sym_SQUOTE,
+    ACTIONS(944), 1,
+      anon_sym_DQUOTE,
   [4337] = 2,
-    ACTIONS(29), 1,
-      anon_sym_LT_SLASH,
-    STATE(189), 1,
-      sym_ETag,
+    ACTIONS(946), 1,
+      anon_sym_GT,
+    ACTIONS(948), 1,
+      sym__S,
   [4344] = 1,
-    ACTIONS(622), 2,
+    ACTIONS(674), 2,
       anon_sym_RPAREN,
       anon_sym_PERCENT,
-  [4349] = 2,
-    ACTIONS(942), 1,
-      anon_sym_RBRACK_RBRACK_GT,
-    ACTIONS(944), 1,
-      sym_CData,
-  [4356] = 2,
-    ACTIONS(756), 1,
-      anon_sym_standalone,
-    ACTIONS(924), 1,
-      anon_sym_QMARK_GT,
-  [4363] = 1,
-    ACTIONS(314), 2,
-      anon_sym_PERCENT,
-      sym__S,
-  [4368] = 1,
-    ACTIONS(776), 2,
-      anon_sym_GT,
-      sym__S,
-  [4373] = 2,
-    ACTIONS(946), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(948), 1,
-      anon_sym_SQUOTE,
-  [4380] = 2,
-    ACTIONS(950), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(952), 1,
+  [4349] = 1,
+    ACTIONS(950), 2,
       anon_sym_SQUOTE,
-  [4387] = 2,
-    ACTIONS(954), 1,
       anon_sym_DQUOTE,
-    ACTIONS(956), 1,
-      anon_sym_SQUOTE,
-  [4394] = 1,
-    ACTIONS(846), 2,
+  [4354] = 1,
+    ACTIONS(952), 2,
+      anon_sym_yes,
+      anon_sym_no,
+  [4359] = 1,
+    ACTIONS(954), 2,
+      anon_sym_yes,
+      anon_sym_no,
+  [4364] = 2,
+    ACTIONS(643), 1,
       anon_sym_GT,
+    ACTIONS(956), 1,
       sym__S,
-  [4399] = 2,
-    ACTIONS(958), 1,
-      anon_sym_GT,
-    ACTIONS(960), 1,
+  [4371] = 1,
+    ACTIONS(206), 2,
+      anon_sym_PERCENT,
       sym__S,
-  [4406] = 2,
-    ACTIONS(962), 1,
-      anon_sym_GT,
-    ACTIONS(964), 1,
+  [4376] = 1,
+    ACTIONS(959), 2,
+      anon_sym_PERCENT,
       sym__S,
-  [4413] = 1,
-    ACTIONS(966), 2,
+  [4381] = 1,
+    ACTIONS(769), 2,
       anon_sym_GT,
       sym__S,
-  [4418] = 2,
-    ACTIONS(794), 1,
+  [4386] = 2,
+    ACTIONS(961), 1,
       anon_sym_GT,
-    ACTIONS(968), 1,
+    ACTIONS(963), 1,
       sym__S,
-  [4425] = 1,
-    ACTIONS(970), 2,
-      sym_CData,
-      anon_sym_RBRACK_RBRACK_GT,
-  [4430] = 1,
-    ACTIONS(972), 2,
+  [4393] = 2,
+    ACTIONS(965), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(967), 1,
+      anon_sym_DQUOTE,
+  [4400] = 1,
+    ACTIONS(811), 2,
       anon_sym_GT,
       sym__S,
-  [4435] = 1,
-    ACTIONS(974), 2,
+  [4405] = 1,
+    ACTIONS(969), 2,
+      anon_sym_GT,
       sym__S,
+  [4410] = 1,
+    ACTIONS(971), 2,
       anon_sym_QMARK_GT,
-  [4440] = 2,
-    ACTIONS(976), 1,
-      anon_sym_RPAREN,
-    ACTIONS(978), 1,
-      sym__S,
-  [4447] = 2,
-    ACTIONS(980), 1,
-      anon_sym_GT,
-    ACTIONS(982), 1,
       sym__S,
-  [4454] = 1,
-    ACTIONS(984), 2,
+  [4415] = 2,
+    ACTIONS(973), 1,
       anon_sym_GT,
+    ACTIONS(975), 1,
       sym__S,
-  [4459] = 1,
-    ACTIONS(986), 2,
-      anon_sym_DQUOTE,
+  [4422] = 2,
+    ACTIONS(977), 1,
       anon_sym_SQUOTE,
-  [4464] = 1,
-    ACTIONS(988), 2,
+    ACTIONS(979), 1,
+      anon_sym_DQUOTE,
+  [4429] = 2,
+    ACTIONS(29), 1,
+      anon_sym_LT_SLASH,
+    STATE(201), 1,
+      sym_ETag,
+  [4436] = 2,
+    ACTIONS(981), 1,
+      anon_sym_GT,
+    ACTIONS(983), 1,
       sym__S,
-      anon_sym_QMARK_GT,
-  [4469] = 2,
-    ACTIONS(990), 1,
-      anon_sym_RPAREN,
-    ACTIONS(992), 1,
+  [4443] = 1,
+    ACTIONS(985), 2,
+      anon_sym_GT,
       sym__S,
-  [4476] = 2,
-    ACTIONS(994), 1,
+  [4448] = 2,
+    ACTIONS(761), 1,
+      anon_sym_GT,
+    ACTIONS(987), 1,
       sym__S,
-    ACTIONS(996), 1,
-      anon_sym_QMARK_GT,
-  [4483] = 1,
-    ACTIONS(998), 2,
-      anon_sym_PERCENT,
+  [4455] = 2,
+    ACTIONS(989), 1,
+      anon_sym_RBRACK_RBRACK_GT,
+    ACTIONS(991), 1,
+      sym_CData,
+  [4462] = 1,
+    ACTIONS(993), 2,
+      anon_sym_GT,
       sym__S,
-  [4488] = 1,
-    ACTIONS(1000), 2,
+  [4467] = 1,
+    ACTIONS(995), 2,
       anon_sym_GT,
       sym__S,
-  [4493] = 2,
-    ACTIONS(658), 1,
+  [4472] = 2,
+    ACTIONS(997), 1,
       anon_sym_GT,
-    ACTIONS(1002), 1,
+    ACTIONS(999), 1,
       sym__S,
-  [4500] = 1,
-    ACTIONS(1005), 2,
+  [4479] = 1,
+    ACTIONS(1001), 2,
       anon_sym_PERCENT,
       sym__S,
-  [4505] = 1,
+  [4484] = 2,
+    ACTIONS(1003), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1005), 1,
+      sym__S,
+  [4491] = 1,
     ACTIONS(1007), 2,
       anon_sym_GT,
       sym__S,
-  [4510] = 1,
+  [4496] = 1,
     ACTIONS(1009), 2,
       anon_sym_PERCENT,
       sym__S,
-  [4515] = 1,
-    ACTIONS(766), 2,
+  [4501] = 1,
+    ACTIONS(1011), 2,
       anon_sym_GT,
       sym__S,
-  [4520] = 2,
-    ACTIONS(1011), 1,
-      anon_sym_GT,
+  [4506] = 2,
     ACTIONS(1013), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1015), 1,
       sym__S,
-  [4527] = 1,
-    ACTIONS(1015), 2,
+  [4513] = 1,
+    ACTIONS(751), 2,
       anon_sym_GT,
       sym__S,
-  [4532] = 2,
+  [4518] = 2,
     ACTIONS(1017), 1,
-      anon_sym_RPAREN,
+      anon_sym_GT,
     ACTIONS(1019), 1,
       sym__S,
-  [4539] = 1,
+  [4525] = 1,
     ACTIONS(1021), 2,
-      anon_sym_PERCENT,
+      anon_sym_GT,
       sym__S,
-  [4544] = 1,
+  [4530] = 1,
     ACTIONS(1023), 2,
       anon_sym_GT,
       sym__S,
-  [4549] = 2,
-    ACTIONS(1025), 1,
+  [4535] = 1,
+    ACTIONS(1025), 2,
       anon_sym_GT,
+      sym__S,
+  [4540] = 2,
     ACTIONS(1027), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1029), 1,
       sym__S,
-  [4556] = 1,
-    ACTIONS(1029), 2,
+  [4547] = 2,
+    ACTIONS(1031), 1,
+      sym_Name,
+    ACTIONS(1033), 1,
       sym__S,
+  [4554] = 1,
+    ACTIONS(832), 2,
+      anon_sym_SQUOTE,
+      anon_sym_DQUOTE,
+  [4559] = 2,
+    ACTIONS(573), 1,
+      sym_Name,
+    STATE(256), 1,
+      sym_Attribute,
+  [4566] = 1,
+    ACTIONS(1035), 2,
       anon_sym_QMARK_GT,
-  [4561] = 1,
-    ACTIONS(1031), 2,
-      anon_sym_GT,
       sym__S,
-  [4566] = 2,
-    ACTIONS(1033), 1,
-      anon_sym_PIPE,
-    ACTIONS(1035), 1,
-      anon_sym_RPAREN,
-  [4573] = 1,
+  [4571] = 1,
     ACTIONS(1037), 2,
-      anon_sym_GT,
-      sym__S,
-  [4578] = 1,
-    ACTIONS(752), 2,
+      anon_sym_QMARK_GT,
       sym__S,
+  [4576] = 2,
+    ACTIONS(874), 1,
       anon_sym_QMARK_GT,
-  [4583] = 1,
-    ACTIONS(1039), 2,
-      anon_sym_GT,
+    ACTIONS(1039), 1,
       sym__S,
-  [4588] = 1,
-    ACTIONS(496), 2,
+  [4583] = 2,
+    ACTIONS(813), 1,
+      sym_Name,
+    STATE(283), 1,
+      sym_PseudoAtt,
+  [4590] = 1,
+    ACTIONS(492), 2,
       anon_sym_PIPE,
       anon_sym_COMMA,
-  [4593] = 2,
-    ACTIONS(159), 1,
+  [4595] = 2,
+    ACTIONS(142), 1,
       anon_sym_PERCENT,
-    STATE(244), 1,
+    STATE(228), 1,
       sym_PEReference,
-  [4600] = 1,
-    ACTIONS(1041), 2,
-      anon_sym_PERCENT,
-      sym__S,
-  [4605] = 2,
+  [4602] = 2,
+    ACTIONS(1041), 1,
+      anon_sym_PIPE,
     ACTIONS(1043), 1,
-      sym__S,
+      anon_sym_RPAREN,
+  [4609] = 2,
     ACTIONS(1045), 1,
+      sym__S,
+    ACTIONS(1047), 1,
       sym_Nmtoken,
-  [4612] = 1,
-    ACTIONS(1047), 2,
+  [4616] = 1,
+    ACTIONS(1049), 2,
       anon_sym_GT,
       sym__S,
-  [4617] = 2,
-    ACTIONS(564), 1,
+  [4621] = 2,
+    ACTIONS(670), 1,
       anon_sym_RPAREN,
-    ACTIONS(1033), 1,
+    ACTIONS(1041), 1,
       anon_sym_PIPE,
-  [4624] = 1,
-    ACTIONS(1049), 2,
-      sym__S,
-      anon_sym_QMARK_GT,
-  [4629] = 1,
+  [4628] = 1,
     ACTIONS(1051), 2,
-      sym__S,
-      anon_sym_QMARK_GT,
-  [4634] = 1,
-    ACTIONS(1053), 2,
       anon_sym_GT,
       sym__S,
-  [4639] = 2,
-    ACTIONS(741), 1,
-      anon_sym_QMARK_GT,
-    ACTIONS(1055), 1,
+  [4633] = 2,
+    ACTIONS(1017), 1,
+      anon_sym_GT,
+    ACTIONS(1053), 1,
+      anon_sym_LBRACK,
+  [4640] = 1,
+    ACTIONS(1055), 2,
+      anon_sym_GT,
       sym__S,
-  [4646] = 1,
+  [4645] = 1,
     ACTIONS(1057), 2,
       anon_sym_GT,
       sym__S,
-  [4651] = 1,
+  [4650] = 1,
     ACTIONS(1059), 2,
-      anon_sym_PERCENT,
+      anon_sym_GT,
       sym__S,
-  [4656] = 1,
+  [4655] = 1,
     ACTIONS(1061), 2,
+      anon_sym_PERCENT,
+      sym__S,
+  [4660] = 1,
+    ACTIONS(1063), 2,
       anon_sym_GT,
       sym__S,
-  [4661] = 2,
-    ACTIONS(1063), 1,
-      sym_Name,
-    ACTIONS(1065), 1,
+  [4665] = 1,
+    ACTIONS(1065), 2,
+      anon_sym_QMARK_GT,
       sym__S,
-  [4668] = 1,
-    ACTIONS(731), 2,
+  [4670] = 1,
+    ACTIONS(777), 2,
       anon_sym_GT,
       sym__S,
-  [4673] = 2,
+  [4675] = 2,
     ACTIONS(1067), 1,
       sym__S,
     ACTIONS(1069), 1,
       sym_Nmtoken,
-  [4680] = 2,
-    ACTIONS(1071), 1,
-      anon_sym_GT,
-    ACTIONS(1073), 1,
+  [4682] = 1,
+    ACTIONS(1071), 2,
+      anon_sym_QMARK_GT,
       sym__S,
   [4687] = 2,
-    ACTIONS(934), 1,
+    ACTIONS(1073), 1,
       anon_sym_GT,
     ACTIONS(1075), 1,
       sym__S,
   [4694] = 2,
-    ACTIONS(697), 1,
+    ACTIONS(629), 1,
       anon_sym_RPAREN,
-    ACTIONS(1033), 1,
+    ACTIONS(1041), 1,
       anon_sym_PIPE,
   [4701] = 1,
     ACTIONS(1077), 2,
@@ -7144,271 +7090,271 @@ static const uint16_t ts_small_parse_table[] = {
       sym__S,
   [4706] = 1,
     ACTIONS(1079), 1,
-      sym_Name,
+      sym_EncName,
   [4710] = 1,
-    ACTIONS(1025), 1,
-      anon_sym_GT,
-  [4714] = 1,
     ACTIONS(1081), 1,
-      anon_sym_DQUOTE,
+      sym__S,
+  [4714] = 1,
+    ACTIONS(1083), 1,
+      sym_Name,
   [4718] = 1,
-    ACTIONS(1071), 1,
-      anon_sym_GT,
+    ACTIONS(1085), 1,
+      aux_sym_SystemLiteral_token2,
   [4722] = 1,
     ACTIONS(1069), 1,
       sym_Nmtoken,
   [4726] = 1,
-    ACTIONS(1081), 1,
-      anon_sym_SQUOTE,
+    ACTIONS(1087), 1,
+      anon_sym_DQUOTE,
   [4730] = 1,
-    ACTIONS(733), 1,
+    ACTIONS(779), 1,
       anon_sym_STAR,
   [4734] = 1,
-    ACTIONS(1083), 1,
-      sym__S,
+    ACTIONS(1087), 1,
+      anon_sym_SQUOTE,
   [4738] = 1,
-    ACTIONS(1085), 1,
-      ts_builtin_sym_end,
+    ACTIONS(1089), 1,
+      anon_sym_DQUOTE,
   [4742] = 1,
-    ACTIONS(812), 1,
-      anon_sym_STAR,
-  [4746] = 1,
-    ACTIONS(1087), 1,
+    ACTIONS(1091), 1,
       sym__S,
+  [4746] = 1,
+    ACTIONS(1093), 1,
+      aux_sym_SystemLiteral_token1,
   [4750] = 1,
-    ACTIONS(1089), 1,
+    ACTIONS(1095), 1,
       sym__S,
   [4754] = 1,
-    ACTIONS(1091), 1,
+    ACTIONS(1097), 1,
       anon_sym_STAR,
   [4758] = 1,
-    ACTIONS(1093), 1,
-      anon_sym_QMARK_GT,
+    ACTIONS(1099), 1,
+      aux_sym_PubidLiteral_token2,
   [4762] = 1,
-    ACTIONS(1095), 1,
-      sym_Name,
+    ACTIONS(1101), 1,
+      aux_sym_PubidLiteral_token1,
   [4766] = 1,
-    ACTIONS(1097), 1,
+    ACTIONS(914), 1,
       sym__S,
   [4770] = 1,
-    ACTIONS(1099), 1,
-      sym_VersionNum,
+    ACTIONS(1103), 1,
+      sym__S,
   [4774] = 1,
-    ACTIONS(1101), 1,
+    ACTIONS(1105), 1,
       sym_Nmtoken,
   [4778] = 1,
-    ACTIONS(1033), 1,
+    ACTIONS(1041), 1,
       anon_sym_PIPE,
   [4782] = 1,
-    ACTIONS(498), 1,
-      anon_sym_PIPE,
+    ACTIONS(1107), 1,
+      sym_Name,
   [4786] = 1,
-    ACTIONS(1103), 1,
-      anon_sym_SQUOTE,
+    ACTIONS(1109), 1,
+      sym__S,
   [4790] = 1,
-    ACTIONS(1105), 1,
+    ACTIONS(1111), 1,
       anon_sym_PIPE,
   [4794] = 1,
-    ACTIONS(1107), 1,
+    ACTIONS(1113), 1,
       sym__S,
   [4798] = 1,
-    ACTIONS(1103), 1,
-      anon_sym_DQUOTE,
+    ACTIONS(1115), 1,
+      sym_VersionNum,
   [4802] = 1,
-    ACTIONS(768), 1,
-      anon_sym_STAR,
+    ACTIONS(496), 1,
+      anon_sym_PIPE,
   [4806] = 1,
-    ACTIONS(1109), 1,
-      sym__S,
-  [4810] = 1,
-    ACTIONS(1111), 1,
+    ACTIONS(997), 1,
       anon_sym_GT,
+  [4810] = 1,
+    ACTIONS(753), 1,
+      anon_sym_STAR,
   [4814] = 1,
-    ACTIONS(1113), 1,
+    ACTIONS(1117), 1,
       anon_sym_SQUOTE,
   [4818] = 1,
-    ACTIONS(1115), 1,
-      anon_sym_LPAREN,
-  [4822] = 1,
     ACTIONS(1117), 1,
-      anon_sym_RBRACK_RBRACK_GT,
-  [4826] = 1,
-    ACTIONS(1113), 1,
       anon_sym_DQUOTE,
-  [4830] = 1,
+  [4822] = 1,
+    ACTIONS(1017), 1,
+      anon_sym_GT,
+  [4826] = 1,
     ACTIONS(1119), 1,
-      anon_sym_DQUOTE,
-  [4834] = 1,
+      sym__S,
+  [4830] = 1,
     ACTIONS(1121), 1,
-      sym_Nmtoken,
+      sym__S,
+  [4834] = 1,
+    ACTIONS(1123), 1,
+      anon_sym_SQUOTE,
   [4838] = 1,
-    ACTIONS(990), 1,
+    ACTIONS(1013), 1,
       anon_sym_RPAREN,
   [4842] = 1,
-    ACTIONS(934), 1,
-      anon_sym_GT,
+    ACTIONS(1125), 1,
+      sym__S,
   [4846] = 1,
     ACTIONS(1123), 1,
-      sym__S,
+      anon_sym_DQUOTE,
   [4850] = 1,
-    ACTIONS(976), 1,
+    ACTIONS(1003), 1,
       anon_sym_RPAREN,
   [4854] = 1,
-    ACTIONS(1125), 1,
-      sym__S,
-  [4858] = 1,
     ACTIONS(1127), 1,
-      sym_Name,
-  [4862] = 1,
+      anon_sym_GT,
+  [4858] = 1,
     ACTIONS(1129), 1,
-      sym__start_tag_name,
-  [4866] = 1,
+      sym__S,
+  [4862] = 1,
     ACTIONS(1131), 1,
+      anon_sym_LPAREN,
+  [4866] = 1,
+    ACTIONS(1133), 1,
       anon_sym_RPAREN,
   [4870] = 1,
-    ACTIONS(1133), 1,
-      anon_sym_GT,
+    ACTIONS(874), 1,
+      anon_sym_QMARK_GT,
   [4874] = 1,
     ACTIONS(1135), 1,
-      anon_sym_GT,
+      anon_sym_version,
   [4878] = 1,
     ACTIONS(1137), 1,
-      anon_sym_SEMI,
+      sym__pi_content,
   [4882] = 1,
     ACTIONS(1139), 1,
-      anon_sym_SEMI,
+      sym_VersionNum,
   [4886] = 1,
     ACTIONS(1141), 1,
-      anon_sym_LBRACK,
+      sym_Nmtoken,
   [4890] = 1,
-    ACTIONS(910), 1,
-      sym__S,
+    ACTIONS(973), 1,
+      anon_sym_GT,
   [4894] = 1,
     ACTIONS(1143), 1,
-      aux_sym_PubidLiteral_token2,
+      anon_sym_LBRACK,
   [4898] = 1,
     ACTIONS(1145), 1,
-      aux_sym_PubidLiteral_token1,
+      aux_sym_CharRef_token2,
   [4902] = 1,
-    ACTIONS(1147), 1,
-      aux_sym_SystemLiteral_token2,
+    ACTIONS(1145), 1,
+      aux_sym_CharRef_token1,
   [4906] = 1,
-    ACTIONS(1149), 1,
-      aux_sym_SystemLiteral_token1,
+    ACTIONS(1147), 1,
+      anon_sym_SEMI,
   [4910] = 1,
-    ACTIONS(1151), 1,
-      anon_sym_EQ,
+    ACTIONS(1149), 1,
+      sym_EncName,
   [4914] = 1,
-    ACTIONS(1153), 1,
-      anon_sym_SEMI,
+    ACTIONS(1151), 1,
+      sym_Name,
   [4918] = 1,
-    ACTIONS(1155), 1,
-      sym__S,
+    ACTIONS(1153), 1,
+      anon_sym_CDATA,
   [4922] = 1,
-    ACTIONS(1157), 1,
-      anon_sym_DQUOTE,
+    ACTIONS(1073), 1,
+      anon_sym_GT,
   [4926] = 1,
-    ACTIONS(1159), 1,
-      anon_sym_QMARK_GT,
+    ACTIONS(1155), 1,
+      anon_sym_SEMI,
   [4930] = 1,
-    ACTIONS(1161), 1,
-      sym_VersionNum,
+    ACTIONS(1157), 1,
+      anon_sym_RBRACK_RBRACK_GT,
   [4934] = 1,
-    ACTIONS(1163), 1,
-      sym__pi_content,
+    ACTIONS(1159), 1,
+      sym_PITarget,
   [4938] = 1,
-    ACTIONS(1165), 1,
-      anon_sym_version,
+    ACTIONS(1161), 1,
+      sym__end_tag_name,
   [4942] = 1,
-    ACTIONS(1157), 1,
-      anon_sym_SQUOTE,
+    ACTIONS(1163), 1,
+      anon_sym_SEMI,
   [4946] = 1,
-    ACTIONS(1167), 1,
-      sym__S,
+    ACTIONS(1089), 1,
+      anon_sym_SQUOTE,
   [4950] = 1,
-    ACTIONS(1169), 1,
+    ACTIONS(1165), 1,
       sym__S,
   [4954] = 1,
-    ACTIONS(1171), 1,
+    ACTIONS(1167), 1,
       anon_sym_GT,
   [4958] = 1,
-    ACTIONS(958), 1,
-      anon_sym_GT,
+    ACTIONS(1169), 1,
+      anon_sym_DQUOTE,
   [4962] = 1,
-    ACTIONS(1173), 1,
-      sym__end_tag_name,
+    ACTIONS(1169), 1,
+      anon_sym_SQUOTE,
   [4966] = 1,
-    ACTIONS(1175), 1,
-      sym_PITarget,
+    ACTIONS(789), 1,
+      anon_sym_STAR,
   [4970] = 1,
-    ACTIONS(1177), 1,
-      aux_sym_CharRef_token2,
+    ACTIONS(1171), 1,
+      sym__S,
   [4974] = 1,
-    ACTIONS(1177), 1,
-      aux_sym_CharRef_token1,
+    ACTIONS(1173), 1,
+      sym__S,
   [4978] = 1,
-    ACTIONS(1179), 1,
-      sym_Name,
+    ACTIONS(1175), 1,
+      anon_sym_QMARK_GT,
   [4982] = 1,
-    ACTIONS(1181), 1,
-      anon_sym_CDATA,
+    ACTIONS(1177), 1,
+      anon_sym_EQ,
   [4986] = 1,
-    ACTIONS(1183), 1,
+    ACTIONS(1179), 1,
       anon_sym_GT,
   [4990] = 1,
-    ACTIONS(1185), 1,
-      anon_sym_DOCTYPE,
-  [4994] = 1,
-    ACTIONS(1187), 1,
+    ACTIONS(1181), 1,
       sym__S,
+  [4994] = 1,
+    ACTIONS(1183), 1,
+      anon_sym_GT,
   [4998] = 1,
-    ACTIONS(924), 1,
-      anon_sym_QMARK_GT,
+    ACTIONS(1185), 1,
+      sym__S,
   [5002] = 1,
-    ACTIONS(1189), 1,
+    ACTIONS(1187), 1,
       sym__S,
   [5006] = 1,
+    ACTIONS(1189), 1,
+      anon_sym_QMARK_GT,
+  [5010] = 1,
     ACTIONS(1191), 1,
       sym__S,
-  [5010] = 1,
+  [5014] = 1,
     ACTIONS(1193), 1,
       anon_sym_GT,
-  [5014] = 1,
+  [5018] = 1,
     ACTIONS(1195), 1,
       anon_sym_SEMI,
-  [5018] = 1,
+  [5022] = 1,
     ACTIONS(1197), 1,
       anon_sym_SEMI,
-  [5022] = 1,
-    ACTIONS(1199), 1,
-      sym__S,
   [5026] = 1,
-    ACTIONS(1201), 1,
+    ACTIONS(1199), 1,
       anon_sym_QMARK_GT,
   [5030] = 1,
-    ACTIONS(874), 1,
-      anon_sym_GT,
+    ACTIONS(1201), 1,
+      sym_Name,
   [5034] = 1,
     ACTIONS(1203), 1,
       anon_sym_GT,
   [5038] = 1,
-    ACTIONS(1205), 1,
-      sym_EncName,
+    ACTIONS(876), 1,
+      anon_sym_GT,
   [5042] = 1,
-    ACTIONS(1207), 1,
-      sym_EncName,
+    ACTIONS(1205), 1,
+      ts_builtin_sym_end,
   [5046] = 1,
-    ACTIONS(1119), 1,
-      anon_sym_SQUOTE,
+    ACTIONS(1207), 1,
+      sym__start_tag_name,
   [5050] = 1,
     ACTIONS(1209), 1,
-      sym__S,
+      anon_sym_DOCTYPE,
   [5054] = 1,
     ACTIONS(1211), 1,
       anon_sym_SEMI,
   [5058] = 1,
     ACTIONS(1213), 1,
-      sym__S,
+      anon_sym_GT,
   [5062] = 1,
     ACTIONS(1215), 1,
       anon_sym_SEMI,
@@ -7441,24 +7387,24 @@ static const uint16_t ts_small_parse_table[] = {
       sym__start_tag_name,
   [5102] = 1,
     ACTIONS(1235), 1,
-      sym_Name,
+      sym_PITarget,
   [5106] = 1,
     ACTIONS(1237), 1,
-      aux_sym_CharRef_token1,
+      sym__end_tag_name,
   [5110] = 1,
-    ACTIONS(1237), 1,
-      aux_sym_CharRef_token2,
-  [5114] = 1,
     ACTIONS(1239), 1,
-      sym_PITarget,
+      sym_Name,
+  [5114] = 1,
+    ACTIONS(1241), 1,
+      aux_sym_CharRef_token1,
   [5118] = 1,
     ACTIONS(1241), 1,
-      sym__end_tag_name,
+      aux_sym_CharRef_token2,
   [5122] = 1,
     ACTIONS(1243), 1,
       sym__pi_content,
   [5126] = 1,
-    ACTIONS(1063), 1,
+    ACTIONS(1031), 1,
       sym_Name,
   [5130] = 1,
     ACTIONS(1245), 1,
@@ -7518,256 +7464,256 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(18)] = 586,
   [SMALL_STATE(19)] = 613,
   [SMALL_STATE(20)] = 640,
-  [SMALL_STATE(21)] = 668,
+  [SMALL_STATE(21)] = 664,
   [SMALL_STATE(22)] = 692,
   [SMALL_STATE(23)] = 720,
-  [SMALL_STATE(24)] = 742,
-  [SMALL_STATE(25)] = 770,
-  [SMALL_STATE(26)] = 798,
-  [SMALL_STATE(27)] = 820,
-  [SMALL_STATE(28)] = 848,
-  [SMALL_STATE(29)] = 876,
+  [SMALL_STATE(24)] = 744,
+  [SMALL_STATE(25)] = 766,
+  [SMALL_STATE(26)] = 794,
+  [SMALL_STATE(27)] = 822,
+  [SMALL_STATE(28)] = 850,
+  [SMALL_STATE(29)] = 872,
   [SMALL_STATE(30)] = 900,
   [SMALL_STATE(31)] = 924,
   [SMALL_STATE(32)] = 952,
-  [SMALL_STATE(33)] = 974,
+  [SMALL_STATE(33)] = 976,
   [SMALL_STATE(34)] = 998,
   [SMALL_STATE(35)] = 1011,
-  [SMALL_STATE(36)] = 1035,
-  [SMALL_STATE(37)] = 1049,
-  [SMALL_STATE(38)] = 1067,
-  [SMALL_STATE(39)] = 1085,
-  [SMALL_STATE(40)] = 1109,
-  [SMALL_STATE(41)] = 1127,
-  [SMALL_STATE(42)] = 1145,
-  [SMALL_STATE(43)] = 1159,
-  [SMALL_STATE(44)] = 1183,
-  [SMALL_STATE(45)] = 1205,
-  [SMALL_STATE(46)] = 1223,
-  [SMALL_STATE(47)] = 1241,
-  [SMALL_STATE(48)] = 1255,
-  [SMALL_STATE(49)] = 1279,
-  [SMALL_STATE(50)] = 1293,
-  [SMALL_STATE(51)] = 1307,
-  [SMALL_STATE(52)] = 1321,
-  [SMALL_STATE(53)] = 1345,
-  [SMALL_STATE(54)] = 1369,
-  [SMALL_STATE(55)] = 1393,
-  [SMALL_STATE(56)] = 1417,
-  [SMALL_STATE(57)] = 1431,
-  [SMALL_STATE(58)] = 1445,
-  [SMALL_STATE(59)] = 1459,
-  [SMALL_STATE(60)] = 1473,
+  [SMALL_STATE(36)] = 1023,
+  [SMALL_STATE(37)] = 1037,
+  [SMALL_STATE(38)] = 1051,
+  [SMALL_STATE(39)] = 1065,
+  [SMALL_STATE(40)] = 1079,
+  [SMALL_STATE(41)] = 1093,
+  [SMALL_STATE(42)] = 1117,
+  [SMALL_STATE(43)] = 1131,
+  [SMALL_STATE(44)] = 1155,
+  [SMALL_STATE(45)] = 1179,
+  [SMALL_STATE(46)] = 1203,
+  [SMALL_STATE(47)] = 1227,
+  [SMALL_STATE(48)] = 1239,
+  [SMALL_STATE(49)] = 1263,
+  [SMALL_STATE(50)] = 1287,
+  [SMALL_STATE(51)] = 1299,
+  [SMALL_STATE(52)] = 1323,
+  [SMALL_STATE(53)] = 1337,
+  [SMALL_STATE(54)] = 1349,
+  [SMALL_STATE(55)] = 1373,
+  [SMALL_STATE(56)] = 1397,
+  [SMALL_STATE(57)] = 1415,
+  [SMALL_STATE(58)] = 1433,
+  [SMALL_STATE(59)] = 1451,
+  [SMALL_STATE(60)] = 1469,
   [SMALL_STATE(61)] = 1487,
   [SMALL_STATE(62)] = 1505,
-  [SMALL_STATE(63)] = 1523,
-  [SMALL_STATE(64)] = 1537,
-  [SMALL_STATE(65)] = 1555,
-  [SMALL_STATE(66)] = 1569,
-  [SMALL_STATE(67)] = 1581,
-  [SMALL_STATE(68)] = 1595,
-  [SMALL_STATE(69)] = 1609,
-  [SMALL_STATE(70)] = 1623,
-  [SMALL_STATE(71)] = 1635,
-  [SMALL_STATE(72)] = 1653,
-  [SMALL_STATE(73)] = 1667,
-  [SMALL_STATE(74)] = 1685,
-  [SMALL_STATE(75)] = 1697,
-  [SMALL_STATE(76)] = 1721,
-  [SMALL_STATE(77)] = 1745,
-  [SMALL_STATE(78)] = 1769,
-  [SMALL_STATE(79)] = 1793,
-  [SMALL_STATE(80)] = 1805,
-  [SMALL_STATE(81)] = 1829,
-  [SMALL_STATE(82)] = 1843,
-  [SMALL_STATE(83)] = 1855,
-  [SMALL_STATE(84)] = 1879,
+  [SMALL_STATE(63)] = 1519,
+  [SMALL_STATE(64)] = 1543,
+  [SMALL_STATE(65)] = 1557,
+  [SMALL_STATE(66)] = 1581,
+  [SMALL_STATE(67)] = 1595,
+  [SMALL_STATE(68)] = 1619,
+  [SMALL_STATE(69)] = 1631,
+  [SMALL_STATE(70)] = 1655,
+  [SMALL_STATE(71)] = 1669,
+  [SMALL_STATE(72)] = 1693,
+  [SMALL_STATE(73)] = 1711,
+  [SMALL_STATE(74)] = 1733,
+  [SMALL_STATE(75)] = 1751,
+  [SMALL_STATE(76)] = 1765,
+  [SMALL_STATE(77)] = 1779,
+  [SMALL_STATE(78)] = 1793,
+  [SMALL_STATE(79)] = 1807,
+  [SMALL_STATE(80)] = 1821,
+  [SMALL_STATE(81)] = 1835,
+  [SMALL_STATE(82)] = 1849,
+  [SMALL_STATE(83)] = 1867,
+  [SMALL_STATE(84)] = 1885,
   [SMALL_STATE(85)] = 1903,
   [SMALL_STATE(86)] = 1921,
   [SMALL_STATE(87)] = 1942,
-  [SMALL_STATE(88)] = 1963,
-  [SMALL_STATE(89)] = 1984,
+  [SMALL_STATE(88)] = 1955,
+  [SMALL_STATE(89)] = 1976,
   [SMALL_STATE(90)] = 1997,
   [SMALL_STATE(91)] = 2018,
   [SMALL_STATE(92)] = 2043,
-  [SMALL_STATE(93)] = 2063,
+  [SMALL_STATE(93)] = 2065,
   [SMALL_STATE(94)] = 2085,
   [SMALL_STATE(95)] = 2105,
   [SMALL_STATE(96)] = 2127,
   [SMALL_STATE(97)] = 2149,
-  [SMALL_STATE(98)] = 2171,
+  [SMALL_STATE(98)] = 2169,
   [SMALL_STATE(99)] = 2191,
   [SMALL_STATE(100)] = 2213,
-  [SMALL_STATE(101)] = 2228,
-  [SMALL_STATE(102)] = 2245,
-  [SMALL_STATE(103)] = 2256,
-  [SMALL_STATE(104)] = 2267,
-  [SMALL_STATE(105)] = 2278,
-  [SMALL_STATE(106)] = 2289,
-  [SMALL_STATE(107)] = 2300,
-  [SMALL_STATE(108)] = 2311,
-  [SMALL_STATE(109)] = 2322,
-  [SMALL_STATE(110)] = 2333,
-  [SMALL_STATE(111)] = 2344,
-  [SMALL_STATE(112)] = 2355,
-  [SMALL_STATE(113)] = 2366,
-  [SMALL_STATE(114)] = 2377,
-  [SMALL_STATE(115)] = 2394,
-  [SMALL_STATE(116)] = 2411,
-  [SMALL_STATE(117)] = 2430,
-  [SMALL_STATE(118)] = 2441,
-  [SMALL_STATE(119)] = 2452,
-  [SMALL_STATE(120)] = 2463,
-  [SMALL_STATE(121)] = 2482,
-  [SMALL_STATE(122)] = 2501,
-  [SMALL_STATE(123)] = 2520,
-  [SMALL_STATE(124)] = 2537,
-  [SMALL_STATE(125)] = 2548,
-  [SMALL_STATE(126)] = 2567,
+  [SMALL_STATE(101)] = 2232,
+  [SMALL_STATE(102)] = 2243,
+  [SMALL_STATE(103)] = 2254,
+  [SMALL_STATE(104)] = 2265,
+  [SMALL_STATE(105)] = 2276,
+  [SMALL_STATE(106)] = 2287,
+  [SMALL_STATE(107)] = 2304,
+  [SMALL_STATE(108)] = 2315,
+  [SMALL_STATE(109)] = 2326,
+  [SMALL_STATE(110)] = 2343,
+  [SMALL_STATE(111)] = 2354,
+  [SMALL_STATE(112)] = 2365,
+  [SMALL_STATE(113)] = 2382,
+  [SMALL_STATE(114)] = 2393,
+  [SMALL_STATE(115)] = 2404,
+  [SMALL_STATE(116)] = 2415,
+  [SMALL_STATE(117)] = 2432,
+  [SMALL_STATE(118)] = 2443,
+  [SMALL_STATE(119)] = 2458,
+  [SMALL_STATE(120)] = 2475,
+  [SMALL_STATE(121)] = 2494,
+  [SMALL_STATE(122)] = 2505,
+  [SMALL_STATE(123)] = 2524,
+  [SMALL_STATE(124)] = 2535,
+  [SMALL_STATE(125)] = 2554,
+  [SMALL_STATE(126)] = 2573,
   [SMALL_STATE(127)] = 2584,
-  [SMALL_STATE(128)] = 2592,
-  [SMALL_STATE(129)] = 2600,
-  [SMALL_STATE(130)] = 2610,
-  [SMALL_STATE(131)] = 2618,
-  [SMALL_STATE(132)] = 2632,
-  [SMALL_STATE(133)] = 2648,
-  [SMALL_STATE(134)] = 2662,
-  [SMALL_STATE(135)] = 2672,
-  [SMALL_STATE(136)] = 2686,
-  [SMALL_STATE(137)] = 2696,
-  [SMALL_STATE(138)] = 2710,
-  [SMALL_STATE(139)] = 2720,
-  [SMALL_STATE(140)] = 2730,
-  [SMALL_STATE(141)] = 2740,
-  [SMALL_STATE(142)] = 2756,
-  [SMALL_STATE(143)] = 2764,
-  [SMALL_STATE(144)] = 2778,
-  [SMALL_STATE(145)] = 2792,
-  [SMALL_STATE(146)] = 2800,
-  [SMALL_STATE(147)] = 2810,
-  [SMALL_STATE(148)] = 2820,
-  [SMALL_STATE(149)] = 2830,
-  [SMALL_STATE(150)] = 2844,
-  [SMALL_STATE(151)] = 2852,
-  [SMALL_STATE(152)] = 2860,
-  [SMALL_STATE(153)] = 2874,
-  [SMALL_STATE(154)] = 2890,
-  [SMALL_STATE(155)] = 2906,
-  [SMALL_STATE(156)] = 2916,
-  [SMALL_STATE(157)] = 2930,
-  [SMALL_STATE(158)] = 2940,
+  [SMALL_STATE(128)] = 2594,
+  [SMALL_STATE(129)] = 2608,
+  [SMALL_STATE(130)] = 2616,
+  [SMALL_STATE(131)] = 2632,
+  [SMALL_STATE(132)] = 2642,
+  [SMALL_STATE(133)] = 2656,
+  [SMALL_STATE(134)] = 2672,
+  [SMALL_STATE(135)] = 2686,
+  [SMALL_STATE(136)] = 2696,
+  [SMALL_STATE(137)] = 2712,
+  [SMALL_STATE(138)] = 2726,
+  [SMALL_STATE(139)] = 2740,
+  [SMALL_STATE(140)] = 2748,
+  [SMALL_STATE(141)] = 2758,
+  [SMALL_STATE(142)] = 2772,
+  [SMALL_STATE(143)] = 2780,
+  [SMALL_STATE(144)] = 2796,
+  [SMALL_STATE(145)] = 2806,
+  [SMALL_STATE(146)] = 2816,
+  [SMALL_STATE(147)] = 2826,
+  [SMALL_STATE(148)] = 2836,
+  [SMALL_STATE(149)] = 2846,
+  [SMALL_STATE(150)] = 2856,
+  [SMALL_STATE(151)] = 2870,
+  [SMALL_STATE(152)] = 2880,
+  [SMALL_STATE(153)] = 2888,
+  [SMALL_STATE(154)] = 2902,
+  [SMALL_STATE(155)] = 2910,
+  [SMALL_STATE(156)] = 2918,
+  [SMALL_STATE(157)] = 2934,
+  [SMALL_STATE(158)] = 2942,
   [SMALL_STATE(159)] = 2956,
-  [SMALL_STATE(160)] = 2969,
-  [SMALL_STATE(161)] = 2982,
-  [SMALL_STATE(162)] = 2995,
-  [SMALL_STATE(163)] = 3008,
-  [SMALL_STATE(164)] = 3021,
-  [SMALL_STATE(165)] = 3034,
-  [SMALL_STATE(166)] = 3047,
-  [SMALL_STATE(167)] = 3056,
-  [SMALL_STATE(168)] = 3069,
-  [SMALL_STATE(169)] = 3076,
-  [SMALL_STATE(170)] = 3089,
-  [SMALL_STATE(171)] = 3100,
-  [SMALL_STATE(172)] = 3107,
-  [SMALL_STATE(173)] = 3114,
-  [SMALL_STATE(174)] = 3121,
-  [SMALL_STATE(175)] = 3134,
-  [SMALL_STATE(176)] = 3141,
-  [SMALL_STATE(177)] = 3154,
-  [SMALL_STATE(178)] = 3167,
-  [SMALL_STATE(179)] = 3176,
-  [SMALL_STATE(180)] = 3189,
-  [SMALL_STATE(181)] = 3202,
-  [SMALL_STATE(182)] = 3215,
-  [SMALL_STATE(183)] = 3224,
-  [SMALL_STATE(184)] = 3233,
-  [SMALL_STATE(185)] = 3246,
-  [SMALL_STATE(186)] = 3253,
-  [SMALL_STATE(187)] = 3260,
-  [SMALL_STATE(188)] = 3273,
-  [SMALL_STATE(189)] = 3280,
-  [SMALL_STATE(190)] = 3287,
-  [SMALL_STATE(191)] = 3296,
-  [SMALL_STATE(192)] = 3309,
+  [SMALL_STATE(160)] = 2963,
+  [SMALL_STATE(161)] = 2970,
+  [SMALL_STATE(162)] = 2979,
+  [SMALL_STATE(163)] = 2986,
+  [SMALL_STATE(164)] = 2999,
+  [SMALL_STATE(165)] = 3008,
+  [SMALL_STATE(166)] = 3021,
+  [SMALL_STATE(167)] = 3034,
+  [SMALL_STATE(168)] = 3045,
+  [SMALL_STATE(169)] = 3054,
+  [SMALL_STATE(170)] = 3067,
+  [SMALL_STATE(171)] = 3080,
+  [SMALL_STATE(172)] = 3089,
+  [SMALL_STATE(173)] = 3096,
+  [SMALL_STATE(174)] = 3109,
+  [SMALL_STATE(175)] = 3120,
+  [SMALL_STATE(176)] = 3127,
+  [SMALL_STATE(177)] = 3138,
+  [SMALL_STATE(178)] = 3145,
+  [SMALL_STATE(179)] = 3158,
+  [SMALL_STATE(180)] = 3167,
+  [SMALL_STATE(181)] = 3174,
+  [SMALL_STATE(182)] = 3187,
+  [SMALL_STATE(183)] = 3200,
+  [SMALL_STATE(184)] = 3213,
+  [SMALL_STATE(185)] = 3222,
+  [SMALL_STATE(186)] = 3235,
+  [SMALL_STATE(187)] = 3248,
+  [SMALL_STATE(188)] = 3259,
+  [SMALL_STATE(189)] = 3272,
+  [SMALL_STATE(190)] = 3281,
+  [SMALL_STATE(191)] = 3294,
+  [SMALL_STATE(192)] = 3307,
   [SMALL_STATE(193)] = 3316,
-  [SMALL_STATE(194)] = 3327,
-  [SMALL_STATE(195)] = 3340,
+  [SMALL_STATE(194)] = 3323,
+  [SMALL_STATE(195)] = 3336,
   [SMALL_STATE(196)] = 3349,
-  [SMALL_STATE(197)] = 3360,
-  [SMALL_STATE(198)] = 3373,
+  [SMALL_STATE(197)] = 3362,
+  [SMALL_STATE(198)] = 3375,
   [SMALL_STATE(199)] = 3382,
-  [SMALL_STATE(200)] = 3393,
-  [SMALL_STATE(201)] = 3406,
-  [SMALL_STATE(202)] = 3413,
-  [SMALL_STATE(203)] = 3424,
-  [SMALL_STATE(204)] = 3437,
-  [SMALL_STATE(205)] = 3450,
-  [SMALL_STATE(206)] = 3463,
-  [SMALL_STATE(207)] = 3472,
-  [SMALL_STATE(208)] = 3485,
-  [SMALL_STATE(209)] = 3494,
-  [SMALL_STATE(210)] = 3505,
-  [SMALL_STATE(211)] = 3518,
-  [SMALL_STATE(212)] = 3531,
-  [SMALL_STATE(213)] = 3538,
-  [SMALL_STATE(214)] = 3547,
+  [SMALL_STATE(200)] = 3395,
+  [SMALL_STATE(201)] = 3402,
+  [SMALL_STATE(202)] = 3409,
+  [SMALL_STATE(203)] = 3422,
+  [SMALL_STATE(204)] = 3435,
+  [SMALL_STATE(205)] = 3446,
+  [SMALL_STATE(206)] = 3453,
+  [SMALL_STATE(207)] = 3466,
+  [SMALL_STATE(208)] = 3479,
+  [SMALL_STATE(209)] = 3488,
+  [SMALL_STATE(210)] = 3501,
+  [SMALL_STATE(211)] = 3510,
+  [SMALL_STATE(212)] = 3521,
+  [SMALL_STATE(213)] = 3528,
+  [SMALL_STATE(214)] = 3541,
   [SMALL_STATE(215)] = 3554,
   [SMALL_STATE(216)] = 3567,
   [SMALL_STATE(217)] = 3580,
   [SMALL_STATE(218)] = 3593,
   [SMALL_STATE(219)] = 3603,
-  [SMALL_STATE(220)] = 3611,
-  [SMALL_STATE(221)] = 3621,
-  [SMALL_STATE(222)] = 3631,
-  [SMALL_STATE(223)] = 3641,
-  [SMALL_STATE(224)] = 3651,
-  [SMALL_STATE(225)] = 3661,
-  [SMALL_STATE(226)] = 3671,
-  [SMALL_STATE(227)] = 3681,
-  [SMALL_STATE(228)] = 3687,
-  [SMALL_STATE(229)] = 3697,
-  [SMALL_STATE(230)] = 3703,
-  [SMALL_STATE(231)] = 3713,
-  [SMALL_STATE(232)] = 3719,
-  [SMALL_STATE(233)] = 3729,
-  [SMALL_STATE(234)] = 3737,
-  [SMALL_STATE(235)] = 3747,
-  [SMALL_STATE(236)] = 3753,
-  [SMALL_STATE(237)] = 3763,
-  [SMALL_STATE(238)] = 3773,
-  [SMALL_STATE(239)] = 3779,
-  [SMALL_STATE(240)] = 3789,
-  [SMALL_STATE(241)] = 3795,
+  [SMALL_STATE(220)] = 3613,
+  [SMALL_STATE(221)] = 3619,
+  [SMALL_STATE(222)] = 3629,
+  [SMALL_STATE(223)] = 3639,
+  [SMALL_STATE(224)] = 3649,
+  [SMALL_STATE(225)] = 3659,
+  [SMALL_STATE(226)] = 3665,
+  [SMALL_STATE(227)] = 3675,
+  [SMALL_STATE(228)] = 3681,
+  [SMALL_STATE(229)] = 3687,
+  [SMALL_STATE(230)] = 3693,
+  [SMALL_STATE(231)] = 3701,
+  [SMALL_STATE(232)] = 3711,
+  [SMALL_STATE(233)] = 3721,
+  [SMALL_STATE(234)] = 3731,
+  [SMALL_STATE(235)] = 3741,
+  [SMALL_STATE(236)] = 3747,
+  [SMALL_STATE(237)] = 3757,
+  [SMALL_STATE(238)] = 3767,
+  [SMALL_STATE(239)] = 3773,
+  [SMALL_STATE(240)] = 3781,
+  [SMALL_STATE(241)] = 3791,
   [SMALL_STATE(242)] = 3801,
   [SMALL_STATE(243)] = 3811,
-  [SMALL_STATE(244)] = 3821,
-  [SMALL_STATE(245)] = 3827,
-  [SMALL_STATE(246)] = 3833,
-  [SMALL_STATE(247)] = 3839,
-  [SMALL_STATE(248)] = 3849,
-  [SMALL_STATE(249)] = 3859,
-  [SMALL_STATE(250)] = 3869,
-  [SMALL_STATE(251)] = 3877,
-  [SMALL_STATE(252)] = 3887,
-  [SMALL_STATE(253)] = 3897,
-  [SMALL_STATE(254)] = 3907,
-  [SMALL_STATE(255)] = 3917,
-  [SMALL_STATE(256)] = 3927,
+  [SMALL_STATE(244)] = 3819,
+  [SMALL_STATE(245)] = 3829,
+  [SMALL_STATE(246)] = 3837,
+  [SMALL_STATE(247)] = 3843,
+  [SMALL_STATE(248)] = 3853,
+  [SMALL_STATE(249)] = 3863,
+  [SMALL_STATE(250)] = 3873,
+  [SMALL_STATE(251)] = 3883,
+  [SMALL_STATE(252)] = 3893,
+  [SMALL_STATE(253)] = 3903,
+  [SMALL_STATE(254)] = 3909,
+  [SMALL_STATE(255)] = 3919,
+  [SMALL_STATE(256)] = 3929,
   [SMALL_STATE(257)] = 3935,
   [SMALL_STATE(258)] = 3945,
   [SMALL_STATE(259)] = 3955,
   [SMALL_STATE(260)] = 3965,
-  [SMALL_STATE(261)] = 3973,
-  [SMALL_STATE(262)] = 3983,
-  [SMALL_STATE(263)] = 3993,
-  [SMALL_STATE(264)] = 4003,
-  [SMALL_STATE(265)] = 4013,
-  [SMALL_STATE(266)] = 4023,
+  [SMALL_STATE(261)] = 3975,
+  [SMALL_STATE(262)] = 3985,
+  [SMALL_STATE(263)] = 3995,
+  [SMALL_STATE(264)] = 4005,
+  [SMALL_STATE(265)] = 4015,
+  [SMALL_STATE(266)] = 4025,
   [SMALL_STATE(267)] = 4033,
-  [SMALL_STATE(268)] = 4043,
-  [SMALL_STATE(269)] = 4051,
-  [SMALL_STATE(270)] = 4057,
+  [SMALL_STATE(268)] = 4041,
+  [SMALL_STATE(269)] = 4047,
+  [SMALL_STATE(270)] = 4055,
   [SMALL_STATE(271)] = 4065,
   [SMALL_STATE(272)] = 4075,
   [SMALL_STATE(273)] = 4085,
@@ -7777,100 +7723,100 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(277)] = 4120,
   [SMALL_STATE(278)] = 4125,
   [SMALL_STATE(279)] = 4130,
-  [SMALL_STATE(280)] = 4137,
-  [SMALL_STATE(281)] = 4144,
-  [SMALL_STATE(282)] = 4149,
-  [SMALL_STATE(283)] = 4154,
-  [SMALL_STATE(284)] = 4161,
-  [SMALL_STATE(285)] = 4168,
-  [SMALL_STATE(286)] = 4173,
-  [SMALL_STATE(287)] = 4180,
+  [SMALL_STATE(280)] = 4135,
+  [SMALL_STATE(281)] = 4142,
+  [SMALL_STATE(282)] = 4147,
+  [SMALL_STATE(283)] = 4152,
+  [SMALL_STATE(284)] = 4157,
+  [SMALL_STATE(285)] = 4164,
+  [SMALL_STATE(286)] = 4171,
+  [SMALL_STATE(287)] = 4178,
   [SMALL_STATE(288)] = 4185,
-  [SMALL_STATE(289)] = 4192,
-  [SMALL_STATE(290)] = 4199,
-  [SMALL_STATE(291)] = 4206,
-  [SMALL_STATE(292)] = 4211,
-  [SMALL_STATE(293)] = 4216,
-  [SMALL_STATE(294)] = 4223,
-  [SMALL_STATE(295)] = 4228,
-  [SMALL_STATE(296)] = 4233,
-  [SMALL_STATE(297)] = 4240,
-  [SMALL_STATE(298)] = 4247,
-  [SMALL_STATE(299)] = 4252,
-  [SMALL_STATE(300)] = 4259,
-  [SMALL_STATE(301)] = 4264,
-  [SMALL_STATE(302)] = 4269,
-  [SMALL_STATE(303)] = 4276,
-  [SMALL_STATE(304)] = 4281,
-  [SMALL_STATE(305)] = 4286,
-  [SMALL_STATE(306)] = 4293,
-  [SMALL_STATE(307)] = 4298,
-  [SMALL_STATE(308)] = 4305,
-  [SMALL_STATE(309)] = 4312,
-  [SMALL_STATE(310)] = 4317,
-  [SMALL_STATE(311)] = 4322,
-  [SMALL_STATE(312)] = 4327,
-  [SMALL_STATE(313)] = 4332,
+  [SMALL_STATE(289)] = 4190,
+  [SMALL_STATE(290)] = 4195,
+  [SMALL_STATE(291)] = 4200,
+  [SMALL_STATE(292)] = 4207,
+  [SMALL_STATE(293)] = 4212,
+  [SMALL_STATE(294)] = 4217,
+  [SMALL_STATE(295)] = 4224,
+  [SMALL_STATE(296)] = 4229,
+  [SMALL_STATE(297)] = 4234,
+  [SMALL_STATE(298)] = 4241,
+  [SMALL_STATE(299)] = 4246,
+  [SMALL_STATE(300)] = 4253,
+  [SMALL_STATE(301)] = 4258,
+  [SMALL_STATE(302)] = 4263,
+  [SMALL_STATE(303)] = 4270,
+  [SMALL_STATE(304)] = 4275,
+  [SMALL_STATE(305)] = 4280,
+  [SMALL_STATE(306)] = 4285,
+  [SMALL_STATE(307)] = 4290,
+  [SMALL_STATE(308)] = 4297,
+  [SMALL_STATE(309)] = 4304,
+  [SMALL_STATE(310)] = 4311,
+  [SMALL_STATE(311)] = 4318,
+  [SMALL_STATE(312)] = 4323,
+  [SMALL_STATE(313)] = 4330,
   [SMALL_STATE(314)] = 4337,
   [SMALL_STATE(315)] = 4344,
   [SMALL_STATE(316)] = 4349,
-  [SMALL_STATE(317)] = 4356,
-  [SMALL_STATE(318)] = 4363,
-  [SMALL_STATE(319)] = 4368,
-  [SMALL_STATE(320)] = 4373,
-  [SMALL_STATE(321)] = 4380,
-  [SMALL_STATE(322)] = 4387,
-  [SMALL_STATE(323)] = 4394,
-  [SMALL_STATE(324)] = 4399,
-  [SMALL_STATE(325)] = 4406,
-  [SMALL_STATE(326)] = 4413,
-  [SMALL_STATE(327)] = 4418,
-  [SMALL_STATE(328)] = 4425,
-  [SMALL_STATE(329)] = 4430,
-  [SMALL_STATE(330)] = 4435,
-  [SMALL_STATE(331)] = 4440,
-  [SMALL_STATE(332)] = 4447,
-  [SMALL_STATE(333)] = 4454,
-  [SMALL_STATE(334)] = 4459,
-  [SMALL_STATE(335)] = 4464,
-  [SMALL_STATE(336)] = 4469,
-  [SMALL_STATE(337)] = 4476,
-  [SMALL_STATE(338)] = 4483,
-  [SMALL_STATE(339)] = 4488,
-  [SMALL_STATE(340)] = 4493,
-  [SMALL_STATE(341)] = 4500,
-  [SMALL_STATE(342)] = 4505,
-  [SMALL_STATE(343)] = 4510,
-  [SMALL_STATE(344)] = 4515,
-  [SMALL_STATE(345)] = 4520,
-  [SMALL_STATE(346)] = 4527,
-  [SMALL_STATE(347)] = 4532,
-  [SMALL_STATE(348)] = 4539,
-  [SMALL_STATE(349)] = 4544,
-  [SMALL_STATE(350)] = 4549,
-  [SMALL_STATE(351)] = 4556,
-  [SMALL_STATE(352)] = 4561,
+  [SMALL_STATE(317)] = 4354,
+  [SMALL_STATE(318)] = 4359,
+  [SMALL_STATE(319)] = 4364,
+  [SMALL_STATE(320)] = 4371,
+  [SMALL_STATE(321)] = 4376,
+  [SMALL_STATE(322)] = 4381,
+  [SMALL_STATE(323)] = 4386,
+  [SMALL_STATE(324)] = 4393,
+  [SMALL_STATE(325)] = 4400,
+  [SMALL_STATE(326)] = 4405,
+  [SMALL_STATE(327)] = 4410,
+  [SMALL_STATE(328)] = 4415,
+  [SMALL_STATE(329)] = 4422,
+  [SMALL_STATE(330)] = 4429,
+  [SMALL_STATE(331)] = 4436,
+  [SMALL_STATE(332)] = 4443,
+  [SMALL_STATE(333)] = 4448,
+  [SMALL_STATE(334)] = 4455,
+  [SMALL_STATE(335)] = 4462,
+  [SMALL_STATE(336)] = 4467,
+  [SMALL_STATE(337)] = 4472,
+  [SMALL_STATE(338)] = 4479,
+  [SMALL_STATE(339)] = 4484,
+  [SMALL_STATE(340)] = 4491,
+  [SMALL_STATE(341)] = 4496,
+  [SMALL_STATE(342)] = 4501,
+  [SMALL_STATE(343)] = 4506,
+  [SMALL_STATE(344)] = 4513,
+  [SMALL_STATE(345)] = 4518,
+  [SMALL_STATE(346)] = 4525,
+  [SMALL_STATE(347)] = 4530,
+  [SMALL_STATE(348)] = 4535,
+  [SMALL_STATE(349)] = 4540,
+  [SMALL_STATE(350)] = 4547,
+  [SMALL_STATE(351)] = 4554,
+  [SMALL_STATE(352)] = 4559,
   [SMALL_STATE(353)] = 4566,
-  [SMALL_STATE(354)] = 4573,
-  [SMALL_STATE(355)] = 4578,
+  [SMALL_STATE(354)] = 4571,
+  [SMALL_STATE(355)] = 4576,
   [SMALL_STATE(356)] = 4583,
-  [SMALL_STATE(357)] = 4588,
-  [SMALL_STATE(358)] = 4593,
-  [SMALL_STATE(359)] = 4600,
-  [SMALL_STATE(360)] = 4605,
-  [SMALL_STATE(361)] = 4612,
-  [SMALL_STATE(362)] = 4617,
-  [SMALL_STATE(363)] = 4624,
-  [SMALL_STATE(364)] = 4629,
-  [SMALL_STATE(365)] = 4634,
-  [SMALL_STATE(366)] = 4639,
-  [SMALL_STATE(367)] = 4646,
-  [SMALL_STATE(368)] = 4651,
-  [SMALL_STATE(369)] = 4656,
-  [SMALL_STATE(370)] = 4661,
-  [SMALL_STATE(371)] = 4668,
-  [SMALL_STATE(372)] = 4673,
-  [SMALL_STATE(373)] = 4680,
+  [SMALL_STATE(357)] = 4590,
+  [SMALL_STATE(358)] = 4595,
+  [SMALL_STATE(359)] = 4602,
+  [SMALL_STATE(360)] = 4609,
+  [SMALL_STATE(361)] = 4616,
+  [SMALL_STATE(362)] = 4621,
+  [SMALL_STATE(363)] = 4628,
+  [SMALL_STATE(364)] = 4633,
+  [SMALL_STATE(365)] = 4640,
+  [SMALL_STATE(366)] = 4645,
+  [SMALL_STATE(367)] = 4650,
+  [SMALL_STATE(368)] = 4655,
+  [SMALL_STATE(369)] = 4660,
+  [SMALL_STATE(370)] = 4665,
+  [SMALL_STATE(371)] = 4670,
+  [SMALL_STATE(372)] = 4675,
+  [SMALL_STATE(373)] = 4682,
   [SMALL_STATE(374)] = 4687,
   [SMALL_STATE(375)] = 4694,
   [SMALL_STATE(376)] = 4701,
@@ -7997,602 +7943,602 @@ static const uint32_t ts_small_parse_table_map[] = {
 static const TSParseActionEntry ts_parse_actions[] = {
   [0] = {.entry = {.count = 0, .reusable = false}},
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
-  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(448),
-  [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
-  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(416),
-  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446),
-  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(445),
-  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(444),
-  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(443),
-  [21] = {.entry = {.count = 1, .reusable = true}}, SHIFT(442),
-  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(475),
-  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(480),
-  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441),
-  [31] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(446),
-  [34] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(445),
-  [37] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(444),
-  [40] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(443),
-  [43] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(442),
-  [46] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(475),
-  [49] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0),
-  [51] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(4),
-  [54] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_content, 1, 0, 0),
-  [56] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [58] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
-  [60] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [62] = {.entry = {.count = 1, .reusable = true}}, SHIFT(479),
-  [64] = {.entry = {.count = 1, .reusable = true}}, SHIFT(374),
-  [66] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
-  [68] = {.entry = {.count = 1, .reusable = true}}, SHIFT(350),
-  [70] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
-  [72] = {.entry = {.count = 1, .reusable = true}}, SHIFT(373),
-  [74] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
-  [76] = {.entry = {.count = 1, .reusable = true}}, SHIFT(324),
-  [78] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0), SHIFT_REPEAT(167),
-  [81] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0), SHIFT_REPEAT(29),
-  [84] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0), SHIFT_REPEAT(479),
-  [87] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0),
-  [89] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0), SHIFT_REPEAT(287),
-  [92] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [94] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
-  [96] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [98] = {.entry = {.count = 1, .reusable = true}}, SHIFT(491),
-  [100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(278),
-  [102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [104] = {.entry = {.count = 1, .reusable = false}}, SHIFT(492),
-  [106] = {.entry = {.count = 1, .reusable = false}}, SHIFT(493),
-  [108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(494),
-  [110] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [112] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
-  [114] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prolog, 1, 0, 0),
-  [116] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(491),
-  [119] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0),
-  [121] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(22),
-  [124] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(492),
-  [127] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(493),
-  [130] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(494),
-  [133] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__cp, 1, 0, 0),
-  [135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
-  [137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
-  [139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(487),
-  [143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [145] = {.entry = {.count = 1, .reusable = false}}, SHIFT(488),
-  [147] = {.entry = {.count = 1, .reusable = false}}, SHIFT(489),
-  [149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(490),
-  [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(293),
-  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
-  [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(295),
-  [157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(451),
-  [159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(482),
-  [161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [165] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prolog, 2, 0, 0),
-  [167] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(487),
-  [170] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0),
+  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
+  [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
+  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(462),
+  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434),
+  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(475),
+  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(477),
+  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(430),
+  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(429),
+  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(426),
+  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(425),
+  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435),
+  [31] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_content, 1, 0, 0),
+  [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [35] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(434),
+  [38] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(475),
+  [41] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0),
+  [43] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(430),
+  [46] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(429),
+  [49] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(426),
+  [52] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(425),
+  [55] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_content_repeat1, 2, 0, 0), SHIFT_REPEAT(5),
+  [58] = {.entry = {.count = 1, .reusable = true}}, SHIFT(476),
+  [60] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
+  [62] = {.entry = {.count = 1, .reusable = true}}, SHIFT(328),
+  [64] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [66] = {.entry = {.count = 1, .reusable = true}}, SHIFT(290),
+  [68] = {.entry = {.count = 1, .reusable = true}}, SHIFT(345),
+  [70] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [72] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0), SHIFT_REPEAT(476),
+  [75] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0), SHIFT_REPEAT(215),
+  [78] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0),
+  [80] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0), SHIFT_REPEAT(30),
+  [83] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__intSubset, 2, 0, 0), SHIFT_REPEAT(290),
+  [86] = {.entry = {.count = 1, .reusable = true}}, SHIFT(374),
+  [88] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [90] = {.entry = {.count = 1, .reusable = true}}, SHIFT(333),
+  [92] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
+  [94] = {.entry = {.count = 1, .reusable = true}}, SHIFT(337),
+  [96] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [98] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
+  [100] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prolog, 1, 0, 0),
+  [102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
+  [106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(487),
+  [108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [110] = {.entry = {.count = 1, .reusable = false}}, SHIFT(488),
+  [112] = {.entry = {.count = 1, .reusable = false}}, SHIFT(489),
+  [114] = {.entry = {.count = 1, .reusable = true}}, SHIFT(490),
+  [116] = {.entry = {.count = 1, .reusable = true}}, SHIFT(491),
+  [118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
+  [120] = {.entry = {.count = 1, .reusable = false}}, SHIFT(492),
+  [122] = {.entry = {.count = 1, .reusable = false}}, SHIFT(493),
+  [124] = {.entry = {.count = 1, .reusable = true}}, SHIFT(494),
+  [126] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prolog, 2, 0, 0),
+  [128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [130] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__cp, 1, 0, 0),
+  [132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
+  [134] = {.entry = {.count = 1, .reusable = true}}, SHIFT(293),
+  [136] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
+  [138] = {.entry = {.count = 1, .reusable = true}}, SHIFT(295),
+  [140] = {.entry = {.count = 1, .reusable = true}}, SHIFT(453),
+  [142] = {.entry = {.count = 1, .reusable = true}}, SHIFT(482),
+  [144] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
+  [146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
+  [148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
+  [150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0),
+  [152] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(487),
+  [155] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(29),
+  [158] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(488),
+  [161] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(489),
+  [164] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat2, 2, 0, 0), SHIFT_REPEAT(490),
+  [167] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0),
+  [169] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(491),
   [172] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(31),
-  [175] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(488),
-  [178] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(489),
-  [181] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(490),
+  [175] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(492),
+  [178] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(493),
+  [181] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EntityValue_repeat1, 2, 0, 0), SHIFT_REPEAT(494),
   [184] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0),
-  [186] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(32),
-  [189] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(273),
-  [192] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0),
+  [186] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(233),
+  [189] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0),
+  [191] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(33),
   [194] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEReference, 3, 0, 0),
-  [196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0),
-  [198] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(476),
-  [201] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(477),
-  [204] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(478),
-  [207] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(35),
-  [210] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_STag, 4, 0, 0),
-  [212] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_STag, 4, 0, 0),
-  [214] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 2, 0, 1),
-  [216] = {.entry = {.count = 1, .reusable = true}}, SHIFT(351),
-  [218] = {.entry = {.count = 1, .reusable = false}}, SHIFT(476),
-  [220] = {.entry = {.count = 1, .reusable = false}}, SHIFT(477),
-  [222] = {.entry = {.count = 1, .reusable = true}}, SHIFT(478),
-  [224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [226] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 1, 0, 1),
-  [228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
-  [230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Reference, 1, 0, 0),
-  [234] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__Reference, 1, 0, 0),
-  [236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0),
-  [238] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(483),
-  [241] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(484),
-  [244] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(485),
-  [247] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(43),
-  [250] = {.entry = {.count = 1, .reusable = true}}, SHIFT(349),
-  [252] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [254] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 3, 0, 3),
-  [256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
-  [258] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 3, 0, 2),
-  [260] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ETag, 4, 0, 0),
-  [262] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_ETag, 4, 0, 0),
-  [264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(319),
-  [266] = {.entry = {.count = 1, .reusable = false}}, SHIFT(483),
-  [268] = {.entry = {.count = 1, .reusable = false}}, SHIFT(484),
-  [270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(485),
-  [272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [274] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EmptyElemTag, 5, 0, 0),
-  [276] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EmptyElemTag, 5, 0, 0),
-  [278] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PI, 5, 0, 0),
-  [280] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PI, 5, 0, 0),
-  [282] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ETag, 3, 0, 0),
-  [284] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_ETag, 3, 0, 0),
-  [286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
-  [288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [292] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
-  [294] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
-  [296] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [298] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EmptyElemTag, 4, 0, 0),
-  [300] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EmptyElemTag, 4, 0, 0),
-  [302] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_STag, 3, 0, 0),
-  [304] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_STag, 3, 0, 0),
-  [306] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_element, 3, 0, 0),
-  [308] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_element, 3, 0, 0),
-  [310] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EmptyElemTag, 3, 0, 0),
-  [312] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EmptyElemTag, 3, 0, 0),
-  [314] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PI, 3, 0, 0),
-  [316] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PI, 3, 0, 0),
-  [318] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prolog, 3, 0, 0),
-  [320] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [322] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_element, 2, 0, 0),
-  [324] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_element, 2, 0, 0),
-  [326] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 2, 0, 2),
-  [328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [330] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_element, 1, 0, 0),
-  [332] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_element, 1, 0, 0),
-  [334] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 4, 0, 0),
-  [336] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CDSect, 3, 0, 0),
-  [338] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_CDSect, 3, 0, 0),
-  [340] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CharRef, 3, 0, 0),
-  [342] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_CharRef, 3, 0, 0),
-  [344] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CDSect, 2, 0, 0),
-  [346] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_CDSect, 2, 0, 0),
-  [348] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 7, 0, 0),
-  [350] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 4, 0, 3),
-  [352] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityRef, 3, 0, 0),
-  [354] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EntityRef, 3, 0, 0),
-  [356] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prolog, 4, 0, 0),
-  [358] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 6, 0, 0),
-  [360] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
-  [362] = {.entry = {.count = 1, .reusable = true}}, SHIFT(323),
-  [364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
-  [366] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [368] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 3, 0, 0),
-  [370] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_STag, 5, 0, 0),
-  [372] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_STag, 5, 0, 0),
-  [374] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 5, 0, 0),
-  [376] = {.entry = {.count = 1, .reusable = true}}, SHIFT(365),
-  [378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(438),
-  [380] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
-  [384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
-  [386] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
-  [388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
-  [390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
-  [392] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
-  [394] = {.entry = {.count = 1, .reusable = true}}, SHIFT(149),
-  [396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [398] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
-  [400] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [402] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
-  [404] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
-  [410] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
-  [412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
-  [414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
-  [416] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
-  [418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(386),
-  [420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
-  [422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
-  [424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
-  [426] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
-  [428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
-  [430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(401),
-  [432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(141),
-  [434] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0), SHIFT_REPEAT(92),
-  [437] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0),
-  [439] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0), SHIFT_REPEAT(357),
-  [442] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PEReference, 3, 0, 0),
-  [444] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_StyleSheetPI, 5, 0, 0),
-  [446] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_StyleSheetPI, 5, 0, 0),
-  [448] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XmlModelPI, 5, 0, 0),
-  [450] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XmlModelPI, 5, 0, 0),
-  [452] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
-  [454] = {.entry = {.count = 1, .reusable = true}}, SHIFT(456),
-  [456] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
-  [460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465),
-  [462] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_StyleSheetPI, 3, 0, 0),
-  [464] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_StyleSheetPI, 3, 0, 0),
-  [466] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XmlModelPI, 3, 0, 0),
-  [468] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XmlModelPI, 3, 0, 0),
-  [470] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XmlModelPI, 4, 0, 0),
-  [472] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XmlModelPI, 4, 0, 0),
-  [474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(331),
-  [476] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
-  [478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(398),
-  [480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(336),
-  [482] = {.entry = {.count = 1, .reusable = true}}, SHIFT(347),
-  [484] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_StyleSheetPI, 4, 0, 0),
-  [486] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_StyleSheetPI, 4, 0, 0),
-  [488] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__cp, 2, 0, 0),
-  [490] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 4, 0, 0),
-  [492] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 4, 0, 0),
-  [494] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 4, 0, 0),
-  [496] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [498] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
-  [500] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
-  [504] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 6, 0, 0),
-  [506] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 6, 0, 0),
-  [508] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0),
-  [510] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(195),
-  [513] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(398),
-  [516] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_children, 1, 0, 0),
-  [518] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
-  [520] = {.entry = {.count = 1, .reusable = true}}, SHIFT(383),
-  [522] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 3, 0, 0),
+  [196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 4, 0, 0),
+  [198] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ETag, 4, 0, 0),
+  [200] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_ETag, 4, 0, 0),
+  [202] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EmptyElemTag, 3, 0, 0),
+  [204] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EmptyElemTag, 3, 0, 0),
+  [206] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PI, 3, 0, 0),
+  [208] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PI, 3, 0, 0),
+  [210] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_element, 2, 0, 0),
+  [212] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_element, 2, 0, 0),
+  [214] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Reference, 1, 0, 0),
+  [216] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__Reference, 1, 0, 0),
+  [218] = {.entry = {.count = 1, .reusable = true}}, SHIFT(322),
+  [220] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [222] = {.entry = {.count = 1, .reusable = false}}, SHIFT(478),
+  [224] = {.entry = {.count = 1, .reusable = false}}, SHIFT(479),
+  [226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(480),
+  [228] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_element, 1, 0, 0),
+  [230] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_element, 1, 0, 0),
+  [232] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327),
+  [234] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [236] = {.entry = {.count = 1, .reusable = false}}, SHIFT(483),
+  [238] = {.entry = {.count = 1, .reusable = false}}, SHIFT(484),
+  [240] = {.entry = {.count = 1, .reusable = true}}, SHIFT(485),
+  [242] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
+  [244] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
+  [246] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [248] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 7, 0, 0),
+  [252] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
+  [254] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
+  [256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
+  [258] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 6, 0, 0),
+  [260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(373),
+  [262] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_STag, 3, 0, 0),
+  [264] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_STag, 3, 0, 0),
+  [266] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 5, 0, 0),
+  [268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
+  [270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(365),
+  [274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(388),
+  [276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [278] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 3, 0, 3),
+  [280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
+  [282] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 3, 0, 2),
+  [284] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prolog, 3, 0, 0),
+  [286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
+  [290] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 1, 0, 1),
+  [292] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
+  [294] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_STag, 5, 0, 0),
+  [296] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_STag, 5, 0, 0),
+  [298] = {.entry = {.count = 1, .reusable = true}}, SHIFT(235),
+  [300] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CDSect, 2, 0, 0),
+  [302] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_CDSect, 2, 0, 0),
+  [304] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EmptyElemTag, 4, 0, 0),
+  [306] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EmptyElemTag, 4, 0, 0),
+  [308] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__choice, 3, 0, 0),
+  [310] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_PseudoAttValue_repeat2, 2, 0, 0),
+  [312] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_PseudoAttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(69),
+  [315] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_PseudoAttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(478),
+  [318] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_PseudoAttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(479),
+  [321] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_PseudoAttValue_repeat2, 2, 0, 0), SHIFT_REPEAT(480),
+  [324] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ETag, 3, 0, 0),
+  [326] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_ETag, 3, 0, 0),
+  [328] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_PseudoAttValue_repeat1, 2, 0, 0),
+  [330] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_PseudoAttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(71),
+  [333] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_PseudoAttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(483),
+  [336] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_PseudoAttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(484),
+  [339] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_PseudoAttValue_repeat1, 2, 0, 0), SHIFT_REPEAT(485),
+  [342] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 2, 0, 2),
+  [344] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
+  [346] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
+  [348] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
+  [350] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [352] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CDSect, 3, 0, 0),
+  [354] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_CDSect, 3, 0, 0),
+  [356] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PI, 5, 0, 0),
+  [358] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PI, 5, 0, 0),
+  [360] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CharRef, 3, 0, 0),
+  [362] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_CharRef, 3, 0, 0),
+  [364] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EmptyElemTag, 5, 0, 0),
+  [366] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EmptyElemTag, 5, 0, 0),
+  [368] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityRef, 3, 0, 0),
+  [370] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_EntityRef, 3, 0, 0),
+  [372] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_STag, 4, 0, 0),
+  [374] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_STag, 4, 0, 0),
+  [376] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_element, 3, 0, 0),
+  [378] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_element, 3, 0, 0),
+  [380] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 2, 0, 1),
+  [382] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_prolog, 4, 0, 0),
+  [384] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 4, 0, 3),
+  [386] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
+  [392] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [394] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
+  [396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [398] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
+  [400] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [402] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
+  [404] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
+  [408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170),
+  [410] = {.entry = {.count = 1, .reusable = true}}, SHIFT(267),
+  [412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
+  [414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
+  [416] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
+  [418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(403),
+  [420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
+  [422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(442),
+  [424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
+  [426] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
+  [428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
+  [430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
+  [432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
+  [434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
+  [436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [438] = {.entry = {.count = 1, .reusable = true}}, SHIFT(450),
+  [440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(448),
+  [442] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_StyleSheetPI, 5, 0, 0),
+  [444] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_StyleSheetPI, 5, 0, 0),
+  [446] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XmlModelPI, 5, 0, 0),
+  [448] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XmlModelPI, 5, 0, 0),
+  [450] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_StyleSheetPI, 4, 0, 0),
+  [452] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_StyleSheetPI, 4, 0, 0),
+  [454] = {.entry = {.count = 1, .reusable = true}}, SHIFT(386),
+  [456] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_PEReference, 3, 0, 0),
+  [458] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XmlModelPI, 4, 0, 0),
+  [460] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XmlModelPI, 4, 0, 0),
+  [462] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0), SHIFT_REPEAT(97),
+  [465] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0),
+  [467] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 2, 0, 0), SHIFT_REPEAT(357),
+  [470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(349),
+  [472] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
+  [474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(398),
+  [476] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XmlModelPI, 3, 0, 0),
+  [478] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XmlModelPI, 3, 0, 0),
+  [480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(343),
+  [482] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_StyleSheetPI, 3, 0, 0),
+  [484] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_StyleSheetPI, 3, 0, 0),
+  [486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(339),
+  [488] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 6, 0, 0),
+  [490] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 6, 0, 0),
+  [492] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
+  [494] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__cp, 2, 0, 0),
+  [496] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
+  [498] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 4, 0, 0),
+  [500] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 4, 0, 0),
+  [502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
+  [504] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0), SHIFT_REPEAT(170),
+  [507] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0),
+  [509] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0), SHIFT_REPEAT(401),
+  [512] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_children, 1, 0, 0),
+  [514] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
+  [516] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
+  [518] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
+  [520] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 5, 0, 0),
+  [522] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 5, 0, 0),
   [524] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0),
   [526] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0), SHIFT_REPEAT(482),
   [529] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__choice_repeat2, 2, 0, 0), SHIFT_REPEAT(358),
-  [532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
-  [534] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__intSubset, 3, 0, 0),
-  [536] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
-  [538] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [540] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
-  [542] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 7, 0, 0),
-  [544] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 7, 0, 0),
-  [546] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0), SHIFT_REPEAT(174),
-  [549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0),
-  [551] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 2, 0, 0), SHIFT_REPEAT(396),
-  [554] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 5, 0, 0),
-  [556] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 5, 0, 0),
-  [558] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
-  [560] = {.entry = {.count = 1, .reusable = true}}, SHIFT(389),
-  [562] = {.entry = {.count = 1, .reusable = true}}, SHIFT(360),
-  [564] = {.entry = {.count = 1, .reusable = true}}, SHIFT(376),
-  [566] = {.entry = {.count = 1, .reusable = true}}, SHIFT(375),
-  [568] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [570] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
-  [572] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
-  [574] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
-  [576] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
-  [578] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [582] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
-  [584] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [586] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
-  [588] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [590] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 12, 0, 0),
-  [592] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 12, 0, 0),
-  [594] = {.entry = {.count = 1, .reusable = true}}, SHIFT(399),
-  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(392),
-  [598] = {.entry = {.count = 1, .reusable = true}}, SHIFT(388),
-  [600] = {.entry = {.count = 1, .reusable = true}}, SHIFT(430),
-  [602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(415),
-  [604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
-  [606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
-  [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
-  [610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
-  [612] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
-  [614] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 8, 0, 0),
-  [616] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 8, 0, 0),
-  [618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
-  [620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
-  [622] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 2, 0, 0),
-  [624] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 2, 0, 0), SHIFT_REPEAT(482),
-  [627] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 11, 0, 0),
-  [629] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 11, 0, 0),
-  [631] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 5, 0, 0),
-  [633] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 5, 0, 0),
-  [635] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
-  [637] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
-  [639] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 3, 0, 0),
-  [641] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(188),
-  [644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(416),
-  [646] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EmptyElemTag_repeat1, 2, 0, 0),
-  [648] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EmptyElemTag_repeat1, 2, 0, 0), SHIFT_REPEAT(288),
-  [651] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
-  [653] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 1, 0, 0),
-  [655] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 1, 0, 0), SHIFT_REPEAT(192),
-  [658] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0),
-  [660] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0), SHIFT_REPEAT(262),
-  [663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(402),
-  [665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
-  [667] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 7, 0, 0),
-  [669] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 7, 0, 0),
-  [671] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
-  [673] = {.entry = {.count = 1, .reusable = true}}, SHIFT(361),
-  [675] = {.entry = {.count = 1, .reusable = true}}, SHIFT(362),
-  [677] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 3, 0, 0),
-  [679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(359),
-  [681] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
-  [683] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0), SHIFT_REPEAT(360),
-  [686] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0),
-  [688] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0), SHIFT_REPEAT(395),
-  [691] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
-  [693] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 9, 0, 0),
-  [695] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 9, 0, 0),
-  [697] = {.entry = {.count = 1, .reusable = true}}, SHIFT(354),
-  [699] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
-  [701] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 10, 0, 0),
-  [703] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 10, 0, 0),
-  [705] = {.entry = {.count = 1, .reusable = true}}, SHIFT(343),
-  [707] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
-  [709] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 6, 0, 0),
-  [711] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 6, 0, 0),
-  [713] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 4, 0, 0),
-  [715] = {.entry = {.count = 1, .reusable = false}}, SHIFT(280),
-  [717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
-  [719] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
-  [721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(337),
-  [723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
-  [725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
-  [727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(427),
-  [729] = {.entry = {.count = 1, .reusable = true}}, SHIFT(426),
-  [731] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 6, 0, 0),
-  [733] = {.entry = {.count = 1, .reusable = true}}, SHIFT(356),
-  [735] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
-  [737] = {.entry = {.count = 1, .reusable = true}}, SHIFT(250),
-  [739] = {.entry = {.count = 1, .reusable = true}}, SHIFT(317),
-  [741] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
-  [743] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [745] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
-  [747] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
-  [749] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_StyleSheetPI_repeat1, 2, 0, 0), SHIFT_REPEAT(290),
-  [752] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_StyleSheetPI_repeat1, 2, 0, 0),
-  [754] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
-  [756] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
-  [758] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_SystemLiteral, 3, 0, 0),
-  [760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
-  [762] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ExternalID, 5, 0, 0),
-  [764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
-  [766] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 5, 0, 0),
-  [768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(371),
-  [770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
-  [772] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Attribute, 3, 0, 0),
-  [774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(369),
-  [776] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttValue, 3, 0, 4),
-  [778] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 3, 0, 0),
-  [780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
-  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
-  [784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
-  [786] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 4, 0, 0),
-  [788] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ExternalID, 3, 0, 0),
-  [790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(228),
-  [792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
-  [794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
-  [796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
-  [798] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 1, 0, 0),
-  [800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
-  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
-  [804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(384),
-  [808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(370),
-  [810] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 4, 0, 0),
-  [812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(344),
-  [814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(437),
-  [816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
-  [818] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 2, 0, 0),
-  [820] = {.entry = {.count = 1, .reusable = true}}, SHIFT(334),
-  [822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(425),
-  [828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424),
-  [830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
-  [832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(387),
-  [836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
-  [840] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
-  [842] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 3, 0, 0),
-  [844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
-  [846] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttValue, 2, 0, 0),
-  [848] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 1, 0, 0),
-  [850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315),
-  [852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
-  [854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
-  [856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
-  [858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [860] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 6, 0, 0),
-  [862] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityValue, 2, 0, 0),
-  [864] = {.entry = {.count = 1, .reusable = true}}, SHIFT(486),
-  [866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(318),
-  [868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435),
-  [870] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 7, 0, 0),
-  [872] = {.entry = {.count = 1, .reusable = true}}, SHIFT(400),
-  [874] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
-  [876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(449),
-  [878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447),
-  [880] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EntityDecl, 1, 0, 0),
-  [882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
-  [884] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__markupdecl, 1, 0, 0),
-  [886] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [888] = {.entry = {.count = 1, .reusable = true}}, SHIFT(459),
-  [890] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationDecl, 7, 0, 0),
-  [892] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elementdecl, 8, 0, 0),
-  [894] = {.entry = {.count = 1, .reusable = true}}, SHIFT(409),
-  [896] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
-  [898] = {.entry = {.count = 1, .reusable = true}}, SHIFT(397),
-  [900] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__AttType, 1, 0, 0),
-  [902] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttDef, 4, 0, 0),
-  [904] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
-  [906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EnumeratedType, 1, 0, 0),
-  [908] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PublicID, 3, 0, 0),
-  [910] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
-  [912] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationDecl, 8, 0, 0),
-  [914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(338),
-  [916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(403),
-  [918] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityValue, 3, 0, 4),
-  [920] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PseudoAttValue, 2, 0, 0),
-  [922] = {.entry = {.count = 1, .reusable = true}}, SHIFT(432),
-  [924] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
-  [926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 8, 0, 0),
-  [928] = {.entry = {.count = 1, .reusable = true}}, SHIFT(481),
-  [930] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
-  [932] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
-  [934] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
-  [936] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 7, 0, 0),
-  [938] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_children, 2, 0, 0),
-  [940] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_StringType, 1, 0, 0),
-  [942] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
-  [944] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
-  [946] = {.entry = {.count = 1, .reusable = true}}, SHIFT(461),
-  [948] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460),
-  [950] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
-  [952] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
-  [954] = {.entry = {.count = 1, .reusable = true}}, SHIFT(393),
-  [956] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433),
-  [958] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
-  [960] = {.entry = {.count = 1, .reusable = true}}, SHIFT(380),
-  [962] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
-  [964] = {.entry = {.count = 1, .reusable = true}}, SHIFT(418),
-  [966] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 9, 0, 0),
-  [968] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
-  [970] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CDStart, 3, 0, 0),
-  [972] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 8, 0, 0),
-  [974] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PseudoAtt, 3, 0, 0),
-  [976] = {.entry = {.count = 1, .reusable = true}}, SHIFT(329),
-  [978] = {.entry = {.count = 1, .reusable = true}}, SHIFT(417),
-  [980] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
-  [982] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439),
-  [984] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 7, 0, 0),
-  [986] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 3, 0, 0),
-  [988] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__VersionInfo, 6, 0, 0),
-  [990] = {.entry = {.count = 1, .reusable = true}}, SHIFT(333),
-  [992] = {.entry = {.count = 1, .reusable = true}}, SHIFT(413),
-  [994] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434),
-  [996] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
-  [998] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEDecl, 9, 0, 0),
-  [1000] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 6, 0, 0),
-  [1002] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0), SHIFT(27),
-  [1005] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 9, 0, 0),
-  [1007] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 8, 0, 0),
-  [1009] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 6, 0, 0),
-  [1011] = {.entry = {.count = 1, .reusable = true}}, SHIFT(348),
-  [1013] = {.entry = {.count = 1, .reusable = true}}, SHIFT(453),
-  [1015] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_DefaultDecl, 3, 0, 0),
-  [1017] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
-  [1019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(410),
-  [1021] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elementdecl, 7, 0, 0),
-  [1023] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_contentspec, 1, 0, 0),
-  [1025] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
-  [1027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(419),
-  [1029] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PseudoAttValue, 3, 0, 4),
-  [1031] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PubidLiteral, 3, 0, 0),
-  [1033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(372),
-  [1035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(339),
-  [1037] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 5, 0, 0),
-  [1039] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 7, 0, 0),
-  [1041] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 5, 0, 0),
-  [1043] = {.entry = {.count = 1, .reusable = true}}, SHIFT(381),
-  [1045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
-  [1047] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 3, 0, 0),
-  [1049] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__SDDecl, 6, 0, 0),
-  [1051] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EncodingDecl, 6, 0, 0),
-  [1053] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_DefaultDecl, 1, 0, 0),
-  [1055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(450),
-  [1057] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttDef, 6, 0, 0),
-  [1059] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEDecl, 10, 0, 0),
-  [1061] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NDataDecl, 4, 0, 0),
-  [1063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464),
-  [1065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(391),
+  [532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(383),
+  [534] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_XMLDecl, 7, 0, 0),
+  [536] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_XMLDecl, 7, 0, 0),
+  [538] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [540] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__intSubset, 3, 0, 0),
+  [542] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0),
+  [544] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(168),
+  [547] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(398),
+  [550] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 3, 0, 0),
+  [552] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__choice_repeat1, 4, 0, 0),
+  [554] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
+  [556] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
+  [558] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
+  [560] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 3, 0, 0),
+  [562] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 2, 0, 0), SHIFT_REPEAT(160),
+  [565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
+  [567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
+  [569] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 7, 0, 0),
+  [571] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 7, 0, 0),
+  [573] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
+  [575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(396),
+  [581] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
+  [583] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 1, 0, 0),
+  [585] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_NotationType_repeat1, 1, 0, 0), SHIFT_REPEAT(162),
+  [588] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
+  [592] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
+  [594] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
+  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
+  [598] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 12, 0, 0),
+  [600] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 12, 0, 0),
+  [602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
+  [604] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_EmptyElemTag_repeat1, 2, 0, 0),
+  [606] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_EmptyElemTag_repeat1, 2, 0, 0), SHIFT_REPEAT(352),
+  [609] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
+  [611] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 11, 0, 0),
+  [613] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 11, 0, 0),
+  [615] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0), SHIFT_REPEAT(360),
+  [618] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0),
+  [620] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 2, 0, 0), SHIFT_REPEAT(395),
+  [623] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
+  [625] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
+  [627] = {.entry = {.count = 1, .reusable = true}}, SHIFT(360),
+  [629] = {.entry = {.count = 1, .reusable = true}}, SHIFT(363),
+  [631] = {.entry = {.count = 1, .reusable = true}}, SHIFT(359),
+  [633] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 5, 0, 0),
+  [635] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 5, 0, 0),
+  [637] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [639] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [641] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
+  [643] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0),
+  [645] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0), SHIFT_REPEAT(258),
+  [648] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
+  [650] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 8, 0, 0),
+  [652] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 8, 0, 0),
+  [654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(393),
+  [656] = {.entry = {.count = 1, .reusable = true}}, SHIFT(278),
+  [658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(389),
+  [660] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 6, 0, 0),
+  [662] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 6, 0, 0),
+  [664] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 4, 0, 0),
+  [666] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
+  [668] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
+  [670] = {.entry = {.count = 1, .reusable = true}}, SHIFT(376),
+  [672] = {.entry = {.count = 1, .reusable = true}}, SHIFT(375),
+  [674] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 2, 0, 0),
+  [676] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 2, 0, 0), SHIFT_REPEAT(482),
+  [679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
+  [681] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
+  [683] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
+  [685] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
+  [687] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 9, 0, 0),
+  [689] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 9, 0, 0),
+  [691] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
+  [693] = {.entry = {.count = 1, .reusable = true}}, SHIFT(203),
+  [695] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_doctypedecl, 10, 0, 0),
+  [697] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_doctypedecl, 10, 0, 0),
+  [699] = {.entry = {.count = 1, .reusable = true}}, SHIFT(321),
+  [701] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
+  [703] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat1, 3, 0, 0),
+  [705] = {.entry = {.count = 1, .reusable = false}}, SHIFT(312),
+  [707] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
+  [709] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
+  [711] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
+  [713] = {.entry = {.count = 1, .reusable = true}}, SHIFT(415),
+  [715] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
+  [717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(408),
+  [719] = {.entry = {.count = 1, .reusable = true}}, SHIFT(407),
+  [721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(361),
+  [723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(362),
+  [725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
+  [727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(399),
+  [729] = {.entry = {.count = 1, .reusable = true}}, SHIFT(350),
+  [731] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446),
+  [733] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
+  [735] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 4, 0, 0),
+  [737] = {.entry = {.count = 1, .reusable = true}}, SHIFT(380),
+  [739] = {.entry = {.count = 1, .reusable = true}}, SHIFT(387),
+  [741] = {.entry = {.count = 1, .reusable = true}}, SHIFT(369),
+  [743] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Attribute, 3, 0, 0),
+  [745] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
+  [747] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_SystemLiteral, 3, 0, 0),
+  [749] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ExternalID, 5, 0, 0),
+  [751] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 5, 0, 0),
+  [753] = {.entry = {.count = 1, .reusable = true}}, SHIFT(371),
+  [755] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
+  [757] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
+  [759] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
+  [761] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
+  [763] = {.entry = {.count = 1, .reusable = true}}, SHIFT(364),
+  [765] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [767] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
+  [769] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttValue, 3, 0, 4),
+  [771] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
+  [773] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [775] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ExternalID, 3, 0, 0),
+  [777] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 6, 0, 0),
+  [779] = {.entry = {.count = 1, .reusable = true}}, SHIFT(366),
+  [781] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [783] = {.entry = {.count = 1, .reusable = true}}, SHIFT(397),
+  [785] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
+  [787] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 4, 0, 0),
+  [789] = {.entry = {.count = 1, .reusable = true}}, SHIFT(344),
+  [791] = {.entry = {.count = 1, .reusable = true}}, SHIFT(378),
+  [793] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 1, 0, 0),
+  [795] = {.entry = {.count = 1, .reusable = true}}, SHIFT(351),
+  [797] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
+  [799] = {.entry = {.count = 1, .reusable = true}}, SHIFT(285),
+  [801] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [803] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
+  [805] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
+  [807] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [809] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [811] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttValue, 2, 0, 0),
+  [813] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
+  [815] = {.entry = {.count = 1, .reusable = true}}, SHIFT(390),
+  [817] = {.entry = {.count = 1, .reusable = true}}, SHIFT(391),
+  [819] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
+  [821] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
+  [823] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
+  [825] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
+  [827] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_StyleSheetPI_repeat1, 2, 0, 0),
+  [829] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_StyleSheetPI_repeat1, 2, 0, 0), SHIFT_REPEAT(356),
+  [832] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 2, 0, 0),
+  [834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(316),
+  [836] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 3, 0, 0),
+  [838] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
+  [840] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Enumeration_repeat1, 3, 0, 0),
+  [842] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_Mixed_repeat2, 1, 0, 0),
+  [844] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315),
+  [846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
+  [848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
+  [850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
+  [852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
+  [854] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
+  [856] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
+  [858] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
+  [860] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 5, 0, 0),
+  [862] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 7, 0, 0),
+  [864] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityValue, 2, 0, 0),
+  [866] = {.entry = {.count = 1, .reusable = true}}, SHIFT(320),
+  [868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(486),
+  [870] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_children, 2, 0, 0),
+  [872] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 7, 0, 0),
+  [874] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
+  [876] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
+  [878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(451),
+  [880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(449),
+  [882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(418),
+  [884] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elementdecl, 7, 0, 0),
+  [886] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationDecl, 7, 0, 0),
+  [888] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__markupdecl, 1, 0, 0),
+  [890] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
+  [892] = {.entry = {.count = 1, .reusable = true}}, SHIFT(459),
+  [894] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elementdecl, 8, 0, 0),
+  [896] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_StringType, 1, 0, 0),
+  [898] = {.entry = {.count = 1, .reusable = true}}, SHIFT(422),
+  [900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
+  [902] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__AttType, 1, 0, 0),
+  [904] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EntityDecl, 1, 0, 0),
+  [906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttDef, 4, 0, 0),
+  [908] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [910] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EnumeratedType, 1, 0, 0),
+  [912] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PublicID, 3, 0, 0),
+  [914] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
+  [916] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationDecl, 8, 0, 0),
+  [918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(338),
+  [920] = {.entry = {.count = 1, .reusable = true}}, SHIFT(414),
+  [922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_EntityValue, 3, 0, 4),
+  [924] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_CDStart, 3, 0, 0),
+  [926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PseudoAtt, 3, 0, 0),
+  [928] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 8, 0, 0),
+  [930] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [932] = {.entry = {.count = 1, .reusable = true}}, SHIFT(481),
+  [934] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
+  [936] = {.entry = {.count = 1, .reusable = true}}, SHIFT(420),
+  [938] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460),
+  [940] = {.entry = {.count = 1, .reusable = true}}, SHIFT(419),
+  [942] = {.entry = {.count = 1, .reusable = true}}, SHIFT(377),
+  [944] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
+  [946] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
+  [948] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439),
+  [950] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__Eq, 3, 0, 0),
+  [952] = {.entry = {.count = 1, .reusable = true}}, SHIFT(437),
+  [954] = {.entry = {.count = 1, .reusable = true}}, SHIFT(385),
+  [956] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_AttlistDecl_repeat1, 2, 0, 0), SHIFT(25),
+  [959] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttlistDecl, 6, 0, 0),
+  [961] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
+  [963] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465),
+  [965] = {.entry = {.count = 1, .reusable = true}}, SHIFT(400),
+  [967] = {.entry = {.count = 1, .reusable = true}}, SHIFT(421),
+  [969] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_contentspec, 1, 0, 0),
+  [971] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PseudoAttValue, 2, 0, 0),
+  [973] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
+  [975] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447),
+  [977] = {.entry = {.count = 1, .reusable = true}}, SHIFT(317),
+  [979] = {.entry = {.count = 1, .reusable = true}}, SHIFT(318),
+  [981] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
+  [983] = {.entry = {.count = 1, .reusable = true}}, SHIFT(454),
+  [985] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PubidLiteral, 3, 0, 0),
+  [987] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
+  [989] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
+  [991] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433),
+  [993] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 9, 0, 0),
+  [995] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 8, 0, 0),
+  [997] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
+  [999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(423),
+  [1001] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEDecl, 9, 0, 0),
+  [1003] = {.entry = {.count = 1, .reusable = true}}, SHIFT(336),
+  [1005] = {.entry = {.count = 1, .reusable = true}}, SHIFT(417),
+  [1007] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 7, 0, 0),
+  [1009] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_GEDecl, 9, 0, 0),
+  [1011] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NotationType, 6, 0, 0),
+  [1013] = {.entry = {.count = 1, .reusable = true}}, SHIFT(340),
+  [1015] = {.entry = {.count = 1, .reusable = true}}, SHIFT(413),
+  [1017] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
+  [1019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(431),
+  [1021] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 6, 0, 0),
+  [1023] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 8, 0, 0),
+  [1025] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_DefaultDecl, 3, 0, 0),
+  [1027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(342),
+  [1029] = {.entry = {.count = 1, .reusable = true}}, SHIFT(410),
+  [1031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464),
+  [1033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
+  [1035] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__EncodingDecl, 6, 0, 0),
+  [1037] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__SDDecl, 6, 0, 0),
+  [1039] = {.entry = {.count = 1, .reusable = true}}, SHIFT(445),
+  [1041] = {.entry = {.count = 1, .reusable = true}}, SHIFT(372),
+  [1043] = {.entry = {.count = 1, .reusable = true}}, SHIFT(346),
+  [1045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(381),
+  [1047] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
+  [1049] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 3, 0, 0),
+  [1051] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 5, 0, 0),
+  [1053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [1055] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_DefaultDecl, 1, 0, 0),
+  [1057] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Mixed, 7, 0, 0),
+  [1059] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_AttDef, 6, 0, 0),
+  [1061] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PEDecl, 10, 0, 0),
+  [1063] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_NDataDecl, 4, 0, 0),
+  [1065] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__VersionInfo, 6, 0, 0),
   [1067] = {.entry = {.count = 1, .reusable = true}}, SHIFT(394),
-  [1069] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
-  [1071] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
-  [1073] = {.entry = {.count = 1, .reusable = true}}, SHIFT(378),
-  [1075] = {.entry = {.count = 1, .reusable = true}}, SHIFT(440),
+  [1069] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
+  [1071] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_PseudoAttValue, 3, 0, 4),
+  [1073] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
+  [1075] = {.entry = {.count = 1, .reusable = true}}, SHIFT(402),
   [1077] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_Enumeration, 4, 0, 0),
-  [1079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
-  [1081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(352),
-  [1083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [1085] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [1087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [1089] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
-  [1091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(342),
-  [1093] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
-  [1095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(414),
-  [1097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
-  [1099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(408),
-  [1101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
-  [1103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(363),
-  [1105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
-  [1107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
-  [1109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [1111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(368),
-  [1113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(364),
-  [1115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
-  [1117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
-  [1119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(335),
-  [1121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
-  [1123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
-  [1125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [1127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(429),
-  [1129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
-  [1131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
-  [1133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
-  [1135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
-  [1137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
-  [1139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
-  [1141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(328),
-  [1143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(382),
-  [1145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(379),
-  [1147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(436),
-  [1149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(431),
-  [1151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
-  [1153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
-  [1155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
-  [1157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
-  [1159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
-  [1161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
-  [1163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(390),
-  [1165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
-  [1167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
-  [1169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
-  [1171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
-  [1173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
-  [1175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(307),
-  [1177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(420),
-  [1179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(421),
-  [1181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(422),
+  [1079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(384),
+  [1081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [1083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
+  [1085] = {.entry = {.count = 1, .reusable = true}}, SHIFT(404),
+  [1087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
+  [1089] = {.entry = {.count = 1, .reusable = true}}, SHIFT(354),
+  [1091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
+  [1093] = {.entry = {.count = 1, .reusable = true}}, SHIFT(405),
+  [1095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
+  [1097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(347),
+  [1099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(409),
+  [1101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(412),
+  [1103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [1105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
+  [1107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(436),
+  [1109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
+  [1111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
+  [1113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
+  [1115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441),
+  [1117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
+  [1119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
+  [1121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(241),
+  [1123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(332),
+  [1125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
+  [1127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(368),
+  [1129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
+  [1131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
+  [1133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(335),
+  [1135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(250),
+  [1137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(452),
+  [1139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(440),
+  [1141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
+  [1143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
+  [1145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(432),
+  [1147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
+  [1149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(382),
+  [1151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(427),
+  [1153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424),
+  [1155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
+  [1157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [1159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
+  [1161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(331),
+  [1163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
+  [1165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
+  [1167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
+  [1169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(370),
+  [1171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(379),
+  [1173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
+  [1175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(149),
+  [1177] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
+  [1179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
+  [1181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
   [1183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(341),
-  [1185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(452),
-  [1187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(237),
-  [1189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(405),
-  [1191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(377),
-  [1193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
-  [1195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
-  [1197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
-  [1199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
-  [1201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
-  [1203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [1205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(404),
-  [1207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(407),
-  [1209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
+  [1185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
+  [1187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
+  [1189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
+  [1191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(416),
+  [1193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [1195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148),
+  [1197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
+  [1199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [1201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(444),
+  [1203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [1205] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [1207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
+  [1209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(443),
   [1211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [1213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(271),
-  [1215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
-  [1217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148),
+  [1213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
+  [1215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
+  [1217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
   [1219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(277),
-  [1221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
-  [1223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
-  [1225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
-  [1227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
-  [1229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
-  [1231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
-  [1233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [1235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(454),
-  [1237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(455),
-  [1239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
-  [1241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
+  [1221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
+  [1223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
+  [1225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
+  [1227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
+  [1229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
+  [1231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
+  [1233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
+  [1235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
+  [1237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
+  [1239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(455),
+  [1241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(456),
   [1243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(457),
   [1245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(466),
   [1247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(467),
@@ -8666,16 +8612,16 @@ static const bool ts_external_scanner_states[11][EXTERNAL_TOKEN_COUNT] = {
     [ts_external_token_CData] = true,
   },
   [7] = {
-    [ts_external_token__start_tag_name] = true,
+    [ts_external_token__pi_content] = true,
   },
   [8] = {
-    [ts_external_token__pi_content] = true,
+    [ts_external_token_PITarget] = true,
   },
   [9] = {
     [ts_external_token__end_tag_name] = true,
   },
   [10] = {
-    [ts_external_token_PITarget] = true,
+    [ts_external_token__start_tag_name] = true,
   },
 };
 
diff --git a/xml/src/tree_sitter/alloc.h b/xml/src/tree_sitter/alloc.h
index 1f4466d..1abdd12 100644
--- a/xml/src/tree_sitter/alloc.h
+++ b/xml/src/tree_sitter/alloc.h
@@ -12,10 +12,10 @@ extern "C" {
 // Allow clients to override allocation functions
 #ifdef TREE_SITTER_REUSE_ALLOCATOR
 
-extern void *(*ts_current_malloc)(size_t);
-extern void *(*ts_current_calloc)(size_t, size_t);
-extern void *(*ts_current_realloc)(void *, size_t);
-extern void (*ts_current_free)(void *);
+extern void *(*ts_current_malloc)(size_t size);
+extern void *(*ts_current_calloc)(size_t count, size_t size);
+extern void *(*ts_current_realloc)(void *ptr, size_t size);
+extern void (*ts_current_free)(void *ptr);
 
 #ifndef ts_malloc
 #define ts_malloc  ts_current_malloc
diff --git a/xml/src/tree_sitter/parser.h b/xml/src/tree_sitter/parser.h
index 17f0e94..799f599 100644
--- a/xml/src/tree_sitter/parser.h
+++ b/xml/src/tree_sitter/parser.h
@@ -47,6 +47,7 @@ struct TSLexer {
   uint32_t (*get_column)(TSLexer *);
   bool (*is_at_included_range_start)(const TSLexer *);
   bool (*eof)(const TSLexer *);
+  void (*log)(const TSLexer *, const char *, ...);
 };
 
 typedef enum {