Merge branch 'master' into eslint-regexp

PrismJS · Jun 13, 2021 · 2e4dd47 · 2e4dd47
2 parents 293dc02 + 5d3d808
commit 2e4dd47
Show file tree

Hide file tree

Showing 161 changed files with 777 additions and 235 deletions.
diff --git a/components.js b/components.js
diff --git a/components.json b/components.json
@@ -1346,6 +1346,15 @@
 			"require": "markup",
 			"owner": "Golmote"
 		},
+		"wolfram": {
+			"title": "Wolfram language",
+			"alias": ["mathematica", "nb", "wl"],
+			"aliasTitles": {
+				"mathematica": "Mathematica",
+				"nb": "Mathematica Notebook"
+			},
+			"owner": "msollami"
+		},
 		"xeora": {
 			"title": "Xeora",
 			"require": "markup",

diff --git a/components/prism-abnf.js b/components/prism-abnf.js
@@ -25,7 +25,7 @@
 			alias: 'operator'
 		},
 		'definition': {
-			pattern: /(^[ \t]*)(?:[a-z][\w-]*|<[^>\r\n]*>)(?=\s*=)/m,
+			pattern: /(^[ \t]*)(?:[a-z][\w-]*|<[^<>\r\n]*>)(?=\s*=)/m,
 			lookbehind: true,
 			alias: 'keyword',
 			inside: {
@@ -41,7 +41,7 @@
 			}
 		},
 		'rule': {
-			pattern: /(^|[^<\w-])[a-z][\w-]*|<[^>\r\n]*>/i,
+			pattern: /(^|[^<\w-])[a-z][\w-]*|<[^<>\r\n]*>/i,
 			lookbehind: true,
 			inside: {
 				'punctuation': /<|>/

diff --git a/components/prism-abnf.min.js b/components/prism-abnf.min.js
diff --git a/components/prism-apacheconf.js b/components/prism-apacheconf.js