From 68cf597792ac4ec9d73049ffbc19df79bbf33039 Mon Sep 17 00:00:00 2001
From: Michael Schmidt <mitchi5000.ms@googlemail.com>
Date: Fri, 27 Sep 2019 21:49:52 +0200
Subject: [PATCH 1/5] Added class adder feature to Custom Class plugin

---
 plugins/custom-class/index.html               |  77 ++++++++--
 plugins/custom-class/prism-custom-class.js    | 136 ++++++++++--------
 .../custom-class/prism-custom-class.min.js    |   2 +-
 3 files changed, 146 insertions(+), 69 deletions(-)

diff --git a/plugins/custom-class/index.html b/plugins/custom-class/index.html
index 2b56f21d5f..748a8fea1b 100644
--- a/plugins/custom-class/index.html
+++ b/plugins/custom-class/index.html
@@ -18,7 +18,7 @@
 	<div class="intro" data-src="templates/header-plugins.html" data-type="text/html"></div>
 
 	<h2>Custom Class</h2>
-	<p>This plugin allows you to prefix Prism default classes (<code>.comment</code> will become <code>.namespace--comment</code>) or replace them with your defined ones (like <code>.editor__comment</code> or <code>.comment_7sh3a</code>).</p>
+	<p>This plugin allows you to prefix Prism's default classes (<code>.comment</code> can become <code>.namespace--comment</code>) or replace them with your defined ones (like <code>.editor__comment</code>). You can even add new classes.</p>
 </header>
 
 <section>
@@ -28,7 +28,7 @@ <h1>Motivation</h1>
 
 	<ul>
 		<li>
-			 You want to add namespace for all of them (like <code>.prism--comment</code>) to avoid conflict with your existing classes.
+			You want to add namespace for all of them (like <code>.prism--comment</code>) to avoid conflict with your existing classes.
 		</li>
 		<li>
 			You use a naming convention (like <a href="https://en.bem.info/method">BEM</a>). You want to write classes like <code>.editor__comment</code>.
@@ -36,17 +36,20 @@ <h1>Motivation</h1>
 		<li>You use
 			<a href="https://github.com/css-modules/css-modules">CSS Modules</a>. You want to use your hashed classes, like <code>.comment_7sh3a</code>.
 		</li>
+		<li>You need more granular control about the classes of certain tokens.
+			You can define functions which will add new classes to tokens, so selectively change the highlighting of certain parts of your code.
+		</li>
 	</ul>
+</section>
 
-	<h1>Features</h1>
-
-	<p>This plugin currently provides 2 features:</p>
+<section>
+	<h1>How to use</h1>
 
-	<h2>1. Prefix all Prism classes with a string</h2>
+	<h2>Prefix all Prism classes</h2>
 
-	<code>Prism.plugins.customClass.prefix('prism--')</code>
+	<pre><code>Prism.plugins.customClass.prefix('prism--')</code></pre>
 
-	<h2>2. Replace some Prism classes with your defined ones via an object</h2>
+	<h2>Replace some Prism classes with ones you defined</h2>
 
 	<pre class="language-js"><code>Prism.plugins.customClass.map({
 	keyword: 'special-keyword',
@@ -54,7 +57,7 @@ <h2>2. Replace some Prism classes with your defined ones via an object</h2>
 	comment: 'comment_93jsa'
 });</code></pre>
 
-	<p>Object's keys are the tokens you want to replace (eg: <code>comment</code>), with their values being the classes you want to use (eg: <code>my-comment</code>). Tokens which are not specified will stay the same.</p>
+	<p>Object's keys are the classes you want to replace (eg: <code>comment</code>), with their values being the classes you want to use (eg: <code>my-comment</code>). Classes which are not specified will stay as they are.</p>
 
 	<p>Alternatively you can also pass a function that takes the original class and returns the mapped class. This function can also be used implement language specific mapped classes.<br>Example:</p>
 
@@ -66,6 +69,21 @@ <h2>2. Replace some Prism classes with your defined ones via an object</h2>
 	}
 });</code></pre>
 
