From de2edbceb8cacd68fcae357b9f1d953b503e0476 Mon Sep 17 00:00:00 2001
From: Michael Sheets <git@whitefalls.org>
Date: Thu, 5 Jul 2018 01:09:46 -0500
Subject: [PATCH] Update for new HTML/XML scopes

---
 Themes/Brilliance Black.tmTheme | 8 ++++----
 Themes/Brilliance Dull.tmTheme  | 8 ++++----
 Themes/Brilliance White.tmTheme | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Themes/Brilliance Black.tmTheme b/Themes/Brilliance Black.tmTheme
index d7c0004..f75d8f1 100644
--- a/Themes/Brilliance Black.tmTheme	
+++ b/Themes/Brilliance Black.tmTheme	
@@ -815,7 +815,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Doctype</string>
 			<key>scope</key>
-			<string>meta.doctype, meta.tag.sgml-declaration.doctype, meta.tag.sgml.doctype</string>
+			<string>meta.tag.metadata.doctype</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -889,7 +889,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Other</string>
 			<key>scope</key>
-			<string>meta.tag.other, entity.name.tag.style, entity.name.tag.script, meta.tag.block.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
+			<string>meta.tag.other, meta.tag.metadata.style entity.name.tag, meta.tag.metadata.script entity.name.tag, meta.tag.metadata.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -902,7 +902,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Form</string>
 			<key>scope</key>
-			<string>meta.tag.form, meta.tag.block.form, meta.tag.inline.form</string>
+			<string>meta.tag.structure.form, meta.tag.block.form, meta.tag.inline.form</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -915,7 +915,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Void</string>
 			<key>scope</key>
-			<string>meta.tag.inline.any.void, meta.tag.form.any.void</string>
+			<string>meta.tag.*.*.void, meta.tag.*.*.*.void</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
diff --git a/Themes/Brilliance Dull.tmTheme b/Themes/Brilliance Dull.tmTheme
index 1859b30..1ad1a61 100644
--- a/Themes/Brilliance Dull.tmTheme	
+++ b/Themes/Brilliance Dull.tmTheme	
@@ -828,7 +828,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Doctype</string>
 			<key>scope</key>
-			<string>meta.doctype, meta.tag.sgml-declaration.doctype, meta.tag.sgml.doctype</string>
+			<string>meta.tag.metadata.doctype</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -902,7 +902,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Other</string>
 			<key>scope</key>
-			<string>meta.tag.other, entity.name.tag.style, entity.name.tag.script, meta.tag.block.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
+			<string>meta.tag.other, meta.tag.metadata.style entity.name.tag, meta.tag.metadata.script entity.name.tag, meta.tag.metadata.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -915,7 +915,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Form</string>
 			<key>scope</key>
-			<string>meta.tag.form, meta.tag.block.form, meta.tag.inline.form</string>
+			<string>meta.tag.structure.form, meta.tag.block.form, meta.tag.inline.form</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -928,7 +928,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Void</string>
 			<key>scope</key>
-			<string>meta.tag.inline.any.void, meta.tag.form.any.void</string>
+			<string>meta.tag.*.*.void, meta.tag.*.*.*.void</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
diff --git a/Themes/Brilliance White.tmTheme b/Themes/Brilliance White.tmTheme
index 31e6119..d4c01a6 100644
--- a/Themes/Brilliance White.tmTheme	
+++ b/Themes/Brilliance White.tmTheme	
@@ -1049,7 +1049,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Other</string>
 			<key>scope</key>
-			<string>meta.tag.other, entity.name.tag.style, entity.name.tag.script, meta.tag.block.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
+			<string>meta.tag.other, meta.tag.metadata.style entity.name.tag, meta.tag.metadata.script entity.name.tag, meta.tag.metadata.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -1075,7 +1075,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Form</string>
 			<key>scope</key>
-			<string>meta.tag.form, meta.tag.block.form, meta.tag.inline.form</string>
+			<string>meta.tag.structure.form, meta.tag.block.form, meta.tag.inline.form</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>
@@ -1114,7 +1114,7 @@ meta.brace.round</string>
 			<key>name</key>
 			<string>✘ Tag Input</string>
 			<key>scope</key>
-			<string>meta.tag.inline.any.void, meta.tag.form.any.void</string>
+			<string>meta.tag.*.*.void, meta.tag.*.*.*.void</string>
 			<key>settings</key>
 			<dict>
 				<key>background</key>