From 825d7e098923c4a66559eb64e06f1a89ebc88e58 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Mon, 15 May 2017 14:05:28 +0300
Subject: [PATCH] bring back and deprecate hgroup element (WEB-23578)

---
 .../resources/html5-schema/html5/common.rnc   |  5 +++
 .../src/resources/html5-schema/html5/meta.rnc |  5 +++
 .../html5-schema/html5/sectional.rnc          | 25 ++++++++++++++
 .../src/resources/patches/0003_hgroup.patch   | 34 -------------------
 4 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 xml/relaxng/src/resources/patches/0003_hgroup.patch

diff --git a/xml/relaxng/src/resources/html5-schema/html5/common.rnc b/xml/relaxng/src/resources/html5-schema/html5/common.rnc
index c6b97872b261..18f0f922bb09 100644
--- a/xml/relaxng/src/resources/html5-schema/html5/common.rnc
+++ b/xml/relaxng/src/resources/html5-schema/html5/common.rnc
@@ -341,6 +341,11 @@ common.attrs.other =
 			}+
 		}
 
+## color for <link rel="mask-icon"> and <meta name="theme-color">
+
+	common.data.color =
+		w:color
+
 ## MIME types
 
 	common.data.mimetype =
diff --git a/xml/relaxng/src/resources/html5-schema/html5/meta.rnc b/xml/relaxng/src/resources/html5-schema/html5/meta.rnc
index ffa7f6dfd8f1..ad47255ed206 100644
--- a/xml/relaxng/src/resources/html5-schema/html5/meta.rnc
+++ b/xml/relaxng/src/resources/html5-schema/html5/meta.rnc
@@ -162,6 +162,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	shared-hyperlink.attrs.type?
 		&	referrerpolicy?
 		&	link.attrs.sizes?
+		&	link.attrs.color?
 		#	link.attrs.title included in common.attrs
 		&	embedded.content.attrs.crossorigin?
 		&	(	common.attrs.aria.role.link
@@ -207,6 +208,10 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute sizes {
 				w:string "any" | common.data.sizes
 			}
+		link.attrs.color =
+			attribute color {
+				common.data.color
+			}
 	link.inner =
 		( empty )
 		
diff --git a/xml/relaxng/src/resources/html5-schema/html5/sectional.rnc b/xml/relaxng/src/resources/html5-schema/html5/sectional.rnc
index 85a49d9ca3a7..afbac8fb61b4 100644
--- a/xml/relaxng/src/resources/html5-schema/html5/sectional.rnc
+++ b/xml/relaxng/src/resources/html5-schema/html5/sectional.rnc
@@ -107,6 +107,31 @@
 
 	common.elem.flow |= h6.elem
 
+## Heading Group: <hgroup>
+
+	hgroup.elem =
+		element hgroup { hgroup.inner & hgroup.attrs } & nonW3C
+	hgroup.attrs =
+		(	common.attrs
+		&	(	common.attrs.aria.implicit.heading
+			|	common.attrs.aria.role.heading
+			|	common.attrs.aria.role.tab
+			|	common.attrs.aria.role.presentation
+			)?
+		)
+	hgroup.inner =
+		(	(	h1.elem
+			|	h2.elem
+			|	h3.elem
+			|	h4.elem
+			|	h5.elem
+			|	h6.elem
+			)
+			&	common.elem.script-supporting*
+		)+
+
+	common.elem.flow |= hgroup.elem
+
 # #####################################################################
 ## Section Meta
 
diff --git a/xml/relaxng/src/resources/patches/0003_hgroup.patch b/xml/relaxng/src/resources/patches/0003_hgroup.patch
deleted file mode 100644
index 714063b4fc6b..000000000000
--- a/xml/relaxng/src/resources/patches/0003_hgroup.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- /Users/denofevil/Code/sandbox/checker/syntax/relaxng/sectional.rnc	2014-01-24 12:18:24.000000000 +0400
-+++ html5/sectional.rnc	2014-01-24 14:06:03.000000000 +0400
-@@ -107,31 +107,6 @@
- 
- 	common.elem.flow |= h6.elem
- 
--## Heading Group: <hgroup>
--
--	hgroup.elem =
--		element hgroup { hgroup.inner & hgroup.attrs } & nonW3C
--	hgroup.attrs =
--		(	common.attrs
--		&	(	common.attrs.aria.implicit.heading
--			|	common.attrs.aria.role.heading
--			|	common.attrs.aria.role.tab
--			|	common.attrs.aria.role.presentation
--			)?
--		)
--	hgroup.inner =
--		(	(	h1.elem
--			|	h2.elem
--			|	h3.elem
--			|	h4.elem
--			|	h5.elem
--			|	h6.elem
--			)
--			&	common.elem.script-supporting*
--		)+
--
--	common.elem.flow |= hgroup.elem
--
- # #####################################################################
- ## Section Meta
-