+	<h2>Add new classes</h2>
+
+	<p>You can add new classes with per-token and per-language precision.</p>
+
+	<pre class="language-js"><code>Prism.plugins.customClass.add(function (language, type, content) {
+	if (language === 'css' && type === 'property' && content === 'content') {
+		return 'content-property';
+	}
+});</code></pre>
+
+	<p><b>Note:</b> The given <code>content</code> is the inner HTML of the current token. All <code>&lt;</code> and <code>&amp;</code> characters are escaped and it might contain the HTML code of nested tokens.</p>
+
+</section>
+
+<section>
 	<h1>Notes</h1>
 
 	<ul>
@@ -101,19 +119,21 @@ <h2>CSS Modules Usage:</h2>
 <section>
 	<h1>Example</h1>
 
-	<h2>Input</h2>
+	<h2>Prefix and map classes</h2>
+
+	<p>Input</p>
 	<pre class="language-markup"><code>&lt;pre class=&quot;language-javascript&quot;&gt;&lt;code&gt;
 	var foo = 'bar';
 &lt;/code&gt;&lt;/pre&gt;</code></pre>
 
-	<h2>Options</h2>
+	<p>Options</p>
 	<pre class="language-js"><code>Prism.plugins.customClass.map({
 	keyword: 'special-keyword',
 	string: 'my-string'
 });
 Prism.plugins.customClass.prefix('pr-');</code></pre>
 
-	<h2>Output</h2>
+	<p>Output</p>
 	<pre class="language-markup"><code>&lt;pre class=&quot;language-javascript&quot;&gt;&lt;code&gt;
 	&lt;span class=&quot;pr-token pr-special-keyword&quot;&gt;var&lt;/span&gt;
 	foo
@@ -121,6 +141,39 @@ <h2>Output</h2>
 	&lt;span class=&quot;pr-my-string&quot;&gt;'bar'&lt;/span&gt;
 	&lt;span class=&quot;pr-token pr-punctuation&quot;&gt;;&lt;/span&gt;
 &lt;/code&gt;&lt;/pre&gt;</code></pre>
+
+	<h2>Add new classes</h2>
+
+	<p>Input</p>
+	<pre class="language-markup"><code>&lt;pre class=&quot;language-css&quot;&gt;&lt;code&gt;
+a::after {
+	content: '\2b00 ';
+	opacity: .7;
+}
+&lt;/code&gt;&lt;/pre&gt;</code></pre>
+
+	<p>Options</p>
+	<pre class="language-js"><code>Prism.plugins.customClass.add(function (language, type, content) {
+	if (language === 'css' && type === 'property' && content === 'content') {
+		return 'content-property';
+	}
+});</code></pre>
+
+	<p>Output</p>
+	<pre class="language-markup"><code>&lt;pre class=" language-css">&lt;code class=" language-css">
+&lt;span class="token selector">a::after&lt;/span>
+&lt;span class="token punctuation">{&lt;/span>
+	&lt;span class="token property content-property">content&lt;/span>
+	&lt;span class="token punctuation">:&lt;/span>
+	&lt;span class="token string">'\2b00 '&lt;/span>
+	&lt;span class="token punctuation">;&lt;/span>
+	&lt;span class="token property">opacity&lt;/span>
+	&lt;span class="token punctuation">:&lt;/span>
+	 .7
+	&lt;span class="token punctuation">;&lt;/span>
+&lt;span class="token punctuation">}&lt;/span>
+&lt;/code>&lt;/pre></code></pre>
+
 </section>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
