Merge branch 'master' into add-rego-support

Author: RunDevelopment

components.js

@@ -528,6 +528,10 @@
 			"title": "Icon",
 			"owner": "Golmote"
 		},
+		"icu-message-format": {
+			"title": "ICU Message Format",
+			"owner": "RunDevelopment"
+		},
 		"idris": {
 			"title": "Idris",
 			"alias": "idr",

components.json

@@ -129,7 +129,7 @@
 				'function': /^[a-z\d-]+(?=:)/,
 				'punctuation': /^::?/,
 				'attributes': {
-					pattern: /(?:\[(?:[^\]\\"]|(["'])(?:(?!\1)[^\\]|\\.)*\1|\\.)*\])/,
+					pattern: /(?:\[(?:[^\]\\"']|(["'])(?:(?!\1)[^\\]|\\.)*\1|\\.)*\])/,
 					inside: attributes.inside
 				}
 			}
@@ -149,7 +149,7 @@
 			Those do not have the restrictions of the constrained quotes.
 			They are, in order: __emphasis__, **strong**, ++monospace++, +++passthrough+++, ##unquoted##, $$passthrough$$, ~subscript~, ^superscript^, {attribute-reference}, [[anchor]], [[[bibliography anchor]]], <<xref>>, (((indexes))) and ((indexes))
 			 */
-			pattern: /(^|[^\\])(?:(?:\B\[(?:[^\]\\"]|(["'])(?:(?!\2)[^\\]|\\.)*\2|\\.)*\])?(?:\b_(?!\s)(?: _|[^_\\\r\n]|\\.)+(?:(?:\r?\n|\r)(?: _|[^_\\\r\n]|\\.)+)*_\b|\B``(?!\s).+?(?:(?:\r?\n|\r).+?)*''\B|\B`(?!\s)(?:[^`'\s]|\s+\S)+['`]\B|\B(['*+#])(?!\s)(?: \3|(?!\3)[^\\\r\n]|\\.)+(?:(?:\r?\n|\r)(?: \3|(?!\3)[^\\\r\n]|\\.)+)*\3\B)|(?:\[(?:[^\]\\"]|(["'])(?:(?!\4)[^\\]|\\.)*\4|\\.)*\])?(?:(__|\*\*|\+\+\+?|##|\$\$|[~^]).+?(?:(?:\r?\n|\r).+?)*\5|\{[^}\r\n]+\}|\[\[\[?.+?(?:(?:\r?\n|\r).+?)*\]?\]\]|<<.+?(?:(?:\r?\n|\r).+?)*>>|\(\(\(?.+?(?:(?:\r?\n|\r).+?)*\)?\)\)))/m,
+			pattern: /(^|[^\\])(?:(?:\B\[(?:[^\]\\"']|(["'])(?:(?!\2)[^\\]|\\.)*\2|\\.)*\])?(?:\b_(?!\s)(?: _|[^_\\\r\n]|\\.)+(?:(?:\r?\n|\r)(?: _|[^_\\\r\n]|\\.)+)*_\b|\B``(?!\s).+?(?:(?:\r?\n|\r).+?)*''\B|\B`(?!\s)(?:[^`'\s]|\s+\S)+['`]\B|\B(['*+#])(?!\s)(?: \3|(?!\3)[^\\\r\n]|\\.)+(?:(?:\r?\n|\r)(?: \3|(?!\3)[^\\\r\n]|\\.)+)*\3\B)|(?:\[(?:[^\]\\"']|(["'])(?:(?!\4)[^\\]|\\.)*\4|\\.)*\])?(?:(__|\*\*|\+\+\+?|##|\$\$|[~^]).+?(?:(?:\r?\n|\r).+?)*\5|\{[^}\r\n]+\}|\[\[\[?.+?(?:(?:\r?\n|\r).+?)*\]?\]\]|<<.+?(?:(?:\r?\n|\r).+?)*>>|\(\(\(?.+?(?:(?:\r?\n|\r).+?)*\)?\)\)))/m,
 			lookbehind: true,
 			inside: {
 				'attributes': attributes,

components/prism-asciidoc.js

@@ -0,0 +1,148 @@
+// https://unicode-org.github.io/icu/userguide/format_parse/messages/
+// https://unicode-org.github.io/icu-docs/apidoc/released/icu4j/com/ibm/icu/text/MessageFormat.html
+
+(function (Prism) {
+
+	/**
+	 * @param {string} source
+	 * @param {number} level
+	 * @returns {string}
+	 */
+	function nested(source, level) {
+		if (level <= 0) {
+			return /[]/.source;
+		} else {
+			return source.replace(/<SELF>/g, function () { return nested(source, level - 1) });
+		}
+	}
+
+	var stringPattern = /'[{}:=,](?:[^']|'')*'(?!')/;
+
+	var escape = {
+		pattern: /''/,
+		greedy: true,
+		alias: 'operator'
+	};
+	var string = {
+		pattern: stringPattern,
+		greedy: true,
+		inside: {
+			'escape': escape
+		}
+	};
+
+	var argumentSource = nested(
+		/\{(?:[^{}']|'(?![{},'])|''|<STR>|<SELF>)*\}/.source
+			.replace(/<STR>/g, function () { return stringPattern.source; }),
+		8
+	);
+
+	var nestedMessage = {
+		pattern: RegExp(argumentSource),
+		inside: {
+			'message': {
+				pattern: /^(\{)[\s\S]+(?=\}$)/,
+				lookbehind: true,
+				inside: null // see below
+			},
+			'message-delimiter': {
+				pattern: /./,
+				alias: 'punctuation'
+			}
+		}
+	};
+
+	Prism.languages['icu-message-format'] = {
+		'argument': {
+			pattern: RegExp(argumentSource),
+			greedy: true,
+			inside: {
+				'content': {
+					pattern: /^(\{)[\s\S]+(?=\}$)/,
+					lookbehind: true,
+					inside: {
+						'argument-name': {
+							pattern: /^(\s*)[^{}:=,\s]+/,
+							lookbehind: true
+						},
+						'choice-style': {
+							// https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classicu_1_1ChoiceFormat.html#details
+							pattern: /^(\s*,\s*choice\s*,\s*)\S(?:[\s\S]*\S)?/,
+							lookbehind: true,
+							inside: {
+								'punctuation': /\|/,
+								'range': {
+									pattern: /^(\s*)[+-]?(?:\d+(?:\.\d*)?|\u221e)\s*[<#\u2264]/,
+									lookbehind: true,
+									inside: {
+										'operator': /[<#\u2264]/,
+										'number': /\S+/
+									}
+								},
+								rest: null // see below
+							}
+						},
+						'plural-style': {
+							// https://unicode-org.github.io/icu-docs/apidoc/released/icu4j/com/ibm/icu/text/PluralFormat.html#:~:text=Patterns%20and%20Their%20Interpretation
+							pattern: /^(\s*,\s*(?:plural|selectordinal)\s*,\s*)\S(?:[\s\S]*\S)?/,
+							lookbehind: true,
+							inside: {
+								'offset': /^offset:\s*\d+/,
+								'nested-message': nestedMessage,
+								'selector': {
+									pattern: /=\d+|[^{}:=,\s]+/,
+									inside: {
+										'keyword': /^(?:zero|one|two|few|many|other)$/
+									}
+								}
+							}
+						},
+						'select-style': {
+							// https://unicode-org.github.io/icu-docs/apidoc/released/icu4j/com/ibm/icu/text/SelectFormat.html#:~:text=Patterns%20and%20Their%20Interpretation
+							pattern: /^(\s*,\s*select\s*,\s*)\S(?:[\s\S]*\S)?/,
+							lookbehind: true,
+							inside: {
+								'nested-message': nestedMessage,
+								'selector': {
+									pattern: /[^{}:=,\s]+/,
+									inside: {
+										'keyword': /^other$/
+									}
+								}
+							}
+						},
+						'keyword': /\b(?:choice|plural|select|selectordinal)\b/,
+						'arg-type': {
+							pattern: /\b(?:number|date|time|spellout|ordinal|duration)\b/,
+							alias: 'keyword'
+						},
+						'arg-skeleton': {
+							pattern: /(,\s*)::[^{}:=,\s]+/,
+							lookbehind: true
+						},
+						'arg-style': {
+							pattern: /(,\s*)(?:short|medium|long|full|integer|currency|percent)(?=\s*$)/,
+							lookbehind: true
+						},
+						'arg-style-text': {
+							pattern: RegExp(/(^\s*,\s*(?=\S))/.source + nested(/(?:[^{}']|'[^']*'|\{(?:<SELF>)?\})+/.source, 8) + '$'),
+							lookbehind: true,
+							alias: 'string'
+						},
+						'punctuation': /,/
+					}
+				},
+				'argument-delimiter': {
+					pattern: /./,
+					alias: 'operator'
+				}
+			}
+		},
+		'escape': escape,
+		'string': string
+	};
+
+	nestedMessage.inside.message.inside = Prism.languages['icu-message-format'];
+	Prism.languages['icu-message-format'].argument.inside.content.inside['choice-style'].inside.rest = Prism.languages['icu-message-format'];
+
+}(Prism));

components/prism-asciidoc.min.js

@@ -161,7 +161,7 @@ Prism.languages.perl = {
 		// ${...}
 		/[&*$@%]#?(?=\{)/,
 		// $foo
-		/[&*$@%]#?(?:(?:::)*'?(?!\d)[\w$]+)+(?:::)*/i,
+		/[&*$@%]#?(?:(?:::)*'?(?!\d)[\w$]+(?![\w$]))+(?:::)*/i,
 		// $1
 		/[&*$@%]\d+/,
 		// $_, @_, %!