CSS modifiers work for inline tags now

js/markdown.js

@@ -50,7 +50,7 @@ class _MDTokenType {
 	static SimpleLink = new _MDTokenType('SimpleLink'); // content=URL
 	static SimpleEmail = new _MDTokenType('SimpleEmail'); // content=email address
 	static Footnote = new _MDTokenType('Footnote'); // content=symbol
-	static Class = new _MDTokenType('Class'); // content
+	static Modifier = new _MDTokenType('Modifier'); // content
 
 	static HTMLTag = new _MDTokenType('HTMLTag'); // content=tag string, tag=_MDHTMLTag
 
@@ -82,18 +82,26 @@ class _MDToken {
 	extra;
 	/** @var {_MDHTMLTag|null} */
 	tag;
+	/** @var {_MDTagModifier|null} */
+	modifier;
 
 	/**
 	 * @param {String} original
 	 * @param {_MDTokenType} type
-	 * @param {String|null} content
+	 * @param {String|_MDTagModifier|null} content
 	 * @param {String|null} extra
 	 * @param {_MDHTMLTag|null} tag
 	 */
 	constructor(original, type, content=null, extra=null, tag=null) {
 		this.original = original;
 		this.type = type;
-		this.content = content;
+		if (content instanceof _MDTagModifier) {
+			this.content = null;
+			this.modifier = content;
+		} else {
+			this.content = content;
+			this.modifier = null;
+		}
 		this.extra = extra;
 		this.tag = tag;
 	}
@@ -925,12 +933,10 @@ class _MDTagModifier {
 	/** @var {Object} */
 	attributes = {};
 
-	static #baseClassRegex = /\.([a-z_\-][a-z0-9_\-]*)/i;
-	static #baseIdRegex = /#([a-z_\-][a-z0-9_\-]*)/i;
-	static #baseAttributeRegex = /([a-z0-9]+)=([^\s\}]+)/i;
-	static #modifierRegex = new RegExp('(?:' + this.#baseClassRegex.source + '|' + this.#baseIdRegex.source + '|' + this.#baseAttributeRegex.source + ')', 'i');
-	// static #baseRegex = new RegExp('\\{(' + this.#modifierRegex.source + '(?:\\s+' + this.#modifierRegex.source + '))\\}', 'i'); //  /\{((?:||)(?:\s+(?:\.[a-z_\-][a-z0-9_\-]*|#[a-z_\-][a-z0-9_\-]*|[a-z0-9]+=\S+)))\}/i; // 1=content
-	static #baseRegex = /\{([^}]+)}/i;
+	static #baseClassRegex = /\.([a-z_\-][a-z0-9_\-]*?)/i;
+	static #baseIdRegex = /#([a-z_\-][a-z0-9_\-]*?)/i;
+	static #baseAttributeRegex = /([a-z0-9]+?)=([^\s\}]+?)/i;
+	static #baseRegex = /\{([^}]+?)}/i;
 	static #leadingClassRegex = new RegExp('^' + this.#baseRegex.source, 'i');
 	static #trailingClassRegex = new RegExp('^(.*?)\\s*' + this.#baseRegex.source + '\\s*$', 'i');
 	static #classRegex = new RegExp('^' + this.#baseClassRegex.source + '$', 'i');  // 1=classname
@@ -984,6 +990,17 @@ class _MDTagModifier {
 	}
 
 	/**
+	 * Extracts modifier from head of string.
+	 * @param {String} line
+	 * @returns {_MDTagModifier}
+	 */
+	static fromStart(line) {
+		let groups = this.#leadingClassRegex.exec(line);
+		if (groups === null) return null;
+		return this.#fromContents(groups[1]);
+	}
+
+	/**
 	 * @param {String} line
 	 * @returns {String}
 	 */
@@ -1243,7 +1260,7 @@ class Markdown {
 	static #footnoteWithTitleRegex = /^\[\^(\d+?)\s+"(.*?)"\]/;  // 1=symbol, 2=title
 	static #footnoteRegex = /^\[\^(\d+?)\]/;  // 1=symbol
 	// Note: label contents have to have matching pairs of [] and (). Handles images inside links.
-	static #labelRegex = /^\[((?:[^\[\]]*\[[^\[\]]*\][^\[\]]*|[^\(\)]*\([^\(\)]*?\)[^\(\)]*|[^\[\]\(\)]*?)*)\]/;  // 1=content
+	static #labelRegex = /^\[((?:[^\[\]]*?\[[^\[\]]*?\][^\[\]]*?|[^\(\)]*?\([^\(\)]*?\)[^\(\)]*?|[^\[\]\(\)]*?)*?)\]/;  // 1=content
 	static #urlWithTitleRegex = /^\((\S+?)\s+"(.*?)"\)/i;  // 1=URL, 2=title
 	static #urlRegex = /^\((\S+?)\)/i;  // 1=URL
 	static #emailWithTitleRegex = new RegExp("^\\(\\s*(" + this.#baseEmailRegex.source + ")\\s+\"(.*?)\"\\s*\\)", "i");  // 1=email, 2=title
@@ -1253,6 +1270,34 @@ class Markdown {
 
 	/**
 	 * @param {String} line
+	 * @returns {String[]}
+	 */
+	static #matchLabel(line) {
+		if (!line.startsWith('[')) return null;
+		var parenCount = 0;
+		var bracketCount = 0;
+		for (var p = 1; p < line.length; p++) {
+			let ch = line.substring(p, p + 1);
+			if (ch == '(') {
+				parenCount++;
+			} else if (ch == ')') {
+				parenCount--;
+				if (parenCount < 0) return null;
+			} else if (ch == '[') {
+				bracketCount++;
+			} else if (ch == ']') {
+				if (bracketCount > 0) {
+					bracketCount--;
+				} else {
+					return [ line.substring(0, p + 1), line.substring(1, p) ];
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @param {String} line
 	 * @returns {_MDToken[]} tokens
 	 */
 	static #tokenize(line) {
@@ -1261,6 +1306,7 @@ class Markdown {
 		var expectLiteral = false;
 		var groups = null;
 		var tag = null;
+		var modifier = null;
 		const endText = function() {
 			if (text.length == 0) return;
 			let textGroups = Markdown.#textWhitespaceRegex.exec(text);
@@ -1315,7 +1361,7 @@ class Markdown {
 				endText();
 				tokens.push(new _MDToken(groups[0], _MDTokenType.Footnote, groups[1]));
 				p += groups[0].length - 1;
-			} else if (groups = this.#labelRegex.exec(remainder)) {
+			} else if (groups = this.#matchLabel(remainder)) {
 				// Label/ref for link/image   [Foo]
 				endText();
 				tokens.push(new _MDToken(groups[0], _MDTokenType.Label, groups[1]));
@@ -1354,6 +1400,10 @@ class Markdown {
 				endText();
 				tokens.push(new _MDToken(tag.fullTag, _MDTokenType.HTMLTag, tag.fullTag, null, tag));
 				p += tag.fullTag.length - 1;
+			} else if (modifier = _MDTagModifier.fromStart(remainder)) {
+				endText();
+				tokens.push(new _MDToken(modifier.original, _MDTokenType.Modifier, modifier));
+				p += modifier.original.length - 1;
 			} else {
 				text += ch;
 			}
@@ -1551,10 +1601,18 @@ class Markdown {
 				}
 			} while (anyChanges);
 		}
+		var lastSpan = null;
 		spans = spans.map(function(span) {
 			if (span instanceof _MDToken) {
+				if (span.type == _MDTokenType.Modifier && lastSpan) {
+					span.modifier.applyTo(lastSpan);
+					lastSpan = null;
+					return new _MDTextSpan('');
+				}
+				lastSpan = null;
 				return new _MDTextSpan(span.original);
 			} else if (span instanceof _MDSpan) {
+				lastSpan = (span instanceof _MDTextSpan) ? null : span;
 				return span;
 			} else {
 				throw new Error(`Unexpected span type ${span.constructor.name}`);