diff --git a/plugins/custom-class/prism-custom-class.js b/plugins/custom-class/prism-custom-class.js
index 3b5e6c129b..f871975a77 100644
--- a/plugins/custom-class/prism-custom-class.js
+++ b/plugins/custom-class/prism-custom-class.js
@@ -1,68 +1,92 @@
-(function(){
+(function () {
 
-if (
-	(typeof self === 'undefined' || !self.Prism) &&
-	(typeof global === 'undefined' || !global.Prism)
-) {
-	return;
-}
-
-/**
- * @callback ClassMapper
- * @param {string} className
- * @param {string} language
- * @returns {string}
- */
-/**
- * @typedef CustomClassOptions
- * @property {ClassMapper} classMap
- * @property {string} prefixString
- */
-
-/** @type {ClassMapper} */
-var defaultClassMap = function (className) { return className; };
-
-/** @type {CustomClassOptions} */
-var options = {
-	classMap: defaultClassMap,
-	prefixString: ''
-};
+	if (
+		(typeof self === 'undefined' || !self.Prism) &&
+		(typeof global === 'undefined' || !global.Prism)
+	) {
+		return;
+	}
 
-Prism.plugins.customClass = {
 	/**
-	 * Maps all class names using the given object or map function.
+	 * @callback ClassMapper
+	 * @param {string} className
+	 * @param {string} language
+	 * @returns {string}
 	 *
-	 * This does not affect the prefix.
-	 *
-	 * @param {Object<string, string> | ClassMapper} classMap
+	 * @callback ClassAdder
+	 * @param {string} language
+	 * @param {string} type
+	 * @param {string} content
+	 * @returns {undefined | string | string[]}
 	 */
-	map: function map(classMap) {
-		if (typeof classMap === 'function') {
-			options.classMap = classMap;
-		} else {
-			options.classMap = function (className) {
-				return classMap[className] || className;
-			};
+
+	/** @type {ClassMapper} */
+	var defaultClassMap = function (className) { return className; };
+
+	// options
+
+	/** @type {ClassAdder[]} */
+	var classAdders = [];
+	/** @type {ClassMapper} */
+	var classMapper = defaultClassMap;
+	/** @type {string} */
+	var prefixString = '';
+
+
+	Prism.plugins.customClass = {
+		/**
+		 * Sets the function which can be used to add custom aliases to any token.
+		 *
+		 * @param {ClassAdder} adder
+		 */
+		add: function (classAdder) {
+			classAdders.push(classAdder);
+		},
+		/**
+		 * Maps all class names using the given object or map function.
+		 *
+		 * This does not affect the prefix.
+		 *
+		 * @param {Object<string, string> | ClassMapper} classMap
+		 */
+		map: function map(classMap) {
+			if (typeof classMap === 'function') {
+				classMapper = classMap;
+			} else {
+				classMapper = function (className) {
+					return classMap[className] || className;
+				};
+			}
+		},
+		/**
+		 * Adds the given prefix to all class names.
+		 *
+		 * @param {string} string
+		 */
+		prefix: function prefix(string) {
+			prefixString = string;
 		}
-	},
-	/**
-	 * Adds the given prefix to all class names.
-	 *
-	 * @param {string} string
-	 */
-	prefix: function prefix(string) {
-		options.prefixString = string;
 	}
-}
 
-Prism.hooks.add('wrap', function (env) {
-	if (options.classMap === defaultClassMap && !options.prefixString) {
-		return;
-	}
+	Prism.hooks.add('wrap', function (env) {
+		for (var i = 0, l = classAdders.length; i < l; i++) {
+			var result = classAdders[i](env.language, env.type, env.content);
+			if (result) {
+				if (Array.isArray(result)) {
+					env.classes.push.apply(env.classes, result);
+				} else {
+					env.classes.push(result);
+				}
+			}
+		}
+
+		if (classMapper === defaultClassMap && !prefixString) {
+			return;
+		}
 
-	env.classes = env.classes.map(function (c) {
-		return options.prefixString + options.classMap(c, env.language);
+		env.classes = env.classes.map(function (c) {
+			return prefixString + classMapper(c, env.language);
+		});
 	});
-});
 
 })();
diff --git a/plugins/custom-class/prism-custom-class.min.js b/plugins/custom-class/prism-custom-class.min.js
index a087f0ef4b..c7f427b0ed 100644
--- a/plugins/custom-class/prism-custom-class.min.js
+++ b/plugins/custom-class/prism-custom-class.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var n=function(n){return n},s={classMap:n,prefixString:""};Prism.plugins.customClass={map:function(i){s.classMap="function"==typeof i?i:function(n){return i[n]||n}},prefix:function(n){s.prefixString=n}},Prism.hooks.add("wrap",function(i){(s.classMap!==n||s.prefixString)&&(i.classes=i.classes.map(function(n){return s.prefixString+s.classMap(n,i.language)}))})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var u=function(n){return n},r=[],t=u,f="";Prism.plugins.customClass={add:function(n){r.push(n)},map:function(s){t="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){f=n}},Prism.hooks.add("wrap",function(s){for(var n=0,a=r.length;n<a;n++){var e=r[n](s.language,s.type,s.content);e&&(Array.isArray(e)?s.classes.push.apply(s.classes,e):s.classes.push(e))}(t!==u||f)&&(s.classes=s.classes.map(function(n){return f+t(n,s.language)}))})}}();
\ No newline at end of file

From e9484e690b18eb0216518ea7efddab59a025736b Mon Sep 17 00:00:00 2001
From: RunDevelopment <mitchi5000.ms@googlemail.com>
Date: Fri, 25 Oct 2019 18:45:20 +0200
Subject: [PATCH 2/5] Changed API

---
 plugins/custom-class/index.html                | 6 +++---
 plugins/custom-class/prism-custom-class.js     | 6 +++---
 plugins/custom-class/prism-custom-class.min.js | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/custom-class/index.html b/plugins/custom-class/index.html
index 49f8dea5d6..58117aaf5b 100644
--- a/plugins/custom-class/index.html
+++ b/plugins/custom-class/index.html
@@ -68,8 +68,8 @@ <h2>Add new classes</h2>
 
 	<p>You can add new classes with per-token and per-language precision.</p>
 
-	<pre class="language-js"><code>Prism.plugins.customClass.add(function (language, type, content) {
-	if (language === 'css' && type === 'property' && content === 'content') {
+	<pre class="language-js"><code>Prism.plugins.customClass.add(function (content, type, language) {
+	if (content === 'content' && type === 'property' && language === 'css') {
 		return 'content-property';
 	}
 });</code></pre>
@@ -149,7 +149,7 @@ <h2>Add new classes</h2>
 
 	<p>Options</p>
 	<pre class="language-js"><code>Prism.plugins.customClass.add(function (language, type, content) {
-	if (language === 'css' && type === 'property' && content === 'content') {
+	if (content === 'content' && type === 'property' && language === 'css') {
 		return 'content-property';
 	}
 });</code></pre>
diff --git a/plugins/custom-class/prism-custom-class.js b/plugins/custom-class/prism-custom-class.js
index f871975a77..7d493140cf 100644
--- a/plugins/custom-class/prism-custom-class.js
+++ b/plugins/custom-class/prism-custom-class.js
@@ -14,9 +14,9 @@
 	 * @returns {string}
 	 *
 	 * @callback ClassAdder
-	 * @param {string} language
-	 * @param {string} type
 	 * @param {string} content
+	 * @param {string} type
+	 * @param {string} language
 	 * @returns {undefined | string | string[]}
 	 */
 
@@ -70,7 +70,7 @@
 
 	Prism.hooks.add('wrap', function (env) {
 		for (var i = 0, l = classAdders.length; i < l; i++) {
-			var result = classAdders[i](env.language, env.type, env.content);
+			var result = classAdders[i](env.content, env.type, env.language);
 			if (result) {
 				if (Array.isArray(result)) {
 					env.classes.push.apply(env.classes, result);
diff --git a/plugins/custom-class/prism-custom-class.min.js b/plugins/custom-class/prism-custom-class.min.js
index c7f427b0ed..ca08571a33 100644
--- a/plugins/custom-class/prism-custom-class.min.js
+++ b/plugins/custom-class/prism-custom-class.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var u=function(n){return n},r=[],t=u,f="";Prism.plugins.customClass={add:function(n){r.push(n)},map:function(s){t="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){f=n}},Prism.hooks.add("wrap",function(s){for(var n=0,a=r.length;n<a;n++){var e=r[n](s.language,s.type,s.content);e&&(Array.isArray(e)?s.classes.push.apply(s.classes,e):s.classes.push(e))}(t!==u||f)&&(s.classes=s.classes.map(function(n){return f+t(n,s.language)}))})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var u=function(n){return n},r=[],t=u,f="";Prism.plugins.customClass={add:function(n){r.push(n)},map:function(s){t="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){f=n}},Prism.hooks.add("wrap",function(s){for(var n=0,a=r.length;n<a;n++){var e=r[n](s.content,s.type,s.language);e&&(Array.isArray(e)?s.classes.push.apply(s.classes,e):s.classes.push(e))}(t!==u||f)&&(s.classes=s.classes.map(function(n){return f+t(n,s.language)}))})}}();
\ No newline at end of file

From f4d5faa261d18aed164070fe9483cf8b478a4e1f Mon Sep 17 00:00:00 2001
From: RunDevelopment <mitchi5000.ms@googlemail.com>
Date: Tue, 29 Oct 2019 19:42:49 +0100
Subject: [PATCH 3/5] API chnages

---
 plugins/custom-class/index.html               |  6 ++--
 plugins/custom-class/prism-custom-class.js    | 31 +++++++++++++------
 .../custom-class/prism-custom-class.min.js    |  2 +-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/plugins/custom-class/index.html b/plugins/custom-class/index.html
index 58117aaf5b..ee9d8f6199 100644
--- a/plugins/custom-class/index.html
+++ b/plugins/custom-class/index.html
@@ -56,7 +56,7 @@ <h2>Replace some Prism classes with ones you defined</h2>
 
 	<p>Alternatively you can also pass a function that takes the original class and returns the mapped class. This function can also be used implement language specific mapped classes.<br>Example:</p>
 
-	<pre class="language-js"><code>Prism.plugins.customClass.map(function (className, language) {
+	<pre class="language-js"><code>Prism.plugins.customClass.map((className, language) => {
 	if (language === 'css') {
 		return cssSpecificMap[className] || className;
 	} else {
@@ -68,7 +68,7 @@ <h2>Add new classes</h2>
 
 	<p>You can add new classes with per-token and per-language precision.</p>
 
-	<pre class="language-js"><code>Prism.plugins.customClass.add(function (content, type, language) {
+	<pre class="language-js"><code>Prism.plugins.customClass.add(({content, type, language}) => {
 	if (content === 'content' && type === 'property' && language === 'css') {
 		return 'content-property';
 	}
@@ -148,7 +148,7 @@ <h2>Add new classes</h2>
 &lt;/code&gt;&lt;/pre&gt;</code></pre>
 
 	<p>Options</p>
-	<pre class="language-js"><code>Prism.plugins.customClass.add(function (language, type, content) {
+	<pre class="language-js"><code>Prism.plugins.customClass.add(({language, type, content}) => {
 	if (content === 'content' && type === 'property' && language === 'css') {
 		return 'content-property';
 	}
diff --git a/plugins/custom-class/prism-custom-class.js b/plugins/custom-class/prism-custom-class.js
index 7d493140cf..5bbeb46c93 100644
--- a/plugins/custom-class/prism-custom-class.js
+++ b/plugins/custom-class/prism-custom-class.js
@@ -14,10 +14,13 @@
 	 * @returns {string}
 	 *
 	 * @callback ClassAdder
-	 * @param {string} content
-	 * @param {string} type
-	 * @param {string} language
+	 * @param {ClassAdderEnvironment} env
 	 * @returns {undefined | string | string[]}
+	 *
+	 * @typedef ClassAdderEnvironment
+	 * @property {string} language
+	 * @property {string} type
+	 * @property {string} content
 	 */
 
 	/** @type {ClassMapper} */
@@ -69,13 +72,21 @@
 	}
 
 	Prism.hooks.add('wrap', function (env) {
-		for (var i = 0, l = classAdders.length; i < l; i++) {
-			var result = classAdders[i](env.content, env.type, env.language);
-			if (result) {
-				if (Array.isArray(result)) {
-					env.classes.push.apply(env.classes, result);
-				} else {
-					env.classes.push(result);
+		if (classAdders.length) {
+			/** @type {ClassAdderEnvironment} */
+			var adderEnv = {
+				content: env.content,
+				type: env.type,
+				language: env.language
+			};
+			for (var i = 0, l = classAdders.length; i < l; i++) {
+				var result = classAdders[i](adderEnv);
+				if (result) {
+					if (Array.isArray(result)) {
+						env.classes.push.apply(env.classes, result);
+					} else {
+						env.classes.push(result);
+					}
 				}
 			}
 		}
diff --git a/plugins/custom-class/prism-custom-class.min.js b/plugins/custom-class/prism-custom-class.min.js
index ca08571a33..8df12e8e8e 100644
--- a/plugins/custom-class/prism-custom-class.min.js
+++ b/plugins/custom-class/prism-custom-class.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var u=function(n){return n},r=[],t=u,f="";Prism.plugins.customClass={add:function(n){r.push(n)},map:function(s){t="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){f=n}},Prism.hooks.add("wrap",function(s){for(var n=0,a=r.length;n<a;n++){var e=r[n](s.content,s.type,s.language);e&&(Array.isArray(e)?s.classes.push.apply(s.classes,e):s.classes.push(e))}(t!==u||f)&&(s.classes=s.classes.map(function(n){return f+t(n,s.language)}))})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var u=function(n){return n},f=[],i=u,o="";Prism.plugins.customClass={add:function(n){f.push(n)},map:function(s){i="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){o=n}},Prism.hooks.add("wrap",function(s){if(f.length)for(var n={content:s.content,type:s.type,language:s.language},e=0,a=f.length;e<a;e++){var t=f[e](n);t&&(Array.isArray(t)?s.classes.push.apply(s.classes,t):s.classes.push(t))}(i!==u||o)&&(s.classes=s.classes.map(function(n){return o+i(n,s.language)}))})}}();
\ No newline at end of file

From 6c2cbf069045f612d3afbce6eff9bb06262c446c Mon Sep 17 00:00:00 2001
From: Michael Schmidt <mitchi5000.ms@googlemail.com>
Date: Fri, 15 Nov 2019 22:34:43 +0100
Subject: [PATCH 4/5] Made `add` a setter

---
 plugins/custom-class/prism-custom-class.js    | 52 ++++++++-----------
 .../custom-class/prism-custom-class.min.js    |  2 +-
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/plugins/custom-class/prism-custom-class.js b/plugins/custom-class/prism-custom-class.js
index 5bbeb46c93..5594ebbc3a 100644
--- a/plugins/custom-class/prism-custom-class.js
+++ b/plugins/custom-class/prism-custom-class.js
@@ -23,15 +23,12 @@
 	 * @property {string} content
 	 */
 
-	/** @type {ClassMapper} */
-	var defaultClassMap = function (className) { return className; };
-
 	// options
 
-	/** @type {ClassAdder[]} */
-	var classAdders = [];
-	/** @type {ClassMapper} */
-	var classMapper = defaultClassMap;
+	/** @type {ClassAdder | undefined} */
+	var adder;
+	/** @type {ClassMapper | undefined} */
+	var mapper;
 	/** @type {string} */
 	var prefixString = '';
 
@@ -40,24 +37,24 @@
 		/**
 		 * Sets the function which can be used to add custom aliases to any token.
 		 *
-		 * @param {ClassAdder} adder
+		 * @param {ClassAdder} classAdder
 		 */
 		add: function (classAdder) {
-			classAdders.push(classAdder);
+			adder = classAdder;
 		},
 		/**
 		 * Maps all class names using the given object or map function.
 		 *
 		 * This does not affect the prefix.
 		 *
-		 * @param {Object<string, string> | ClassMapper} classMap
+		 * @param {Object<string, string> | ClassMapper} classMapper
 		 */
-		map: function map(classMap) {
-			if (typeof classMap === 'function') {
-				classMapper = classMap;
+		map: function map(classMapper) {
+			if (typeof classMapper === 'function') {
+				mapper = classMapper;
 			} else {
-				classMapper = function (className) {
-					return classMap[className] || className;
+				mapper = function (className) {
+					return classMapper[className] || className;
 				};
 			}
 		},
@@ -72,31 +69,26 @@
 	}
 
 	Prism.hooks.add('wrap', function (env) {
-		if (classAdders.length) {
-			/** @type {ClassAdderEnvironment} */
-			var adderEnv = {
+		if (adder) {
+			var result = adder({
 				content: env.content,
 				type: env.type,
 				language: env.language
-			};
-			for (var i = 0, l = classAdders.length; i < l; i++) {
-				var result = classAdders[i](adderEnv);
-				if (result) {
-					if (Array.isArray(result)) {
-						env.classes.push.apply(env.classes, result);
-					} else {
-						env.classes.push(result);
-					}
-				}
+			});
+
+			if (Array.isArray(result)) {
+				env.classes.push.apply(env.classes, result);
+			} else if (result) {
+				env.classes.push(result);
 			}
 		}
 
-		if (classMapper === defaultClassMap && !prefixString) {
+		if (!mapper && !prefixString) {
 			return;
 		}
 
 		env.classes = env.classes.map(function (c) {
-			return prefixString + classMapper(c, env.language);
+			return prefixString + mapper(c, env.language);
 		});
 	});
 
diff --git a/plugins/custom-class/prism-custom-class.min.js b/plugins/custom-class/prism-custom-class.min.js
index 8df12e8e8e..c6de515305 100644
--- a/plugins/custom-class/prism-custom-class.min.js
+++ b/plugins/custom-class/prism-custom-class.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var u=function(n){return n},f=[],i=u,o="";Prism.plugins.customClass={add:function(n){f.push(n)},map:function(s){i="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){o=n}},Prism.hooks.add("wrap",function(s){if(f.length)for(var n={content:s.content,type:s.type,language:s.language},e=0,a=f.length;e<a;e++){var t=f[e](n);t&&(Array.isArray(t)?s.classes.push.apply(s.classes,t):s.classes.push(t))}(i!==u||o)&&(s.classes=s.classes.map(function(n){return o+i(n,s.language)}))})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var a,e,t="";Prism.plugins.customClass={add:function(n){a=n},map:function(s){e="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){t=n}},Prism.hooks.add("wrap",function(s){if(a){var n=a({content:s.content,type:s.type,language:s.language});Array.isArray(n)?s.classes.push.apply(s.classes,n):n&&s.classes.push(n)}(e||t)&&(s.classes=s.classes.map(function(n){return t+e(n,s.language)}))})}}();
\ No newline at end of file

From 9da0665ade2da902ca5e6a00bac0271a2c82511c Mon Sep 17 00:00:00 2001
From: Michael Schmidt <mitchi5000.ms@googlemail.com>
Date: Fri, 15 Nov 2019 23:56:39 +0100
Subject: [PATCH 5/5] Check for existence.

---
 plugins/custom-class/prism-custom-class.js     | 4 ++--
 plugins/custom-class/prism-custom-class.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/custom-class/prism-custom-class.js b/plugins/custom-class/prism-custom-class.js
index 5594ebbc3a..24f56549e7 100644
--- a/plugins/custom-class/prism-custom-class.js
+++ b/plugins/custom-class/prism-custom-class.js
@@ -64,7 +64,7 @@
 		 * @param {string} string
 		 */
 		prefix: function prefix(string) {
-			prefixString = string;
+			prefixString = string || '';
 		}
 	}
 
@@ -88,7 +88,7 @@
 		}
 
 		env.classes = env.classes.map(function (c) {
-			return prefixString + mapper(c, env.language);
+			return prefixString + mapper ? mapper(c, env.language) : c;
 		});
 	});
 
diff --git a/plugins/custom-class/prism-custom-class.min.js b/plugins/custom-class/prism-custom-class.min.js
index c6de515305..da639b6707 100644
--- a/plugins/custom-class/prism-custom-class.min.js
+++ b/plugins/custom-class/prism-custom-class.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var a,e,t="";Prism.plugins.customClass={add:function(n){a=n},map:function(s){e="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){t=n}},Prism.hooks.add("wrap",function(s){if(a){var n=a({content:s.content,type:s.type,language:s.language});Array.isArray(n)?s.classes.push.apply(s.classes,n):n&&s.classes.push(n)}(e||t)&&(s.classes=s.classes.map(function(n){return t+e(n,s.language)}))})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism||"undefined"!=typeof global&&global.Prism){var a,e,t="";Prism.plugins.customClass={add:function(n){a=n},map:function(s){e="function"==typeof s?s:function(n){return s[n]||n}},prefix:function(n){t=n||""}},Prism.hooks.add("wrap",function(s){if(a){var n=a({content:s.content,type:s.type,language:s.language});Array.isArray(n)?s.classes.push.apply(s.classes,n):n&&s.classes.push(n)}(e||t)&&(s.classes=s.classes.map(function(n){return t+e?e(n,s.language):n}))})}}();
\ No newline at end of file