From 2aeed5ccb58d42873ea75dd44835a132bed2b46d Mon Sep 17 00:00:00 2001
From: Fabian Giesen <ryg@gmx.net>
Date: Thu, 25 Jul 2013 19:19:15 -0700
Subject: [PATCH 001/310] Refine C number regexp.

- Exponent may contain '+', not just '-'.
- Numbers may have "float" (f), "unsigned" (u), "long" (l)
  or "long long" (ll) suffixes.

The set of suffixes described by this regexp is somewhat larger
than what a real C compiler would accept.
---
 components/prism-c.js     | 3 ++-
 components/prism-c.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/prism-c.js b/components/prism-c.js
index a0a8933ecd..c449a29653 100644
--- a/components/prism-c.js
+++ b/components/prism-c.js
@@ -1,6 +1,7 @@
 Prism.languages.c = Prism.languages.extend('clike', {
 	'keyword': /\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/g,
-	'operator': /[-+]{1,2}|!=?|&lt;{1,2}=?|&gt;{1,2}=?|\-&gt;|={1,2}|\^|~|%|(&amp;){1,2}|\|?\||\?|\*|\//g
+	'operator': /[-+]{1,2}|!=?|&lt;{1,2}=?|&gt;{1,2}=?|\-&gt;|={1,2}|\^|~|%|(&amp;){1,2}|\|?\||\?|\*|\//g,
+	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)[fFuUlL]*\b/g
 });
 
 Prism.languages.insertBefore('c', 'keyword', {
diff --git a/components/prism-c.min.js b/components/prism-c.min.js
index 1cb1b16deb..61e5a3538d 100644
--- a/components/prism-c.min.js
+++ b/components/prism-c.min.js
@@ -1 +1 @@
-Prism.languages.c=Prism.languages.extend("clike",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/g,operator:/[-+]{1,2}|!=?|&lt;{1,2}=?|&gt;{1,2}=?|\-&gt;|={1,2}|\^|~|%|(&amp;){1,2}|\|?\||\?|\*|\//g});Prism.languages.insertBefore("c","keyword",{property:/#\s*[a-zA-Z]+/g});
+Prism.languages.c=Prism.languages.extend("clike",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/g,operator:/[-+]{1,2}|!=?|&lt;{1,2}=?|&gt;{1,2}=?|\-&gt;|={1,2}|\^|~|%|(&amp;){1,2}|\|?\||\?|\*|\//g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)[fFuUlL]*\b/g});Prism.languages.insertBefore("c","keyword",{property:/#\s*[a-zA-Z]+/g});
\ No newline at end of file

From a418b1a81fa362764018d8efab4e4c366678a3d8 Mon Sep 17 00:00:00 2001
From: Fabian Giesen <ryg@gmx.net>
Date: Thu, 25 Jul 2013 19:25:51 -0700
Subject: [PATCH 002/310] C-like: Allow '+' in exponents.

---
 components/prism-clike.js     | 4 ++--
 components/prism-clike.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index 89f949294f..31e2c25496 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -19,8 +19,8 @@ Prism.languages.clike = {
 			punctuation: /\(/
 		}
 	},
-	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
+	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)\b/g,
 	'operator': /[-+]{1,2}|!|&lt;=?|>=?|={1,3}|(&amp;){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,
 	'ignore': /&(lt|gt|amp);/gi,
 	'punctuation': /[{}[\];(),.:]/g
-};
\ No newline at end of file
+};
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index 22c8cff628..80077beda6 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/ig,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,"function":{pattern:/[a-z0-9_]+\(/ig,inside:{punctuation:/\(/}}, number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,operator:/[-+]{1,2}|!|&lt;=?|>=?|={1,3}|(&amp;){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};
\ No newline at end of file
+Prism.languages.clike={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/gi,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,"function":{pattern:/[a-z0-9_]+\(/gi,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)\b/g,operator:/[-+]{1,2}|!|&lt;=?|>=?|={1,3}|(&amp;){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};
\ No newline at end of file

From c9ec813b6660e3ef9e58bafbc5dcca5a44c90a4a Mon Sep 17 00:00:00 2001
From: Andreas Rohner <andreas.rohner@gmx.net>
Date: Sun, 10 Aug 2014 14:53:23 +0200
Subject: [PATCH 003/310] Extend Latex support

This patch extends the support for Latex in the following way:

* Support for various equation environments and for the verbatim
  environment
* Certain functions like `\ref` or `\begin` always contain a reference
  or a keyword and they are highlighted as such.
* Chapter and section headlines are written in bold to make them stand
  out more, because they structure the document.
* Since `selector` and `string` have the same color in the default
  theme, the token type `function` is used to highlight Latex commands.
* Add support for the `\url` command
* Add alias support
---
 components/prism-latex.js     | 67 +++++++++++++++++++++++++++++++----
 components/prism-latex.min.js |  2 +-
 2 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/components/prism-latex.js b/components/prism-latex.js
index c8902f6c5a..5e0a0e6312 100644
--- a/components/prism-latex.js
+++ b/components/prism-latex.js
@@ -1,6 +1,61 @@
-Prism.languages.latex = {
-	'comment': /%.*?(\r?\n|$)$/m,
-	'string': /(\$)(\\?.)*?\1/g,
-	'punctuation': /[{}]/g,
-	'selector': /\\[a-z;,:\.]*/i
-}
\ No newline at end of file
+(function(Prism) {
+	var funcPattern = /\\([^a-z()[\]]|[a-z\*]+)/gi,
+	    insideEqu = {
+		    'equation-command': {
+			    pattern: funcPattern,
+			    alias: 'regex'
+		    }
+	    };
+
+	Prism.languages.latex = {
+		'comment': /%.*?$/gm,
+		// the verbatim environment prints whitespace to the document
+		'cdata':  {
+			pattern: /(\\begin\{((?:verbatim|lstlisting)\*?)\})([\w\W]*?)(?=\\end\{\2\})/,
+			lookbehind: true
+		},
+		/*
+		 * equations can be between $ $ or \( \) or \[ \]
+		 * (all are multiline)
+		 */
+		'equation': [
+			{
+				pattern: /(\$(\\?[\w\W])*?\$|\\\((\\?[\w\W])*?\\\)|\\\[(\\?[\w\W])*?\\\])/g,
+				inside: insideEqu,
+				alias: 'string'
+			},
+			{
+				pattern: /(\\begin\{((?:equation|math|eqnarray|align|multline|gather)\*?)\})([\w\W]*?)(?=\\end\{\2\})/,
+				lookbehind: true,
+				inside: insideEqu,
+				alias: 'string'
+			}
+		],
+		/*
+		 * arguments which are keywords or references are highlighted
+		 * as keywords
+		 */
+		'keyword': {
+			pattern: /(\\(?:begin|end|ref|cite|label|usepackage|documentclass)(?:\[[^\]]+\])?\{)[^}]+(?=\}(?:\[[^\]]+\])?)/,
+			lookbehind: true
+		},
+		'url': {
+			pattern: /(\\url\{)[^}]+(?=\})/,
+			lookbehind: true
+		},
+		/*
+		 * section or chapter headlines are highlighted as bold so that
+		 * they stand out more
+		 */
+		'headline': {
+			pattern: /(\\(?:part|chapter|section|subsection|frametitle|subsubsection|paragraph|subparagraph|subsubparagraph|subsubsubparagraph)\*?(?:\[[^\]]+\])?\{)[^}]+(?=\}(?:\[[^\]]+\])?)/,
+			lookbehind: true,
+			alias: 'class-name'
+		},
+		'function': {
+			pattern: funcPattern,
+			alias: 'selector'
+		},
+		'punctuation': /[[\]{}&]/g,
+	};
+})(Prism);
diff --git a/components/prism-latex.min.js b/components/prism-latex.min.js
index 29f90249f1..2699cd297d 100644
--- a/components/prism-latex.min.js
+++ b/components/prism-latex.min.js
@@ -1 +1 @@
-Prism.languages.latex={comment:/%.*?(\r?\n|$)$/m,string:/(\$)(\\?.)*?\1/g,punctuation:/[{}]/g,selector:/\\[a-z;,:\.]*/i};
\ No newline at end of file
+!function(a){var e=/\\([^a-z()[\]]|[a-z\*]+)/gi,n={"equation-command":{pattern:e,alias:"regex"}};a.languages.latex={comment:/%.*?$/gm,cdata:{pattern:/(\\begin\{((?:verbatim|lstlisting)\*?)\})([\w\W]*?)(?=\\end\{\2\})/,lookbehind:!0},equation:[{pattern:/(\$(\\?[\w\W])*?\$|\\\((\\?[\w\W])*?\\\)|\\\[(\\?[\w\W])*?\\\])/g,inside:n,alias:"string"},{pattern:/(\\begin\{((?:equation|math|eqnarray|align|multline|gather)\*?)\})([\w\W]*?)(?=\\end\{\2\})/,lookbehind:!0,inside:n,alias:"string"}],keyword:{pattern:/(\\(?:begin|end|ref|cite|label|usepackage|documentclass)(?:\[[^\]]+\])?\{)[^}]+(?=\}(?:\[[^\]]+\])?)/,lookbehind:!0},url:{pattern:/(\\url\{)[^}]+(?=\})/,lookbehind:!0},headline:{pattern:/(\\(?:part|chapter|section|subsection|frametitle|subsubsection|paragraph|subparagraph|subsubparagraph|subsubsubparagraph)\*?(?:\[[^\]]+\])?\{)[^}]+(?=\}(?:\[[^\]]+\])?)/,lookbehind:!0,alias:"class-name"},"function":{pattern:e,alias:"selector"},punctuation:/[[\]{}&]/g}}(Prism);
\ No newline at end of file

From c84bd33208d8adb41aa6afc55137e6f26b4fc159 Mon Sep 17 00:00:00 2001
From: Peter Chaplin <peter@qcode.co.uk>
Date: Thu, 11 Dec 2014 10:25:23 +0000
Subject: [PATCH 004/310] Add Tcl language

---
 components.js           |   4 ++
 components/prism-tcl.js | 116 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 components/prism-tcl.js

diff --git a/components.js b/components.js
index 7bae5697d4..70f7ddcb91 100644
--- a/components.js
+++ b/components.js
@@ -206,6 +206,10 @@ var components = {
 		"handlebars": {
 			"title": "Handlebars",
 			"owner": "Golmote"
+		},
+		"tcl": {
+			"title": "Tcl",
+			"owner": "PeterChaplin"
 		}
 	},
 	"plugins": {
diff --git a/components/prism-tcl.js b/components/prism-tcl.js
new file mode 100644
index 0000000000..a52379bf64
--- /dev/null
+++ b/components/prism-tcl.js
@@ -0,0 +1,116 @@
+Prism.languages.tcl = {
+	'escaped': /\\./g,
+	'comment': /#.*/g,
+	'string': /"[^"]*"/g,
+	'variable': [
+		{
+			pattern: /(\$)(::)?([a-zA-Z0-9]+::)*[a-zA-Z0-9_]+/g,
+			lookbehind: true
+		},
+		{
+			pattern: /(\$){[^}]+}/g,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*set\s+)(::)?([a-zA-Z0-9]+::)*[a-zA-Z0-9_]+/gm,
+			lookbehind: true
+		}
+	],
+	'function': {
+		lookbehind: true,
+		pattern: /(^\s*proc\s+)[^\s]+/gm
+	},
+	'builtin': [
+		{
+			pattern: /(^\s*)(proc|return|class|error|eval|exit)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*)(for|foreach|if|switch|while|break|continue)\b/gm,
+			lookbehind: true
+		},
+		/\b(elseif|else)\b/g
+	],
+	'scope': {
+		pattern: /^\s+(global|upvar|variable)\b/gm,
+		alias: 'constant'
+	},
+	'keyword': [
+		{
+			pattern: /(^\s*|\[)(after|append|apply|array|auto_execok|auto_import)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(auto_load|auto_mkindex|automkindex_old)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(auto_qualify|auto_reset|bgerror|binary|catch|cd)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(chan|clock|close|concat|dde|dict|encoding|eof)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(exec|exit|expr|fblocked|fconfigure|fcopy|file)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(fileevent|filename|flush|gets|glob|history)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(http|incr|info|interp|join|lappend|lassign)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(lindex|linsert|list|llength|load|lrange)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(lrepeat|lreplace|lreverse|lsearch|lset|lsort)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(mathfunc|mathop|memory|msgcat|namespace|open)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(package|parray|pid|pkg_mkIndex|platform|puts)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(pwd|re_syntax|read|refchan|regexp|registry)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(regsub|rename|Safe_Base|scan|seek|set|socket)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(source|split|string|subst|Tcl|tcl_endOfWord)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(tcl_findLibrary|tclStartOfNextWord)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(tclstartOfPreviousWord|tclwordBreakAfter)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(tclwordBreakBefore|tcltest|tclvars|tell|time)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(tm|trace|unknown|unload|unset|update|uplevel)\b/gm,
+			lookbehind: true
+		},
+		{
+			pattern: /(^\s*|\[)(upvar|variable|vwait)\b/gm,
+			lookbehind: true
+		}
+	]
+};

From c38007c42c53edc9fb5fe77e8457cef1298e5f4b Mon Sep 17 00:00:00 2001
From: Petr Chalupny <temnoregg@gmail.com>
Date: Wed, 31 Dec 2014 12:18:24 +0100
Subject: [PATCH 005/310] Added Qore language support

---
 components/prism-qore.js     | 20 ++++++++++++++++++++
 components/prism-qore.min.js |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 components/prism-qore.js
 create mode 100644 components/prism-qore.min.js

diff --git a/components/prism-qore.js b/components/prism-qore.js
new file mode 100644
index 0000000000..a2ce637e51
--- /dev/null
+++ b/components/prism-qore.js
@@ -0,0 +1,20 @@
+Prism.languages.qore = Prism.languages.extend('clike', {
+  'comment': {
+    pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|((\/\/)|#).*?(\r?\n|$))/g, // /(^|[^\\])([\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,
+    lookbehind: true
+  },
+	'variable': /(\$\w+)\b/ig,
+	'keyword': /\b(abstract|any|assert|binary|bool|boolean|break|byte|case|catch|char|class|code|const|continue|data|default|do|double|else|enum|extends|final|finally|float|for|goto|hash|if|implements|import|inherits|instanceof|int|interface|long|my|native|new|nothing|null|object|our|own|private|reference|rethrow|return|short|softint|softfloat|softnumber|softbool|softstring|softdate|softlist|static|strictfp|string|sub|super|switch|synchronized|this|throw|throws|transient|try|void|volatile|while)\b/g,
+	'number': /\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp\-]+\b|\b\d*\.?\d+[e]?[\d]*[df]\b|\W\d*\.?\d+\b/gi,
+  'boolean': /\b(true|false)\b/ig,
+	'operator': {
+		pattern: /([^\.]|^)([-+]{1,2}|!|=?&lt;|=?&gt;|={1,2}|(&amp;){1,2}|\|?\||\?|\*|\/|%|\^|(&lt;){2}|($gt;){2,3}|:|~|new|background|dlete|remove|cast|shift|pop|chomp|trim|elements|keys|exists|instanceof|unshift|push|splice|extract|map|foldl|foldr|select|\$)/g,
+		lookbehind: true
+	},
+	'function': {
+		pattern: /[a-z0-9_]+\(/ig,
+		inside: {
+			punctuation: /\(/
+		}
+	},
+});
\ No newline at end of file
diff --git a/components/prism-qore.min.js b/components/prism-qore.min.js
new file mode 100644
index 0000000000..760c5add03
--- /dev/null
+++ b/components/prism-qore.min.js
@@ -0,0 +1 @@
+Prism.languages.qore=Prism.languages.extend("clike",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|((\/\/)|#).*?(\r?\n|$))/g,lookbehind:!0},variable:/(\$\w+)\b/gi,keyword:/\b(abstract|any|assert|binary|bool|boolean|break|byte|case|catch|char|class|code|const|continue|data|default|do|double|else|enum|extends|final|finally|float|for|goto|hash|if|implements|import|inherits|instanceof|int|interface|long|my|native|new|nothing|null|object|our|own|private|reference|rethrow|return|short|softint|softfloat|softnumber|softbool|softstring|softdate|softlist|static|strictfp|string|sub|super|switch|synchronized|this|throw|throws|transient|try|void|volatile|while)\b/g,number:/\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp\-]+\b|\b\d*\.?\d+[e]?[\d]*[df]\b|\W\d*\.?\d+\b/gi,"boolean":/\b(true|false)\b/gi,operator:{pattern:/([^\.]|^)([-+]{1,2}|!|=?&lt;|=?&gt;|={1,2}|(&amp;){1,2}|\|?\||\?|\*|\/|%|\^|(&lt;){2}|($gt;){2,3}|:|~|new|background|dlete|remove|cast|shift|pop|chomp|trim|elements|keys|exists|instanceof|unshift|push|splice|extract|map|foldl|foldr|select|\$)/g,lookbehind:!0},"function":{pattern:/[a-z0-9_]+\(/gi,inside:{punctuation:/\(/}}});

From 98c326b21abedcdb1bfa62aee10c64e03143e391 Mon Sep 17 00:00:00 2001
From: Petr Chalupny <temnoregg@gmail.com>
Date: Wed, 31 Dec 2014 12:23:01 +0100
Subject: [PATCH 006/310] Added Qore to component listing

---
 components.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components.js b/components.js
index 8d48e5fe46..846ac2b798 100644
--- a/components.js
+++ b/components.js
@@ -268,6 +268,10 @@ var components = {
 		"powershell": {
 			"title": "PowerShell",
 			"owner": "nauzilus"
+		},
+		"qore": {
+			"title": "Qore",
+			"owner": "temnroegg"
 		}
 	},
 	"plugins": {

From 230b67ae8088481ed0d24120ed3ed3e6b4fe6f8b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 21 Mar 2015 00:05:02 +0100
Subject: [PATCH 007/310] Add Brainfuck language

---
 components.js                     |  4 ++++
 components/prism-brainfuck.js     | 20 ++++++++++++++++
 components/prism-brainfuck.min.js |  1 +
 examples/prism-brainfuck.html     | 40 +++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 components/prism-brainfuck.js
 create mode 100644 components/prism-brainfuck.min.js
 create mode 100644 examples/prism-brainfuck.html

diff --git a/components.js b/components.js
index 83b7c39853..b1e05d91a5 100644
--- a/components.js
+++ b/components.js
@@ -319,6 +319,10 @@ var components = {
 			"title": "Wiki markup",
 			"require": "markup",
 			"owner": "Golmote"
+		},
+		"brainfuck": {
+			"title": "Brainfuck",
+			"owner": "Golmote"
 		}
 	},
 	"plugins": {
diff --git a/components/prism-brainfuck.js b/components/prism-brainfuck.js
new file mode 100644
index 0000000000..604d12292c
--- /dev/null
+++ b/components/prism-brainfuck.js
@@ -0,0 +1,20 @@
+Prism.languages.brainfuck = {
+	'pointer': {
+		pattern: /<|>/,
+		alias: 'keyword'
+	},
+	'increment': {
+		pattern: /\+/,
+		alias: 'inserted'
+	},
+	'decrement': {
+		pattern: /-/,
+		alias: 'deleted'
+	},
+	'branching': {
+		pattern: /\[|\]/,
+		alias: 'important'
+	},
+	'operator': /[.,]/,
+	'comment': /\S+/
+};
\ No newline at end of file
diff --git a/components/prism-brainfuck.min.js b/components/prism-brainfuck.min.js
new file mode 100644
index 0000000000..ed9707eaa4
--- /dev/null
+++ b/components/prism-brainfuck.min.js
@@ -0,0 +1 @@
+Prism.languages.brainfuck={pointer:{pattern:/<|>/,alias:"keyword"},increment:{pattern:/\+/,alias:"inserted"},decrement:{pattern:/-/,alias:"deleted"},branching:{pattern:/\[|\]/,alias:"important"},operator:/[.,]/,comment:/\S+/};
\ No newline at end of file
diff --git a/examples/prism-brainfuck.html b/examples/prism-brainfuck.html
new file mode 100644
index 0000000000..e4cf9fe22d
--- /dev/null
+++ b/examples/prism-brainfuck.html
@@ -0,0 +1,40 @@
+<h1>Brainfuck</h1>
+<p>To use this language, use the class "language-brainfuck".</p>
+
+<h2>Full example</h2>
+<pre><code>+++++ +++               Set Cell #0 to 8
+[
+    >++++               Add 4 to Cell #1; this will always set Cell #1 to 4
+    [                   as the cell will be cleared by the loop
+        >++             Add 2 to Cell #2
+        >+++            Add 3 to Cell #3
+        >+++            Add 3 to Cell #4
+        >+              Add 1 to Cell #5
+        <<<<-           Decrement the loop counter in Cell #1
+    ]                   Loop till Cell #1 is zero; number of iterations is 4
+    >+                  Add 1 to Cell #2
+    >+                  Add 1 to Cell #3
+    >-                  Subtract 1 from Cell #4
+    >>+                 Add 1 to Cell #6
+    [<]                 Move back to the first zero cell you find; this will
+                        be Cell #1 which was cleared by the previous loop
+    <-                  Decrement the loop Counter in Cell #0
+]                       Loop till Cell #0 is zero; number of iterations is 8
+
+The result of this is:
+Cell No :   0   1   2   3   4   5   6
+Contents:   0   0  72 104  88  32   8
+Pointer :   ^
+
+>>.                     Cell #2 has value 72 which is 'H'
+>---.                   Subtract 3 from Cell #3 to get 101 which is 'e'
++++++++..+++.           Likewise for 'llo' from Cell #3
+>>.                     Cell #5 is 32 for the space
+<-.                     Subtract 1 from Cell #4 for 87 to give a 'W'
+<.                      Cell #3 was set to 'o' from the end of 'Hello'
++++.------.--------.    Cell #3 for 'rl' and 'd'
+>>+.                    Add 1 to Cell #5 gives us an exclamation point
+>++.                    And finally a newline from Cell #6</code></pre>
+
+<h2>One-line example</h2>
+<pre><code>++++++++[>++++[>++>+++>+++>+<<<<-]>+>+>->>+[<]<-]>>.>---.+++++++..+++.>>.<-.<.+++.------.--------.>>+.>++.</code></pre>

From c79922532b787f159861aaaf66bf1c4e4c4e82fe Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 31 Mar 2015 07:47:32 +0200
Subject: [PATCH 008/310] Fixed implicitly declared variable

---
 plugins/line-numbers/prism-line-numbers.js     | 2 +-
 plugins/line-numbers/prism-line-numbers.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/line-numbers/prism-line-numbers.js b/plugins/line-numbers/prism-line-numbers.js
index e340049f73..329d568ac5 100644
--- a/plugins/line-numbers/prism-line-numbers.js
+++ b/plugins/line-numbers/prism-line-numbers.js
@@ -8,7 +8,7 @@ Prism.hooks.add('after-highlight', function (env) {
 	var linesNum = (1 + env.code.split('\n').length);
 	var lineNumbersWrapper;
 
-	lines = new Array(linesNum);
+	var lines = new Array(linesNum);
 	lines = lines.join('<span></span>');
 
 	lineNumbersWrapper = document.createElement('span');
diff --git a/plugins/line-numbers/prism-line-numbers.min.js b/plugins/line-numbers/prism-line-numbers.min.js
index bade829a23..a0172fc885 100644
--- a/plugins/line-numbers/prism-line-numbers.min.js
+++ b/plugins/line-numbers/prism-line-numbers.min.js
@@ -1 +1 @@
-Prism.hooks.add("after-highlight",function(e){var n=e.element.parentNode;if(n&&/pre/i.test(n.nodeName)&&-1!==n.className.indexOf("line-numbers")){var t,a=1+e.code.split("\n").length;lines=new Array(a),lines=lines.join("<span></span>"),t=document.createElement("span"),t.className="line-numbers-rows",t.innerHTML=lines,n.hasAttribute("data-start")&&(n.style.counterReset="linenumber "+(parseInt(n.getAttribute("data-start"),10)-1)),e.element.appendChild(t)}});
\ No newline at end of file
+Prism.hooks.add("after-highlight",function(e){var t=e.element.parentNode;if(t&&/pre/i.test(t.nodeName)&&-1!==t.className.indexOf("line-numbers")){var n,a=1+e.code.split("\n").length,r=new Array(a);r=r.join("<span></span>"),n=document.createElement("span"),n.className="line-numbers-rows",n.innerHTML=r,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(n)}});
\ No newline at end of file

From b31e2dd5242878f6e7c8f4237024150ab5d96704 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 1 Apr 2015 09:05:57 +0200
Subject: [PATCH 009/310] Add a "Select All" languages checkbox (fix #513)

---
 components.js |  3 ++-
 download.html |  3 ++-
 download.js   | 62 ++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/components.js b/components.js
index 7be18694e5..a4c0867284 100644
--- a/components.js
+++ b/components.js
@@ -35,7 +35,8 @@ var components = {
 		"meta": {
 			"path": "components/prism-{id}",
 			"noCSS": true,
-			"examplesPath": "examples/prism-{id}"
+			"examplesPath": "examples/prism-{id}",
+			"addCheckAll": true
 		},
 		"markup": {
 			"title": "Markup",
diff --git a/download.html b/download.html
index f273c7eaa0..0dd9930f0d 100644
--- a/download.html
+++ b/download.html
@@ -65,7 +65,8 @@
 		column-span: all;
 	}
 
-	section.options#category-languages label[data-id="javascript"] {
+	section.options#category-languages label[data-id="javascript"],
+	section.options label[data-id^="check-all-"] {
 		border-bottom: 1px solid #aaa;
 		padding-bottom: 1em;
 		margin-bottom: 1em;
diff --git a/download.js b/download.js
index 742da9716b..e56e58710c 100644
--- a/download.js
+++ b/download.js
@@ -64,6 +64,37 @@ for (var category in components) {
 		},
 		inside: '#components'
 	});
+
+	if (all.meta.addCheckAll) {
+		$u.element.create('label', {
+			attributes: {
+				'data-id': 'check-all-' + category
+			},
+			contents: [
+				{
+					tag: 'input',
+					properties: {
+						type: 'checkbox',
+						name: 'check-all-' + category,
+						value: '',
+						checked: false,
+						onclick: (function(category, all){
+							return function () {
+								var checkAll = this;
+								$$('input[name="download-' + category + '"]').forEach(function(input) {
+									all[input.value].enabled = input.checked = checkAll.checked;
+								});
+
+								update(category);
+							};
+						})(category, all)
+					}
+				},
+				'Select/unselect all'
+			],
+			inside: all.meta.section
+		});
+	}
 	
 	for (var id in all) {
 		if(id === 'meta') {
@@ -266,10 +297,11 @@ function update(updatedCategory, updatedId){
 	
 	for (var category in components) {
 		var all = components[category];
-		
+		var allChecked = true;
+
 		for (var id in all) {
 			var info = all[id];
-			
+
 			if (info.enabled || id == updatedId) {
 				var distro = info.files[minified? 'minified' : 'dev'];
 				
@@ -295,18 +327,28 @@ function update(updatedCategory, updatedId){
 					}
 				});
 			}
+			if (id !== 'meta' && !info.enabled) {
+				allChecked = false;
+			}
+		}
+
+		if (all.meta.addCheckAll) {
+			$('input[name="check-all-' + category + '"]').checked = allChecked;
 		}
 	}
 	
 	total.all = total.js + total.css;
-	updated.all = updated.js + updated.css;
-	
-	$u.element.prop($('label[data-id="' + updatedId + '"] .filesize'), {
-		textContent: prettySize(updated.all),
-		title: (updated.js? Math.round(100 * updated.js / updated.all) + '% JavaScript' : '') + 
-				(updated.js && updated.css? ' + ' : '') +
-				(updated.css? Math.round(100 * updated.css / updated.all) + '% CSS' : '')
-	});
+
+	if (updatedId) {
+		updated.all = updated.js + updated.css;
+
+		$u.element.prop($('label[data-id="' + updatedId + '"] .filesize'), {
+			textContent: prettySize(updated.all),
+			title: (updated.js ? Math.round(100 * updated.js / updated.all) + '% JavaScript' : '') +
+				(updated.js && updated.css ? ' + ' : '') +
+				(updated.css ? Math.round(100 * updated.css / updated.all) + '% CSS' : '')
+		});
+	}
 	
 	$('#filesize').textContent = prettySize(total.all);
 	

From 93fb18a10a27ecba1c88657ee1c1ce35a954a676 Mon Sep 17 00:00:00 2001
From: Daniel Flint <nauzilus@gmail.com>
Date: Fri, 3 Apr 2015 00:04:46 +1100
Subject: [PATCH 010/310] Don't force scrollbars to be shown unnecessarily.

---
 plugins/show-language/prism-show-language.css     | 2 +-
 plugins/show-language/prism-show-language.min.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/show-language/prism-show-language.css b/plugins/show-language/prism-show-language.css
index 5561baeb7b..336f0f9b96 100644
--- a/plugins/show-language/prism-show-language.css
+++ b/plugins/show-language/prism-show-language.css
@@ -2,7 +2,7 @@ pre[class*='language-'] {
 	position: relative;
 }
 pre[class*='language-'] > code[data-language] {
-	overflow: scroll;
+	overflow: auto;
 	max-height: 28em;
 	display: block;
 }
diff --git a/plugins/show-language/prism-show-language.min.css b/plugins/show-language/prism-show-language.min.css
index 76d4568213..0444f4dda3 100644
--- a/plugins/show-language/prism-show-language.min.css
+++ b/plugins/show-language/prism-show-language.min.css
@@ -1 +1 @@
-pre[class*=language-]{position:relative}pre[class*=language-]>code[data-language]{overflow:scroll;max-height:28em;display:block}pre[class*=language-]>code[data-language]::before{content:attr(data-language);color:#000;background-color:#CFCFCF;display:inline-block;position:absolute;top:0;right:0;font-size:.9em;border-radius:0 0 0 5px;padding:0 .5em;text-shadow:none}
\ No newline at end of file
+pre[class*=language-]{position:relative}pre[class*=language-]>code[data-language]{overflow:auto;max-height:28em;display:block}pre[class*=language-]>code[data-language]::before{content:attr(data-language);color:#000;background-color:#CFCFCF;display:inline-block;position:absolute;top:0;right:0;font-size:.9em;border-radius:0 0 0 5px;padding:0 .5em;text-shadow:none}
\ No newline at end of file

From 2781c8b9ca060361d944a82708ec5870116e5710 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 10 Apr 2015 21:36:06 +0200
Subject: [PATCH 011/310] Allow empty single-like comments. Fix #564

---
 components/prism-clike.js     | 2 +-
 components/prism-clike.min.js | 2 +-
 prism.js                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index 1c8548bd77..5c0a03a7c6 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -5,7 +5,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^\\:])\/\/.+/,
+			pattern: /(^|[^\\:])\/\/.*/,
 			lookbehind: true
 		}
 	],
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index 1c583cf382..83c97474a8 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.+/,lookbehind:!0}],string:/("|')(\\\n|\\?.)*?\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\\n|\\?.)*?\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 2a5c0244bd..e74f7cd746 100644
--- a/prism.js
+++ b/prism.js
@@ -544,7 +544,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^\\:])\/\/.+/,
+			pattern: /(^|[^\\:])\/\/.*/,
 			lookbehind: true
 		}
 	],

From 8417aff19b942e9ef2f7d0cd56ab388dbd353d4a Mon Sep 17 00:00:00 2001
From: Andreas Larsen <andreaslarsen86@gmail.com>
Date: Fri, 10 Apr 2015 23:40:29 +0200
Subject: [PATCH 012/310] Fixes same empty // comment error as in clike

---
 components/prism-less.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-less.js b/components/prism-less.js
index 3328db8f49..0ed468c543 100644
--- a/components/prism-less.js
+++ b/components/prism-less.js
@@ -10,7 +10,7 @@ Prism.languages.less = Prism.languages.extend('css', {
 	'comment': [
 		/\/\*[\w\W]*?\*\//,
 		{
-			pattern: /(^|[^\\])\/\/.+/,
+			pattern: /(^|[^\\])\/\/.*/,
 			lookbehind: true
 		}
 	],
@@ -57,4 +57,4 @@ Prism.languages.insertBefore('less', 'property', {
 		lookbehind: true,
 		alias: 'function'
 	}
-});
\ No newline at end of file
+});

From 0c30a04308c4c3d9e74f2ab100f7ef515394c124 Mon Sep 17 00:00:00 2001
From: Andreas Larsen <andreaslarsen86@gmail.com>
Date: Fri, 10 Apr 2015 23:41:20 +0200
Subject: [PATCH 013/310] Same as #566 - just the minified file

---
 components/prism-less.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-less.min.js b/components/prism-less.min.js
index e4c1be2240..5f826d6903 100644
--- a/components/prism-less.min.js
+++ b/components/prism-less.min.js
@@ -1 +1 @@
-Prism.languages.less=Prism.languages.extend("css",{comment:[/\/\*[\w\W]*?\*\//,{pattern:/(^|[^\\])\/\/.+/,lookbehind:!0}],atrule:{pattern:/@[\w-]+?(?:\([^{}]+\)|[^(){};])*?(?=\s*\{)/i,inside:{punctuation:/[:()]/}},selector:{pattern:/(?:@\{[\w-]+\}|[^{};\s@])(?:@\{[\w-]+\}|\([^{}]*\)|[^{};@])*?(?=\s*\{)/,inside:{variable:/@+[\w-]+/}},property:/(\b|\B)(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,punctuation:/[{}();:,]/,operator:/[+\-*\/]/}),Prism.languages.insertBefore("less","punctuation",{"function":Prism.languages.less.function}),Prism.languages.insertBefore("less","property",{variable:[{pattern:/@[\w-]+\s*:/,inside:{punctuation:/:/}},/@@?[\w-]+/],"mixin-usage":{pattern:/([{;]\s*)[.#](?!\d)[\w-]+.*?(?=[(;])/,lookbehind:!0,alias:"function"}});
\ No newline at end of file
+Prism.languages.less=Prism.languages.extend("css",{comment:[/\/\*[\w\W]*?\*\//,{pattern:/(^|[^\\])\/\/.*/,lookbehind:!0}],atrule:{pattern:/@[\w-]+?(?:\([^{}]+\)|[^(){};])*?(?=\s*\{)/i,inside:{punctuation:/[:()]/}},selector:{pattern:/(?:@\{[\w-]+\}|[^{};\s@])(?:@\{[\w-]+\}|\([^{}]*\)|[^{};@])*?(?=\s*\{)/,inside:{variable:/@+[\w-]+/}},property:/(\b|\B)(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,punctuation:/[{}();:,]/,operator:/[+\-*\/]/}),Prism.languages.insertBefore("less","punctuation",{"function":Prism.languages.less.function}),Prism.languages.insertBefore("less","property",{variable:[{pattern:/@[\w-]+\s*:/,inside:{punctuation:/:/}},/@@?[\w-]+/],"mixin-usage":{pattern:/([{;]\s*)[.#](?!\d)[\w-]+.*?(?=[(;])/,lookbehind:!0,alias:"function"}});

From 2acd30dcd625113b14a3edc994ba7ce2d7bc25f1 Mon Sep 17 00:00:00 2001
From: Daniel Flint <nauzilus@gmail.com>
Date: Fri, 17 Apr 2015 18:23:37 +1000
Subject: [PATCH 014/310] Work nicely with line-numbers plugin

Generated content on the `pre` means if the highlighted area needs to scroll, the language will scroll out of view with the code.
But that's better than completely breaking another plugin.
---
 plugins/show-language/index.html                  | 7 -------
 plugins/show-language/prism-show-language.css     | 7 +------
 plugins/show-language/prism-show-language.js      | 6 +++++-
 plugins/show-language/prism-show-language.min.css | 2 +-
 plugins/show-language/prism-show-language.min.js  | 2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/plugins/show-language/index.html b/plugins/show-language/index.html
index aa790af970..299a73cde1 100644
--- a/plugins/show-language/index.html
+++ b/plugins/show-language/index.html
@@ -36,13 +36,6 @@ <h2>HTML (Markup)</h2>
 	<pre data-src="plugins/show-language/index.html"></pre>
 </section>
 
-<section>
-	<h1>Known Issues</h1>
-
-	<ul>
-		<li>Changes the appearence of the Funky theme, to be less 'funky' and more 'black'</li>
-	</ul>
-</section>	
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
 <script src="prism.js"></script>
diff --git a/plugins/show-language/prism-show-language.css b/plugins/show-language/prism-show-language.css
index 336f0f9b96..4a3c2f29f6 100644
--- a/plugins/show-language/prism-show-language.css
+++ b/plugins/show-language/prism-show-language.css
@@ -1,12 +1,7 @@
 pre[class*='language-'] {
 	position: relative;
 }
-pre[class*='language-'] > code[data-language] {
-	overflow: auto;
-	max-height: 28em;
-	display: block;
-}
-pre[class*='language-'] > code[data-language]::before {
+pre[class*='language-'][data-language]::before {
 	content: attr(data-language);
 	color: black;
 	background-color: #CFCFCF;
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
index 7ca2f231a9..7b345d39be 100644
--- a/plugins/show-language/prism-show-language.js
+++ b/plugins/show-language/prism-show-language.js
@@ -9,8 +9,12 @@ var Languages = {
 	'cpp': 'C++'
 };
 Prism.hooks.add('before-highlight', function(env) {
+	var pre = env.element.parentNode;
+	if (!pre || !/pre/i.test(pre.nodeName)) {
+		return;
+	}
 	var language = Languages[env.language] || env.language;
-	env.element.setAttribute('data-language', language);
+	pre.setAttribute('data-language', language);
 });
 
 })();
diff --git a/plugins/show-language/prism-show-language.min.css b/plugins/show-language/prism-show-language.min.css
index 0444f4dda3..16a7f46830 100644
--- a/plugins/show-language/prism-show-language.min.css
+++ b/plugins/show-language/prism-show-language.min.css
@@ -1 +1 @@
-pre[class*=language-]{position:relative}pre[class*=language-]>code[data-language]{overflow:auto;max-height:28em;display:block}pre[class*=language-]>code[data-language]::before{content:attr(data-language);color:#000;background-color:#CFCFCF;display:inline-block;position:absolute;top:0;right:0;font-size:.9em;border-radius:0 0 0 5px;padding:0 .5em;text-shadow:none}
\ No newline at end of file
+pre[class*=language-]{position:relative}pre[class*=language-][data-language]::before{content:attr(data-language);color:#000;background-color:#CFCFCF;display:inline-block;position:absolute;top:0;right:0;font-size:.9em;border-radius:0 0 0 5px;padding:0 .5em;text-shadow:none}
\ No newline at end of file
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
index 4ac0d48ab3..3f9280d985 100644
--- a/plugins/show-language/prism-show-language.min.js
+++ b/plugins/show-language/prism-show-language.min.js
@@ -1 +1 @@
-!function(){if(self.Prism){var a={csharp:"C#",cpp:"C++"};Prism.hooks.add("before-highlight",function(e){var t=a[e.language]||e.language;e.element.setAttribute("data-language",t)})}}();
\ No newline at end of file
+!function(){if(self.Prism){var e={csharp:"C#",cpp:"C++"};Prism.hooks.add("before-highlight",function(a){var t=a.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var i=e[a.language]||a.language;t.setAttribute("data-language",i)}})}}();
\ No newline at end of file

From 969cda6fd2562b23df74c082906bd4b53796beca Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 26 Apr 2015 12:05:19 +0200
Subject: [PATCH 015/310] Fix typo in Python keywords: "elf" => "elif". Fix
 #573

---
 components/prism-python.js     | 2 +-
 components/prism-python.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-python.js b/components/prism-python.js
index ceda1631d3..f04765b56c 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -4,7 +4,7 @@ Prism.languages.python= {
 		lookbehind: true
 	},
 	'string': /"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,
-	'keyword' : /\b(as|assert|break|class|continue|def|del|elf|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
+	'keyword' : /\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
 	'boolean' : /\b(True|False)\b/,
 	'number' : /\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
 	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,
diff --git a/components/prism-python.min.js b/components/prism-python.min.js
index 6f615d3e0a..3bd60b4f42 100644
--- a/components/prism-python.min.js
+++ b/components/prism-python.min.js
@@ -1 +1 @@
-Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,keyword:/\b(as|assert|break|class|continue|def|del|elf|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,keyword:/\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file

From 33bebfe7bbac6c44ec53f7acb5f4547fe7746eb5 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 6 May 2015 07:38:23 +0200
Subject: [PATCH 016/310] Line-numbers : accept CSS class on both <pre> and
 <code>. Fixes #568

---
 plugins/line-numbers/prism-line-numbers.js     | 18 ++++++++++++++++--
 plugins/line-numbers/prism-line-numbers.min.js |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/line-numbers/prism-line-numbers.js b/plugins/line-numbers/prism-line-numbers.js
index 329d568ac5..9443deb7dc 100644
--- a/plugins/line-numbers/prism-line-numbers.js
+++ b/plugins/line-numbers/prism-line-numbers.js
@@ -1,10 +1,24 @@
 Prism.hooks.add('after-highlight', function (env) {
-	// works only for <code> wrapped inside <pre data-line-numbers> (not inline)
+	// works only for <code> wrapped inside <pre> (not inline)
 	var pre = env.element.parentNode;
-	if (!pre || !/pre/i.test(pre.nodeName) || pre.className.indexOf('line-numbers') === -1) {
+	var clsReg = /\s*\bline-numbers\b\s*/;
+	if (
+		!pre || !/pre/i.test(pre.nodeName) ||
+		// Abort only if nor the <pre> nor the <code> have the class
+		(!clsReg.test(pre.className) && !clsReg.test(env.element.className))
+	) {
 		return;
 	}
 
+	if (clsReg.test(env.element.className)) {
+		// Remove the class "line-numbers" from the <code>
+		env.element.className = env.element.className.replace(clsReg, '');
+	}
+	if (!clsReg.test(pre.className)) {
+		// Add the class "line-numbers" to the <pre>
+		pre.className += ' line-numbers';
+	}
+
 	var linesNum = (1 + env.code.split('\n').length);
 	var lineNumbersWrapper;
 
diff --git a/plugins/line-numbers/prism-line-numbers.min.js b/plugins/line-numbers/prism-line-numbers.min.js
index a0172fc885..26f0a22514 100644
--- a/plugins/line-numbers/prism-line-numbers.min.js
+++ b/plugins/line-numbers/prism-line-numbers.min.js
@@ -1 +1 @@
-Prism.hooks.add("after-highlight",function(e){var t=e.element.parentNode;if(t&&/pre/i.test(t.nodeName)&&-1!==t.className.indexOf("line-numbers")){var n,a=1+e.code.split("\n").length,r=new Array(a);r=r.join("<span></span>"),n=document.createElement("span"),n.className="line-numbers-rows",n.innerHTML=r,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(n)}});
\ No newline at end of file
+Prism.hooks.add("after-highlight",function(e){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=1+e.code.split("\n").length,l=new Array(n);l=l.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}});
\ No newline at end of file

From 951e973eaf6f61f9bbba513ed075638aa1c76b65 Mon Sep 17 00:00:00 2001
From: beckwith <beckwith@beckwith-macbookpro.roam.corp.google.com>
Date: Fri, 8 May 2015 08:27:36 -0700
Subject: [PATCH 017/310] add dockerfile highlighting

---
 components.js                  |  4 ++++
 components/prism-docker.js     |  8 +++++++
 examples/prism-dockerfile.html | 39 ++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 components/prism-docker.js
 create mode 100644 examples/prism-dockerfile.html

diff --git a/components.js b/components.js
index 7be18694e5..8997f0ac60 100644
--- a/components.js
+++ b/components.js
@@ -114,6 +114,10 @@ var components = {
 			"require": "clike",
 			"owner": "Golmote"
 		},
+		"dockerfile": {
+			"title": "Dockerfile",
+			"owner": "JustinBeckwith"
+		},
 		"eiffel": {
 			"title": "Eiffel",
 			"owner": "Conaclos"
diff --git a/components/prism-docker.js b/components/prism-docker.js
new file mode 100644
index 0000000000..835f037591
--- /dev/null
+++ b/components/prism-docker.js
@@ -0,0 +1,8 @@
+Prism.languages.docker = {
+	'keyword': {
+    pattern: /^\s*\b(ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|ENTRYPOINT)\b\s/mi
+	},
+  'string': /("|')(\\\n|\\?.)*?\1/,
+	'comment': /#[^\n]+/,
+  'punctuation': /([:[\]{}\-,|>?]|---|\.\.\.)/
+};
diff --git a/examples/prism-dockerfile.html b/examples/prism-dockerfile.html
new file mode 100644
index 0000000000..295a3cff60
--- /dev/null
+++ b/examples/prism-dockerfile.html
@@ -0,0 +1,39 @@
+<h1>Dockerfile</h1>
+<p>To use this language, use the class "language-docker".</p>
+
+<h2>Comments</h2>
+<pre><code># These are the comments for a dockerfile.
+# I want to make sure $(variables) don't break out,
+# and we shouldn't see keywords like ADD or ENTRYPOINT
+</code></pre>
+
+<h2>Instructions</h2>
+<pre><code># Use the official go docker image built on debian.
+FROM golang:1.4.2
+
+# Grab the source code and add it to the workspace.
+ADD . /go/src/github.com/JustinBeckwith/revel-appengine
+
+# Install revel and the revel CLI.
+RUN go get github.com/revel/revel
+RUN go get github.com/revel/cmd/revel
+</code></pre>
+
+
+<h2>Full example</h2>
+<pre><code># Use the official go docker image built on debian.
+FROM golang:1.4.2
+
+# Grab the source code and add it to the workspace.
+ADD . /go/src/github.com/JustinBeckwith/revel-appengine
+
+# Install revel and the revel CLI.
+RUN go get github.com/revel/revel
+RUN go get github.com/revel/cmd/revel
+
+# Use the revel CLI to start up our application.
+ENTRYPOINT revel run github.com/JustinBeckwith/revel-appengine dev 8080
+
+# Open up the port where the app is running.
+EXPOSE 8080
+</code></pre>

From 99d87ca25e68ee6ae1c1052c8a17347a8895fe7f Mon Sep 17 00:00:00 2001
From: Justin Beckwith <justin.beckwith@gmail.com>
Date: Wed, 13 May 2015 17:54:36 -0700
Subject: [PATCH 018/310] fix CR feedback, add better sample

---
 components.js                  |  4 +--
 components/prism-docker.js     |  9 +++---
 examples/prism-docker.html     | 52 ++++++++++++++++++++++++++++++++++
 examples/prism-dockerfile.html | 39 -------------------------
 4 files changed, 59 insertions(+), 45 deletions(-)
 create mode 100644 examples/prism-docker.html
 delete mode 100644 examples/prism-dockerfile.html

diff --git a/components.js b/components.js
index 8997f0ac60..346cb8ebe5 100644
--- a/components.js
+++ b/components.js
@@ -114,8 +114,8 @@ var components = {
 			"require": "clike",
 			"owner": "Golmote"
 		},
-		"dockerfile": {
-			"title": "Dockerfile",
+		"docker": {
+			"title": "Docker",
 			"owner": "JustinBeckwith"
 		},
 		"eiffel": {
diff --git a/components/prism-docker.js b/components/prism-docker.js
index 835f037591..b8724b51c2 100644
--- a/components/prism-docker.js
+++ b/components/prism-docker.js
@@ -1,8 +1,9 @@
 Prism.languages.docker = {
 	'keyword': {
-    pattern: /^\s*\b(ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|ENTRYPOINT)\b\s/mi
+		pattern: /(^\s*)(?:ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|ENTRYPOINT)(?=\s)/mi,
+		lookbehind: true
 	},
-  'string': /("|')(\\\n|\\?.)*?\1/,
-	'comment': /#[^\n]+/,
-  'punctuation': /([:[\]{}\-,|>?]|---|\.\.\.)/
+	'string': /("|')(\\\n|\\?.)*?\1/,
+	'comment': /#.*/,
+	'punctuation': /([:[\]{}\-,|>?]|---|\.\.\.)/
 };
diff --git a/examples/prism-docker.html b/examples/prism-docker.html
new file mode 100644
index 0000000000..a37b2df2ed
--- /dev/null
+++ b/examples/prism-docker.html
@@ -0,0 +1,52 @@
+<h1>Docker</h1>
+<p>To use this language, use the class "language-docker".</p>
+
+<h2>Comments</h2>
+<pre><code># These are the comments for a dockerfile.
+# I want to make sure $(variables) don't break out,
+# and we shouldn't see keywords like ADD or ENTRYPOINT
+</code></pre>
+
+<h2>Full example</h2>
+<pre><code># Nginx
+#
+# VERSION               0.0.1
+
+FROM      ubuntu
+MAINTAINER Victor Vieux <victor@docker.com>
+
+LABEL Description="This image is used to start the foobar executable" Vendor="ACME Products" Version="1.0"
+RUN apt-get update && apt-get install -y inotify-tools nginx apache2 openssh-server
+
+# Firefox over VNC
+#
+# VERSION               0.3
+
+FROM ubuntu
+
+# Install vnc, xvfb in order to create a 'fake' display and firefox
+RUN apt-get update && apt-get install -y x11vnc xvfb firefox
+RUN mkdir ~/.vnc
+# Setup a password
+RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
+# Autostart firefox (might not be the best way, but it does the trick)
+RUN bash -c 'echo "firefox" >> /.bashrc'
+
+EXPOSE 5900
+CMD    ["x11vnc", "-forever", "-usepw", "-create"]
+
+# Multiple images example
+#
+# VERSION               0.1
+
+FROM ubuntu
+RUN echo foo > bar
+# Will output something like ===> 907ad6c2736f
+
+FROM ubuntu
+RUN echo moo > oink
+# Will output something like ===> 695d7793cbe4
+
+# You᾿ll now have two images, 907ad6c2736f with /bar, and 695d7793cbe4 with
+# /oink.
+</code></pre>
diff --git a/examples/prism-dockerfile.html b/examples/prism-dockerfile.html
deleted file mode 100644
index 295a3cff60..0000000000
--- a/examples/prism-dockerfile.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<h1>Dockerfile</h1>
-<p>To use this language, use the class "language-docker".</p>
-
-<h2>Comments</h2>
-<pre><code># These are the comments for a dockerfile.
-# I want to make sure $(variables) don't break out,
-# and we shouldn't see keywords like ADD or ENTRYPOINT
-</code></pre>
-
-<h2>Instructions</h2>
-<pre><code># Use the official go docker image built on debian.
-FROM golang:1.4.2
-
-# Grab the source code and add it to the workspace.
-ADD . /go/src/github.com/JustinBeckwith/revel-appengine
-
-# Install revel and the revel CLI.
-RUN go get github.com/revel/revel
-RUN go get github.com/revel/cmd/revel
-</code></pre>
-
-
-<h2>Full example</h2>
-<pre><code># Use the official go docker image built on debian.
-FROM golang:1.4.2
-
-# Grab the source code and add it to the workspace.
-ADD . /go/src/github.com/JustinBeckwith/revel-appengine
-
-# Install revel and the revel CLI.
-RUN go get github.com/revel/revel
-RUN go get github.com/revel/cmd/revel
-
-# Use the revel CLI to start up our application.
-ENTRYPOINT revel run github.com/JustinBeckwith/revel-appengine dev 8080
-
-# Open up the port where the app is running.
-EXPOSE 8080
-</code></pre>

From d795397ef0880bfb79efa2481b7155981be8ef4e Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 23 May 2015 10:25:16 +0200
Subject: [PATCH 019/310] C#: Verbatim strings can contain doubled quotes and
 new lines

---
 components/prism-csharp.js     | 5 ++++-
 components/prism-csharp.min.js | 2 +-
 examples/prism-csharp.html     | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/prism-csharp.js b/components/prism-csharp.js
index b405a85eb2..50ee493ee1 100644
--- a/components/prism-csharp.js
+++ b/components/prism-csharp.js
@@ -1,6 +1,9 @@
 Prism.languages.csharp = Prism.languages.extend('clike', {
 	'keyword': /\b(abstract|as|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|async|await|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b/,
-	'string': /@?("|')(\\?.)*?\1/,
+	'string': [
+		/@("|')(\1\1|\\\1|\\?(?!\1)[\s\S])*\1/,
+		/("|')(\\?.)*?\1/
+	],
 	'preprocessor': /^\s*#.*/m,
 	'number': /\b-?(0x[\da-f]+|\d*\.?\d+)\b/i
 });
diff --git a/components/prism-csharp.min.js b/components/prism-csharp.min.js
index 526a84705c..abde3d03c6 100644
--- a/components/prism-csharp.min.js
+++ b/components/prism-csharp.min.js
@@ -1 +1 @@
-Prism.languages.csharp=Prism.languages.extend("clike",{keyword:/\b(abstract|as|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|async|await|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b/,string:/@?("|')(\\?.)*?\1/,preprocessor:/^\s*#.*/m,number:/\b-?(0x[\da-f]+|\d*\.?\d+)\b/i});
\ No newline at end of file
+Prism.languages.csharp=Prism.languages.extend("clike",{keyword:/\b(abstract|as|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|async|await|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b/,string:[/@("|')(\1\1|\\\1|\\?(?!\1)[\s\S])*\1/,/("|')(\\?.)*?\1/],preprocessor:/^\s*#.*/m,number:/\b-?(0x[\da-f]+|\d*\.?\d+)\b/i});
\ No newline at end of file
diff --git a/examples/prism-csharp.html b/examples/prism-csharp.html
index 84d760f14d..9073aedab1 100644
--- a/examples/prism-csharp.html
+++ b/examples/prism-csharp.html
@@ -10,6 +10,10 @@ <h2>Strings</h2>
 <pre><code>"foo \"bar\" baz"
 'foo \'bar\' baz'
 @"Verbatim strings"
+@"Luis: ""Patrick, where did you get that overnight bag?""
+    Patrick: ""Jean Paul Gaultier.""";
+@'Luis: ''Patrick, where did you get that overnight bag?''
+    Patrick: ''Jean Paul Gaultier.''';
 </code></pre>
 
 <h2>Full example</h2>

From 534f34cd35526481e4a32ac4d1eaf447a5a64bf2 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 23 May 2015 10:26:08 +0200
Subject: [PATCH 020/310] Run gulp task

---
 components/prism-less.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-less.min.js b/components/prism-less.min.js
index 5f826d6903..e470eab9b0 100644
--- a/components/prism-less.min.js
+++ b/components/prism-less.min.js
@@ -1 +1 @@
-Prism.languages.less=Prism.languages.extend("css",{comment:[/\/\*[\w\W]*?\*\//,{pattern:/(^|[^\\])\/\/.*/,lookbehind:!0}],atrule:{pattern:/@[\w-]+?(?:\([^{}]+\)|[^(){};])*?(?=\s*\{)/i,inside:{punctuation:/[:()]/}},selector:{pattern:/(?:@\{[\w-]+\}|[^{};\s@])(?:@\{[\w-]+\}|\([^{}]*\)|[^{};@])*?(?=\s*\{)/,inside:{variable:/@+[\w-]+/}},property:/(\b|\B)(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,punctuation:/[{}();:,]/,operator:/[+\-*\/]/}),Prism.languages.insertBefore("less","punctuation",{"function":Prism.languages.less.function}),Prism.languages.insertBefore("less","property",{variable:[{pattern:/@[\w-]+\s*:/,inside:{punctuation:/:/}},/@@?[\w-]+/],"mixin-usage":{pattern:/([{;]\s*)[.#](?!\d)[\w-]+.*?(?=[(;])/,lookbehind:!0,alias:"function"}});
+Prism.languages.less=Prism.languages.extend("css",{comment:[/\/\*[\w\W]*?\*\//,{pattern:/(^|[^\\])\/\/.*/,lookbehind:!0}],atrule:{pattern:/@[\w-]+?(?:\([^{}]+\)|[^(){};])*?(?=\s*\{)/i,inside:{punctuation:/[:()]/}},selector:{pattern:/(?:@\{[\w-]+\}|[^{};\s@])(?:@\{[\w-]+\}|\([^{}]*\)|[^{};@])*?(?=\s*\{)/,inside:{variable:/@+[\w-]+/}},property:/(\b|\B)(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,punctuation:/[{}();:,]/,operator:/[+\-*\/]/}),Prism.languages.insertBefore("less","punctuation",{"function":Prism.languages.less.function}),Prism.languages.insertBefore("less","property",{variable:[{pattern:/@[\w-]+\s*:/,inside:{punctuation:/:/}},/@@?[\w-]+/],"mixin-usage":{pattern:/([{;]\s*)[.#](?!\d)[\w-]+.*?(?=[(;])/,lookbehind:!0,alias:"function"}});
\ No newline at end of file

From 81eff5476fe6b703b13643b52285b6151055a7f4 Mon Sep 17 00:00:00 2001
From: Weston Ganger <westonganger@gmail.com>
Date: Sat, 23 May 2015 14:54:09 -0700
Subject: [PATCH 021/310] fixed string interpolation feature

---
 components/prism-ruby.js | 28 ++++++++++++++++++++++------
 examples/prism-ruby.html |  8 +++++++-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/components/prism-ruby.js b/components/prism-ruby.js
index 554d6873e4..e1a19d3475 100644
--- a/components/prism-ruby.js
+++ b/components/prism-ruby.js
@@ -5,17 +5,33 @@
  * 		constant, builtin, variable, symbol, regex
  */
 Prism.languages.ruby = Prism.languages.extend('clike', {
-	'comment': /#[^\r\n]*(\r?\n|$)/,
-	'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/,
+        'comment': /#(?!\{[^\r\n]*?\})[^\r\n]*(\r?\n|$)/g,
+	'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/g,
 	'builtin': /\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
-	'constant': /\b[A-Z][a-zA-Z_0-9]*[?!]?\b/
+	'constant': /\b[A-Z][a-zA-Z_0-9]*[?!]?\b/g
 });
 
 Prism.languages.insertBefore('ruby', 'keyword', {
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
+		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,
 		lookbehind: true
 	},
-	'variable': /[@$]+\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/,
-	'symbol': /:\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/
+	'variable': /[@$]+\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/g,
+	'symbol': /:\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/g
 });
+
+Prism.languages.ruby.string = {
+        pattern: /("|')(\\\n|\\?.)*?\1/,
+        inside: {
+          'interpolation': {
+            pattern: /#\{[^}]+\}/,
+            inside: {
+              'delimiter': {
+                pattern: /^#\{|\}$/,
+                alias: 'tag'
+              },
+              rest: Prism.languages.extend('ruby')
+            }
+          }
+        }
+};
diff --git a/examples/prism-ruby.html b/examples/prism-ruby.html
index 8d724c98ce..4d6472e8b2 100644
--- a/examples/prism-ruby.html
+++ b/examples/prism-ruby.html
@@ -25,6 +25,9 @@ <h2>Variables</h2>
 <h2>Symbols</h2>
 <pre><code>mystring = :steveT;</code></pre>
 
+<h2>String Interpolation</h2>
+<pre><code>"foo #{'bar'+my_variable}"</code></pre>
+
 <h2>Known failures</h2>
 <p>There are certain edge cases where Prism will fail.
 	There are always such cases in every regex-based syntax highlighter.
@@ -32,6 +35,9 @@ <h2>Known failures</h2>
 	If a failure is listed here, it doesn’t mean it will never be fixed. This is more of a “known bugs” list, just with a certain type of bug.
 </p>
 
+<h3>Comments that look like interpolation shows as ruby code</h3>
+<pre><code>#{my_var}</code></pre>
+
 <h3>Comment-like substrings</h3>
 <pre><code>"foo # bar";</code></pre>
 
@@ -43,4 +49,4 @@ <h3>Multi-line comments are not supported</h3>
 ************************
 This is a comment block
 ************************
-=end</code></pre>
\ No newline at end of file
+=end</code></pre>

From 9020d78f89a0fbb92e0605d1fe165129df0e168c Mon Sep 17 00:00:00 2001
From: Justin Beckwith <justin.beckwith@gmail.com>
Date: Mon, 25 May 2015 21:34:42 -0700
Subject: [PATCH 022/310] add label keyword to docker highlighter

---
 components/prism-docker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-docker.js b/components/prism-docker.js
index b8724b51c2..ddf909e2f6 100644
--- a/components/prism-docker.js
+++ b/components/prism-docker.js
@@ -1,6 +1,6 @@
 Prism.languages.docker = {
 	'keyword': {
-		pattern: /(^\s*)(?:ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|ENTRYPOINT)(?=\s)/mi,
+		pattern: /(^\s*)(?:ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|LABEL|ENTRYPOINT)(?=\s)/mi,
 		lookbehind: true
 	},
 	'string': /("|')(\\\n|\\?.)*?\1/,

From e3f4d7af137edcc0843883ad1811b2eeafe8a199 Mon Sep 17 00:00:00 2001
From: Weston Ganger <westonganger@gmail.com>
Date: Fri, 29 May 2015 20:31:17 -0700
Subject: [PATCH 023/310] added ruby string interpolation

---
 components/prism-ruby.js | 38 +++++++++++++++++++-------------------
 examples/prism-ruby.html |  3 +++
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/components/prism-ruby.js b/components/prism-ruby.js
index e1a19d3475..f34a6de4bb 100644
--- a/components/prism-ruby.js
+++ b/components/prism-ruby.js
@@ -5,33 +5,33 @@
  * 		constant, builtin, variable, symbol, regex
  */
 Prism.languages.ruby = Prism.languages.extend('clike', {
-        'comment': /#(?!\{[^\r\n]*?\})[^\r\n]*(\r?\n|$)/g,
-	'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/g,
+	'comment': /#(?!\{[^\r\n]*?\})[^\r\n]*(\r?\n|$)/,
+	'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/,
 	'builtin': /\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
-	'constant': /\b[A-Z][a-zA-Z_0-9]*[?!]?\b/g
+	'constant': /\b[A-Z][a-zA-Z_0-9]*[?!]?\b/
 });
 
 Prism.languages.insertBefore('ruby', 'keyword', {
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,
+		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true
 	},
-	'variable': /[@$]+\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/g,
-	'symbol': /:\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/g
+	'variable': /[@$]+\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/,
+	'symbol': /:\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/
 });
 
 Prism.languages.ruby.string = {
-        pattern: /("|')(\\\n|\\?.)*?\1/,
-        inside: {
-          'interpolation': {
-            pattern: /#\{[^}]+\}/,
-            inside: {
-              'delimiter': {
-                pattern: /^#\{|\}$/,
-                alias: 'tag'
-              },
-              rest: Prism.languages.extend('ruby')
-            }
-          }
-        }
+	pattern: /("|')(\\\n|\\?.)*?\1/,
+	inside: {
+		'interpolation': {
+			pattern: /#\{[^}]+\}/,
+			inside: {
+				'delimiter': {
+					pattern: /^#\{|\}$/,
+					alias: 'tag'
+				},
+				rest: Prism.util.clone(Prism.languages.ruby)
+			}
+		}
+	}
 };
diff --git a/examples/prism-ruby.html b/examples/prism-ruby.html
index 4d6472e8b2..1e7b748aa1 100644
--- a/examples/prism-ruby.html
+++ b/examples/prism-ruby.html
@@ -38,6 +38,9 @@ <h2>Known failures</h2>
 <h3>Comments that look like interpolation shows as ruby code</h3>
 <pre><code>#{my_var}</code></pre>
 
+<h3>Double quoted strings inside of string interpolation</h3>
+<pre><code>"foo #{my_var + "bar"}"</code></pre>
+
 <h3>Comment-like substrings</h3>
 <pre><code>"foo # bar";</code></pre>
 

From 67b89eaf0ff666573261b7856b262c4cf26f8bc9 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Mon, 1 Jun 2015 18:45:17 +0200
Subject: [PATCH 024/310] Handlebars: support blocks with dashes

---
 components/prism-handlebars.js     |  4 ++--
 components/prism-handlebars.min.js |  2 +-
 examples/prism-handlebars.html     | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/components/prism-handlebars.js b/components/prism-handlebars.js
index 3154940500..00fe7714d6 100644
--- a/components/prism-handlebars.js
+++ b/components/prism-handlebars.js
@@ -1,7 +1,7 @@
 (function(Prism) {
 
 	var handlebars_pattern = /\{\{\{[\w\W]+?\}\}\}|\{\{[\w\W]+?\}\}/g;
-	
+
 	Prism.languages.handlebars = Prism.languages.extend('markup', {
 		'handlebars': {
 			pattern: handlebars_pattern,
@@ -14,7 +14,7 @@
 				'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
 				'boolean': /\b(true|false)\b/,
 				'block': {
-					pattern: /^(\s*~?\s*)[#\/]\w+/i,
+					pattern: /^(\s*~?\s*)[#\/]\S+/i,
 					lookbehind: true,
 					alias: 'keyword'
 				},
diff --git a/components/prism-handlebars.min.js b/components/prism-handlebars.min.js
index d303e50220..acafd0c263 100644
--- a/components/prism-handlebars.min.js
+++ b/components/prism-handlebars.min.js
@@ -1 +1 @@
-!function(e){var a=/\{\{\{[\w\W]+?\}\}\}|\{\{[\w\W]+?\}\}/g;e.languages.handlebars=e.languages.extend("markup",{handlebars:{pattern:a,inside:{delimiter:{pattern:/^\{\{\{?|\}\}\}?$/i,alias:"punctuation"},string:/(["'])(\\?.)+?\1/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,"boolean":/\b(true|false)\b/,block:{pattern:/^(\s*~?\s*)[#\/]\w+/i,lookbehind:!0,alias:"keyword"},brackets:{pattern:/\[[^\]]+\]/,inside:{punctuation:/\[|\]/,variable:/[\w\W]+/}},punctuation:/[!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]/,variable:/[^!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/}}}),e.languages.insertBefore("handlebars","tag",{"handlebars-comment":{pattern:/\{\{![\w\W]*?\}\}/,alias:["handlebars","comment"]}}),e.hooks.add("before-highlight",function(e){"handlebars"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(a,function(a){return e.tokenStack.push(a),"___HANDLEBARS"+e.tokenStack.length+"___"}))}),e.hooks.add("before-insert",function(e){"handlebars"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),e.hooks.add("after-highlight",function(a){if("handlebars"===a.language){for(var n,t=0;n=a.tokenStack[t];t++)a.highlightedCode=a.highlightedCode.replace("___HANDLEBARS"+(t+1)+"___",e.highlight(n,a.grammar,"handlebars"));a.element.innerHTML=a.highlightedCode}})}(Prism);
\ No newline at end of file
+!function(e){var a=/\{\{\{[\w\W]+?\}\}\}|\{\{[\w\W]+?\}\}/g;e.languages.handlebars=e.languages.extend("markup",{handlebars:{pattern:a,inside:{delimiter:{pattern:/^\{\{\{?|\}\}\}?$/i,alias:"punctuation"},string:/(["'])(\\?.)+?\1/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,"boolean":/\b(true|false)\b/,block:{pattern:/^(\s*~?\s*)[#\/]\S+/i,lookbehind:!0,alias:"keyword"},brackets:{pattern:/\[[^\]]+\]/,inside:{punctuation:/\[|\]/,variable:/[\w\W]+/}},punctuation:/[!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]/,variable:/[^!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/}}}),e.languages.insertBefore("handlebars","tag",{"handlebars-comment":{pattern:/\{\{![\w\W]*?\}\}/,alias:["handlebars","comment"]}}),e.hooks.add("before-highlight",function(e){"handlebars"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(a,function(a){return e.tokenStack.push(a),"___HANDLEBARS"+e.tokenStack.length+"___"}))}),e.hooks.add("before-insert",function(e){"handlebars"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),e.hooks.add("after-highlight",function(a){if("handlebars"===a.language){for(var n,t=0;n=a.tokenStack[t];t++)a.highlightedCode=a.highlightedCode.replace("___HANDLEBARS"+(t+1)+"___",e.highlight(n,a.grammar,"handlebars"));a.element.innerHTML=a.highlightedCode}})}(Prism);
\ No newline at end of file
diff --git a/examples/prism-handlebars.html b/examples/prism-handlebars.html
index ec7d31d4f0..49c5096e34 100644
--- a/examples/prism-handlebars.html
+++ b/examples/prism-handlebars.html
@@ -26,8 +26,12 @@ <h2>Block helpers</h2>
 {{/with}}
 &lt;div class="{{#if test}}foo{{else}}bar{{/if}}">&lt;/div>
 {{#list array}}
-  {{@index}}. {{title}}
-{{/list}}</code></pre>
+	{{@index}}. {{title}}
+{{/list}}
+{{#block-with-hyphens args=yep}}
+	This should probably work...
+{{/block-with-hyphens}}
+</code></pre>
 
 <h2>Known failures</h2>
 <p>There are certain edge cases where Prism will fail.
@@ -37,4 +41,4 @@ <h2>Known failures</h2>
 </p>
 
 <h3>Handlebars tag in the middle of an HTML tag</h3>
-<pre><code>&lt;div{{#if test}} class="test"{{/if}}>&lt;/div></code></pre>
\ No newline at end of file
+<pre><code>&lt;div{{#if test}} class="test"{{/if}}>&lt;/div></code></pre>

From f45dc851351e2736ab4a775e6d79136350a94957 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Mon, 1 Jun 2015 18:53:38 +0200
Subject: [PATCH 025/310] Install mocha

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 06152b4fa8..74b926099b 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "gulp-concat": "^2.3.4",
     "gulp-header": "^1.0.5",
     "gulp-rename": "^1.2.0",
-    "gulp-uglify": "^0.3.1"
+    "gulp-uglify": "^0.3.1",
+    "mocha": "^2.2.5"
   }
 }

From d1f905209ae44960a956481f7133be504471d39f Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Mon, 1 Jun 2015 20:39:11 +0200
Subject: [PATCH 026/310] Implemented test runner

---
 package.json                       |   3 +-
 tests/helper/components.js         |  11 ++++
 tests/helper/prism-loader.js       | 101 +++++++++++++++++++++++++++++
 tests/helper/test-case.js          |  71 ++++++++++++++++++++
 tests/helper/test-discovery.js     |  63 ++++++++++++++++++
 tests/languages/javascript/test.js |   0
 tests/run.js                       |  32 +++++++++
 7 files changed, 280 insertions(+), 1 deletion(-)
 create mode 100644 tests/helper/components.js
 create mode 100644 tests/helper/prism-loader.js
 create mode 100644 tests/helper/test-case.js
 create mode 100644 tests/helper/test-discovery.js
 create mode 100644 tests/languages/javascript/test.js
 create mode 100644 tests/run.js

diff --git a/package.json b/package.json
index 74b926099b..e254ad770a 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Lightweight, robust, elegant syntax highlighting. A spin-off project from Dabblet.",
   "main": "prism.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "mocha tests/run.js"
   },
   "repository": {
     "type": "git",
@@ -18,6 +18,7 @@
   "license": "MIT",
   "readmeFilename": "README.md",
   "devDependencies": {
+    "chai": "^2.3.0",
     "gulp": "^3.8.6",
     "gulp-concat": "^2.3.4",
     "gulp-header": "^1.0.5",
diff --git a/tests/helper/components.js b/tests/helper/components.js
new file mode 100644
index 0000000000..274ad146f7
--- /dev/null
+++ b/tests/helper/components.js
@@ -0,0 +1,11 @@
+"use strict";
+
+var fs = require("fs");
+var vm = require('vm');
+
+var fileContent = fs.readFileSync(__dirname + "/../../components.js", "utf8");
+var context = {};
+vm.createContext(context);
+vm.runInContext(fileContent, context);
+
+module.exports = context.components;
diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
new file mode 100644
index 0000000000..1f1426ac92
--- /dev/null
+++ b/tests/helper/prism-loader.js
@@ -0,0 +1,101 @@
+"use strict";
+
+var fs = require("fs");
+var vm = require('vm');
+var components = require("./components");
+var languagesCatalog = components.languages;
+
+
+module.exports = {
+
+	/**
+	 * Creates a new Prism instance with the given language loaded
+	 *
+	 * @param {string} language
+	 * @returns {Prism}
+	 */
+	createInstance: function (language) {
+		var Prism = this.createEmptyPrism();
+		return this.loadLanguage(language, Prism);
+	},
+
+
+	/**
+	 * Loads the given language (including recursively loading the dependencies) and
+	 * appends the config to the given Prism object
+	 *
+	 * @private
+	 * @param {string} language
+	 * @param {Prism} Prism
+	 * @returns {Prism}
+	 */
+	loadLanguage: function (language, Prism) {
+		if (!languagesCatalog[language])
+		{
+			throw new Error("Language '" + language + "' not found.");
+		}
+
+		// if the language has a dependency -> load it first
+		if (languagesCatalog[language].require)
+		{
+			Prism = this.loadLanguage(languagesCatalog[language].require, Prism);
+		}
+
+		// load the language itself
+		var languageSource = this.loadFileSource(language);
+		var context = this.runFileWithContext(languageSource, {Prism: Prism});
+
+		return context.Prism;
+	},
+
+
+	/**
+	 * Creates a new empty prism instance
+	 *
+	 * @private
+	 * @returns {Prism}
+	 */
+	createEmptyPrism: function () {
+		var coreSource = this.loadFileSource("core");
+		var context = this.runFileWithContext(coreSource);
+		return context.Prism;
+	},
+
+
+	/**
+	 * Cached file sources, to prevent massive HDD work
+	 *
+	 * @private
+	 * @type {Object.<string, string>}
+	 */
+	fileSourceCache: {},
+
+
+	/**
+	 * Loads the given file source as string
+	 *
+	 * @private
+	 * @param {string} name
+	 * @returns {string}
+	 */
+	loadFileSource: function (name) {
+		return this.fileSourceCache[name] = this.fileSourceCache[name] || fs.readFileSync(__dirname + "/../../components/prism-" + name + ".js", "utf8");
+	},
+
+
+	/**
+	 * Runs a VM for a given file source with the given context
+	 *
+	 * @private
+	 * @param {string} fileSource
+	 * @param {*}context
+	 *
+	 * @returns {*}
+	 */
+	runFileWithContext: function (fileSource, context) {
+		context = context || {};
+		vm.createContext(context);
+		vm.runInContext(fileSource, context);
+		return context;
+	}
+};
diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
new file mode 100644
index 0000000000..6afce39ae3
--- /dev/null
+++ b/tests/helper/test-case.js
@@ -0,0 +1,71 @@
+"use strict";
+
+var fs = require("fs");
+var expect = require("chai").expect;
+var PrismLoader = require("./prism-loader");
+
+module.exports = {
+
+	/**
+	 * Runs the given test case file and asserts the result
+	 *
+	 * @param {string} language
+	 * @param {string} filePath
+	 */
+	runTestCase: function (language, filePath) {
+		var testCase = this.parseTestCaseFile(filePath);
+
+		if (null === testCase) {
+			throw new Error("Test case file has invalid format, please read the docs.");
+		}
+
+		var Prism = PrismLoader.createInstance(language);
+		var compiledTokenStream = Prism.tokenize(testCase.testSource, Prism.languages[language]);
+		var simplifiedTokenStream = this.transformCompiledTokenStream(compiledTokenStream);
+
+		expect(simplifiedTokenStream).to.eql(testCase.expectedTokenStream);
+	},
+
+
+	/**
+	 * Simplifies the token stream to ease the matching with the expected token stream
+	 *
+	 * @param {string} tokenStream
+	 * @returns {Array.<string[]>}
+	 */
+	transformCompiledTokenStream: function (tokenStream) {
+		return tokenStream.filter(
+			function (token) {
+				// only support objects
+				return (typeof token === "object");
+			}
+		).map(
+			function (entry)
+			{
+				return [entry.type, entry.content];
+			}
+		);
+	},
+
+
+	/**
+	 * Parses the test case from the given test case file
+	 *
+	 * @private
+	 * @param {string} filePath
+	 * @returns {{testSource: string, expectedTokenStream: *}|null}
+	 */
+	parseTestCaseFile: function (filePath) {
+		var testCaseSource = fs.readFileSync(filePath, "utf8");
+		var testCase = testCaseSource.split(/^----*\w*$/m);
+
+		if (2 === testCase.length) {
+			return {
+				testSource: testCase[0].trim(),
+				expectedTokenStream: JSON.parse(testCase[1])
+			};
+		}
+
+		return null;
+	}
+};
diff --git a/tests/helper/test-discovery.js b/tests/helper/test-discovery.js
new file mode 100644
index 0000000000..9f9ea2dca4
--- /dev/null
+++ b/tests/helper/test-discovery.js
@@ -0,0 +1,63 @@
+"use strict";
+
+var fs = require("fs");
+var path = require('path');
+
+
+module.exports = {
+
+	/**
+	 * Loads the list of all available tests
+	 *
+	 * @param {string} rootDir
+	 * @returns {Object.<string, string[]>}
+	 */
+	loadAllTests: function (rootDir) {
+		var testSuite = {};
+		var self = this;
+
+		this.getAllDirectories(rootDir).forEach(
+			function (language) {
+				testSuite[language] = self.getAllFiles(path.join(rootDir, language));
+			}
+		);
+
+		return testSuite;
+	},
+
+
+	/**
+	 * Returns a list of all (sub)directories (just the directory names, not full paths)
+	 * in the given src directory
+	 *
+	 * @param {string} src
+	 * @returns {Array.<string>}
+	 */
+	getAllDirectories: function (src) {
+		return fs.readdirSync(src).filter(
+			function (file) {
+				return fs.statSync(path.join(src, file)).isDirectory();
+			}
+		);
+	},
+
+
+	/**
+	 * Returns a list of all full file paths to all files in the given src directory
+	 *
+	 * @private
+	 * @param {string} src
+	 * @returns {Array.<string>}
+	 */
+	getAllFiles: function (src) {
+		return fs.readdirSync(src).filter(
+			function (fileName) {
+				return fs.statSync(path.join(src, fileName)).isFile();
+			}
+		).map(
+			function (fileName) {
+				return path.join(src, fileName);
+			}
+		);
+	}
+};
diff --git a/tests/languages/javascript/test.js b/tests/languages/javascript/test.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/run.js b/tests/run.js
new file mode 100644
index 0000000000..50bd20f137
--- /dev/null
+++ b/tests/run.js
@@ -0,0 +1,32 @@
+"use strict";
+
+var TestDiscovery = require("./helper/test-discovery");
+var TestCase = require("./helper/test-case");
+var path = require("path");
+
+// load complete test suite
+var testSuite = TestDiscovery.loadAllTests(__dirname + "/languages");
+
+// define tests for all tests in all languages in the test suite
+for (var language in testSuite)
+{
+	if (!testSuite.hasOwnProperty(language)) {
+		continue;
+	}
+
+	(function (language, testFiles) {
+		describe("Testing language '" + language + "'", function() {
+			testFiles.forEach(
+				function (filePath) {
+					var fileName = path.basename(filePath);
+
+					it("Should pass test case '" + fileName + "'",
+						function () {
+							TestCase.runTestCase(language, filePath);
+						}
+					);
+				}
+			);
+		});
+	})(language, testSuite[language]);
+}

From a806d1cc55f1d22d5a964c241bca40a74923763c Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Mon, 1 Jun 2015 20:39:28 +0200
Subject: [PATCH 027/310] Added first simple test case

---
 tests/languages/javascript/test.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/languages/javascript/test.js b/tests/languages/javascript/test.js
index e69de29bb2..df16f2e405 100644
--- a/tests/languages/javascript/test.js
+++ b/tests/languages/javascript/test.js
@@ -0,0 +1,10 @@
+var a = 5;
+
+----------------------------------------------------
+
+[
+	["keyword", "var"],
+	["operator", "="],
+	["number", "5"],
+	["punctuation", ";"]
+]

From 8c64e4779203ef3f9cce8adb8d3afd896ca364e1 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Mon, 1 Jun 2015 21:12:37 +0200
Subject: [PATCH 028/310] Fixed internal test names

---
 tests/run.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run.js b/tests/run.js
index 50bd20f137..32dab49fb5 100644
--- a/tests/run.js
+++ b/tests/run.js
@@ -20,7 +20,7 @@ for (var language in testSuite)
 				function (filePath) {
 					var fileName = path.basename(filePath);
 
-					it("Should pass test case '" + fileName + "'",
+					it("– should pass test case '" + fileName + "'",
 						function () {
 							TestCase.runTestCase(language, filePath);
 						}

From 4693499f5b97df5e79a8951c4de21c11a062916d Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <Kev.Kirsche+GitHub@gmail.com>
Date: Thu, 11 Jun 2015 20:52:53 -0400
Subject: [PATCH 029/310] Remove moot `version` property from bower.json

Per bower/bower.json-spec@a325da3

Also their maintainer says they probably won't ever use it: http://stackoverflow.com/questions/24844901/bowers-bower-json-file-version-property
---
 bower.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bower.json b/bower.json
index 822afac07c..16a07f097a 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,5 @@
 {
   "name": "prism",
-  "version": "0.0.1",
   "main": [
       "prism.js",
       "themes/prism.css"

From 52fd55ee6ac8cfd01bdecaa63a47554810c8b8fa Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 12 Jun 2015 20:20:41 +0200
Subject: [PATCH 030/310] Relax markup grammar to allow non-ASCII chars in tag
 names and attributes. Fix #585

---
 components/prism-markup.js     | 10 +++++-----
 components/prism-markup.min.js |  2 +-
 examples/prism-markup.html     |  7 ++++++-
 prism.js                       | 10 +++++-----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/components/prism-markup.js b/components/prism-markup.js
index f4ab4f3651..febdc98171 100644
--- a/components/prism-markup.js
+++ b/components/prism-markup.js
@@ -4,13 +4,13 @@ Prism.languages.markup = {
 	'doctype': /<!DOCTYPE.+?>/,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
-		pattern: /<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,
+		pattern: /<\/?[^\s>\/]+\s*(?:\s+[^\s>\/=]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,
 		inside: {
 			'tag': {
-				pattern: /^<\/?[\w:-]+/i,
+				pattern: /^<\/?[^\s>\/]+/i,
 				inside: {
 					'punctuation': /^<\/?/,
-					'namespace': /^[\w-]+?:/
+					'namespace': /^[^\s>\/:]+:/
 				}
 			},
 			'attr-value': {
@@ -21,9 +21,9 @@ Prism.languages.markup = {
 			},
 			'punctuation': /\/?>/,
 			'attr-name': {
-				pattern: /[\w:-]+/,
+				pattern: /[^\s>\/]+/,
 				inside: {
-					'namespace': /^[\w-]+?:/
+					'namespace': /^[^\s>\/:]+:/
 				}
 			}
 
diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
index fbf30552b9..dece1fb7eb 100644
--- a/components/prism-markup.min.js
+++ b/components/prism-markup.min.js
@@ -1 +1 @@
-Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/=|>|"/}},punctuation:/\/?>/,"attr-name":{pattern:/[\w:-]+/,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
+Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/]+\s*(?:\s+[^\s>\/=]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/=|>|"/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
diff --git a/examples/prism-markup.html b/examples/prism-markup.html
index d3a333c76d..7709c025fd 100644
--- a/examples/prism-markup.html
+++ b/examples/prism-markup.html
@@ -72,4 +72,9 @@ <h2>Invalid HTML</h2>
 <h2>Multi-line attribute values</h2>
 <pre><code>&lt;p title="foo
 bar
-baz"></code></pre>
\ No newline at end of file
+baz"></code></pre>
+
+<h2>XML tags with non-ASCII characters</h2>
+<pre><code>&lt;L&auml;ufer&gt;foo&lt;/L&auml;ufer&gt;
+&lt;tag l&auml;ufer="l&auml;ufer"&gt;bar&lt;/tag&gt;
+&lt;l&auml;ufer:tag&gt;baz&lt;/l&auml;ufer:tag&gt;</code></pre>
\ No newline at end of file
diff --git a/prism.js b/prism.js
index e74f7cd746..ace59c0437 100644
--- a/prism.js
+++ b/prism.js
@@ -441,13 +441,13 @@ Prism.languages.markup = {
 	'doctype': /<!DOCTYPE.+?>/,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
-		pattern: /<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,
+		pattern: /<\/?[^\s>\/]+\s*(?:\s+[^\s>\/=]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,
 		inside: {
 			'tag': {
-				pattern: /^<\/?[\w:-]+/i,
+				pattern: /^<\/?[^\s>\/]+/i,
 				inside: {
 					'punctuation': /^<\/?/,
-					'namespace': /^[\w-]+?:/
+					'namespace': /^[^\s>\/:]+:/
 				}
 			},
 			'attr-value': {
@@ -458,9 +458,9 @@ Prism.languages.markup = {
 			},
 			'punctuation': /\/?>/,
 			'attr-name': {
-				pattern: /[\w:-]+/,
+				pattern: /[^\s>\/]+/,
 				inside: {
-					'namespace': /^[\w-]+?:/
+					'namespace': /^[^\s>\/:]+:/
 				}
 			}
 

From 1707e4e3a54a506e915c3b6ba7ca165fff9a2c1c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 12 Jun 2015 20:33:36 +0200
Subject: [PATCH 031/310] Add .DS_Store in .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 692a6cb8bc..ea5cfc7e8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 hide-*.js
 node_modules
-.idea/
\ No newline at end of file
+.idea/
+.DS_Store
\ No newline at end of file

From 75452ba11b3b1c6074b99f54b7a7a592e2adb0f1 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 12 Jun 2015 21:35:06 +0200
Subject: [PATCH 032/310] Markup: optimized tag's regexp so that it stops
 crashing on large unclosed tags

---
 components/prism-markup.js     | 2 +-
 components/prism-markup.min.js | 2 +-
 prism.js                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-markup.js b/components/prism-markup.js
index febdc98171..eeec921065 100644
--- a/components/prism-markup.js
+++ b/components/prism-markup.js
@@ -4,7 +4,7 @@ Prism.languages.markup = {
 	'doctype': /<!DOCTYPE.+?>/,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
-		pattern: /<\/?[^\s>\/]+\s*(?:\s+[^\s>\/=]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,
+		pattern: /<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,
diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
index dece1fb7eb..458e87ec48 100644
--- a/components/prism-markup.min.js
+++ b/components/prism-markup.min.js
@@ -1 +1 @@
-Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/]+\s*(?:\s+[^\s>\/=]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/=|>|"/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
+Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/=|>|"/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index ace59c0437..cdf4543ed8 100644
--- a/prism.js
+++ b/prism.js
@@ -441,7 +441,7 @@ Prism.languages.markup = {
 	'doctype': /<!DOCTYPE.+?>/,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
-		pattern: /<\/?[^\s>\/]+\s*(?:\s+[^\s>\/=]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/i,
+		pattern: /<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,

From e2580134029cdab3045e761f02eb1124503d9288 Mon Sep 17 00:00:00 2001
From: a-rey <aaronreyes2@gmail.com>
Date: Fri, 12 Jun 2015 15:38:43 -0400
Subject: [PATCH 033/310] adding vhdl language

---
 components.js            |  4 ++++
 components/prism-vhdl.js | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 components/prism-vhdl.js

diff --git a/components.js b/components.js
index 7be18694e5..52988bf83c 100644
--- a/components.js
+++ b/components.js
@@ -322,6 +322,10 @@ var components = {
 			"require": "javascript",
 			"owner": "vkbansal"
 		},
+		"vhdl": {
+			"title": "VHDL",
+			"owner": "a-rey"
+		},
 		"wiki": {
 			"title": "Wiki markup",
 			"require": "markup",
diff --git a/components/prism-vhdl.js b/components/prism-vhdl.js
new file mode 100644
index 0000000000..41bff16806
--- /dev/null
+++ b/components/prism-vhdl.js
@@ -0,0 +1,24 @@
+Prism.languages.vhdl = {
+	'comment': /(--[^\r\n]+)/,
+	// support for all logic vectors
+	'vhdl-vectors': {
+		'pattern': /(\b[oOxXbB]"[\dA-Fa-f_]+"|"[UuXx01ZzWwLlHh-]+")/,
+		'alias': 'number'
+	},
+	'string': /(")(\\\n|\\?.)*?"/,
+	'constant': /\b(use|library)\b/i,
+	// support for predefined attributes included
+	'keyword': /\b(access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|signal|shared|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with|'base|'left|'right|'high|'low|'ascending|'image|'value|'pos|'val|'succ|'pred|'leftof|'rightof|'left|'left|'right|'right|'high|'high|'low|'low|'range|'range|'reverse_range|'reverse_range|'length|'length|'ascending|'ascending|'delayed|'stable|'stable|'quiet|'quiet|'transaction|'event|'active|'last_event|'last_active|'last_value|'driving|'driving_value|'simple_name|'instance_name|'path_name)\b/i,
+	'boolean': /\b(true|false)\b/i,
+	'function': {
+		// support for operator overloading included
+		pattern: /([a-z0-9_]+|"\S+")\(/i,
+		inside: {
+			punctuation: /\(/
+		}
+	},
+	// decimal, based, physical, and exponential numbers supported
+	'number': /('[UuXx01ZzWwLlHh-]'|\b\d+([_.]+)?(#[\dA-Fa-f_.]+#)?([eE][-+]?\d+)?)/,
+	'operator': /[-+]{1}|<=?|>=?|=|:=|&|\*|\/|\b(abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,
+	'punctuation': /[{}[\];(),.:]/
+};

From fe608582d4257fca273bc6bd3cb0acce7ad7622f Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 12 Jun 2015 21:43:31 +0200
Subject: [PATCH 034/310] Improve test drive page usability. Fix #591

---
 test.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test.html b/test.html
index 1ffc38a422..63d46e12f7 100644
--- a/test.html
+++ b/test.html
@@ -72,12 +72,12 @@ <h2>Test drive</h2>
 			<textarea>&lt;p class="hey">Type some code here&lt;/p></textarea>
 		</p>
 
+		<p>Result:</p>
+		<pre><code></code></pre>
+
 		<p id="language">
 			<strong>Language:</strong>
 		</p>
-
-		<p>Result:</p>
-		<pre><code></code></pre>
 	</form>
 </section>
 

From b081804639aed4f2e63ccd7a4130ac3f762ba1bd Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 13 Jun 2015 11:03:08 +0200
Subject: [PATCH 035/310] Basic Sass support (fix #199)

---
 components.js                |  4 +++
 components/prism-sass.js     | 66 ++++++++++++++++++++++++++++++++++++
 components/prism-sass.min.js |  1 +
 examples/prism-sass.html     | 50 +++++++++++++++++++++++++++
 4 files changed, 121 insertions(+)
 create mode 100644 components/prism-sass.js
 create mode 100644 components/prism-sass.min.js
 create mode 100644 examples/prism-sass.html

diff --git a/components.js b/components.js
index 7be18694e5..7523fae381 100644
--- a/components.js
+++ b/components.js
@@ -276,6 +276,10 @@ var components = {
 			"title": "SAS",
 			"owner": "Golmote"
 		},
+		"sass": {
+			"title": "Sass (Sass)",
+			"owner": "Golmote"
+		},
 		"scss": {
 			"title": "Sass (Scss)",
 			"require": "css",
diff --git a/components/prism-sass.js b/components/prism-sass.js
new file mode 100644
index 0000000000..9115684fa3
--- /dev/null
+++ b/components/prism-sass.js
@@ -0,0 +1,66 @@
+(function(Prism) {
+	Prism.languages.sass = Prism.languages.extend('css', {
+		// Sass comments don't need to be closed, only indented
+		'comment': /^([ \t]*)\/[\/*].*(?:(?:\r?\n|\r)\1[ \t]+.+)*/m
+	});
+
+	Prism.languages.insertBefore('sass', 'atrule', {
+		// We want to consume the whole line
+		'atrule-line': {
+			// Includes support for = and + shortcuts
+			pattern: /^(?:[ \t]*)[@+=].+/m,
+			inside: {
+				'atrule': /^(?:[ \t]*)(?:@[\w-]+|[+=])/m
+			}
+		}
+	});
+	delete Prism.languages.sass.atrule;
+
+
+	var variable = /((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i;
+	var operator = /[-+]{1,2}|==?|!=|\|?\||\?|\*|\/|%/;
+
+	Prism.languages.insertBefore('sass', 'property', {
+		// We want to consume the whole line
+		'variable-line': {
+			pattern: /(^|(?:\r?\n|\r))[ \t]*\$.+/,
+			lookbehind: true,
+			inside: {
+				'punctuation': /:/,
+				'variable': variable,
+				'operator': operator
+			}
+		},
+		// We want to consume the whole line
+		'property-line': {
+			pattern: /(^|(?:\r?\n|\r))[ \t]*(?:[^:\s]+[ ]*:.*|:[^:\s]+.*)/i,
+			lookbehind: true,
+			inside: {
+				'property': [
+					/[^:\s]+(?=\s*:)/,
+					{
+						pattern: /(:)[^:\s]+/,
+						lookbehind: true
+					}
+				],
+				'punctuation': /:/,
+				'variable': variable,
+				'operator': operator,
+				'important': Prism.languages.sass.important
+			}
+		}
+	});
+	delete Prism.languages.sass.property;
+	delete Prism.languages.sass.important;
+
+	// Now that whole lines for other patterns are consumed,
+	// what's left should be selectors
+	delete Prism.languages.sass.selector;
+	Prism.languages.insertBefore('sass', 'punctuation', {
+		'selector': {
+			pattern: /([ \t]*).+(?:,(?:\r?\n|\r)\1[ \t]+.+)*/,
+			lookbehind: true
+		}
+	});
+
+}(Prism));
\ No newline at end of file
diff --git a/components/prism-sass.min.js b/components/prism-sass.min.js
new file mode 100644
index 0000000000..8b4ea94203
--- /dev/null
+++ b/components/prism-sass.min.js
@@ -0,0 +1 @@
+!function(e){e.languages.sass=e.languages.extend("css",{comment:/^([ \t]*)\/[\/*].*(?:(?:\r?\n|\r)\1[ \t]+.+)*/m}),e.languages.insertBefore("sass","atrule",{"atrule-line":{pattern:/^(?:[ \t]*)[@+=].+/m,inside:{atrule:/^(?:[ \t]*)(?:@[\w-]+|[+=])/m}}}),delete e.languages.sass.atrule;var a=/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i,s=/[-+]{1,2}|==?|!=|\|?\||\?|\*|\/|%/;e.languages.insertBefore("sass","property",{"variable-line":{pattern:/(^|(?:\r?\n|\r))[ \t]*\$.+/,lookbehind:!0,inside:{punctuation:/:/,variable:a,operator:s}},"property-line":{pattern:/(^|(?:\r?\n|\r))[ \t]*(?:[^:\s]+[ ]*:.*|:[^:\s]+.*)/i,lookbehind:!0,inside:{property:[/[^:\s]+(?=\s*:)/,{pattern:/(:)[^:\s]+/,lookbehind:!0}],punctuation:/:/,variable:a,operator:s,important:e.languages.sass.important}}}),delete e.languages.sass.property,delete e.languages.sass.important,delete e.languages.sass.selector,e.languages.insertBefore("sass","punctuation",{selector:{pattern:/([ \t]*).+(?:,(?:\r?\n|\r)\1[ \t]+.+)*/,lookbehind:!0}})}(Prism);
\ No newline at end of file
diff --git a/examples/prism-sass.html b/examples/prism-sass.html
new file mode 100644
index 0000000000..68a7763e5c
--- /dev/null
+++ b/examples/prism-sass.html
@@ -0,0 +1,50 @@
+<h1>Sass (Sass)</h1>
+<p>To use this language, use the class "language-sass".</p>
+
+<h2>Comments</h2>
+<pre><code>/* This comment will appear in the CSS output.
+  This is nested beneath the comment,
+  so it's part of it
+
+// This comment will not appear in the CSS output.
+  This is nested beneath the comment as well,
+  so it also won't appear</code></pre>
+
+<h2>At-rules and shortcuts</h2>
+<pre><code>@mixin large-text
+  color: #ff0000
+
+@media (min-width: 600px)
+  h1
+    @include large-text
+
+=large-text
+  color: #ff0000
+
+h1
+  +large-text</code></pre>
+
+<h2>Variables</h2>
+<pre><code>$width: 5em
+#main
+  width: $width
+</code></pre>
+
+<h2>Known failures</h2>
+<p>There are certain edge cases where Prism will fail.
+    There are always such cases in every regex-based syntax highlighter.
+    However, Prism dares to be open and honest about them.
+    If a failure is listed here, it doesn’t mean it will never be fixed. This is more of a “known bugs” list, just with a certain type of bug.
+</p>
+
+<h3>Deprecated Sass syntax is not supported</h3>
+<pre><code>.page
+  color = 5px + 9px
+
+!width = 13px
+.icon
+  width = !width</code></pre>
+
+<h3>Selectors with pseudo classes are highlighted as property/value pairs</h3>
+<pre><code>a:hover
+  text-decoration: underline</code></pre>
\ No newline at end of file

From be5e037b171be70be362574ebfffe4f0499bb4c5 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sat, 13 Jun 2015 15:12:21 +0200
Subject: [PATCH 036/310] Added support for test case comments

---
 tests/helper/test-case.js | 59 ++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 10 deletions(-)

diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index 6afce39ae3..9bec510323 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -1,9 +1,38 @@
 "use strict";
 
 var fs = require("fs");
-var expect = require("chai").expect;
+var assert = require("chai").assert;
 var PrismLoader = require("./prism-loader");
 
+/**
+ * Handles parsing of a test case file.
+ *
+ *
+ * A test case file consists of at least two parts, separated by a line of dashes.
+ * This separation line must start at the beginning of the line and consist of at least three dashes.
+ *
+ * The test case file can either consist of two parts:
+ *
+ *     {source code}
+ *     ----
+ *     {expected token stream}
+ *
+ *
+ * or of three parts:
+ *
+ *     {source code}
+ *     ----
+ *     {expected token stream}
+ *     ----
+ *     {text comment explaining the test case}
+ *
+ * If the file contains more than three parts, the remaining parts are just ignored.
+ * If the file however does not contain at least two parts (so no expected token stream),
+ * the test case will later be marked as failed.
+ *
+ *
+ * @type {{runTestCase: Function, transformCompiledTokenStream: Function, parseTestCaseFile: Function}}
+ */
 module.exports = {
 
 	/**
@@ -23,7 +52,7 @@ module.exports = {
 		var compiledTokenStream = Prism.tokenize(testCase.testSource, Prism.languages[language]);
 		var simplifiedTokenStream = this.transformCompiledTokenStream(compiledTokenStream);
 
-		expect(simplifiedTokenStream).to.eql(testCase.expectedTokenStream);
+		assert.deepEqual(simplifiedTokenStream, testCase.expectedTokenStream, testCase.comment);
 	},
 
 
@@ -53,19 +82,29 @@ module.exports = {
 	 *
 	 * @private
 	 * @param {string} filePath
-	 * @returns {{testSource: string, expectedTokenStream: *}|null}
+	 * @returns {{testSource: string, expectedTokenStream: Array.<Array.<string>>, comment:string?}|null}
 	 */
 	parseTestCaseFile: function (filePath) {
 		var testCaseSource = fs.readFileSync(filePath, "utf8");
-		var testCase = testCaseSource.split(/^----*\w*$/m);
+		var testCaseParts = testCaseSource.split(/^----*\w*$/m);
 
-		if (2 === testCase.length) {
-			return {
-				testSource: testCase[0].trim(),
-				expectedTokenStream: JSON.parse(testCase[1])
-			};
+		// No expected token stream found
+		if (2 > testCaseParts.length) {
+			return null;
 		}
 
-		return null;
+		var testCase = {
+			testSource: testCaseParts[0].trim(),
+			expectedTokenStream: JSON.parse(testCaseParts[1]),
+			comment: null
+		};
+
+		// if there are three parts, the third one is the comment
+		// explaining the test case
+		if (testCaseParts[2]) {
+			testCase.comment = testCaseParts[2].trim();
+		}
+
+		return testCase;
 	}
 };

From 829f8a860dbd6426213c3e0c3cd2afb22d3591d1 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sat, 13 Jun 2015 15:24:53 +0200
Subject: [PATCH 037/310] New file extension for test case files: .test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## All test case files are now required to have the ".test" extension.
This prevents issues with syntax highlighting in common IDEs and also prevents the test system to choke on non-testcase files in these directories (like `.DS_Store` or `Thumbs.db`).

## Hide the ".test" extension in the description of the test cases
The message for a testcase `blabla.test` will now just read:

> 1) Testing language 'css' – should pass test case 'blabla':
---
 tests/helper/test-discovery.js | 4 +++-
 tests/run.js                   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/helper/test-discovery.js b/tests/helper/test-discovery.js
index 9f9ea2dca4..7cbaef8193 100644
--- a/tests/helper/test-discovery.js
+++ b/tests/helper/test-discovery.js
@@ -52,7 +52,9 @@ module.exports = {
 	getAllFiles: function (src) {
 		return fs.readdirSync(src).filter(
 			function (fileName) {
-				return fs.statSync(path.join(src, fileName)).isFile();
+				// only find files that have the ".test" extension
+				return ".test" === path.extname(fileName) &&
+					fs.statSync(path.join(src, fileName)).isFile();
 			}
 		).map(
 			function (fileName) {
diff --git a/tests/run.js b/tests/run.js
index 32dab49fb5..0f0475fa6e 100644
--- a/tests/run.js
+++ b/tests/run.js
@@ -18,7 +18,7 @@ for (var language in testSuite)
 		describe("Testing language '" + language + "'", function() {
 			testFiles.forEach(
 				function (filePath) {
-					var fileName = path.basename(filePath);
+					var fileName = path.basename(filePath, path.extname(filePath));
 
 					it("– should pass test case '" + fileName + "'",
 						function () {

From dec517f38299413bd66f82cb8f64636e46737433 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sat, 13 Jun 2015 15:25:53 +0200
Subject: [PATCH 038/310] Refreshed example test case for new file extension
 and comment support.

---
 tests/languages/javascript/{test.js => testcase1.test} | 4 ++++
 1 file changed, 4 insertions(+)
 rename tests/languages/javascript/{test.js => testcase1.test} (60%)

diff --git a/tests/languages/javascript/test.js b/tests/languages/javascript/testcase1.test
similarity index 60%
rename from tests/languages/javascript/test.js
rename to tests/languages/javascript/testcase1.test
index df16f2e405..e6cd4a59aa 100644
--- a/tests/languages/javascript/test.js
+++ b/tests/languages/javascript/testcase1.test
@@ -8,3 +8,7 @@ var a = 5;
 	["number", "5"],
 	["punctuation", ";"]
 ]
+
+----------------------------------------------------
+
+This is a comment explaining this test case.
\ No newline at end of file

From 09898e8e77a38f812e080c3f1ffbdd28182bd14f Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sat, 13 Jun 2015 16:37:07 +0200
Subject: [PATCH 039/310] Support language inclusion tests

By using composed language names "language+language2+language3" you can test language inclusion or do integration tests.
---
 tests/helper/prism-loader.js | 36 +++++++++++++++++++++++++-----------
 tests/helper/test-case.js    | 20 ++++++++++++++++----
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
index 1f1426ac92..df34951be0 100644
--- a/tests/helper/prism-loader.js
+++ b/tests/helper/prism-loader.js
@@ -11,12 +11,21 @@ module.exports = {
 	/**
 	 * Creates a new Prism instance with the given language loaded
 	 *
-	 * @param {string} language
+	 * @param {string|string[]} languages
 	 * @returns {Prism}
 	 */
-	createInstance: function (language) {
-		var Prism = this.createEmptyPrism();
-		return this.loadLanguage(language, Prism);
+	createInstance: function (languages) {
+		var context = {
+			loadedLanguages: [],
+			Prism: this.createEmptyPrism()
+		};
+		languages = Array.isArray(languages) ? languages : [languages];
+
+		for (var i = 0, l = languages.length; i < l; i++) {
+			context = this.loadLanguage(languages[i], context);
+		}
+
+		return context.Prism;
 	},
 
 
@@ -26,26 +35,31 @@ module.exports = {
 	 *
 	 * @private
 	 * @param {string} language
-	 * @param {Prism} Prism
-	 * @returns {Prism}
+	 * @param {{loadedLanguages: string[], Prism: Prism}} context
 	 */
-	loadLanguage: function (language, Prism) {
+	loadLanguage: function (language, context) {
 		if (!languagesCatalog[language])
 		{
 			throw new Error("Language '" + language + "' not found.");
 		}
 
+		// the given language was already loaded
+		if (-1 < context.loadedLanguages.indexOf(language)) {
+			return context;
+		}
+
 		// if the language has a dependency -> load it first
 		if (languagesCatalog[language].require)
 		{
-			Prism = this.loadLanguage(languagesCatalog[language].require, Prism);
+			context = this.loadLanguage(languagesCatalog[language].require, context);
 		}
 
 		// load the language itself
 		var languageSource = this.loadFileSource(language);
-		var context = this.runFileWithContext(languageSource, {Prism: Prism});
+		context.Prism = this.runFileWithContext(languageSource, {Prism: context.Prism}).Prism;
+		context.loadedLanguages.push(language);
 
-		return context.Prism;
+		return context;
 	},
 
 
@@ -88,7 +102,7 @@ module.exports = {
 	 *
 	 * @private
 	 * @param {string} fileSource
-	 * @param {*}context
+	 * @param {*} [context]
 	 *
 	 * @returns {*}
 	 */
diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index 9bec510323..095cba0eda 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -38,18 +38,30 @@ module.exports = {
 	/**
 	 * Runs the given test case file and asserts the result
 	 *
-	 * @param {string} language
+	 * The passed language identifier can either be a language like "css" or a composed language
+	 * identifier like "css+markup". Composed identifiers can be used for testing language inclusion.
+	 *
+	 * When testing language inclusion, the first given language is the main language which will be passed
+	 * to Prism for highlighting ("css+markup" will result in a call to Prism to highlight with the "css" grammar).
+	 * But it will be ensured, that the additional passed languages will be loaded too.
+	 *
+	 * The languages will be loaded in the order they were provided.
+	 *
+	 * @param {string} languageIdentifier
 	 * @param {string} filePath
 	 */
-	runTestCase: function (language, filePath) {
+	runTestCase: function (languageIdentifier, filePath) {
 		var testCase = this.parseTestCaseFile(filePath);
+		var languages = languageIdentifier.split("+");
 
 		if (null === testCase) {
 			throw new Error("Test case file has invalid format, please read the docs.");
 		}
 
-		var Prism = PrismLoader.createInstance(language);
-		var compiledTokenStream = Prism.tokenize(testCase.testSource, Prism.languages[language]);
+		var Prism = PrismLoader.createInstance(languages);
+		// the first language is the main language to highlight
+		var mainLanguageGrammar = Prism.languages[languages[0]];
+		var compiledTokenStream = Prism.tokenize(testCase.testSource, mainLanguageGrammar);
 		var simplifiedTokenStream = this.transformCompiledTokenStream(compiledTokenStream);
 
 		assert.deepEqual(simplifiedTokenStream, testCase.expectedTokenStream, testCase.comment);

From aec5fcc4a2f8d9e60fe9c9172c5b26a495c9893b Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sat, 13 Jun 2015 16:41:31 +0200
Subject: [PATCH 040/310] Added return type definition

---
 tests/helper/prism-loader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
index df34951be0..87739fd2e9 100644
--- a/tests/helper/prism-loader.js
+++ b/tests/helper/prism-loader.js
@@ -36,6 +36,7 @@ module.exports = {
 	 * @private
 	 * @param {string} language
 	 * @param {{loadedLanguages: string[], Prism: Prism}} context
+	 * @returns {{loadedLanguages: string[], Prism: Prism}}
 	 */
 	loadLanguage: function (language, context) {
 		if (!languagesCatalog[language])

From 9fb1e8b74528901571d480641762cf4902bf6e4d Mon Sep 17 00:00:00 2001
From: a-rey <aaronreyes2@gmail.com>
Date: Sat, 13 Jun 2015 14:58:11 -0400
Subject: [PATCH 041/310] requested changes/optimizations

---
 components/prism-vhdl.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/prism-vhdl.js b/components/prism-vhdl.js
index 41bff16806..71bd533381 100644
--- a/components/prism-vhdl.js
+++ b/components/prism-vhdl.js
@@ -1,14 +1,14 @@
 Prism.languages.vhdl = {
-	'comment': /(--[^\r\n]+)/,
+	'comment': /--.+/,
 	// support for all logic vectors
 	'vhdl-vectors': {
-		'pattern': /(\b[oOxXbB]"[\dA-Fa-f_]+"|"[UuXx01ZzWwLlHh-]+")/,
+		'pattern': /(\b[oxb]"[\da-f_]+"|"[01uxzwlh-]+")/i,
 		'alias': 'number'
 	},
-	'string': /(")(\\\n|\\?.)*?"/,
+	'string': /"(\\\n|\\?.)*?"/,
 	'constant': /\b(use|library)\b/i,
 	// support for predefined attributes included
-	'keyword': /\b(access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|signal|shared|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with|'base|'left|'right|'high|'low|'ascending|'image|'value|'pos|'val|'succ|'pred|'leftof|'rightof|'left|'left|'right|'right|'high|'high|'low|'low|'range|'range|'reverse_range|'reverse_range|'length|'length|'ascending|'ascending|'delayed|'stable|'stable|'quiet|'quiet|'transaction|'event|'active|'last_event|'last_active|'last_value|'driving|'driving_value|'simple_name|'instance_name|'path_name)\b/i,
+	'keyword': /\b('active|'ascending|'base|'delayed|'driving|'driving_value|'event|'high|'image|'instance_name|'last_active|'last_event|'last_value|'left|'leftof|'length|'low|'path_name|'pos|'pred|'quiet|'range|'reverse_range|'right|'rightof|'simple_name|'stable|'succ|'transaction|'val|'value|access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|shared|signal|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with)\b/i,
 	'boolean': /\b(true|false)\b/i,
 	'function': {
 		// support for operator overloading included
@@ -18,7 +18,7 @@ Prism.languages.vhdl = {
 		}
 	},
 	// decimal, based, physical, and exponential numbers supported
-	'number': /('[UuXx01ZzWwLlHh-]'|\b\d+([_.]+)?(#[\dA-Fa-f_.]+#)?([eE][-+]?\d+)?)/,
-	'operator': /[-+]{1}|<=?|>=?|=|:=|&|\*|\/|\b(abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,
+	'number': /'[01uxzwlh-]'|\b\d+[_.]*(#[\da-f_.]+#)?([e][-+]?\d+)?/i,
+	'operator': /<=?|>=?|:=|[-+*/&=]|\b(abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,
 	'punctuation': /[{}[\];(),.:]/
 };

From 5d99957accc8106c2a2f5d16d5e8fb340a6d776f Mon Sep 17 00:00:00 2001
From: Logan Franken <loganfranken@gmail.com>
Date: Sun, 14 Jun 2015 00:48:06 -0700
Subject: [PATCH 042/310] Added support for 'y' and 'u' ES6 JavaScript regex
 flags

---
 components/prism-javascript.js     | 2 +-
 components/prism-javascript.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index 754ff0e489..06ae9c9f36 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -6,7 +6,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
+		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true
 	}
 });
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index a8669d76bd..9372774688 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|get|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|get|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file

From ca68b876b5f77b9dd440ebce41061e8d1e312de2 Mon Sep 17 00:00:00 2001
From: Logan Franken <loganfranken@gmail.com>
Date: Sun, 14 Jun 2015 00:53:20 -0700
Subject: [PATCH 043/310] Added support for missing ES6 keywords in JavaScript

---
 components/prism-javascript.js     | 2 +-
 components/prism-javascript.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index 06ae9c9f36..863f3af82a 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -1,5 +1,5 @@
 Prism.languages.javascript = Prism.languages.extend('clike', {
-	'keyword': /\b(break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|get|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
+	'keyword': /\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,
 	'function': /(?!\d)[a-z0-9_$]+(?=\()/i
 });
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index 9372774688..655d780795 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|get|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file

From 1453aac5a1e598fa8d2501ff2df6b5d3412a8bf3 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 14 Jun 2015 17:53:53 +0200
Subject: [PATCH 044/310] Run gulp task

---
 prism.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prism.js b/prism.js
index cdf4543ed8..0a62921272 100644
--- a/prism.js
+++ b/prism.js
@@ -576,14 +576,14 @@ Prism.languages.clike = {
 ********************************************** */
 
 Prism.languages.javascript = Prism.languages.extend('clike', {
-	'keyword': /\b(break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|get|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
+	'keyword': /\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,
 	'function': /(?!\d)[a-z0-9_$]+(?=\()/i
 });
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
+		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true
 	}
 });

From 04f72b1495278dccea1d6d994fbc885d5f841692 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 14 Jun 2015 18:26:16 +0200
Subject: [PATCH 045/310] ES6: Template strings + interpolation

---
 components/prism-javascript.js     | 19 +++++++++++++++++++
 components/prism-javascript.min.js |  2 +-
 examples/prism-javascript.html     | 27 ++++++++++++++++++++++++++-
 prism.js                           | 19 +++++++++++++++++++
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index 863f3af82a..f4139f2a9b 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -11,6 +11,25 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	}
 });
 
+Prism.languages.insertBefore('javascript', 'string', {
+	'template-string': {
+		pattern: /`(?:\\`|\\?[^`])*`/,
+		inside: {
+			'interpolation': {
+				pattern: /\$\{[^}]+\}/,
+				inside: {
+					'interpolation-punctuation': {
+						pattern: /^\$\{|\}$/,
+						alias: 'punctuation'
+					},
+					rest: Prism.languages.javascript
+				}
+			},
+			'string': /[\s\S]+/
+		}
+	}
+});
+
 if (Prism.languages.markup) {
 	Prism.languages.insertBefore('markup', 'tag', {
 		'script': {
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index 655d780795..da70a1b4a7 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
diff --git a/examples/prism-javascript.html b/examples/prism-javascript.html
index 213969fc2c..5bd11e3857 100644
--- a/examples/prism-javascript.html
+++ b/examples/prism-javascript.html
@@ -50,6 +50,24 @@ <h2>A division operator on the same line as a regex</h2>
 <pre><code>var foo = 1/2, bar = /a/g;
 var foo = /a/, bar = 3/4;</code></pre>
 
+<h2>ES6 features</h2>
+<pre><code>// Regex "y" and "u" flags
+/[a-zA-Z]+/gimyu
+
+// for..of loops
+for(let x of y) { }
+
+// Modules: import
+import { foo as bar } from "file.js"
+
+// Template strings
+`Only on ${y} one line`
+`This template string ${x} is on
+
+multiple lines.`
+`40 + 2 = ${ 40 + 2 }`
+`The squares of the first 3 natural integers are ${[for (x of [1,2,3]) x*x].join(', ')}`</code></pre>
+
 <h2>Known failures</h2>
 <p>There are certain edge cases where Prism will fail.
 	There are always such cases in every regex-based syntax highlighter.
@@ -61,4 +79,11 @@ <h3>Comment-like substrings</h3>
 <pre><code>"foo /* bar */ baz"; "foo // bar";</code></pre>
 
 <h3>Two quotes of the same type (i.e. both single or both double) inside a regex</h3>
-<pre><code>foo = /"foo"/;</code></pre>
\ No newline at end of file
+<pre><code>foo = /"foo"/;</code></pre>
+
+<h3>String interpolation containing a closing brace</h3>
+<pre><code>`${ {foo:'bar'}.foo }`
+`${ '}' }`</code></pre>
+
+<h3>String interpolation containing an unescaped back-tick</h3>
+<pre><code>`${ '`' }`</code></pre>
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 0a62921272..8e27b9fe6f 100644
--- a/prism.js
+++ b/prism.js
@@ -588,6 +588,25 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	}
 });
 
+Prism.languages.insertBefore('javascript', 'string', {
+	'template-string': {
+		pattern: /`(?:\\`|\\?[^`])*`/,
+		inside: {
+			'interpolation': {
+				pattern: /\$\{[^}]+\}/,
+				inside: {
+					'interpolation-punctuation': {
+						pattern: /^\$\{|\}$/,
+						alias: 'punctuation'
+					},
+					rest: Prism.languages.javascript
+				}
+			},
+			'string': /[\s\S]+/
+		}
+	}
+});
+
 if (Prism.languages.markup) {
 	Prism.languages.insertBefore('markup', 'tag', {
 		'script': {

From a8aa05886c38712484a808c9a7fedaa79ade558a Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sun, 14 Jun 2015 18:18:37 +0200
Subject: [PATCH 046/310] Implemented support for octal and binary numbers in
 javascript

They are supported from ES6+
---
 components/prism-javascript.js     | 2 +-
 components/prism-javascript.min.js | 2 +-
 prism.js                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index f4139f2a9b..c614346ba2 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -1,6 +1,6 @@
 Prism.languages.javascript = Prism.languages.extend('clike', {
 	'keyword': /\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
-	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,
+	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
 	'function': /(?!\d)[a-z0-9_$]+(?=\()/i
 });
 
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index da70a1b4a7..095cfb1cd4 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 8e27b9fe6f..b0dd854b7a 100644
--- a/prism.js
+++ b/prism.js
@@ -577,7 +577,7 @@ Prism.languages.clike = {
 
 Prism.languages.javascript = Prism.languages.extend('clike', {
 	'keyword': /\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
-	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|-?Infinity)\b/,
+	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
 	'function': /(?!\d)[a-z0-9_$]+(?=\()/i
 });
 

From 43cc56f51046439854a1a95e8467be37ebefbac0 Mon Sep 17 00:00:00 2001
From: a-rey <aaronreyes2@gmail.com>
Date: Sun, 14 Jun 2015 16:32:47 -0400
Subject: [PATCH 047/310] getting rid of [] and ()

---
 components/prism-vhdl.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-vhdl.js b/components/prism-vhdl.js
index 71bd533381..bed5ffece6 100644
--- a/components/prism-vhdl.js
+++ b/components/prism-vhdl.js
@@ -2,7 +2,7 @@ Prism.languages.vhdl = {
 	'comment': /--.+/,
 	// support for all logic vectors
 	'vhdl-vectors': {
-		'pattern': /(\b[oxb]"[\da-f_]+"|"[01uxzwlh-]+")/i,
+		'pattern': /\b[oxb]"[\da-f_]+"|"[01uxzwlh-]+"/i,
 		'alias': 'number'
 	},
 	'string': /"(\\\n|\\?.)*?"/,
@@ -18,7 +18,7 @@ Prism.languages.vhdl = {
 		}
 	},
 	// decimal, based, physical, and exponential numbers supported
-	'number': /'[01uxzwlh-]'|\b\d+[_.]*(#[\da-f_.]+#)?([e][-+]?\d+)?/i,
+	'number': /'[01uxzwlh-]'|\b\d+[_.]*(#[\da-f_.]+#)?(e[-+]?\d+)?/i,
 	'operator': /<=?|>=?|:=|[-+*/&=]|\b(abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,
 	'punctuation': /[{}[\];(),.:]/
 };

From 3d3989151c8b10ddaacba2c033ee97a0b34b649a Mon Sep 17 00:00:00 2001
From: a-rey <aaronreyes2@gmail.com>
Date: Thu, 18 Jun 2015 11:13:15 -0400
Subject: [PATCH 048/310] adding example page and minified file

---
 components/prism-vhdl.min.js |  1 +
 examples/prism-vhdl.html     | 95 ++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 components/prism-vhdl.min.js
 create mode 100644 examples/prism-vhdl.html

diff --git a/components/prism-vhdl.min.js b/components/prism-vhdl.min.js
new file mode 100644
index 0000000000..3680f052e9
--- /dev/null
+++ b/components/prism-vhdl.min.js
@@ -0,0 +1 @@
+Prism.languages.vhdl={comment:/--.+/,"vhdl-vectors":{pattern:/\b[oxb]"[\da-f_]+"|"[01uxzwlh-]+"/i,alias:"number"},string:/"(\\\n|\\?.)*?"/,constant:/\b(use|library)\b/i,keyword:/\b('active|'ascending|'base|'delayed|'driving|'driving_value|'event|'high|'image|'instance_name|'last_active|'last_event|'last_value|'left|'leftof|'length|'low|'path_name|'pos|'pred|'quiet|'range|'reverse_range|'right|'rightof|'simple_name|'stable|'succ|'transaction|'val|'value|access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|shared|signal|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with)\b/i,"boolean":/\b(true|false)\b/i,"function":{pattern:/([a-z0-9_]+|"\S+")\(/i,inside:{punctuation:/\(/}},number:/'[01uxzwlh-]'|\b\d+[_.]*(#[\da-f_.]+#)?(e[-+]?\d+)?/i,operator:/<=?|>=?|:=|[-+*/&=]|\b(abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/examples/prism-vhdl.html b/examples/prism-vhdl.html
new file mode 100644
index 0000000000..1dbf649f79
--- /dev/null
+++ b/examples/prism-vhdl.html
@@ -0,0 +1,95 @@
+<h1>VHDL</h1>
+<p>To use this language, use the class "language-vhdl".</p>
+
+<h2>Comments</h2>
+<pre><code>-- I am a comment
+I am not</code></pre>
+
+<h2>Literals</h2>
+<pre><code>constant FREEZE : integer := 32;
+constant TEMP : real := 32.0;
+A_INT <= 16#FF#;
+B_INT <= 2#1010_1010#;
+MONEY := 1_000_000.0;
+FACTOR := 2.2E-6;
+constant DEL1 :time := 10 ns;
+constant DEL2 :time := 2.27 us;
+type MY_LOGIC is ('X','0','1','Z');
+type T_STATE is (IDLE, READ, END_CYC);
+signal CLK : MY_LOGIC := '0';
+signal STATE : T_STATE := IDLE;
+constant FLAG :bit_vector(0 to 7) := "11111111";
+constant MSG : string := "Hello";
+BIT_8_BUS <= B"1111_1111";
+BIT_9_BUS <= O"353";
+BIT_16_BUS <= X"AA55";
+constant TWO_LINE_MSG : string := "Hello" & CR & "World";</code></pre>
+
+<h2>Full example</h2>
+<pre><code>-- example code from: http://www.csee.umbc.edu/portal/help/VHDL/samples/samples.html
+library IEEE;
+use IEEE.std_logic_1164.all;
+
+entity fadd is               -- full adder stage, interface
+  port(a    : in  std_logic;
+       b    : in  std_logic;
+       cin  : in  std_logic;
+       s    : out std_logic;
+       cout : out std_logic);
+end entity fadd;
+
+architecture circuits of fadd is  -- full adder stage, body
+begin  -- circuits of fadd
+  s <= a xor b xor cin after 1 ns;
+  cout <= (a and b) or (a and cin) or (b and cin) after 1 ns;
+end architecture circuits; -- of fadd
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+entity add32 is             -- simple 32 bit ripple carry adder
+  port(a    : in  std_logic_vector(31 downto 0);
+       b    : in  std_logic_vector(31 downto 0);
+       cin  : in  std_logic;
+       sum  : out std_logic_vector(31 downto 0);
+       cout : out std_logic);
+end entity add32;
+
+architecture circuits of add32 is
+  signal c : std_logic_vector(0 to 30); -- internal carry signals
+begin  -- circuits of add32
+  a0: entity WORK.fadd port map(a(0), b(0), cin, sum(0), c(0));
+  stage: for I in 1 to 30 generate
+             as: entity WORK.fadd port map(a(I), b(I), c(I-1) , sum(I), c(I));
+         end generate stage;
+  a31: entity WORK.fadd port map(a(31), b(31), c(30) , sum(31), cout);
+end architecture circuits;  -- of add32
+
+use STD.textio.all;
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.std_logic_textio.all;
+
+entity signal_trace is
+end signal_trace;
+
+architecture circuits of signal_trace is
+  signal a:    std_logic_vector(31 downto 0) := x"00000000";
+  signal b:    std_logic_vector(31 downto 0) := x"FFFFFFFF";
+  signal cin:  std_logic := '1';
+  signal cout: std_logic;
+  signal sum:  std_logic_vector(31 downto 0);
+begin  -- circuits of signal_trace
+  adder: entity WORK.add32 port map(a, b, cin, sum, cout); -- parallel circuit
+
+  prtsum: process (sum)
+            variable my_line : LINE;
+            alias swrite is write [line, string, side, width] ;
+          begin
+            swrite(my_line, "sum=");
+            write(my_line, sum);
+            swrite(my_line, ",  at=");
+            write(my_line, now);
+            writeline(output, my_line);
+          end process prtsum;
+
+end architecture circuits; -- of signal_trace</code></pre>

From fa2ca999cee9c180c4e5c42c355e331e89c8cf79 Mon Sep 17 00:00:00 2001
From: AJ Ortega <ajo@renitservices.com>
Date: Thu, 18 Jun 2015 21:23:21 -0700
Subject: [PATCH 049/310] Add repository field to bower.json.

---
 bower.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bower.json b/bower.json
index 16a07f097a..39d655cd80 100644
--- a/bower.json
+++ b/bower.json
@@ -8,6 +8,10 @@
   "authors": "Lea Verou",
   "description": "Lightweight, robust, elegant syntax highlighting. A spin-off project from Dabblet.",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/PrismJS/prism.git"
+  }
   "ignore": [
     "**/.*",
     "img",

From 2dd972c215ef0bf781b1959678c607ddb3d1d434 Mon Sep 17 00:00:00 2001
From: AJ Ortega <ajo@renitservices.com>
Date: Thu, 18 Jun 2015 21:24:43 -0700
Subject: [PATCH 050/310] Update bower.json

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 39d655cd80..17c6956b1e 100644
--- a/bower.json
+++ b/bower.json
@@ -11,7 +11,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/PrismJS/prism.git"
-  }
+  },
   "ignore": [
     "**/.*",
     "img",

From f1b2e87adef3256cf8b9f549e557bb83bee4d6af Mon Sep 17 00:00:00 2001
From: aviaryan <avi.aryan123@gmail.com>
Date: Fri, 19 Jun 2015 11:55:24 +0530
Subject: [PATCH 051/310] added function highlighting in python

---
 components/prism-python.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/prism-python.js b/components/prism-python.js
index f04765b56c..33bebb9279 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -4,10 +4,13 @@ Prism.languages.python= {
 		lookbehind: true
 	},
 	'string': /"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,
+	'function' : {
+		pattern: /((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,
+		lookbehind: true
+	},
 	'keyword' : /\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
 	'boolean' : /\b(True|False)\b/,
 	'number' : /\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
 	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,
 	'punctuation' : /[{}[\];(),.:]/
-};
-
+};
\ No newline at end of file

From 7af9c9bf233224b8bc7208eaafaac33b82c8ea1e Mon Sep 17 00:00:00 2001
From: aviaryan <avi.aryan123@gmail.com>
Date: Fri, 19 Jun 2015 12:12:27 +0530
Subject: [PATCH 052/310] fixed bug with hexa numbers highlighting in python

---
 components/prism-python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-python.js b/components/prism-python.js
index 33bebb9279..b2e031f0a2 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -10,7 +10,7 @@ Prism.languages.python= {
 	},
 	'keyword' : /\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
 	'boolean' : /\b(True|False)\b/,
-	'number' : /\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
+	'number' : /\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
 	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,
 	'punctuation' : /[{}[\];(),.:]/
 };
\ No newline at end of file

From 2f2ac778fc45e092a2d4499b3d034d427810442e Mon Sep 17 00:00:00 2001
From: aviaryan <avi.aryan123@gmail.com>
Date: Fri, 19 Jun 2015 12:18:28 +0530
Subject: [PATCH 053/310] updated python min file

---
 components/prism-python.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-python.min.js b/components/prism-python.min.js
index 3bd60b4f42..888e8a3fab 100644
--- a/components/prism-python.min.js
+++ b/components/prism-python.min.js
@@ -1 +1 @@
-Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,keyword:/\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,"function":{pattern:/((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,lookbehind:!0},keyword:/\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file

From 476cbf4262a10491a110e4d3544ca0e060725217 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 20 Jun 2015 20:06:39 +0200
Subject: [PATCH 054/310] Improved regex performance of C-like strings and JS
 regexps

---
 components/prism-clike.js          | 2 +-
 components/prism-clike.min.js      | 2 +-
 components/prism-javascript.js     | 2 +-
 components/prism-javascript.min.js | 2 +-
 prism.js                           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index 5c0a03a7c6..3d9f88e57e 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -9,7 +9,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		}
 	],
-	'string': /("|')(\\\n|\\?.)*?\1/,
+	'string': /("|')(\\[\s\S]|(?!\1)[^\\])*\1/,
 	'class-name': {
 		pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index 83c97474a8..1ea8bb34ef 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\\n|\\?.)*?\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\[\s\S]|(?!\1)[^\\])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index c614346ba2..b29f194e75 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -6,7 +6,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
+		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true
 	}
 });
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index 095cfb1cd4..3fa033b019 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index b0dd854b7a..332d792060 100644
--- a/prism.js
+++ b/prism.js
@@ -548,7 +548,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		}
 	],
-	'string': /("|')(\\\n|\\?.)*?\1/,
+	'string': /("|')(\\[\s\S]|(?!\1)[^\\])*\1/,
 	'class-name': {
 		pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,
@@ -583,7 +583,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 
 Prism.languages.insertBefore('javascript', 'keyword', {
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
+		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true
 	}
 });

From a7064dd4cc896955590a6a7010e44acaf3faead0 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 20 Jun 2015 20:07:37 +0200
Subject: [PATCH 055/310] Moved up JS strings before template strings as they
 are far more common

---
 components/prism-javascript.js     | 2 +-
 components/prism-javascript.min.js | 2 +-
 examples/prism-javascript.html     | 3 +++
 prism.js                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index b29f194e75..f2b4054be1 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -11,7 +11,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	}
 });
 
-Prism.languages.insertBefore('javascript', 'string', {
+Prism.languages.insertBefore('javascript', 'class-name', {
 	'template-string': {
 		pattern: /`(?:\\`|\\?[^`])*`/,
 		inside: {
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index 3fa033b019..3bbd703b14 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
diff --git a/examples/prism-javascript.html b/examples/prism-javascript.html
index 5bd11e3857..77a63d0f40 100644
--- a/examples/prism-javascript.html
+++ b/examples/prism-javascript.html
@@ -81,6 +81,9 @@ <h3>Comment-like substrings</h3>
 <h3>Two quotes of the same type (i.e. both single or both double) inside a regex</h3>
 <pre><code>foo = /"foo"/;</code></pre>
 
+<h3>Two quotes of the same type (i.e. both single or both double) inside string interpolation</h3>
+<pre><code>foo = `${"foo"}`;</code></pre>
+
 <h3>String interpolation containing a closing brace</h3>
 <pre><code>`${ {foo:'bar'}.foo }`
 `${ '}' }`</code></pre>
diff --git a/prism.js b/prism.js
index 332d792060..7ef3b77011 100644
--- a/prism.js
+++ b/prism.js
@@ -588,7 +588,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	}
 });
 
-Prism.languages.insertBefore('javascript', 'string', {
+Prism.languages.insertBefore('javascript', 'class-name', {
 	'template-string': {
 		pattern: /`(?:\\`|\\?[^`])*`/,
 		inside: {

From e22af8b487174b1961a32f3518451809fa997e34 Mon Sep 17 00:00:00 2001
From: Logan Franken <loganfranken@gmail.com>
Date: Sat, 20 Jun 2015 18:44:16 -0700
Subject: [PATCH 056/310] Removed '\r' from line highlight new line spacing
 logic

---
 plugins/line-highlight/prism-line-highlight.js     | 2 +-
 plugins/line-highlight/prism-line-highlight.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/line-highlight/prism-line-highlight.js b/plugins/line-highlight/prism-line-highlight.js
index b8dddebb29..577d142e98 100644
--- a/plugins/line-highlight/prism-line-highlight.js
+++ b/plugins/line-highlight/prism-line-highlight.js
@@ -29,7 +29,7 @@ function highlightLines(pre, lines, classes) {
 		
 		var line = document.createElement('div');
 		
-		line.textContent = Array(end - start + 2).join(' \r\n');
+		line.textContent = Array(end - start + 2).join(' \n');
 		line.className = (classes || '') + ' line-highlight';
 
     //if the line-numbers plugin is enabled, then there is no reason for this plugin to display the line numbers
diff --git a/plugins/line-highlight/prism-line-highlight.min.js b/plugins/line-highlight/prism-line-highlight.min.js
index 9432b403ac..83a0108a55 100644
--- a/plugins/line-highlight/prism-line-highlight.min.js
+++ b/plugins/line-highlight/prism-line-highlight.min.js
@@ -1 +1 @@
-!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,r){for(var i,a=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,o=parseFloat(getComputedStyle(e).lineHeight),d=0;i=a[d++];){i=i.split("-");var c=+i[0],h=+i[1]||c,s=document.createElement("div");s.textContent=Array(h-c+2).join(" \r\n"),s.className=(r||"")+" line-highlight",t(e,"line-numbers")||(s.setAttribute("data-start",c),h>c&&s.setAttribute("data-end",h)),s.style.top=(c-l-1)*o+"px",t(e,"line-numbers")?e.appendChild(s):(e.querySelector("code")||e).appendChild(s)}}function r(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var r=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(r&&!document.getElementById(t)){var i=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(i);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,r,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var i=(crlf=/\r?\n|\r/g,0);Prism.hooks.add("after-highlight",function(t){var a=t.element.parentNode,l=a&&a.getAttribute("data-line");a&&l&&/pre/i.test(a.nodeName)&&(clearTimeout(i),e(".line-highlight",a).forEach(function(e){e.parentNode.removeChild(e)}),n(a,l),i=setTimeout(r,1))}),addEventListener("hashchange",r)}}();
\ No newline at end of file
+!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,i){for(var r,a=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,o=parseFloat(getComputedStyle(e).lineHeight),d=0;r=a[d++];){r=r.split("-");var c=+r[0],h=+r[1]||c,s=document.createElement("div");s.textContent=Array(h-c+2).join(" \n"),s.className=(i||"")+" line-highlight",t(e,"line-numbers")||(s.setAttribute("data-start",c),h>c&&s.setAttribute("data-end",h)),s.style.top=(c-l-1)*o+"px",t(e,"line-numbers")?e.appendChild(s):(e.querySelector("code")||e).appendChild(s)}}function i(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var i=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(i&&!document.getElementById(t)){var r=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(r);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,i,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var r=(crlf=/\r?\n|\r/g,0);Prism.hooks.add("after-highlight",function(t){var a=t.element.parentNode,l=a&&a.getAttribute("data-line");a&&l&&/pre/i.test(a.nodeName)&&(clearTimeout(r),e(".line-highlight",a).forEach(function(e){e.parentNode.removeChild(e)}),n(a,l),r=setTimeout(i,1))}),addEventListener("hashchange",i)}}();
\ No newline at end of file

From 8030db914a1e7331d245db0b9b787b4364994440 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 25 Jun 2015 08:00:14 +0200
Subject: [PATCH 057/310] File Highlight: allow to specify the language (takes
 precedence over extension guess) + Set language on parent even if unknown.
 Fix #607

---
 components/prism-core.js                      |  8 +++---
 components/prism-core.min.js                  |  2 +-
 plugins/file-highlight/index.html             |  4 +--
 .../file-highlight/prism-file-highlight.js    | 17 +++++++++++--
 .../prism-file-highlight.min.js               |  2 +-
 prism.js                                      | 25 ++++++++++++++-----
 6 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/components/prism-core.js b/components/prism-core.js
index 750ebb19f0..b9a0ac61a8 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -161,10 +161,6 @@ var _ = self.Prism = {
 			grammar = _.languages[language];
 		}
 
-		if (!grammar) {
-			return;
-		}
-
 		// Set language on the element, if not present
 		element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 
@@ -175,6 +171,10 @@ var _ = self.Prism = {
 			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 		}
 
+		if (!grammar) {
+			return;
+		}
+
 		var code = element.textContent;
 
 		if(!code) {
diff --git a/components/prism-core.min.js b/components/prism-core.min.js
index 703d1430ef..df4ccd4c43 100644
--- a/components/prism-core.min.js
+++ b/components/prism-core.min.js
@@ -1 +1 @@
-self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{};var Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var s={};for(var o in i)if(i.hasOwnProperty(o)){if(o==n)for(var l in a)a.hasOwnProperty(l)&&(s[l]=a[l]);s[o]=i[o]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=s)}),r[e]=s},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,s,o=a;o&&!e.test(o.className);)o=o.parentNode;if(o&&(l=(o.className.match(e)||[,""])[1],s=t.languages[l]),s){a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,o=a.parentNode,/pre/i.test(o.nodeName)&&(o.className=o.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent;if(u){u=u.replace(/^(?:\r?\n|\r)/,"");var g={element:a,language:l,grammar:s,code:u};if(t.hooks.run("before-highlight",g),r&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g)}}},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var s=n[l];s="Array"===t.util.type(s)?s:[s];for(var o=0;o<s.length;++o){var u=s[o],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var s="";for(var o in i.attributes)s+=o+'="'+(i.attributes[o]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+s+">"+i.content+"</"+i.tag+">"},!self.document)return self.addEventListener?(self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),self.close()},!1),self.Prism):self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
+self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{};var Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var s={};for(var o in i)if(i.hasOwnProperty(o)){if(o==n)for(var l in a)a.hasOwnProperty(l)&&(s[l]=a[l]);s[o]=i[o]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=s)}),r[e]=s},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,s,o=a;o&&!e.test(o.className);)o=o.parentNode;if(o&&(l=(o.className.match(e)||[,""])[1],s=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,o=a.parentNode,/pre/i.test(o.nodeName)&&(o.className=o.className.replace(e,"").replace(/\s+/g," ")+" language-"+l),s){var u=a.textContent;if(u){u=u.replace(/^(?:\r?\n|\r)/,"");var g={element:a,language:l,grammar:s,code:u};if(t.hooks.run("before-highlight",g),r&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g)}}},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var s=n[l];s="Array"===t.util.type(s)?s:[s];for(var o=0;o<s.length;++o){var u=s[o],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var s="";for(var o in i.attributes)s+=o+'="'+(i.attributes[o]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+s+">"+i.content+"</"+i.tag+">"},!self.document)return self.addEventListener?(self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),self.close()},!1),self.Prism):self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
diff --git a/plugins/file-highlight/index.html b/plugins/file-highlight/index.html
index 0a3cb58be7..686a7f796d 100644
--- a/plugins/file-highlight/index.html
+++ b/plugins/file-highlight/index.html
@@ -37,7 +37,7 @@ <h1>How to use</h1>
 
 <section>
 	<h1>Examples</h1>
-	
+
 	<p>The plugin’s JS code:</p>
 	<pre data-src="plugins/file-highlight/prism-file-highlight.js"></pre>
 	
@@ -53,7 +53,7 @@ <h1>Examples</h1>
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
 <script src="prism.js"></script>
-<script src="plugins/file-highlight/prism-file-highlight.js"></script>
+<!-- The File Highlight plugin is already included into Prism.js build -->
 <script src="utopia.js"></script>
 <script src="components.js"></script>
 <script src="code.js"></script>
diff --git a/plugins/file-highlight/prism-file-highlight.js b/plugins/file-highlight/prism-file-highlight.js
index c81dd01af1..5fea85abf0 100644
--- a/plugins/file-highlight/prism-file-highlight.js
+++ b/plugins/file-highlight/prism-file-highlight.js
@@ -18,8 +18,21 @@
 
 		Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach(function(pre) {
 			var src = pre.getAttribute('data-src');
-			var extension = (src.match(/\.(\w+)$/) || [,''])[1];
-			var language = Extensions[extension] || extension;
+
+			var language, parent = pre;
+			var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
+			while (parent && !lang.test(parent.className)) {
+				parent = parent.parentNode;
+			}
+
+			if (parent) {
+				language = (pre.className.match(lang) || [,''])[1];
+			}
+
+			if (!language) {
+				var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+				language = Extensions[extension] || extension;
+			}
 
 			var code = document.createElement('code');
 			code.className = 'language-' + language;
diff --git a/plugins/file-highlight/prism-file-highlight.min.js b/plugins/file-highlight/prism-file-highlight.min.js
index a14cc1369e..42889f90b6 100644
--- a/plugins/file-highlight/prism-file-highlight.min.js
+++ b/plugins/file-highlight/prism-file-highlight.min.js
@@ -1 +1 @@
-!function(){self.Prism&&self.document&&document.querySelector&&(self.Prism.fileHighlight=function(){var e={js:"javascript",html:"markup",svg:"markup",xml:"markup",py:"python",rb:"ruby",ps1:"powershell",psm1:"powershell"};Array.prototype.slice.call(document.querySelectorAll("pre[data-src]")).forEach(function(t){var r=t.getAttribute("data-src"),s=(r.match(/\.(\w+)$/)||[,""])[1],n=e[s]||s,a=document.createElement("code");a.className="language-"+n,t.textContent="",a.textContent="Loading…",t.appendChild(a);var l=new XMLHttpRequest;l.open("GET",r,!0),l.onreadystatechange=function(){4==l.readyState&&(l.status<400&&l.responseText?(a.textContent=l.responseText,Prism.highlightElement(a)):a.textContent=l.status>=400?"✖ Error "+l.status+" while fetching file: "+l.statusText:"✖ Error: File does not exist or is empty")},l.send(null)})},self.Prism.fileHighlight())}();
\ No newline at end of file
+!function(){self.Prism&&self.document&&document.querySelector&&(self.Prism.fileHighlight=function(){var e={js:"javascript",html:"markup",svg:"markup",xml:"markup",py:"python",rb:"ruby",ps1:"powershell",psm1:"powershell"};Array.prototype.slice.call(document.querySelectorAll("pre[data-src]")).forEach(function(t){for(var r,s=t.getAttribute("data-src"),a=t,n=/\blang(?:uage)?-(?!\*)(\w+)\b/i;a&&!n.test(a.className);)a=a.parentNode;if(a&&(r=(t.className.match(n)||[,""])[1]),!r){var l=(s.match(/\.(\w+)$/)||[,""])[1];r=e[l]||l}var o=document.createElement("code");o.className="language-"+r,t.textContent="",o.textContent="Loading…",t.appendChild(o);var i=new XMLHttpRequest;i.open("GET",s,!0),i.onreadystatechange=function(){4==i.readyState&&(i.status<400&&i.responseText?(o.textContent=i.responseText,Prism.highlightElement(o)):o.textContent=i.status>=400?"✖ Error "+i.status+" while fetching file: "+i.statusText:"✖ Error: File does not exist or is empty")},i.send(null)})},self.Prism.fileHighlight())}();
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 7ef3b77011..fb0aeca690 100644
--- a/prism.js
+++ b/prism.js
@@ -166,10 +166,6 @@ var _ = self.Prism = {
 			grammar = _.languages[language];
 		}
 
-		if (!grammar) {
-			return;
-		}
-
 		// Set language on the element, if not present
 		element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 
@@ -180,6 +176,10 @@ var _ = self.Prism = {
 			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 		}
 
+		if (!grammar) {
+			return;
+		}
+
 		var code = element.textContent;
 
 		if(!code) {
@@ -648,8 +648,21 @@ if (Prism.languages.markup) {
 
 		Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach(function(pre) {
 			var src = pre.getAttribute('data-src');
-			var extension = (src.match(/\.(\w+)$/) || [,''])[1];
-			var language = Extensions[extension] || extension;
+
+			var language, parent = pre;
+			var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
+			while (parent && !lang.test(parent.className)) {
+				parent = parent.parentNode;
+			}
+
+			if (parent) {
+				language = (pre.className.match(lang) || [,''])[1];
+			}
+
+			if (!language) {
+				var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+				language = Extensions[extension] || extension;
+			}
 
 			var code = document.createElement('code');
 			code.className = 'language-' + language;

From 5b1e07bc04b0ac0b56a0f4baa6026eefb9aa5c4f Mon Sep 17 00:00:00 2001
From: Weston Ganger <westonganger@gmail.com>
Date: Thu, 25 Jun 2015 12:58:40 -0700
Subject: [PATCH 058/310] fixed double quoted strings in interpolation ruby

---
 components/prism-ruby.js | 2 +-
 examples/prism-ruby.html | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/prism-ruby.js b/components/prism-ruby.js
index f34a6de4bb..030eefe9f7 100644
--- a/components/prism-ruby.js
+++ b/components/prism-ruby.js
@@ -21,7 +21,7 @@ Prism.languages.insertBefore('ruby', 'keyword', {
 });
 
 Prism.languages.ruby.string = {
-	pattern: /("|')(\\\n|\\?.)*?\1/,
+	pattern: /("|')(#\{[^}]+\}|\\\n|\\?.)*?\1/,
 	inside: {
 		'interpolation': {
 			pattern: /#\{[^}]+\}/,
diff --git a/examples/prism-ruby.html b/examples/prism-ruby.html
index 1e7b748aa1..4d6472e8b2 100644
--- a/examples/prism-ruby.html
+++ b/examples/prism-ruby.html
@@ -38,9 +38,6 @@ <h2>Known failures</h2>
 <h3>Comments that look like interpolation shows as ruby code</h3>
 <pre><code>#{my_var}</code></pre>
 
-<h3>Double quoted strings inside of string interpolation</h3>
-<pre><code>"foo #{my_var + "bar"}"</code></pre>
-
 <h3>Comment-like substrings</h3>
 <pre><code>"foo # bar";</code></pre>
 

From 7410377118a82fdfdbd36f82ae9fc63851e26ad6 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Sat, 27 Jun 2015 21:52:20 +1000
Subject: [PATCH 059/310] Added Keyman language
 (http://help.keyman.com/developer)

---
 components.js              |  4 ++++
 components/prism-keyman.js | 14 ++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 components/prism-keyman.js

diff --git a/components.js b/components.js
index a7005728af..997960cd6d 100644
--- a/components.js
+++ b/components.js
@@ -185,6 +185,10 @@ var components = {
 			"title": "Julia",
 			"owner": "cdagnino"
 		},
+		"keyman": {
+			"title": "Keyman",
+			"owner": "mcdurdin"
+		},
 		"latex": {
 			"title": "LaTeX",
 			"owner": "japborst"
diff --git a/components/prism-keyman.js b/components/prism-keyman.js
new file mode 100644
index 0000000000..1a0c9751f3
--- /dev/null
+++ b/components/prism-keyman.js
@@ -0,0 +1,14 @@
+Prism.languages.keyman = {
+	'comment': /\b[cC]\s.*?(\r?\n|$)/,
+	'function': /\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT)\s+)*(([T|K|U]_[a-z0-9_]+)|(".+")|('.+'))\s*\]/i,  // virtual key
+	'string': /("|')((?!\1).)*\1/,
+	'keyword': /\b(any|beep|call|context|deadkey|dk|if|index|notany|nul|outs|return|reset|save|set|store|use)\b/i,  // rule keywords
+	'atrule': /\b(ansi|begin|unicode|group|(using keys))\b/i,   // structural keywords
+	'bold': [   // header statements
+		/\&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embdjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
+		/\b(bitmap|bitmaps|(caps on only)|(caps always off)|(shift frees caps)|copyright|hotkey|language|layout|message|name|version)\b/i
+	],
+	'number': /\b(([uU]\+[\dA-Fa-f]+)|([dD]\d+)|([xX][\dA-Fa-f]+)|([0-7]+))\b/, // U+####, x###, d### characters and numbers
+	'operator': /[+>\\,\(\)]/,
+	'tag': /\$(keyman|kmfl|silkey|keymanweb|keymanonly):/i   // prefixes
+};
\ No newline at end of file

From e07819b86e71b4f100002950adae322c189ef76b Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Sat, 27 Jun 2015 22:42:19 +1000
Subject: [PATCH 060/310] Keyman examples

---
 examples/prism-keyman.html | 101 +++++++++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 examples/prism-keyman.html

diff --git a/examples/prism-keyman.html b/examples/prism-keyman.html
new file mode 100644
index 0000000000..d85f58cb38
--- /dev/null
+++ b/examples/prism-keyman.html
@@ -0,0 +1,101 @@
+<h1>Keyman</h1>
+<p>To use this language, use the class "language-keyman".</p>
+
+<h2>Comments</h2>
+<pre><code>c This is a comment</code></pre>
+
+<h2>Strings, numbers and characters</h2>
+<pre><code>"'this' is a string"
+'and so is "this"'
+U+0041 d65 x41   c these are all the letter A
+</code></pre>
+
+<h2>Example Code</h2>
+<pre><code>c =====================Begin Identity Section===================================================
+c 
+c Mnemonic input method for Amharic script on US-QWERTY
+c keyboards for Keyman version 7.1, compliant with Unicode 4.1 and later.
+c 
+
+store(&amp;VERSION) '9.0'
+store(&amp;Name) "Amharic"
+c store(&amp;MnemonicLayout) "1"
+store(&amp;CapsAlwaysOff) "1"
+store(&amp;Copyright) "Creative Commons Attribution 3.0"
+store(&amp;Message) "This is an Amharic language mnemonic input method for Ethiopic script that requires Unicode 4.1 support."
+store(&amp;WINDOWSLANGUAGES) 'x045E x045E'
+store(&amp;LANGUAGE) 'x045E'
+store(&amp;EthnologueCode) "amh"
+store(&amp;VISUALKEYBOARD) 'gff-amh-7.kvk'
+store(&amp;KMW_EMBEDCSS) 'gff-amh-7.css'
+HOTKEY "^%A"
+c 
+c =====================End Identity Section=====================================================
+
+c =====================Begin Data Section=======================================================
+
+c ---------------------Maps for Numbers---------------------------------------------------------
+store(ArabOnes) '23456789'
+store(ones)     '፪፫፬፭፮፯፰፱'
+store(tens)     '፳፴፵፶፷፸፹፺'
+store(arabNumbers) '123456789'
+store(ethNumbers) '፩፪፫፬፭፮፯፰፱፲፳፴፵፶፷፸፹፺፻፼'
+store(arabNumbersWithZero) '0123456789'
+store(ColonOrComma) ':,'
+store(ethWordspaceOrComma) '፡፣'
+c ---------------------End Numbers--------------------------------------------------------------
+
+c =====================End Data Section=========================================================
+
+c =====================Begin Functional Section=================================================
+c 
+store(&amp;LAYOUTFILE) 'gff-amh-7_layout.js'
+store(&amp;BITMAP) 'amharic.bmp'
+store(&amp;TARGETS) 'any windows'
+begin Unicode > use(main)
+group(main) using keys    
+
+c ---------------------Input of Numbers---------------------------------------------------------
+
+c Special Rule for Arabic Numerals
+c 
+c The following attempts to auto-correct the use of Ethiopic wordspace and
+c Ethiopic comma within an Arabic numeral context.  Ethiopic wordspace gets
+c used erroneously in time formats and Ethiopic commas as an order of thousands
+c delimiter. The correction context is not known until numerals appear on _both_
+c sides of the punctuation.
+c 
+  any(arabNumbersWithZero) any(ethWordspaceOrComma) + any(arabNumbers) > index(arabNumbersWithZero,1) index(ColonOrComma,2) index(arabNumbers,3)
+
+c Ethiopic Numerals
+
+  "'" + '1' > '፩'
+  "'" + any(ArabOnes) > index(ones,2)
+
+c special cases for multiples of one
+  '፩'  + '0' > '፲'
+  '፲'  + '0' > '፻'
+  '፻'  + '0' > '፲፻'
+  '፲፻' + '0' > '፼'
+  '፼'  + '0' > '፲፼'    
+  '፲፼' + '0' > '፻፼' 
+  '፻፼'  + '0' > '፲፻፼'
+  '፲፻፼' + '0' > '፼፼'
+  '፼፼' + '0' > context beep  c do not go any higher, we could beep here
+
+c upto the order of 100 million
+  any(ones)     + '0' > index(tens,1)
+  any(tens)     + '0' > index(ones,1) '፻'  c Hundreds
+  any(ones)  '፻ '+ '0' > index(tens,1) '፻'  c Thousands
+  any(tens)  '፻' + '0' > index(ones,1) '፼'  c Ten Thousands
+  any(ones)  '፼' + '0' > index(tens,1) '፼'  c Hundred Thousands
+  any(tens)  '፼' + '0' > index(ones,1) '፻፼' c Millions
+  any(ones) '፻፼' + '0' > index(tens,1) '፻፼' c Ten Millions
+  any(tens) '፻፼' + '0' > index(ones,1) '፼፼' c Hundred Millions
+
+c enhance this later, look for something that can copy a match over
+  any(ethNumbers) + any(arabNumbers) > index(ethNumbers,1)  index(ethNumbers,2)
+c ---------------------End Input of Numbers-----------------------------------------------------
+                                            
+c =====================End Functional Section===================================================
+</code></pre>

From 1c8a841957164e91217c437aebbf3af954645d9b Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Sat, 27 Jun 2015 22:46:21 +1000
Subject: [PATCH 061/310] Add match and nomatch structural keywords

---
 components/prism-keyman.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-keyman.js b/components/prism-keyman.js
index 1a0c9751f3..98793d5d61 100644
--- a/components/prism-keyman.js
+++ b/components/prism-keyman.js
@@ -3,7 +3,7 @@ Prism.languages.keyman = {
 	'function': /\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT)\s+)*(([T|K|U]_[a-z0-9_]+)|(".+")|('.+'))\s*\]/i,  // virtual key
 	'string': /("|')((?!\1).)*\1/,
 	'keyword': /\b(any|beep|call|context|deadkey|dk|if|index|notany|nul|outs|return|reset|save|set|store|use)\b/i,  // rule keywords
-	'atrule': /\b(ansi|begin|unicode|group|(using keys))\b/i,   // structural keywords
+	'atrule': /\b(ansi|begin|unicode|group|(using keys)|match|nomatch)\b/i,   // structural keywords
 	'bold': [   // header statements
 		/\&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embdjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
 		/\b(bitmap|bitmaps|(caps on only)|(caps always off)|(shift frees caps)|copyright|hotkey|language|layout|message|name|version)\b/i

From ab4a4cad3dbb4423bcfb1abb154bf0370b69296e Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Sun, 28 Jun 2015 06:24:07 +1000
Subject: [PATCH 062/310] Clean up Keyman regexes, add further examples

---
 components/prism-keyman.js | 14 +++++++-------
 examples/prism-keyman.html |  9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/components/prism-keyman.js b/components/prism-keyman.js
index 98793d5d61..aec70fa654 100644
--- a/components/prism-keyman.js
+++ b/components/prism-keyman.js
@@ -1,14 +1,14 @@
 Prism.languages.keyman = {
-	'comment': /\b[cC]\s.*?(\r?\n|$)/,
-	'function': /\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT)\s+)*(([T|K|U]_[a-z0-9_]+)|(".+")|('.+'))\s*\]/i,  // virtual key
+	'comment': /\bc\s.*/i,
+	'function': /\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT|CAPS|NCAPS)\s+)*([TKU]_[a-z0-9_?]+|".+?"|'.+?')\s*\]/i,  // virtual key
 	'string': /("|')((?!\1).)*\1/,
 	'keyword': /\b(any|beep|call|context|deadkey|dk|if|index|notany|nul|outs|return|reset|save|set|store|use)\b/i,  // rule keywords
-	'atrule': /\b(ansi|begin|unicode|group|(using keys)|match|nomatch)\b/i,   // structural keywords
+	'atrule': /\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,   // structural keywords
 	'bold': [   // header statements
-		/\&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embdjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
-		/\b(bitmap|bitmaps|(caps on only)|(caps always off)|(shift frees caps)|copyright|hotkey|language|layout|message|name|version)\b/i
+		/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embdjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
+		/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i
 	],
-	'number': /\b(([uU]\+[\dA-Fa-f]+)|([dD]\d+)|([xX][\dA-Fa-f]+)|([0-7]+))\b/, // U+####, x###, d### characters and numbers
-	'operator': /[+>\\,\(\)]/,
+	'number': /\b(U\+[\dA-F]+|d\d+|x[\da-f]+|[0-7]+)\b/i, // U+####, x###, d### characters and numbers
+	'operator': /[+>\\,()]/,
 	'tag': /\$(keyman|kmfl|silkey|keymanweb|keymanonly):/i   // prefixes
 };
\ No newline at end of file
diff --git a/examples/prism-keyman.html b/examples/prism-keyman.html
index d85f58cb38..05898fd1cd 100644
--- a/examples/prism-keyman.html
+++ b/examples/prism-keyman.html
@@ -10,7 +10,16 @@ <h2>Strings, numbers and characters</h2>
 U+0041 d65 x41   c these are all the letter A
 </code></pre>
 
+<h2>Prefixes and Virtual Keys</h2>
+
+<pre><code>
+c Match RAlt+E on desktops, Ctrl+Alt+E on web because L/R Alt not consistently supported in browsers.
+$KeymanOnly: + [RALT K_E] > "€"
+$KeymanWeb: + [CTRL ALT K_E] > "€"
+</code></pre>
+
 <h2>Example Code</h2>
+
 <pre><code>c =====================Begin Identity Section===================================================
 c 
 c Mnemonic input method for Amharic script on US-QWERTY

From a03b32992876c81e12c1a9b85de5be63eff386b0 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Sun, 28 Jun 2015 06:29:30 +1000
Subject: [PATCH 063/310] bare numbers are not always octal so allow any digit

---
 components/prism-keyman.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-keyman.js b/components/prism-keyman.js
index aec70fa654..16752b5295 100644
--- a/components/prism-keyman.js
+++ b/components/prism-keyman.js
@@ -8,7 +8,7 @@ Prism.languages.keyman = {
 		/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embdjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
 		/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i
 	],
-	'number': /\b(U\+[\dA-F]+|d\d+|x[\da-f]+|[0-7]+)\b/i, // U+####, x###, d### characters and numbers
+	'number': /\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i, // U+####, x###, d### characters and numbers
 	'operator': /[+>\\,()]/,
 	'tag': /\$(keyman|kmfl|silkey|keymanweb|keymanonly):/i   // prefixes
 };
\ No newline at end of file

From c7eb5cb1ccda13d9f708c185254f76b1256504b1 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Sun, 28 Jun 2015 08:22:28 +1000
Subject: [PATCH 064/310] rename $silkey to $weaver

---
 components/prism-keyman.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-keyman.js b/components/prism-keyman.js
index 16752b5295..1082d9d927 100644
--- a/components/prism-keyman.js
+++ b/components/prism-keyman.js
@@ -10,5 +10,5 @@ Prism.languages.keyman = {
 	],
 	'number': /\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i, // U+####, x###, d### characters and numbers
 	'operator': /[+>\\,()]/,
-	'tag': /\$(keyman|kmfl|silkey|keymanweb|keymanonly):/i   // prefixes
+	'tag': /\$(keyman|kmfl|weaver|keymanweb|keymanonly):/i   // prefixes
 };
\ No newline at end of file

From 12219d2f59de3bf4b8951efd87ad12951ad715ab Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 28 Jun 2015 02:17:08 +0200
Subject: [PATCH 065/310] Add support for Makefile

---
 components.js                    |   4 +
 components/prism-makefile.js     |  31 ++++
 components/prism-makefile.min.js |   1 +
 examples/prism-makefile.html     | 266 +++++++++++++++++++++++++++++++
 4 files changed, 302 insertions(+)
 create mode 100644 components/prism-makefile.js
 create mode 100644 components/prism-makefile.min.js
 create mode 100644 examples/prism-makefile.html

diff --git a/components.js b/components.js
index a7005728af..47932aa9d9 100644
--- a/components.js
+++ b/components.js
@@ -198,6 +198,10 @@ var components = {
 			"title": "LOLCODE",
 			"owner": "Golmote"
 		},
+		"makefile": {
+			"title": "Makefile",
+			"owner": "Golmote"
+		},
 		"markdown": {
 			"title": "Markdown",
 			"require": "markup",
diff --git a/components/prism-makefile.js b/components/prism-makefile.js
new file mode 100644
index 0000000000..a678fabac8
--- /dev/null
+++ b/components/prism-makefile.js
@@ -0,0 +1,31 @@
+Prism.languages.makefile = {
+	'comment': {
+		pattern: /(^|[^\\])#(?:\\[\s\S]|.)*/,
+		lookbehind: true
+	},
+	'string': /(["'])(?:\\[\s\S]|(?!\1)[^\\\r\n])*\1/,
+
+	// Built-in target names
+	'builtin': /\.[A-Z][^:#=\s]+(?=\s*:(?!=))/,
+
+	// Targets
+	'symbol': {
+		pattern: /^[^:=\r\n]+(?=\s*:(?!=))/m,
+		inside: {
+			'variable': /\$+(?:[^(){}:#=\s]+|(?=[({]))/
+		}
+	},
+	'variable': /\$+(?:[^(){}:#=\s]+|\([@*%<^+?][DF]\)|(?=[({]))/,
+
+	'keyword': [
+		// Directives
+		/\b(?:define|else|endef|endif|export|ifn?def|ifn?eq|-?include|override|private|sinclude|undefine|unexport|vpath)\b/,
+		// Functions
+		{
+			pattern: /(\()(?:addsuffix|abspath|and|basename|call|dir|error|eval|file|filter(?:-out)?|findstring|firstword|flavor|foreach|guile|if|info|join|lastword|load|notdir|or|origin|patsubst|realpath|shell|sort|strip|subst|suffix|value|warning|wildcard|word(?:s|list)?)(?=[ \t])/,
+			lookbehind: true
+		}
+	],
+	'operator': /(?:::|[?:+!])?=|[|@]/,
+	'punctuation': /[:;(){}]/
+};
\ No newline at end of file
diff --git a/components/prism-makefile.min.js b/components/prism-makefile.min.js
new file mode 100644
index 0000000000..85d6f42ca2
--- /dev/null
+++ b/components/prism-makefile.min.js
@@ -0,0 +1 @@
+Prism.languages.makefile={comment:{pattern:/(^|[^\\])#(?:\\[\s\S]|.)*/,lookbehind:!0},string:/(["'])(?:\\[\s\S]|(?!\1)[^\\\r\n])*\1/,builtin:/\.[A-Z][^:#=\s]+(?=\s*:(?!=))/,symbol:{pattern:/^[^:=\r\n]+(?=\s*:(?!=))/m,inside:{variable:/\$+(?:[^(){}:#=\s]+|(?=[({]))/}},variable:/\$+(?:[^(){}:#=\s]+|\([@*%<^+?][DF]\)|(?=[({]))/,keyword:[/\b(?:define|else|endef|endif|export|ifn?def|ifn?eq|-?include|override|private|sinclude|undefine|unexport|vpath)\b/,{pattern:/(\()(?:addsuffix|abspath|and|basename|call|dir|error|eval|file|filter(?:-out)?|findstring|firstword|flavor|foreach|guile|if|info|join|lastword|load|notdir|or|origin|patsubst|realpath|shell|sort|strip|subst|suffix|value|warning|wildcard|word(?:s|list)?)(?=[ \t])/,lookbehind:!0}],operator:/(?:::|[?:+!])?=|[|@]/,punctuation:/[:;(){}]/};
\ No newline at end of file
diff --git a/examples/prism-makefile.html b/examples/prism-makefile.html
new file mode 100644
index 0000000000..738c9a9759
--- /dev/null
+++ b/examples/prism-makefile.html
@@ -0,0 +1,266 @@
+<h1>Makefile</h1>
+<p>To use this language, use the class "language-makefile".</p>
+
+<h2>Comments</h2>
+<pre><code># This is a comment
+include foo # This is another comment</code></pre>
+
+<h2>Targets</h2>
+<pre><code>kbd.o command.o files.o : command.h
+display.o insert.o search.o files.o : buffer.h
+
+.PHONY: clean
+clean:
+        rm *.o temp</code></pre>
+
+<h2>Variables</h2>
+<pre><code>objects = main.o kbd.o command.o display.o \
+          insert.o search.o files.o utils.o
+
+edit : $(objects)
+        cc -o edit $(objects)
+
+$(objects) : defs.h
+
+%oo: $$< $$^ $$+ $$*
+
+foo : bar/lose
+        cd $(@D) && gobble $(@F) > ../$@</code></pre>
+
+<h2>Strings</h2>
+<pre><code>STR = 'A string!'
+
+HELLO = 'hello \
+world'
+
+HELLO2 = "hello \
+world"</code></pre>
+
+<h2>Directives</h2>
+<pre><code>include foo *.mk $(bar)
+
+vpath %.c foo
+
+override define two-lines =
+foo
+$(bar)
+endef
+
+ifeq ($(CC),gcc)
+  libs=$(libs_for_gcc)
+else
+  libs=$(normal_libs)
+endif</code></pre>
+
+<h2>Functions</h2>
+<pre><code>whoami    := $(shell whoami)
+host-type := $(shell arch)
+
+y = $(subst 1,2,$(x))
+
+dirs := a b c d
+files := $(foreach dir,$(dirs),$(wildcard $(dir)/*))
+
+reverse = $(2) $(1)
+foo = $(call reverse,a,b)
+
+$(foreach prog,$(PROGRAMS),$(eval $(call PROGRAM_template,$(prog))))</code></pre>
+
+<h2>Complete example</h2>
+<pre><code>#!/usr/bin/make -f
+# Generated automatically from Makefile.in by configure.
+# Un*x Makefile for GNU tar program.
+# Copyright (C) 1991 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute
+# it and/or modify it under the terms of the GNU
+# General Public License …
+…
+…
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+
+# If you use gcc, you should either run the
+# fixincludes script that comes with it or else use
+# gcc with the -traditional option.  Otherwise ioctl
+# calls will be compiled incorrectly on some systems.
+CC = gcc -O
+YACC = bison -y
+INSTALL = /usr/local/bin/install -c
+INSTALLDATA = /usr/local/bin/install -c -m 644
+
+# Things you might add to DEFS:
+# -DSTDC_HEADERS        If you have ANSI C headers and
+#                       libraries.
+# -DPOSIX               If you have POSIX.1 headers and
+#                       libraries.
+# -DBSD42               If you have sys/dir.h (unless
+#                       you use -DPOSIX), sys/file.h,
+#                       and st_blocks in `struct stat'.
+# -DUSG                 If you have System V/ANSI C
+#                       string and memory functions
+#                       and headers, sys/sysmacros.h,
+#                       fcntl.h, getcwd, no valloc,
+#                       and ndir.h (unless
+#                       you use -DDIRENT).
+# -DNO_MEMORY_H         If USG or STDC_HEADERS but do not
+#                       include memory.h.
+# -DDIRENT              If USG and you have dirent.h
+#                       instead of ndir.h.
+# -DSIGTYPE=int         If your signal handlers
+#                       return int, not void.
+# -DNO_MTIO             If you lack sys/mtio.h
+#                       (magtape ioctls).
+# -DNO_REMOTE           If you do not have a remote shell
+#                       or rexec.
+# -DUSE_REXEC           To use rexec for remote tape
+#                       operations instead of
+#                       forking rsh or remsh.
+# -DVPRINTF_MISSING     If you lack vprintf function
+#                       (but have _doprnt).
+# -DDOPRNT_MISSING      If you lack _doprnt function.
+#                       Also need to define
+#                       -DVPRINTF_MISSING.
+# -DFTIME_MISSING       If you lack ftime system call.
+# -DSTRSTR_MISSING      If you lack strstr function.
+# -DVALLOC_MISSING      If you lack valloc function.
+# -DMKDIR_MISSING       If you lack mkdir and
+#                       rmdir system calls.
+# -DRENAME_MISSING      If you lack rename system call.
+# -DFTRUNCATE_MISSING   If you lack ftruncate
+#                       system call.
+# -DV7                  On Version 7 Unix (not
+#                       tested in a long time).
+# -DEMUL_OPEN3          If you lack a 3-argument version
+#                       of open, and want to emulate it
+#                       with system calls you do have.
+# -DNO_OPEN3            If you lack the 3-argument open
+#                       and want to disable the tar -k
+#                       option instead of emulating open.
+# -DXENIX               If you have sys/inode.h
+#                       and need it 94 to be included.
+
+DEFS =  -DSIGTYPE=int -DDIRENT -DSTRSTR_MISSING \
+        -DVPRINTF_MISSING -DBSD42
+# Set this to rtapelib.o unless you defined NO_REMOTE,
+# in which case make it empty.
+RTAPELIB = rtapelib.o
+LIBS =
+DEF_AR_FILE = /dev/rmt8
+DEFBLOCKING = 20
+
+CDEBUG = -g
+CFLAGS = $(CDEBUG) -I. -I$(srcdir) $(DEFS) \
+        -DDEF_AR_FILE=\"$(DEF_AR_FILE)\" \
+        -DDEFBLOCKING=$(DEFBLOCKING)
+LDFLAGS = -g
+
+prefix = /usr/local
+# Prefix for each installed program,
+# normally empty or `g'.
+binprefix =
+
+# The directory to install tar in.
+bindir = $(prefix)/bin
+
+# The directory to install the info files in.
+infodir = $(prefix)/info
+
+#### End of system configuration section. ####
+
+SRCS_C  = tar.c create.c extract.c buffer.c   \
+          getoldopt.c update.c gnu.c mangle.c \
+          version.c list.c names.c diffarch.c \
+          port.c wildmat.c getopt.c getopt1.c \
+          regex.c
+SRCS_Y  = getdate.y
+SRCS    = $(SRCS_C) $(SRCS_Y)
+OBJS    = $(SRCS_C:.c=.o) $(SRCS_Y:.y=.o) $(RTAPELIB)
+
+AUX =   README COPYING ChangeLog Makefile.in  \
+        makefile.pc configure configure.in \
+        tar.texinfo tar.info* texinfo.tex \
+        tar.h port.h open3.h getopt.h regex.h \
+        rmt.h rmt.c rtapelib.c alloca.c \
+        msd_dir.h msd_dir.c tcexparg.c \
+        level-0 level-1 backup-specs testpad.c
+
+.PHONY: all
+all:    tar rmt tar.info
+
+tar:    $(OBJS)
+        $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+rmt:    rmt.c
+        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ rmt.c
+
+tar.info: tar.texinfo
+        makeinfo tar.texinfo
+
+.PHONY: install
+install: all
+        $(INSTALL) tar $(bindir)/$(binprefix)tar
+        -test ! -f rmt || $(INSTALL) rmt /etc/rmt
+        $(INSTALLDATA) $(srcdir)/tar.info* $(infodir)
+
+$(OBJS): tar.h port.h testpad.h
+regex.o buffer.o tar.o: regex.h
+# getdate.y has 8 shift/reduce conflicts.
+
+testpad.h: testpad
+        ./testpad
+
+testpad: testpad.o
+        $(CC) -o $@ testpad.o
+
+TAGS:   $(SRCS)
+        etags $(SRCS)
+
+.PHONY: clean
+clean:
+        rm -f *.o tar rmt testpad testpad.h core
+
+.PHONY: distclean
+distclean: clean
+        rm -f TAGS Makefile config.status
+
+.PHONY: realclean
+realclean: distclean
+        rm -f tar.info*
+
+.PHONY: shar
+shar: $(SRCS) $(AUX)
+        shar $(SRCS) $(AUX) | compress \
+          > tar-`sed -e '/version_string/!d' \
+                     -e 's/[^0-9.]*\([0-9.]*\).*/\1/' \
+                     -e q
+                     version.c`.shar.Z
+
+.PHONY: dist
+dist: $(SRCS) $(AUX)
+        echo tar-`sed \
+             -e '/version_string/!d' \
+             -e 's/[^0-9.]*\([0-9.]*\).*/\1/' \
+             -e q
+             version.c` > .fname
+        -rm -rf `cat .fname`
+        mkdir `cat .fname`
+        ln $(SRCS) $(AUX) `cat .fname`
+        tar chZf `cat .fname`.tar.Z `cat .fname`
+        -rm -rf `cat .fname` .fname
+
+tar.zoo: $(SRCS) $(AUX)
+        -rm -rf tmp.dir
+        -mkdir tmp.dir
+        -rm tar.zoo
+        for X in $(SRCS) $(AUX) ; do \
+            echo $$X ; \
+            sed 's/$$/^M/' $$X \
+            > tmp.dir/$$X ; done
+        cd tmp.dir ; zoo aM ../tar.zoo *
+        -rm -rf tmp.dir
+</code></pre>
\ No newline at end of file

From 670d5afe758c94addbfe4ed8df16e2bf4b517f66 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 28 Jun 2015 02:33:28 +0200
Subject: [PATCH 066/310] Regression fix: do not allow multi-line strings in
 C-like (unless properly escaped)

---
 components/prism-clike.js     | 2 +-
 components/prism-clike.min.js | 2 +-
 prism.js                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index 3d9f88e57e..7a5ba2e5dd 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -9,7 +9,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		}
 	],
-	'string': /("|')(\\[\s\S]|(?!\1)[^\\])*\1/,
+	'string': /("|')(\\[\s\S]|(?!\1)[^\\\r\n])*\1/,
 	'class-name': {
 		pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index 1ea8bb34ef..32ad31cfa1 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\[\s\S]|(?!\1)[^\\])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\[\s\S]|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index fb0aeca690..60c7db9004 100644
--- a/prism.js
+++ b/prism.js
@@ -548,7 +548,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		}
 	],
-	'string': /("|')(\\[\s\S]|(?!\1)[^\\])*\1/,
+	'string': /("|')(\\[\s\S]|(?!\1)[^\\\r\n])*\1/,
 	'class-name': {
 		pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,

From f28a3e0ad676fb708aad917ac68b040118864db7 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 28 Jun 2015 05:00:41 +0200
Subject: [PATCH 067/310] Run gulp task

---
 components/prism-keyman.min.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 components/prism-keyman.min.js

diff --git a/components/prism-keyman.min.js b/components/prism-keyman.min.js
new file mode 100644
index 0000000000..3978bd266d
--- /dev/null
+++ b/components/prism-keyman.min.js
@@ -0,0 +1 @@
+Prism.languages.keyman={comment:/\bc\s.*/i,"function":/\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT|CAPS|NCAPS)\s+)*([TKU]_[a-z0-9_?]+|".+?"|'.+?')\s*\]/i,string:/("|')((?!\1).)*\1/,keyword:/\b(any|beep|call|context|deadkey|dk|if|index|notany|nul|outs|return|reset|save|set|store|use)\b/i,atrule:/\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,bold:[/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embdjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i],number:/\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i,operator:/[+>\\,()]/,tag:/\$(keyman|kmfl|weaver|keymanweb|keymanonly):/i};
\ No newline at end of file

From 08054b153b9d7bb1ac109c6bad56ea2e95ea6e38 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 30 Jun 2015 21:29:30 +0200
Subject: [PATCH 068/310] Add support for elixir

---
 components.js                  |   4 +
 components/prism-elixir.js     |  82 ++++++
 components/prism-elixir.min.js |   1 +
 examples/prism-elixir.html     | 474 +++++++++++++++++++++++++++++++++
 4 files changed, 561 insertions(+)
 create mode 100644 components/prism-elixir.js
 create mode 100644 components/prism-elixir.min.js
 create mode 100644 examples/prism-elixir.html

diff --git a/components.js b/components.js
index 919b3c13ae..71400f0d84 100644
--- a/components.js
+++ b/components.js
@@ -122,6 +122,10 @@ var components = {
 			"title": "Eiffel",
 			"owner": "Conaclos"
 		},
+		"elixir": {
+			"title": "elixir",
+			"owner": "Golmote"
+		},
 		"erlang": {
 			"title": "Erlang",
 			"owner": "Golmote"
diff --git a/components/prism-elixir.js b/components/prism-elixir.js
new file mode 100644
index 0000000000..a8c52b8740
--- /dev/null
+++ b/components/prism-elixir.js
@@ -0,0 +1,82 @@
+Prism.languages.elixir = {
+	'heredoc': {
+		pattern: /(?:~[csw])?("""|''')[\s\S]*?\1/i,
+		alias: 'string'
+	},
+	// Negative look-ahead is needed for string interpolation
+	'comment': /#(?!\{).*/,
+	// ~r"""foo""", ~r'''foo''', ~r/foo/, ~r|foo|, ~r"foo", ~r'foo', ~r(foo), ~r[foo], ~r{foo}, ~r<foo>
+	'regex': /~[rR](?:("""|'''|[\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[uismxfr]*/,
+	'string': [
+		{
+			// ~s"""foo""", ~s'''foo''', ~s/foo/, ~s|foo|, ~s"foo", ~s'foo', ~s(foo), ~s[foo], ~s{foo}, ~s<foo>
+			pattern: /~[cCsSwW](?:([\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[csa]?/,
+			inside: {
+				// See interpolation below
+			}
+		},
+		{
+			// Multi-line strings are allowed
+			pattern: /("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/,
+			inside: {
+				// See interpolation below
+			}
+		}
+	],
+	'atom': {
+		// Look-behind prevents bad highlighting of the :: operator
+		pattern: /(^|[^:]):\w+/,
+		lookbehind: true,
+		alias: 'symbol'
+	},
+	// Look-ahead prevents bad highlighting of the :: operator
+	'attr-name': /\w+:(?!:)/,
+	'capture': {
+		// Look-behind prevents bad highlighting of the && operator
+		pattern: /(^|[^&])&(?:[^&\s\d()][^()]*|(?=\())/,
+		lookbehind: true,
+		alias: 'function'
+	},
+	'argument': {
+		// Look-behind prevents bad highlighting of the && operator
+		pattern: /(^|[^&])&\d+/,
+		lookbehind: true,
+		alias: 'variable'
+	},
+	'attribute': {
+		pattern: /@[\S]+/,
+		alias: 'variable'
+	},
+	'number': /\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,
+	'keyword': /\b(?:after|alias|and|case|catch|cond|def|defcallback|defexception|defimpl|defmodule|defp|defprotocol|defstruct|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,
+	'boolean': /\b(?:true|false|nil)\b/,
+	'operator': [
+		/\bin\b|\|>|\\\\|::|\.\.\.?|\+\+|--|&&|\|\||<>|[!=]==?|[<>]=|->|=>|<-|=~|\B!|[+\-*\/=|^&]/,
+		{
+			// We don't want to match <<
+			pattern: /([^<])<(?!<)/,
+			lookbehind: true
+		},
+		{
+			// We don't want to match >>
+			pattern: /([^>])>(?!>)/,
+			lookbehind: true
+		}
+	],
+	'punctuation': /<<|>>|[.,%\[\]{}()]/
+};
+
+Prism.languages.elixir.string.forEach(function(o) {
+	o.inside = {
+		'interpolation': {
+			pattern: /#\{[^}]+\}/,
+			inside: {
+				'delimiter': {
+					pattern: /^#\{|\}$/,
+					alias: 'punctuation'
+				},
+				rest: Prism.util.clone(Prism.languages.elixir)
+			}
+		}
+	};
+});
\ No newline at end of file
diff --git a/components/prism-elixir.min.js b/components/prism-elixir.min.js
new file mode 100644
index 0000000000..d412babad6
--- /dev/null
+++ b/components/prism-elixir.min.js
@@ -0,0 +1 @@
+Prism.languages.elixir={heredoc:{pattern:/(?:~[csw])?("""|''')[\s\S]*?\1/i,alias:"string"},comment:/#(?!\{).*/,regex:/~[rR](?:("""|'''|[\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[uismxfr]*/,string:[{pattern:/~[cCsSwW](?:([\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[csa]?/,inside:{}},{pattern:/("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/,inside:{}}],atom:{pattern:/(^|[^:]):\w+/,lookbehind:!0,alias:"symbol"},"attr-name":/\w+:(?!:)/,capture:{pattern:/(^|[^&])&(?:[^&\s\d()][^()]*|(?=\())/,lookbehind:!0,alias:"function"},argument:{pattern:/(^|[^&])&\d+/,lookbehind:!0,alias:"variable"},attribute:{pattern:/@[\S]+/,alias:"variable"},number:/\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,keyword:/\b(?:after|alias|and|case|catch|cond|def|defcallback|defexception|defimpl|defmodule|defp|defprotocol|defstruct|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,"boolean":/\b(?:true|false|nil)\b/,operator:[/\bin\b|\|>|\\\\|::|\.\.\.?|\+\+|--|&&|\|\||<>|[!=]==?|[<>]=|->|=>|<-|=~|\B!|[+\-*\/=|^&]/,{pattern:/([^<])<(?!<)/,lookbehind:!0},{pattern:/([^>])>(?!>)/,lookbehind:!0}],punctuation:/<<|>>|[.,%\[\]{}()]/},Prism.languages.elixir.string.forEach(function(e){e.inside={interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"},rest:Prism.util.clone(Prism.languages.elixir)}}}});
\ No newline at end of file
diff --git a/examples/prism-elixir.html b/examples/prism-elixir.html
new file mode 100644
index 0000000000..09b3631429
--- /dev/null
+++ b/examples/prism-elixir.html
@@ -0,0 +1,474 @@
+<h1>elixir</h1>
+<p>To use this language, use the class "language-elixir".</p>
+
+<h2>Comments</h2>
+<pre><code># This is a comment</code></pre>
+
+<h2>Atoms</h2>
+<pre><code>:foo
+:bar</code></pre>
+
+<h2>Numbers</h2>
+<pre><code>42
+0b1010
+0o777
+0x1F
+3.14159
+5.2e10
+100_000</code></pre>
+
+<h2>Strings and heredoc</h2>
+<pre><code>'A string with \'quotes\'!'
+"A string with \"quotes\"!"
+"Multi-line
+strings are supported"
+""" "Heredoc" strings are
+also supported. # This is not a comment
+"""</code></pre>
+
+<h2>Sigils</h2>
+<pre><code>~s"""This is a sigil
+using heredoc delimiters"""
+~r/a [reg]exp/
+~r(another|regexp)
+~w[some words]s
+~c&lt;a char list></code></pre>
+
+<h2>Interpolation</h2>
+<pre><code>"This is an #{:atom}"
+~s/#{40+2} is the answer/</code></pre>
+
+<h2>Function capturing</h2>
+<pre><code>fun = &Math.zero?/1
+(&is_function/1).(fun)
+fun = &(&1 + 1)
+fun.(1)
+fun = &List.flatten(&1, &2)
+fun.([1, [[2], 3]], [4, 5])</code></pre>
+
+<h2>Module attributes</h2>
+<pre><code>defmodule MyServer do
+  @vsn 2
+end
+
+defmodule Math do
+  @moduledoc """
+  Provides math-related functions.
+
+  ## Examples
+
+      iex> Math.sum(1, 2)
+      3
+
+  """
+
+  @doc """
+  Calculates the sum of two numbers.
+  """
+  def sum(a, b), do: a + b
+end</code></pre>
+
+<h2>Full example</h2>
+<pre><code># Example from http://learnxinyminutes.com/docs/elixir/
+
+# Single line comments start with a number symbol.
+
+# There's no multi-line comment,
+# but you can stack multiple comments.
+
+# To use the elixir shell use the `iex` command.
+# Compile your modules with the `elixirc` command.
+
+# Both should be in your path if you installed elixir correctly.
+
+## ---------------------------
+## -- Basic types
+## ---------------------------
+
+# There are numbers
+3    # integer
+0x1F # integer
+3.0  # float
+
+# Atoms, that are literals, a constant with name. They start with `:`.
+:hello # atom
+
+# Tuples that are stored contiguously in memory.
+{1,2,3} # tuple
+
+# We can access a tuple element with the `elem` function:
+elem({1, 2, 3}, 0) #=> 1
+
+# Lists that are implemented as linked lists.
+[1,2,3] # list
+
+# We can access the head and tail of a list as follows:
+[head | tail] = [1,2,3]
+head #=> 1
+tail #=> [2,3]
+
+# In elixir, just like in Erlang, the `=` denotes pattern matching and
+# not an assignment.
+#
+# This means that the left-hand side (pattern) is matched against a
+# right-hand side.
+#
+# This is how the above example of accessing the head and tail of a list works.
+
+# A pattern match will error when the sides don't match, in this example
+# the tuples have different sizes.
+# {a, b, c} = {1, 2} #=> ** (MatchError) no match of right hand side value: {1,2}
+
+# There are also binaries
+&lt;&lt;1,2,3>> # binary
+
+# Strings and char lists
+"hello" # string
+'hello' # char list
+
+# Multi-line strings
+"""
+I'm a multi-line
+string.
+"""
+#=> "I'm a multi-line\nstring.\n"
+
+# Strings are all encoded in UTF-8:
+"héllò" #=> "héllò"
+
+# Strings are really just binaries, and char lists are just lists.
+&lt;&lt;?a, ?b, ?c>> #=> "abc"
+[?a, ?b, ?c]   #=> 'abc'
+
+# `?a` in elixir returns the ASCII integer for the letter `a`
+?a #=> 97
+
+# To concatenate lists use `++`, for binaries use `&lt;>`
+[1,2,3] ++ [4,5]     #=> [1,2,3,4,5]
+'hello ' ++ 'world'  #=> 'hello world'
+
+&lt;&lt;1,2,3>> &lt;> &lt;&lt;4,5>> #=> &lt;&lt;1,2,3,4,5>>
+"hello " &lt;> "world"  #=> "hello world"
+
+# Ranges are represented as `start..end` (both inclusive)
+1..10 #=> 1..10
+lower..upper = 1..10 # Can use pattern matching on ranges as well
+[lower, upper] #=> [1, 10]
+
+## ---------------------------
+## -- Operators
+## ---------------------------
+
+# Some math
+1 + 1  #=> 2
+10 - 5 #=> 5
+5 * 2  #=> 10
+10 / 2 #=> 5.0
+
+# In elixir the operator `/` always returns a float.
+
+# To do integer division use `div`
+div(10, 2) #=> 5
+
+# To get the division remainder use `rem`
+rem(10, 3) #=> 1
+
+# There are also boolean operators: `or`, `and` and `not`.
+# These operators expect a boolean as their first argument.
+true and true #=> true
+false or true #=> true
+# 1 and true    #=> ** (ArgumentError) argument error
+
+# Elixir also provides `||`, `&&` and `!` which accept arguments of any type.
+# All values except `false` and `nil` will evaluate to true.
+1 || true  #=> 1
+false && 1 #=> false
+nil && 20  #=> nil
+!true #=> false
+
+# For comparisons we have: `==`, `!=`, `===`, `!==`, `&lt;=`, `>=`, `&lt;` and `>`
+1 == 1 #=> true
+1 != 1 #=> false
+1 &lt; 2  #=> true
+
+# `===` and `!==` are more strict when comparing integers and floats:
+1 == 1.0  #=> true
+1 === 1.0 #=> false
+
+# We can also compare two different data types:
+1 &lt; :hello #=> true
+
+# The overall sorting order is defined below:
+# number &lt; atom &lt; reference &lt; functions &lt; port &lt; pid &lt; tuple &lt; list &lt; bit string
+
+# To quote Joe Armstrong on this: "The actual order is not important,
+# but that a total ordering is well defined is important."
+
+## ---------------------------
+## -- Control Flow
+## ---------------------------
+
+# `if` expression
+if false do
+  "This will never be seen"
+else
+  "This will"
+end
+
+# There's also `unless`
+unless true do
+  "This will never be seen"
+else
+  "This will"
+end
+
+# Remember pattern matching? Many control-flow structures in elixir rely on it.
+
+# `case` allows us to compare a value against many patterns:
+case {:one, :two} do
+  {:four, :five} ->
+    "This won't match"
+  {:one, x} ->
+    "This will match and bind `x` to `:two`"
+  _ ->
+    "This will match any value"
+end
+
+# It's common to bind the value to `_` if we don't need it.
+# For example, if only the head of a list matters to us:
+[head | _] = [1,2,3]
+head #=> 1
+
+# For better readability we can do the following:
+[head | _tail] = [:a, :b, :c]
+head #=> :a
+
+# `cond` lets us check for many conditions at the same time.
+# Use `cond` instead of nesting many `if` expressions.
+cond do
+  1 + 1 == 3 ->
+    "I will never be seen"
+  2 * 5 == 12 ->
+    "Me neither"
+  1 + 2 == 3 ->
+    "But I will"
+end
+
+# It is common to set the last condition equal to `true`, which will always match.
+cond do
+  1 + 1 == 3 ->
+    "I will never be seen"
+  2 * 5 == 12 ->
+    "Me neither"
+  true ->
+    "But I will (this is essentially an else)"
+end
+
+# `try/catch` is used to catch values that are thrown, it also supports an
+# `after` clause that is invoked whether or not a value is caught.
+try do
+  throw(:hello)
+catch
+  message -> "Got #{message}."
+after
+  IO.puts("I'm the after clause.")
+end
+#=> I'm the after clause
+# "Got :hello"
+
+## ---------------------------
+## -- Modules and Functions
+## ---------------------------
+
+# Anonymous functions (notice the dot)
+square = fn(x) -> x * x end
+square.(5) #=> 25
+
+# They also accept many clauses and guards.
+# Guards let you fine tune pattern matching,
+# they are indicated by the `when` keyword:
+f = fn
+  x, y when x > 0 -> x + y
+  x, y -> x * y
+end
+
+f.(1, 3)  #=> 4
+f.(-1, 3) #=> -3
+
+# Elixir also provides many built-in functions.
+# These are available in the current scope.
+is_number(10)    #=> true
+is_list("hello") #=> false
+elem({1,2,3}, 0) #=> 1
+
+# You can group several functions into a module. Inside a module use `def`
+# to define your functions.
+defmodule Math do
+  def sum(a, b) do
+    a + b
+  end
+
+  def square(x) do
+    x * x
+  end
+end
+
+Math.sum(1, 2)  #=> 3
+Math.square(3) #=> 9
+
+# To compile our simple Math module save it as `math.ex` and use `elixirc`
+# in your terminal: elixirc math.ex
+
+# Inside a module we can define functions with `def` and private functions with `defp`.
+# A function defined with `def` is available to be invoked from other modules,
+# a private function can only be invoked locally.
+defmodule PrivateMath do
+  def sum(a, b) do
+    do_sum(a, b)
+  end
+
+  defp do_sum(a, b) do
+    a + b
+  end
+end
+
+PrivateMath.sum(1, 2)    #=> 3
+# PrivateMath.do_sum(1, 2) #=> ** (UndefinedFunctionError)
+
+# Function declarations also support guards and multiple clauses:
+defmodule Geometry do
+  def area({:rectangle, w, h}) do
+    w * h
+  end
+
+  def area({:circle, r}) when is_number(r) do
+    3.14 * r * r
+  end
+end
+
+Geometry.area({:rectangle, 2, 3}) #=> 6
+Geometry.area({:circle, 3})       #=> 28.25999999999999801048
+# Geometry.area({:circle, "not_a_number"})
+#=> ** (FunctionClauseError) no function clause matching in Geometry.area/1
+
+# Due to immutability, recursion is a big part of elixir
+defmodule Recursion do
+  def sum_list([head | tail], acc) do
+    sum_list(tail, acc + head)
+  end
+
+  def sum_list([], acc) do
+    acc
+  end
+end
+
+Recursion.sum_list([1,2,3], 0) #=> 6
+
+# Elixir modules support attributes, there are built-in attributes and you
+# may also add custom ones.
+defmodule MyMod do
+  @moduledoc """
+  This is a built-in attribute on a example module.
+  """
+
+  @my_data 100 # This is a custom attribute.
+  IO.inspect(@my_data) #=> 100
+end
+
+## ---------------------------
+## -- Structs and Exceptions
+## ---------------------------
+
+# Structs are extensions on top of maps that bring default values,
+# compile-time guarantees and polymorphism into Elixir.
+defmodule Person do
+  defstruct name: nil, age: 0, height: 0
+end
+
+joe_info = %Person{ name: "Joe", age: 30, height: 180 }
+#=> %Person{age: 30, height: 180, name: "Joe"}
+
+# Access the value of name
+joe_info.name #=> "Joe"
+
+# Update the value of age
+older_joe_info = %{ joe_info | age: 31 }
+#=> %Person{age: 31, height: 180, name: "Joe"}
+
+# The `try` block with the `rescue` keyword is used to handle exceptions
+try do
+  raise "some error"
+rescue
+  RuntimeError -> "rescued a runtime error"
+  _error -> "this will rescue any error"
+end
+
+# All exceptions have a message
+try do
+  raise "some error"
+rescue
+  x in [RuntimeError] ->
+    x.message
+end
+
+## ---------------------------
+## -- Concurrency
+## ---------------------------
+
+# Elixir relies on the actor model for concurrency. All we need to write
+# concurrent programs in elixir are three primitives: spawning processes,
+# sending messages and receiving messages.
+
+# To start a new process we use the `spawn` function, which takes a function
+# as argument.
+f = fn -> 2 * 2 end #=> #Function&lt;erl_eval.20.80484245>
+spawn(f) #=> #PID&lt;0.40.0>
+
+# `spawn` returns a pid (process identifier), you can use this pid to send
+# messages to the process. To do message passing we use the `send` operator.
+# For all of this to be useful we need to be able to receive messages. This is
+# achieved with the `receive` mechanism:
+defmodule Geometry do
+  def area_loop do
+    receive do
+      {:rectangle, w, h} ->
+        IO.puts("Area = #{w * h}")
+        area_loop()
+      {:circle, r} ->
+        IO.puts("Area = #{3.14 * r * r}")
+        area_loop()
+    end
+  end
+end
+
+# Compile the module and create a process that evaluates `area_loop` in the shell
+pid = spawn(fn -> Geometry.area_loop() end) #=> #PID&lt;0.40.0>
+
+# Send a message to `pid` that will match a pattern in the receive statement
+send pid, {:rectangle, 2, 3}
+#=> Area = 6
+#   {:rectangle,2,3}
+
+send pid, {:circle, 2}
+#=> Area = 12.56000000000000049738
+#   {:circle,2}
+
+# The shell is also a process, you can use `self` to get the current pid
+self() #=> #PID&lt;0.27.0></code></pre>
+
+<h2>Known failures</h2>
+<p>There are certain edge cases where Prism will fail.
+	There are always such cases in every regex-based syntax highlighter.
+	However, Prism dares to be open and honest about them.
+	If a failure is listed here, it doesn’t mean it will never be fixed. This is more of a “known bugs” list, just with a certain type of bug.
+</p>
+
+<h3>Comments starting with an opening curly brace</h3>
+<pre><code>#{ This is not highlighted properly.</code></pre>
+
+<h3>Comment-like substrings</h3>
+<pre><code>"foo # var"</code></pre>
+
+<h3>String interpolation in single-quoted strings</h3>
+<pre><code>'#{:atom} &lt;- this should not be highligted'</code></pre>
+

From a58bf9ae73edfc18d4260dca1f08f885b2259487 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Thu, 7 May 2015 21:01:26 -0700
Subject: [PATCH 069/310] javascript: Add async/await

---
 components/prism-javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index f2b4054be1..d4f1025dbf 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -1,5 +1,5 @@
 Prism.languages.javascript = Prism.languages.extend('clike', {
-	'keyword': /\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
+	'keyword': /\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
 	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
 	'function': /(?!\d)[a-z0-9_$]+(?=\()/i
 });

From 8be7815bfec07835d72f8a5cf5ea28ca6031655a Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 1 Jul 2015 18:50:02 +0200
Subject: [PATCH 070/310] Run gulp task

---
 components/prism-javascript.min.js | 2 +-
 prism.js                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index 3bbd703b14..a3a4a002ab 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 60c7db9004..81a2f0b286 100644
--- a/prism.js
+++ b/prism.js
@@ -576,7 +576,7 @@ Prism.languages.clike = {
 ********************************************** */
 
 Prism.languages.javascript = Prism.languages.extend('clike', {
-	'keyword': /\b(as|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
+	'keyword': /\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
 	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
 	'function': /(?!\d)[a-z0-9_$]+(?=\()/i
 });

From 950afe9d69fae09fbe23486a0363a99d386bd16e Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Thu, 2 Jul 2015 09:19:05 +1000
Subject: [PATCH 071/310] fix typo in kmw_embedjs

---
 components/prism-keyman.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-keyman.js b/components/prism-keyman.js
index 1082d9d927..aaafa10f61 100644
--- a/components/prism-keyman.js
+++ b/components/prism-keyman.js
@@ -5,7 +5,7 @@ Prism.languages.keyman = {
 	'keyword': /\b(any|beep|call|context|deadkey|dk|if|index|notany|nul|outs|return|reset|save|set|store|use)\b/i,  // rule keywords
 	'atrule': /\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,   // structural keywords
 	'bold': [   // header statements
-		/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embdjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
+		/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embedjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
 		/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i
 	],
 	'number': /\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i, // U+####, x###, d### characters and numbers

From ebfc23c878cb8f13c4a0af1d2035e6cd293524f9 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Thu, 2 Jul 2015 09:42:35 +1000
Subject: [PATCH 072/310] Added baselayout, layer and platform statements (they
 exist as keywords as well as system stores)

---
 components/prism-keyman.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-keyman.js b/components/prism-keyman.js
index aaafa10f61..9c3e0bf5b6 100644
--- a/components/prism-keyman.js
+++ b/components/prism-keyman.js
@@ -2,9 +2,9 @@ Prism.languages.keyman = {
 	'comment': /\bc\s.*/i,
 	'function': /\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT|CAPS|NCAPS)\s+)*([TKU]_[a-z0-9_?]+|".+?"|'.+?')\s*\]/i,  // virtual key
 	'string': /("|')((?!\1).)*\1/,
-	'keyword': /\b(any|beep|call|context|deadkey|dk|if|index|notany|nul|outs|return|reset|save|set|store|use)\b/i,  // rule keywords
+	'keyword': /\b(any|baselayout|beep|call|context|deadkey|dk|if|index|layer|notany|nul|outs|platform|return|reset|save|set|store|use)\b/i,  // rule keywords
 	'atrule': /\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,   // structural keywords
-	'bold': [   // header statements
+	'bold': [   // header statements, system stores and variable system stores
 		/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embedjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
 		/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i
 	],

From 1682ca5e9024e006230c758a4c538fd1c7c5f95a Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 2 Jul 2015 06:26:56 +0200
Subject: [PATCH 073/310] Run gulp task

---
 components/prism-keyman.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-keyman.min.js b/components/prism-keyman.min.js
index 3978bd266d..1c6d17995a 100644
--- a/components/prism-keyman.min.js
+++ b/components/prism-keyman.min.js
@@ -1 +1 @@
-Prism.languages.keyman={comment:/\bc\s.*/i,"function":/\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT|CAPS|NCAPS)\s+)*([TKU]_[a-z0-9_?]+|".+?"|'.+?')\s*\]/i,string:/("|')((?!\1).)*\1/,keyword:/\b(any|beep|call|context|deadkey|dk|if|index|notany|nul|outs|return|reset|save|set|store|use)\b/i,atrule:/\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,bold:[/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embdjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i],number:/\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i,operator:/[+>\\,()]/,tag:/\$(keyman|kmfl|weaver|keymanweb|keymanonly):/i};
\ No newline at end of file
+Prism.languages.keyman={comment:/\bc\s.*/i,"function":/\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT|CAPS|NCAPS)\s+)*([TKU]_[a-z0-9_?]+|".+?"|'.+?')\s*\]/i,string:/("|')((?!\1).)*\1/,keyword:/\b(any|baselayout|beep|call|context|deadkey|dk|if|index|layer|notany|nul|outs|platform|return|reset|save|set|store|use)\b/i,atrule:/\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,bold:[/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embedjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i],number:/\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i,operator:/[+>\\,()]/,tag:/\$(keyman|kmfl|weaver|keymanweb|keymanonly):/i};
\ No newline at end of file

From 88f44a79d069af2b2d3efcdb899d7ef7d025d035 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 6 Jul 2015 19:58:40 +0200
Subject: [PATCH 074/310] Swift: update keyword list (fix #625)

---
 components/prism-swift.js     | 2 +-
 components/prism-swift.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-swift.js b/components/prism-swift.js
index dc2f790ce5..953b7177cd 100644
--- a/components/prism-swift.js
+++ b/components/prism-swift.js
@@ -1,6 +1,6 @@
 // issues: nested multiline comments, highlighting inside string interpolations
 Prism.languages.swift = Prism.languages.extend('clike', {
-	'keyword': /\b(as|associativity|break|case|class|continue|convenience|default|deinit|didSet|do|dynamicType|else|enum|extension|fallthrough|final|for|func|get|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|protocol|public|required|return|right|safe|self|Self|set|static|struct|subscript|super|switch|Type|typealias|unowned|unowned|unsafe|var|weak|where|while|willSet|__COLUMN__|__FILE__|__FUNCTION__|__LINE__)\b/,
+	'keyword': /\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic|dynamicType|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__COLUMN__|__FILE__|__FUNCTION__|__LINE__)\b/,
 	'number': /\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,
 	'constant': /\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,
 	'atrule': /@\b(IBOutlet|IBDesignable|IBAction|IBInspectable|class_protocol|exported|noreturn|NSCopying|NSManaged|objc|UIApplicationMain|auto_closure)\b/,
diff --git a/components/prism-swift.min.js b/components/prism-swift.min.js
index 4e17687017..863366b193 100644
--- a/components/prism-swift.min.js
+++ b/components/prism-swift.min.js
@@ -1 +1 @@
-Prism.languages.swift=Prism.languages.extend("clike",{keyword:/\b(as|associativity|break|case|class|continue|convenience|default|deinit|didSet|do|dynamicType|else|enum|extension|fallthrough|final|for|func|get|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|protocol|public|required|return|right|safe|self|Self|set|static|struct|subscript|super|switch|Type|typealias|unowned|unowned|unsafe|var|weak|where|while|willSet|__COLUMN__|__FILE__|__FUNCTION__|__LINE__)\b/,number:/\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,constant:/\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,atrule:/@\b(IBOutlet|IBDesignable|IBAction|IBInspectable|class_protocol|exported|noreturn|NSCopying|NSManaged|objc|UIApplicationMain|auto_closure)\b/,builtin:/\b([A-Z]\S+|abs|advance|alignof|alignofValue|assert|contains|count|countElements|debugPrint|debugPrintln|distance|dropFirst|dropLast|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lazy|lexicographicalCompare|map|max|maxElement|min|minElement|numericCast|overlaps|partition|prefix|print|println|reduce|reflect|reverse|sizeof|sizeofValue|sort|sorted|split|startsWith|stride|strideof|strideofValue|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|withExtendedLifetime|withUnsafeMutablePointer|withUnsafeMutablePointers|withUnsafePointer|withUnsafePointers|withVaList)\b/});
\ No newline at end of file
+Prism.languages.swift=Prism.languages.extend("clike",{keyword:/\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic|dynamicType|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__COLUMN__|__FILE__|__FUNCTION__|__LINE__)\b/,number:/\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,constant:/\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,atrule:/@\b(IBOutlet|IBDesignable|IBAction|IBInspectable|class_protocol|exported|noreturn|NSCopying|NSManaged|objc|UIApplicationMain|auto_closure)\b/,builtin:/\b([A-Z]\S+|abs|advance|alignof|alignofValue|assert|contains|count|countElements|debugPrint|debugPrintln|distance|dropFirst|dropLast|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lazy|lexicographicalCompare|map|max|maxElement|min|minElement|numericCast|overlaps|partition|prefix|print|println|reduce|reflect|reverse|sizeof|sizeofValue|sort|sorted|split|startsWith|stride|strideof|strideofValue|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|withExtendedLifetime|withUnsafeMutablePointer|withUnsafeMutablePointers|withUnsafePointer|withUnsafePointers|withVaList)\b/});
\ No newline at end of file

From 5b29a673c468920ac68c3af6e769f72c2b895434 Mon Sep 17 00:00:00 2001
From: Vivek Ghaisas <v.a.ghaisas@gmail.com>
Date: Mon, 6 Jul 2015 21:25:08 +0300
Subject: [PATCH 075/310] Add Ubuntu Mono font to font stack

None of the other fonts are currently available on Ubuntu and the
addition of Ubuntu Mono to the font stack makes the code look much nicer
on Ubuntu systems.

Also added a missing newline to the end of prism-coy.css
---
 themes/prism-coy.css      | 4 ++--
 themes/prism-dark.css     | 2 +-
 themes/prism-funky.css    | 2 +-
 themes/prism-okaidia.css  | 2 +-
 themes/prism-tomorrow.css | 2 +-
 themes/prism-twilight.css | 2 +-
 themes/prism.css          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/themes/prism-coy.css b/themes/prism-coy.css
index 8db555e126..7a325d63a8 100644
--- a/themes/prism-coy.css
+++ b/themes/prism-coy.css
@@ -7,7 +7,7 @@
 code[class*="language-"],
 pre[class*="language-"] {
 	color: black;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
@@ -228,4 +228,4 @@ pre[data-line] code {
 }
 pre .line-highlight {
 	margin-top: 0;
-}
\ No newline at end of file
+}
diff --git a/themes/prism-dark.css b/themes/prism-dark.css
index a8047fce6e..1c4daa2227 100644
--- a/themes/prism-dark.css
+++ b/themes/prism-dark.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: white;
 	text-shadow: 0 -.1em .2em black;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-funky.css b/themes/prism-funky.css
index f2614d1573..30135635ee 100644
--- a/themes/prism-funky.css
+++ b/themes/prism-funky.css
@@ -6,7 +6,7 @@
 
 code[class*="language-"],
 pre[class*="language-"] {
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-okaidia.css b/themes/prism-okaidia.css
index 3ff2e3c772..0fac6828db 100644
--- a/themes/prism-okaidia.css
+++ b/themes/prism-okaidia.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: #f8f8f2;
 	text-shadow: 0 1px rgba(0, 0, 0, 0.3);
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-tomorrow.css b/themes/prism-tomorrow.css
index c998fb22cb..44f0f7edd0 100644
--- a/themes/prism-tomorrow.css
+++ b/themes/prism-tomorrow.css
@@ -7,7 +7,7 @@
 code[class*="language-"],
 pre[class*="language-"] {
 	color: #ccc;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-twilight.css b/themes/prism-twilight.css
index 89dbe848b4..ab0813410e 100644
--- a/themes/prism-twilight.css
+++ b/themes/prism-twilight.css
@@ -7,7 +7,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: white;
 	direction: ltr;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	text-align: left;
 	text-shadow: 0 -.1em .2em black;
 	white-space: pre;
diff --git a/themes/prism.css b/themes/prism.css
index a04c82c89c..3a57f8e817 100644
--- a/themes/prism.css
+++ b/themes/prism.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: black;
 	text-shadow: 0 1px white;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;

From 9391e09ceef2a641b9e4289a2cefcb672f897ea9 Mon Sep 17 00:00:00 2001
From: Logan Franken <loganfranken@gmail.com>
Date: Tue, 7 Jul 2015 23:22:09 -0700
Subject: [PATCH 076/310] Added regex rule to capture media query media types
 and logical operators in SCSS language

---
 components/prism-scss.js     | 2 +-
 components/prism-scss.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-scss.js b/components/prism-scss.js
index 69ea3c79f3..36b956c4ed 100644
--- a/components/prism-scss.js
+++ b/components/prism-scss.js
@@ -5,7 +5,7 @@ Prism.languages.scss = Prism.languages.extend('css', {
 	},
 	// aturle is just the @***, not the entire rule (to highlight var & stuffs)
 	// + add ability to highlight number & unit for media queries
-	'atrule': /@[\w-]+(?=\s+(\(|\{|;))/i,
+	'atrule': /@[\w-]+.*?(?=\s+(\(|\{|;))/i,
 	// url, compassified
 	'url': /([-a-z]+-)*url(?=\()/i,
 	// CSS selector regex is not appropriate for Sass
diff --git a/components/prism-scss.min.js b/components/prism-scss.min.js
index 7d0d82b47f..ef62fb7fe4 100644
--- a/components/prism-scss.min.js
+++ b/components/prism-scss.min.js
@@ -1 +1 @@
-Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:/@[\w-]+(?=\s+(\(|\{|;))/i,url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/});
\ No newline at end of file
+Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:/@[\w-]+.*?(?=\s+(\(|\{|;))/i,url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/});
\ No newline at end of file

From bf8e032623d0954969374e51d02d3640faa6f1b1 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 09:10:59 +0200
Subject: [PATCH 077/310] Fix SCSS media queries

---
 components/prism-scss.js     | 8 +++++++-
 components/prism-scss.min.js | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/prism-scss.js b/components/prism-scss.js
index 36b956c4ed..907b6632bc 100644
--- a/components/prism-scss.js
+++ b/components/prism-scss.js
@@ -5,7 +5,13 @@ Prism.languages.scss = Prism.languages.extend('css', {
 	},
 	// aturle is just the @***, not the entire rule (to highlight var & stuffs)
 	// + add ability to highlight number & unit for media queries
-	'atrule': /@[\w-]+.*?(?=\s+(\(|\{|;))/i,
+	'atrule': {
+		pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,
+		inside: {
+			'property': Prism.languages.css.property,
+			'punctuation': /[():]/
+		}
+	},
 	// url, compassified
 	'url': /([-a-z]+-)*url(?=\()/i,
 	// CSS selector regex is not appropriate for Sass
diff --git a/components/prism-scss.min.js b/components/prism-scss.min.js
index ef62fb7fe4..a8444e438c 100644
--- a/components/prism-scss.min.js
+++ b/components/prism-scss.min.js
@@ -1 +1 @@
-Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:/@[\w-]+.*?(?=\s+(\(|\{|;))/i,url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/});
\ No newline at end of file
+Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,inside:{property:Prism.languages.css.property,punctuation:/[():]/}},url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/});
\ No newline at end of file

From 1ebcb8e65d35d25e5404029312e8fff14e42c328 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 19:17:36 +0200
Subject: [PATCH 078/310] Markup: highlight single quotes in attr-value as
 punctuation

---
 components/prism-markup.js     | 2 +-
 components/prism-markup.min.js | 2 +-
 prism.js                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-markup.js b/components/prism-markup.js
index eeec921065..12dcc68a66 100644
--- a/components/prism-markup.js
+++ b/components/prism-markup.js
@@ -16,7 +16,7 @@ Prism.languages.markup = {
 			'attr-value': {
 				pattern: /=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,
 				inside: {
-					'punctuation': /=|>|"/
+					'punctuation': /[=>"']/
 				}
 			},
 			'punctuation': /\/?>/,
diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
index 458e87ec48..dc2aa39d5e 100644
--- a/components/prism-markup.min.js
+++ b/components/prism-markup.min.js
@@ -1 +1 @@
-Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/=|>|"/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
+Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 81a2f0b286..f6cac06edd 100644
--- a/prism.js
+++ b/prism.js
@@ -453,7 +453,7 @@ Prism.languages.markup = {
 			'attr-value': {
 				pattern: /=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,
 				inside: {
-					'punctuation': /=|>|"/
+					'punctuation': /[=>"']/
 				}
 			},
 			'punctuation': /\/?>/,

From c19a238bd0e8aa9e7030f2316be117de375abdbd Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 19:18:35 +0200
Subject: [PATCH 079/310] Markup: doctype and prolog can be multi-line.

---
 components/prism-markup.js     | 4 ++--
 components/prism-markup.min.js | 2 +-
 prism.js                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-markup.js b/components/prism-markup.js
index 12dcc68a66..f3abdf28b5 100644
--- a/components/prism-markup.js
+++ b/components/prism-markup.js
@@ -1,7 +1,7 @@
 Prism.languages.markup = {
 	'comment': /<!--[\w\W]*?-->/,
-	'prolog': /<\?.+?\?>/,
-	'doctype': /<!DOCTYPE.+?>/,
+	'prolog': /<\?[\w\W]+?\?>/,
+	'doctype': /<!DOCTYPE[\w\W]+?>/,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
 		pattern: /<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
index dc2aa39d5e..6a17f5eb13 100644
--- a/components/prism-markup.min.js
+++ b/components/prism-markup.min.js
@@ -1 +1 @@
-Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
+Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?[\w\W]+?\?>/,doctype:/<!DOCTYPE[\w\W]+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index f6cac06edd..98a851d6bb 100644
--- a/prism.js
+++ b/prism.js
@@ -437,8 +437,8 @@ if (typeof module !== 'undefined' && module.exports) {
 
 Prism.languages.markup = {
 	'comment': /<!--[\w\W]*?-->/,
-	'prolog': /<\?.+?\?>/,
-	'doctype': /<!DOCTYPE.+?>/,
+	'prolog': /<\?[\w\W]+?\?>/,
+	'doctype': /<!DOCTYPE[\w\W]+?>/,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
 		pattern: /<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,

From eef42485c5981b841b670ffebbc50ba2c4492c87 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 19:24:19 +0200
Subject: [PATCH 080/310] SCSS: Highlight everything inside atrules

---
 components/prism-scss.js     | 7 +++----
 components/prism-scss.min.js | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/prism-scss.js b/components/prism-scss.js
index 907b6632bc..56d643b892 100644
--- a/components/prism-scss.js
+++ b/components/prism-scss.js
@@ -3,13 +3,10 @@ Prism.languages.scss = Prism.languages.extend('css', {
 		pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,
 		lookbehind: true
 	},
-	// aturle is just the @***, not the entire rule (to highlight var & stuffs)
-	// + add ability to highlight number & unit for media queries
 	'atrule': {
 		pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,
 		inside: {
-			'property': Prism.languages.css.property,
-			'punctuation': /[():]/
+			// See rest at the end of the file
 		}
 	},
 	// url, compassified
@@ -40,3 +37,5 @@ Prism.languages.insertBefore('scss', 'function', {
 	'null': /\b(null)\b/,
 	'operator': /\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/
 });
+
+Prism.languages.scss['atrule'].inside.rest = Prism.util.clone(Prism.languages.scss);
\ No newline at end of file
diff --git a/components/prism-scss.min.js b/components/prism-scss.min.js
index a8444e438c..05b354022e 100644
--- a/components/prism-scss.min.js
+++ b/components/prism-scss.min.js
@@ -1 +1 @@
-Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,inside:{property:Prism.languages.css.property,punctuation:/[():]/}},url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/});
\ No newline at end of file
+Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,inside:{}},url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/}),Prism.languages.scss.atrule.inside.rest=Prism.util.clone(Prism.languages.scss);
\ No newline at end of file

From cd0273ee23712b9e3edb003e0c327cdfced60c08 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 19:26:35 +0200
Subject: [PATCH 081/310] CSS: Highlight parentheses as punctuation

---
 components/prism-css.js     | 4 ++--
 components/prism-css.min.js | 2 +-
 prism.js                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-css.js b/components/prism-css.js
index 4b0b721889..68ec5e1ec4 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -11,8 +11,8 @@ Prism.languages.css = {
 	'string': /("|')(\\\n|\\?.)*?\1/,
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,
-	'punctuation': /[\{\};:]/,
-	'function': /[-a-z0-9]+(?=\()/i
+	'function': /[-a-z0-9]+(?=\()/i,
+	'punctuation': /[(){};:]/
 };
 
 if (Prism.languages.markup) {
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index a7d624b0e6..db3214519d 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{punctuation:/[;:]/}},url:/url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/,string:/("|')(\\\n|\\?.)*?\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,punctuation:/[\{\};:]/,"function":/[-a-z0-9]+(?=\()/i},Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{punctuation:/[;:]/}},url:/url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/,string:/("|')(\\\n|\\?.)*?\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 98a851d6bb..31e0ae9c75 100644
--- a/prism.js
+++ b/prism.js
@@ -495,8 +495,8 @@ Prism.languages.css = {
 	'string': /("|')(\\\n|\\?.)*?\1/,
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,
-	'punctuation': /[\{\};:]/,
-	'function': /[-a-z0-9]+(?=\()/i
+	'function': /[-a-z0-9]+(?=\()/i,
+	'punctuation': /[(){};:]/
 };
 
 if (Prism.languages.markup) {

From e25408898e247646d26d23bc7b744d822d427c5b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 19:32:10 +0200
Subject: [PATCH 082/310] CSS: Improve atrules

---
 components/prism-css.js      | 5 ++++-
 components/prism-css.min.js  | 2 +-
 components/prism-scss.js     | 3 ++-
 components/prism-scss.min.js | 2 +-
 prism.js                     | 5 ++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/components/prism-css.js b/components/prism-css.js
index 68ec5e1ec4..ca86ba6f9f 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -3,7 +3,8 @@ Prism.languages.css = {
 	'atrule': {
 		pattern: /@[\w-]+?.*?(;|(?=\s*\{))/i,
 		inside: {
-			'punctuation': /[;:]/
+			'rule': /@[\w-]+/
+			// See rest below
 		}
 	},
 	'url': /url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,
@@ -15,6 +16,8 @@ Prism.languages.css = {
 	'punctuation': /[(){};:]/
 };
 
+Prism.languages.css['atrule'].inside.rest = Prism.util.clone(Prism.languages.css);
+
 if (Prism.languages.markup) {
 	Prism.languages.insertBefore('markup', 'tag', {
 		'style': {
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index db3214519d..f3d20421d2 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{punctuation:/[;:]/}},url:/url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/,string:/("|')(\\\n|\\?.)*?\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/,string:/("|')(\\\n|\\?.)*?\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
diff --git a/components/prism-scss.js b/components/prism-scss.js
index 56d643b892..c798ff86e6 100644
--- a/components/prism-scss.js
+++ b/components/prism-scss.js
@@ -6,7 +6,8 @@ Prism.languages.scss = Prism.languages.extend('css', {
 	'atrule': {
 		pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,
 		inside: {
-			// See rest at the end of the file
+			'rule': /@[\w-]+/
+			// See rest below
 		}
 	},
 	// url, compassified
diff --git a/components/prism-scss.min.js b/components/prism-scss.min.js
index 05b354022e..a7469c723c 100644
--- a/components/prism-scss.min.js
+++ b/components/prism-scss.min.js
@@ -1 +1 @@
-Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,inside:{}},url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/}),Prism.languages.scss.atrule.inside.rest=Prism.util.clone(Prism.languages.scss);
\ No newline at end of file
+Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,inside:{rule:/@[\w-]+/}},url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/}),Prism.languages.scss.atrule.inside.rest=Prism.util.clone(Prism.languages.scss);
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 31e0ae9c75..59c1e13bc2 100644
--- a/prism.js
+++ b/prism.js
@@ -487,7 +487,8 @@ Prism.languages.css = {
 	'atrule': {
 		pattern: /@[\w-]+?.*?(;|(?=\s*\{))/i,
 		inside: {
-			'punctuation': /[;:]/
+			'rule': /@[\w-]+/
+			// See rest below
 		}
 	},
 	'url': /url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,
@@ -499,6 +500,8 @@ Prism.languages.css = {
 	'punctuation': /[(){};:]/
 };
 
+Prism.languages.css['atrule'].inside.rest = Prism.util.clone(Prism.languages.css);
+
 if (Prism.languages.markup) {
 	Prism.languages.insertBefore('markup', 'tag', {
 		'style': {

From 901812c1f041188a73b6062ed41d2058e12c2714 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 19:35:57 +0200
Subject: [PATCH 083/310] CSS: Improved url and string regexps + handle \r

---
 components/prism-css.js     | 4 ++--
 components/prism-css.min.js | 2 +-
 prism.js                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-css.js b/components/prism-css.js
index ca86ba6f9f..9bc63fa637 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -7,9 +7,9 @@ Prism.languages.css = {
 			// See rest below
 		}
 	},
-	'url': /url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,
+	'url': /url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
 	'selector': /[^\{\}\s][^\{\};]*(?=\s*\{)/,
-	'string': /("|')(\\\n|\\?.)*?\1/,
+	'string': /("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,
 	'function': /[-a-z0-9]+(?=\()/i,
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index f3d20421d2..0fdb8d51da 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/,string:/("|')(\\\n|\\?.)*?\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/,string:/("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 59c1e13bc2..49e0a9090c 100644
--- a/prism.js
+++ b/prism.js
@@ -491,9 +491,9 @@ Prism.languages.css = {
 			// See rest below
 		}
 	},
-	'url': /url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,
+	'url': /url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
 	'selector': /[^\{\}\s][^\{\};]*(?=\s*\{)/,
-	'string': /("|')(\\\n|\\?.)*?\1/,
+	'string': /("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,
 	'function': /[-a-z0-9]+(?=\()/i,

From f2e2718f2435a56f79b6177d4708a9364161656f Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 19:39:35 +0200
Subject: [PATCH 084/310] CSS: Selector regexp should not include last spaces
 before brace

---
 components/prism-css.js     | 2 +-
 components/prism-css.min.js | 2 +-
 prism.js                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-css.js b/components/prism-css.js
index 9bc63fa637..995d37e7ee 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -8,7 +8,7 @@ Prism.languages.css = {
 		}
 	},
 	'url': /url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
-	'selector': /[^\{\}\s][^\{\};]*(?=\s*\{)/,
+	'selector': /[^\{\}\s][^\{\};]*?(?=\s*\{)/,
 	'string': /("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index 0fdb8d51da..b320fd77ad 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/,string:/("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 49e0a9090c..889ef42585 100644
--- a/prism.js
+++ b/prism.js
@@ -492,7 +492,7 @@ Prism.languages.css = {
 		}
 	},
 	'url': /url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
-	'selector': /[^\{\}\s][^\{\};]*(?=\s*\{)/,
+	'selector': /[^\{\}\s][^\{\};]*?(?=\s*\{)/,
 	'string': /("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,

From 15760e1805d41bbcb0ac2dd1f75312e61873c270 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 8 Jul 2015 20:23:32 +0200
Subject: [PATCH 085/310] C-like and CSS: Fixes for \r\n

---
 components/prism-clike.js     | 2 +-
 components/prism-clike.min.js | 2 +-
 components/prism-css.js       | 4 ++--
 components/prism-css.min.js   | 2 +-
 prism.js                      | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index 7a5ba2e5dd..378742bc05 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -9,7 +9,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		}
 	],
-	'string': /("|')(\\[\s\S]|(?!\1)[^\\\r\n])*\1/,
+	'string': /("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 	'class-name': {
 		pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index 32ad31cfa1..de8f99a09d 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\[\s\S]|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/components/prism-css.js b/components/prism-css.js
index 995d37e7ee..05af658a7c 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -7,9 +7,9 @@ Prism.languages.css = {
 			// See rest below
 		}
 	},
-	'url': /url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
+	'url': /url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
 	'selector': /[^\{\}\s][^\{\};]*?(?=\s*\{)/,
-	'string': /("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,
+	'string': /("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,
 	'function': /[-a-z0-9]+(?=\()/i,
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index b320fd77ad..da88a59401 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 889ef42585..c57d55872c 100644
--- a/prism.js
+++ b/prism.js
@@ -491,9 +491,9 @@ Prism.languages.css = {
 			// See rest below
 		}
 	},
-	'url': /url\((?:(["'])(\\[\w\W]|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
+	'url': /url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
 	'selector': /[^\{\}\s][^\{\};]*?(?=\s*\{)/,
-	'string': /("|')(\\[\w\W]|(?!\1)[^\\\r\n])*\1/,
+	'string': /("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,
 	'function': /[-a-z0-9]+(?=\()/i,
@@ -551,7 +551,7 @@ Prism.languages.clike = {
 			lookbehind: true
 		}
 	],
-	'string': /("|')(\\[\s\S]|(?!\1)[^\\\r\n])*\1/,
+	'string': /("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 	'class-name': {
 		pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,

From b6535ddba456c5c8ae0225f8f0bec91ff477cb1e Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 10 Jul 2015 08:07:05 +0200
Subject: [PATCH 086/310] C-like: removed unused 'ignore' pattern.

---
 components/prism-clike.js     | 1 -
 components/prism-clike.min.js | 2 +-
 prism.js                      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index 378742bc05..57679cf2bc 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -27,6 +27,5 @@ Prism.languages.clike = {
 	},
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
 	'operator': /[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,
-	'ignore': /&(lt|gt|amp);/i,
 	'punctuation': /[{}[\];(),.:]/
 };
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index de8f99a09d..abae2a8322 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,ignore:/&(lt|gt|amp);/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index c57d55872c..bca193ab34 100644
--- a/prism.js
+++ b/prism.js
@@ -569,7 +569,6 @@ Prism.languages.clike = {
 	},
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
 	'operator': /[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,
-	'ignore': /&(lt|gt|amp);/i,
 	'punctuation': /[{}[\];(),.:]/
 };
 

From 6bf0794c62a80ba21cc78fa5eb12c85f7a01f234 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 10 Jul 2015 08:23:19 +0200
Subject: [PATCH 087/310] ActionScript: Fix ! operator and add ++ and -- as
 whole operators

---
 components/prism-actionscript.js     | 2 +-
 components/prism-actionscript.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-actionscript.js b/components/prism-actionscript.js
index 66b3f7269e..62d8ee5d3f 100644
--- a/components/prism-actionscript.js
+++ b/components/prism-actionscript.js
@@ -4,7 +4,7 @@
 
 Prism.languages.actionscript = Prism.languages.extend('javascript',  {
 	'keyword': /\b(?:as|break|case|catch|class|const|default|delete|do|else|extends|finally|for|function|if|implements|import|in|instanceof|interface|internal|is|native|new|null|package|private|protected|public|return|super|switch|this|throw|try|typeof|use|var|void|while|with|dynamic|each|final|get|include|namespace|native|override|set|static)\b/,
-	'operator': /(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=)=?|[=~?@]/
+	'operator': /\+\+|--|(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=?)=?|[~?@]/
 });
 Prism.languages.actionscript['class-name'].alias = 'function';
 
diff --git a/components/prism-actionscript.min.js b/components/prism-actionscript.min.js
index cbe958c936..d2368bac3a 100644
--- a/components/prism-actionscript.min.js
+++ b/components/prism-actionscript.min.js
@@ -1 +1 @@
-Prism.languages.actionscript=Prism.languages.extend("javascript",{keyword:/\b(?:as|break|case|catch|class|const|default|delete|do|else|extends|finally|for|function|if|implements|import|in|instanceof|interface|internal|is|native|new|null|package|private|protected|public|return|super|switch|this|throw|try|typeof|use|var|void|while|with|dynamic|each|final|get|include|namespace|native|override|set|static)\b/,operator:/(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=)=?|[=~?@]/}),Prism.languages.actionscript["class-name"].alias="function",Prism.languages.markup&&Prism.languages.insertBefore("actionscript","operator",{xml:{pattern:/(^|[^.])<[\s\S]*>(?=\s*($|[\r\n,.;\]})<]))/,inside:{rest:Prism.languages.markup}}});
\ No newline at end of file
+Prism.languages.actionscript=Prism.languages.extend("javascript",{keyword:/\b(?:as|break|case|catch|class|const|default|delete|do|else|extends|finally|for|function|if|implements|import|in|instanceof|interface|internal|is|native|new|null|package|private|protected|public|return|super|switch|this|throw|try|typeof|use|var|void|while|with|dynamic|each|final|get|include|namespace|native|override|set|static)\b/,operator:/\+\+|--|(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=?)=?|[~?@]/}),Prism.languages.actionscript["class-name"].alias="function",Prism.languages.markup&&Prism.languages.insertBefore("actionscript","operator",{xml:{pattern:/(^|[^.])<[\s\S]*>(?=\s*($|[\r\n,.;\]})<]))/,inside:{rest:Prism.languages.markup}}});
\ No newline at end of file

From 90257b0de107ca592c3c6a44eea67fd7169c7c47 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 10 Jul 2015 21:49:55 +0200
Subject: [PATCH 088/310] ActionScript: Fix XML highlighting

---
 components/prism-actionscript.js     | 9 +++------
 components/prism-actionscript.min.js | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/prism-actionscript.js b/components/prism-actionscript.js
index 62d8ee5d3f..ff5804d4d3 100644
--- a/components/prism-actionscript.js
+++ b/components/prism-actionscript.js
@@ -1,7 +1,3 @@
-/* TODO
-	Fix XML highlighting
- */
-
 Prism.languages.actionscript = Prism.languages.extend('javascript',  {
 	'keyword': /\b(?:as|break|case|catch|class|const|default|delete|do|else|extends|finally|for|function|if|implements|import|in|instanceof|interface|internal|is|native|new|null|package|private|protected|public|return|super|switch|this|throw|try|typeof|use|var|void|while|with|dynamic|each|final|get|include|namespace|native|override|set|static)\b/,
 	'operator': /\+\+|--|(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=?)=?|[~?@]/
@@ -9,9 +5,10 @@ Prism.languages.actionscript = Prism.languages.extend('javascript',  {
 Prism.languages.actionscript['class-name'].alias = 'function';
 
 if (Prism.languages.markup) {
-	Prism.languages.insertBefore('actionscript', 'operator', {
+	Prism.languages.insertBefore('actionscript', 'string', {
 		'xml': {
-			pattern: /(^|[^.])<[\s\S]*>(?=\s*($|[\r\n,.;\]})<]))/,
+			pattern: /(^|[^.])<\/?\w+(?:\s+[^\s>\/=]+=("|')(?:\\\1|\\?(?!\1)[\w\W])*\2)*\s*\/?>/,
+			lookbehind: true,
 			inside: {
 				rest: Prism.languages.markup
 			}
diff --git a/components/prism-actionscript.min.js b/components/prism-actionscript.min.js
index d2368bac3a..91a859074c 100644
--- a/components/prism-actionscript.min.js
+++ b/components/prism-actionscript.min.js
@@ -1 +1 @@
-Prism.languages.actionscript=Prism.languages.extend("javascript",{keyword:/\b(?:as|break|case|catch|class|const|default|delete|do|else|extends|finally|for|function|if|implements|import|in|instanceof|interface|internal|is|native|new|null|package|private|protected|public|return|super|switch|this|throw|try|typeof|use|var|void|while|with|dynamic|each|final|get|include|namespace|native|override|set|static)\b/,operator:/\+\+|--|(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=?)=?|[~?@]/}),Prism.languages.actionscript["class-name"].alias="function",Prism.languages.markup&&Prism.languages.insertBefore("actionscript","operator",{xml:{pattern:/(^|[^.])<[\s\S]*>(?=\s*($|[\r\n,.;\]})<]))/,inside:{rest:Prism.languages.markup}}});
\ No newline at end of file
+Prism.languages.actionscript=Prism.languages.extend("javascript",{keyword:/\b(?:as|break|case|catch|class|const|default|delete|do|else|extends|finally|for|function|if|implements|import|in|instanceof|interface|internal|is|native|new|null|package|private|protected|public|return|super|switch|this|throw|try|typeof|use|var|void|while|with|dynamic|each|final|get|include|namespace|native|override|set|static)\b/,operator:/\+\+|--|(?:[+\-*\/%^]|&&?|\|\|?|<<?|>>?>?|[!=]=?)=?|[~?@]/}),Prism.languages.actionscript["class-name"].alias="function",Prism.languages.markup&&Prism.languages.insertBefore("actionscript","string",{xml:{pattern:/(^|[^.])<\/?\w+(?:\s+[^\s>\/=]+=("|')(?:\\\1|\\?(?!\1)[\w\W])*\2)*\s*\/?>/,lookbehind:!0,inside:{rest:Prism.languages.markup}}});
\ No newline at end of file

From 2c1626a731321b55a38c7a8ba2d142641d65a29d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 10 Jul 2015 22:01:06 +0200
Subject: [PATCH 089/310] ActionScript: Update examples to add inline XML

---
 examples/prism-actionscript.html | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/examples/prism-actionscript.html b/examples/prism-actionscript.html
index cf4e33462e..416bae2f7e 100644
--- a/examples/prism-actionscript.html
+++ b/examples/prism-actionscript.html
@@ -19,6 +19,29 @@ <h2>Classes</h2>
 <pre><code>class A {}
 class B extends A {}</code></pre>
 
+<h2>Inline XML</h2>
+<pre><code>var employees:XML =
+    &lt;employees>
+        &lt;employee ssn="123-123-1234">
+            &lt;name first="John" last="Doe"/>
+            &lt;address>
+                &lt;street>11 Main St.&lt;/street>
+                &lt;city>San Francisco&lt;/city>
+                &lt;state>CA&lt;/state>
+                &lt;zip>98765&lt;/zip>
+            &lt;/address>
+        &lt;/employee>
+        &lt;employee ssn="789-789-7890">
+            &lt;name first="Mary" last="Roe"/>
+            &lt;address>
+                &lt;street>99 Broad St.&lt;/street>
+                &lt;city>Newton&lt;/city>
+                &lt;state>MA&lt;/state>
+                &lt;zip>01234&lt;/zip>
+            &lt;/address>
+        &lt;/employee>
+    &lt;/employees>;</code></pre>
+
 <h2>Full example</h2>
 <pre><code>package {
   import flash.display.*;

From 39877114faecb0235f6e19e35686572a4eee07fa Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 10 Jul 2015 22:04:05 +0200
Subject: [PATCH 090/310] ActionScript: Update examples to add inline XML

---
 examples/prism-actionscript.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/examples/prism-actionscript.html b/examples/prism-actionscript.html
index 416bae2f7e..5c3f297f8c 100644
--- a/examples/prism-actionscript.html
+++ b/examples/prism-actionscript.html
@@ -25,7 +25,6 @@ <h2>Inline XML</h2>
         &lt;employee ssn="123-123-1234">
             &lt;name first="John" last="Doe"/>
             &lt;address>
-                &lt;street>11 Main St.&lt;/street>
                 &lt;city>San Francisco&lt;/city>
                 &lt;state>CA&lt;/state>
                 &lt;zip>98765&lt;/zip>
@@ -34,7 +33,6 @@ <h2>Inline XML</h2>
         &lt;employee ssn="789-789-7890">
             &lt;name first="Mary" last="Roe"/>
             &lt;address>
-                &lt;street>99 Broad St.&lt;/street>
                 &lt;city>Newton&lt;/city>
                 &lt;state>MA&lt;/state>
                 &lt;zip>01234&lt;/zip>

From e87efd8bd703542aabf8c6cb0d6f91d13e2c6970 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 10 Jul 2015 22:21:08 +0200
Subject: [PATCH 091/310] Apacheconf: don't include the spaces in
 directive-inline

---
 components/prism-apacheconf.js     | 3 ++-
 components/prism-apacheconf.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/prism-apacheconf.js b/components/prism-apacheconf.js
index 8fac6dfc09..31db26bfd6 100644
--- a/components/prism-apacheconf.js
+++ b/components/prism-apacheconf.js
@@ -1,7 +1,8 @@
 Prism.languages.apacheconf = {
 	'comment': /#.*/,
 	'directive-inline': {
-		pattern: /^\s*\b(AcceptFilter|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding|AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch|Allow|AllowCONNECT|AllowEncodedSlashes|AllowMethods|AllowOverride|AllowOverrideList|Anonymous|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID|Anonymous_VerifyEmail|AsyncRequestWorkerFactor|AuthBasicAuthoritative|AuthBasicFake|AuthBasicProvider|AuthBasicUseDigestAlgorithm|AuthDBDUserPWQuery|AuthDBDUserRealmQuery|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm|AuthDigestDomain|AuthDigestNonceLifetime|AuthDigestProvider|AuthDigestQop|AuthDigestShmemSize|AuthFormAuthoritative|AuthFormBody|AuthFormDisableNoStore|AuthFormFakeBasicAuth|AuthFormLocation|AuthFormLoginRequiredLocation|AuthFormLoginSuccessLocation|AuthFormLogoutLocation|AuthFormMethod|AuthFormMimetype|AuthFormPassword|AuthFormProvider|AuthFormSitePassphrase|AuthFormSize|AuthFormUsername|AuthGroupFile|AuthLDAPAuthorizePrefix|AuthLDAPBindAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareAsUser|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPInitialBindAsUser|AuthLDAPInitialBindPattern|AuthLDAPMaxSubGroupDepth|AuthLDAPRemoteUserAttribute|AuthLDAPRemoteUserIsDN|AuthLDAPSearchAsUser|AuthLDAPSubGroupAttribute|AuthLDAPSubGroupClass|AuthLDAPUrl|AuthMerging|AuthName|AuthnCacheContext|AuthnCacheEnable|AuthnCacheProvideFor|AuthnCacheSOCache|AuthnCacheTimeout|AuthnzFcgiCheckAuthnProvider|AuthnzFcgiDefineProvider|AuthType|AuthUserFile|AuthzDBDLoginToReferer|AuthzDBDQuery|AuthzDBDRedirectQuery|AuthzDBMType|AuthzSendForbiddenOnFailure|BalancerGrowth|BalancerInherit|BalancerMember|BalancerPersist|BrowserMatch|BrowserMatchNoCase|BufferedLogs|BufferSize|CacheDefaultExpire|CacheDetailHeader|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheFile|CacheHeader|CacheIgnoreCacheControl|CacheIgnoreHeaders|CacheIgnoreNoLastMod|CacheIgnoreQueryString|CacheIgnoreURLSessionIdentifiers|CacheKeyBaseURL|CacheLastModifiedFactor|CacheLock|CacheLockMaxAge|CacheLockPath|CacheMaxExpire|CacheMaxFileSize|CacheMinExpire|CacheMinFileSize|CacheNegotiatedDocs|CacheQuickHandler|CacheReadSize|CacheReadTime|CacheRoot|CacheSocache|CacheSocacheMaxSize|CacheSocacheMaxTime|CacheSocacheMinTime|CacheSocacheReadSize|CacheSocacheReadTime|CacheStaleOnError|CacheStoreExpired|CacheStoreNoStore|CacheStorePrivate|CGIDScriptTimeout|CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckCaseOnly|CheckSpelling|ChrootDir|ContentDigest|CookieDomain|CookieExpires|CookieName|CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavGenericLockDB|DavLockDB|DavMinTimeout|DBDExptime|DBDInitSQL|DBDKeep|DBDMax|DBDMin|DBDParams|DBDPersist|DBDPrepareSQL|DBDriver|DefaultIcon|DefaultLanguage|DefaultRuntimeDir|DefaultType|Define|DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateInflateLimitRequestBody|DeflateInflateRatioBurst|DeflateInflateRatioLimit|DeflateMemLevel|DeflateWindowSize|Deny|DirectoryCheckHandler|DirectoryIndex|DirectoryIndexRedirect|DirectorySlash|DocumentRoot|DTracePrivileges|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|Error|ErrorDocument|ErrorLog|ErrorLogFormat|Example|ExpiresActive|ExpiresByType|ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FallbackResource|FileETag|FilterChain|FilterDeclare|FilterProtocol|FilterProvider|FilterTrace|ForceLanguagePriority|ForceType|ForensicLog|GprofDir|GracefulShutdownTimeout|Group|Header|HeaderName|HeartbeatAddress|HeartbeatListen|HeartbeatMaxServers|HeartbeatStorage|HeartbeatStorage|HostnameLookups|IdentityCheck|IdentityCheckTimeout|ImapBase|ImapDefault|ImapMenu|Include|IncludeOptional|IndexHeadInsert|IndexIgnore|IndexIgnoreReset|IndexOptions|IndexOrderDefault|IndexStyleSheet|InputSed|ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout|KeptBodySize|LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionPoolTTL|LDAPConnectionTimeout|LDAPLibraryDebug|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPReferralHopLimit|LDAPReferrals|LDAPRetries|LDAPRetryDelay|LDAPSharedCacheFile|LDAPSharedCacheSize|LDAPTimeout|LDAPTrustedClientCert|LDAPTrustedGlobalCert|LDAPTrustedMode|LDAPVerifyServerCert|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine|LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|LogFormat|LogLevel|LogMessage|LuaAuthzProvider|LuaCodeCache|LuaHookAccessChecker|LuaHookAuthChecker|LuaHookCheckUserID|LuaHookFixups|LuaHookInsertFilter|LuaHookLog|LuaHookMapToStorage|LuaHookTranslateName|LuaHookTypeChecker|LuaInherit|LuaInputFilter|LuaMapHandler|LuaOutputFilter|LuaPackageCPath|LuaPackagePath|LuaQuickHandler|LuaRoot|LuaScope|MaxConnectionsPerChild|MaxKeepAliveRequests|MaxMemFree|MaxRangeOverlaps|MaxRangeReversals|MaxRanges|MaxRequestWorkers|MaxSpareServers|MaxSpareThreads|MaxThreads|MergeTrailers|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads|MMapFile|ModemStandard|ModMimeUsePathInfo|MultiviewsMatch|Mutex|NameVirtualHost|NoProxy|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|OutputSed|PassEnv|PidFile|PrivilegesMode|Protocol|ProtocolEcho|ProxyAddHeaders|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyExpressDBMFile|ProxyExpressDBMType|ProxyExpressEnable|ProxyFtpDirCharset|ProxyFtpEscapeWildcards|ProxyFtpListOnWildcard|ProxyHTMLBufSize|ProxyHTMLCharsetOut|ProxyHTMLDocType|ProxyHTMLEnable|ProxyHTMLEvents|ProxyHTMLExtended|ProxyHTMLFixups|ProxyHTMLInterp|ProxyHTMLLinks|ProxyHTMLMeta|ProxyHTMLStripComments|ProxyHTMLURLMap|ProxyIOBufferSize|ProxyMaxForwards|ProxyPass|ProxyPassInherit|ProxyPassInterpolateEnv|ProxyPassMatch|ProxyPassReverse|ProxyPassReverseCookieDomain|ProxyPassReverseCookiePath|ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxySCGIInternalRedirect|ProxySCGISendfile|ProxySet|ProxySourceAddress|ProxyStatus|ProxyTimeout|ProxyVia|ReadmeName|ReceiveBufferSize|Redirect|RedirectMatch|RedirectPermanent|RedirectTemp|ReflectorHeader|RemoteIPHeader|RemoteIPInternalProxy|RemoteIPInternalProxyList|RemoteIPProxiesHeader|RemoteIPTrustedProxy|RemoteIPTrustedProxyList|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader|RequestReadTimeout|Require|RewriteBase|RewriteCond|RewriteEngine|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC|Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen|SeeRequestTail|SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|Session|SessionCookieName|SessionCookieName2|SessionCookieRemove|SessionCryptoCipher|SessionCryptoDriver|SessionCryptoPassphrase|SessionCryptoPassphraseFile|SessionDBDCookieName|SessionDBDCookieName2|SessionDBDCookieRemove|SessionDBDDeleteLabel|SessionDBDInsertLabel|SessionDBDPerUser|SessionDBDSelectLabel|SessionDBDUpdateLabel|SessionEnv|SessionExclude|SessionHeader|SessionInclude|SessionMaxAge|SetEnv|SetEnvIf|SetEnvIfExpr|SetEnvIfNoCase|SetHandler|SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIETag|SSILastModified|SSILegacyExprParser|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath|SSLCADNRequestFile|SSLCADNRequestPath|SSLCARevocationCheck|SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLCompression|SSLCryptoDevice|SSLEngine|SSLFIPS|SSLHonorCipherOrder|SSLInsecureRenegotiation|SSLOCSPDefaultResponder|SSLOCSPEnable|SSLOCSPOverrideResponder|SSLOCSPResponderTimeout|SSLOCSPResponseMaxAge|SSLOCSPResponseTimeSkew|SSLOCSPUseRequestNonce|SSLOpenSSLConfCmd|SSLOptions|SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationCheck|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCheckPeerCN|SSLProxyCheckPeerExpire|SSLProxyCheckPeerName|SSLProxyCipherSuite|SSLProxyEngine|SSLProxyMachineCertificateChainFile|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRenegBufferSize|SSLRequire|SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLSessionTicketKeyFile|SSLSRPUnknownUserSeed|SSLSRPVerifierFile|SSLStaplingCache|SSLStaplingErrorCacheTimeout|SSLStaplingFakeTryLater|SSLStaplingForceURL|SSLStaplingResponderTimeout|SSLStaplingResponseMaxAge|SSLStaplingResponseTimeSkew|SSLStaplingReturnResponderErrors|SSLStaplingStandardCacheTimeout|SSLStrictSNIVHostCheck|SSLUserName|SSLUseStapling|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|Substitute|Suexec|SuexecUserGroup|ThreadLimit|ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnDefine|UndefMacro|UnsetEnv|Use|UseCanonicalName|UseCanonicalPhysicalPort|User|UserDir|VHostCGIMode|VHostCGIPrivs|VHostGroup|VHostPrivs|VHostSecure|VHostUser|VirtualDocumentRoot|VirtualDocumentRootIP|VirtualScriptAlias|VirtualScriptAliasIP|WatchdogInterval|XBitHack|xml2EncAlias|xml2EncDefault|xml2StartParse)\b/mi,
+		pattern: /^(\s*)\b(AcceptFilter|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding|AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch|Allow|AllowCONNECT|AllowEncodedSlashes|AllowMethods|AllowOverride|AllowOverrideList|Anonymous|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID|Anonymous_VerifyEmail|AsyncRequestWorkerFactor|AuthBasicAuthoritative|AuthBasicFake|AuthBasicProvider|AuthBasicUseDigestAlgorithm|AuthDBDUserPWQuery|AuthDBDUserRealmQuery|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm|AuthDigestDomain|AuthDigestNonceLifetime|AuthDigestProvider|AuthDigestQop|AuthDigestShmemSize|AuthFormAuthoritative|AuthFormBody|AuthFormDisableNoStore|AuthFormFakeBasicAuth|AuthFormLocation|AuthFormLoginRequiredLocation|AuthFormLoginSuccessLocation|AuthFormLogoutLocation|AuthFormMethod|AuthFormMimetype|AuthFormPassword|AuthFormProvider|AuthFormSitePassphrase|AuthFormSize|AuthFormUsername|AuthGroupFile|AuthLDAPAuthorizePrefix|AuthLDAPBindAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareAsUser|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPInitialBindAsUser|AuthLDAPInitialBindPattern|AuthLDAPMaxSubGroupDepth|AuthLDAPRemoteUserAttribute|AuthLDAPRemoteUserIsDN|AuthLDAPSearchAsUser|AuthLDAPSubGroupAttribute|AuthLDAPSubGroupClass|AuthLDAPUrl|AuthMerging|AuthName|AuthnCacheContext|AuthnCacheEnable|AuthnCacheProvideFor|AuthnCacheSOCache|AuthnCacheTimeout|AuthnzFcgiCheckAuthnProvider|AuthnzFcgiDefineProvider|AuthType|AuthUserFile|AuthzDBDLoginToReferer|AuthzDBDQuery|AuthzDBDRedirectQuery|AuthzDBMType|AuthzSendForbiddenOnFailure|BalancerGrowth|BalancerInherit|BalancerMember|BalancerPersist|BrowserMatch|BrowserMatchNoCase|BufferedLogs|BufferSize|CacheDefaultExpire|CacheDetailHeader|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheFile|CacheHeader|CacheIgnoreCacheControl|CacheIgnoreHeaders|CacheIgnoreNoLastMod|CacheIgnoreQueryString|CacheIgnoreURLSessionIdentifiers|CacheKeyBaseURL|CacheLastModifiedFactor|CacheLock|CacheLockMaxAge|CacheLockPath|CacheMaxExpire|CacheMaxFileSize|CacheMinExpire|CacheMinFileSize|CacheNegotiatedDocs|CacheQuickHandler|CacheReadSize|CacheReadTime|CacheRoot|CacheSocache|CacheSocacheMaxSize|CacheSocacheMaxTime|CacheSocacheMinTime|CacheSocacheReadSize|CacheSocacheReadTime|CacheStaleOnError|CacheStoreExpired|CacheStoreNoStore|CacheStorePrivate|CGIDScriptTimeout|CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckCaseOnly|CheckSpelling|ChrootDir|ContentDigest|CookieDomain|CookieExpires|CookieName|CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavGenericLockDB|DavLockDB|DavMinTimeout|DBDExptime|DBDInitSQL|DBDKeep|DBDMax|DBDMin|DBDParams|DBDPersist|DBDPrepareSQL|DBDriver|DefaultIcon|DefaultLanguage|DefaultRuntimeDir|DefaultType|Define|DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateInflateLimitRequestBody|DeflateInflateRatioBurst|DeflateInflateRatioLimit|DeflateMemLevel|DeflateWindowSize|Deny|DirectoryCheckHandler|DirectoryIndex|DirectoryIndexRedirect|DirectorySlash|DocumentRoot|DTracePrivileges|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|Error|ErrorDocument|ErrorLog|ErrorLogFormat|Example|ExpiresActive|ExpiresByType|ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FallbackResource|FileETag|FilterChain|FilterDeclare|FilterProtocol|FilterProvider|FilterTrace|ForceLanguagePriority|ForceType|ForensicLog|GprofDir|GracefulShutdownTimeout|Group|Header|HeaderName|HeartbeatAddress|HeartbeatListen|HeartbeatMaxServers|HeartbeatStorage|HeartbeatStorage|HostnameLookups|IdentityCheck|IdentityCheckTimeout|ImapBase|ImapDefault|ImapMenu|Include|IncludeOptional|IndexHeadInsert|IndexIgnore|IndexIgnoreReset|IndexOptions|IndexOrderDefault|IndexStyleSheet|InputSed|ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout|KeptBodySize|LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionPoolTTL|LDAPConnectionTimeout|LDAPLibraryDebug|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPReferralHopLimit|LDAPReferrals|LDAPRetries|LDAPRetryDelay|LDAPSharedCacheFile|LDAPSharedCacheSize|LDAPTimeout|LDAPTrustedClientCert|LDAPTrustedGlobalCert|LDAPTrustedMode|LDAPVerifyServerCert|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine|LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|LogFormat|LogLevel|LogMessage|LuaAuthzProvider|LuaCodeCache|LuaHookAccessChecker|LuaHookAuthChecker|LuaHookCheckUserID|LuaHookFixups|LuaHookInsertFilter|LuaHookLog|LuaHookMapToStorage|LuaHookTranslateName|LuaHookTypeChecker|LuaInherit|LuaInputFilter|LuaMapHandler|LuaOutputFilter|LuaPackageCPath|LuaPackagePath|LuaQuickHandler|LuaRoot|LuaScope|MaxConnectionsPerChild|MaxKeepAliveRequests|MaxMemFree|MaxRangeOverlaps|MaxRangeReversals|MaxRanges|MaxRequestWorkers|MaxSpareServers|MaxSpareThreads|MaxThreads|MergeTrailers|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads|MMapFile|ModemStandard|ModMimeUsePathInfo|MultiviewsMatch|Mutex|NameVirtualHost|NoProxy|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|OutputSed|PassEnv|PidFile|PrivilegesMode|Protocol|ProtocolEcho|ProxyAddHeaders|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyExpressDBMFile|ProxyExpressDBMType|ProxyExpressEnable|ProxyFtpDirCharset|ProxyFtpEscapeWildcards|ProxyFtpListOnWildcard|ProxyHTMLBufSize|ProxyHTMLCharsetOut|ProxyHTMLDocType|ProxyHTMLEnable|ProxyHTMLEvents|ProxyHTMLExtended|ProxyHTMLFixups|ProxyHTMLInterp|ProxyHTMLLinks|ProxyHTMLMeta|ProxyHTMLStripComments|ProxyHTMLURLMap|ProxyIOBufferSize|ProxyMaxForwards|ProxyPass|ProxyPassInherit|ProxyPassInterpolateEnv|ProxyPassMatch|ProxyPassReverse|ProxyPassReverseCookieDomain|ProxyPassReverseCookiePath|ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxySCGIInternalRedirect|ProxySCGISendfile|ProxySet|ProxySourceAddress|ProxyStatus|ProxyTimeout|ProxyVia|ReadmeName|ReceiveBufferSize|Redirect|RedirectMatch|RedirectPermanent|RedirectTemp|ReflectorHeader|RemoteIPHeader|RemoteIPInternalProxy|RemoteIPInternalProxyList|RemoteIPProxiesHeader|RemoteIPTrustedProxy|RemoteIPTrustedProxyList|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader|RequestReadTimeout|Require|RewriteBase|RewriteCond|RewriteEngine|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC|Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen|SeeRequestTail|SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|Session|SessionCookieName|SessionCookieName2|SessionCookieRemove|SessionCryptoCipher|SessionCryptoDriver|SessionCryptoPassphrase|SessionCryptoPassphraseFile|SessionDBDCookieName|SessionDBDCookieName2|SessionDBDCookieRemove|SessionDBDDeleteLabel|SessionDBDInsertLabel|SessionDBDPerUser|SessionDBDSelectLabel|SessionDBDUpdateLabel|SessionEnv|SessionExclude|SessionHeader|SessionInclude|SessionMaxAge|SetEnv|SetEnvIf|SetEnvIfExpr|SetEnvIfNoCase|SetHandler|SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIETag|SSILastModified|SSILegacyExprParser|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath|SSLCADNRequestFile|SSLCADNRequestPath|SSLCARevocationCheck|SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLCompression|SSLCryptoDevice|SSLEngine|SSLFIPS|SSLHonorCipherOrder|SSLInsecureRenegotiation|SSLOCSPDefaultResponder|SSLOCSPEnable|SSLOCSPOverrideResponder|SSLOCSPResponderTimeout|SSLOCSPResponseMaxAge|SSLOCSPResponseTimeSkew|SSLOCSPUseRequestNonce|SSLOpenSSLConfCmd|SSLOptions|SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationCheck|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCheckPeerCN|SSLProxyCheckPeerExpire|SSLProxyCheckPeerName|SSLProxyCipherSuite|SSLProxyEngine|SSLProxyMachineCertificateChainFile|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRenegBufferSize|SSLRequire|SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLSessionTicketKeyFile|SSLSRPUnknownUserSeed|SSLSRPVerifierFile|SSLStaplingCache|SSLStaplingErrorCacheTimeout|SSLStaplingFakeTryLater|SSLStaplingForceURL|SSLStaplingResponderTimeout|SSLStaplingResponseMaxAge|SSLStaplingResponseTimeSkew|SSLStaplingReturnResponderErrors|SSLStaplingStandardCacheTimeout|SSLStrictSNIVHostCheck|SSLUserName|SSLUseStapling|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|Substitute|Suexec|SuexecUserGroup|ThreadLimit|ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnDefine|UndefMacro|UnsetEnv|Use|UseCanonicalName|UseCanonicalPhysicalPort|User|UserDir|VHostCGIMode|VHostCGIPrivs|VHostGroup|VHostPrivs|VHostSecure|VHostUser|VirtualDocumentRoot|VirtualDocumentRootIP|VirtualScriptAlias|VirtualScriptAliasIP|WatchdogInterval|XBitHack|xml2EncAlias|xml2EncDefault|xml2StartParse)\b/mi,
+		lookbehind: true,
 		alias: 'property'
 	},
 	'directive-block': {
diff --git a/components/prism-apacheconf.min.js b/components/prism-apacheconf.min.js
index 6ccefa7d74..05577c5be3 100644
--- a/components/prism-apacheconf.min.js
+++ b/components/prism-apacheconf.min.js
@@ -1 +1 @@
-Prism.languages.apacheconf={comment:/#.*/,"directive-inline":{pattern:/^\s*\b(AcceptFilter|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding|AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch|Allow|AllowCONNECT|AllowEncodedSlashes|AllowMethods|AllowOverride|AllowOverrideList|Anonymous|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID|Anonymous_VerifyEmail|AsyncRequestWorkerFactor|AuthBasicAuthoritative|AuthBasicFake|AuthBasicProvider|AuthBasicUseDigestAlgorithm|AuthDBDUserPWQuery|AuthDBDUserRealmQuery|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm|AuthDigestDomain|AuthDigestNonceLifetime|AuthDigestProvider|AuthDigestQop|AuthDigestShmemSize|AuthFormAuthoritative|AuthFormBody|AuthFormDisableNoStore|AuthFormFakeBasicAuth|AuthFormLocation|AuthFormLoginRequiredLocation|AuthFormLoginSuccessLocation|AuthFormLogoutLocation|AuthFormMethod|AuthFormMimetype|AuthFormPassword|AuthFormProvider|AuthFormSitePassphrase|AuthFormSize|AuthFormUsername|AuthGroupFile|AuthLDAPAuthorizePrefix|AuthLDAPBindAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareAsUser|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPInitialBindAsUser|AuthLDAPInitialBindPattern|AuthLDAPMaxSubGroupDepth|AuthLDAPRemoteUserAttribute|AuthLDAPRemoteUserIsDN|AuthLDAPSearchAsUser|AuthLDAPSubGroupAttribute|AuthLDAPSubGroupClass|AuthLDAPUrl|AuthMerging|AuthName|AuthnCacheContext|AuthnCacheEnable|AuthnCacheProvideFor|AuthnCacheSOCache|AuthnCacheTimeout|AuthnzFcgiCheckAuthnProvider|AuthnzFcgiDefineProvider|AuthType|AuthUserFile|AuthzDBDLoginToReferer|AuthzDBDQuery|AuthzDBDRedirectQuery|AuthzDBMType|AuthzSendForbiddenOnFailure|BalancerGrowth|BalancerInherit|BalancerMember|BalancerPersist|BrowserMatch|BrowserMatchNoCase|BufferedLogs|BufferSize|CacheDefaultExpire|CacheDetailHeader|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheFile|CacheHeader|CacheIgnoreCacheControl|CacheIgnoreHeaders|CacheIgnoreNoLastMod|CacheIgnoreQueryString|CacheIgnoreURLSessionIdentifiers|CacheKeyBaseURL|CacheLastModifiedFactor|CacheLock|CacheLockMaxAge|CacheLockPath|CacheMaxExpire|CacheMaxFileSize|CacheMinExpire|CacheMinFileSize|CacheNegotiatedDocs|CacheQuickHandler|CacheReadSize|CacheReadTime|CacheRoot|CacheSocache|CacheSocacheMaxSize|CacheSocacheMaxTime|CacheSocacheMinTime|CacheSocacheReadSize|CacheSocacheReadTime|CacheStaleOnError|CacheStoreExpired|CacheStoreNoStore|CacheStorePrivate|CGIDScriptTimeout|CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckCaseOnly|CheckSpelling|ChrootDir|ContentDigest|CookieDomain|CookieExpires|CookieName|CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavGenericLockDB|DavLockDB|DavMinTimeout|DBDExptime|DBDInitSQL|DBDKeep|DBDMax|DBDMin|DBDParams|DBDPersist|DBDPrepareSQL|DBDriver|DefaultIcon|DefaultLanguage|DefaultRuntimeDir|DefaultType|Define|DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateInflateLimitRequestBody|DeflateInflateRatioBurst|DeflateInflateRatioLimit|DeflateMemLevel|DeflateWindowSize|Deny|DirectoryCheckHandler|DirectoryIndex|DirectoryIndexRedirect|DirectorySlash|DocumentRoot|DTracePrivileges|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|Error|ErrorDocument|ErrorLog|ErrorLogFormat|Example|ExpiresActive|ExpiresByType|ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FallbackResource|FileETag|FilterChain|FilterDeclare|FilterProtocol|FilterProvider|FilterTrace|ForceLanguagePriority|ForceType|ForensicLog|GprofDir|GracefulShutdownTimeout|Group|Header|HeaderName|HeartbeatAddress|HeartbeatListen|HeartbeatMaxServers|HeartbeatStorage|HeartbeatStorage|HostnameLookups|IdentityCheck|IdentityCheckTimeout|ImapBase|ImapDefault|ImapMenu|Include|IncludeOptional|IndexHeadInsert|IndexIgnore|IndexIgnoreReset|IndexOptions|IndexOrderDefault|IndexStyleSheet|InputSed|ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout|KeptBodySize|LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionPoolTTL|LDAPConnectionTimeout|LDAPLibraryDebug|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPReferralHopLimit|LDAPReferrals|LDAPRetries|LDAPRetryDelay|LDAPSharedCacheFile|LDAPSharedCacheSize|LDAPTimeout|LDAPTrustedClientCert|LDAPTrustedGlobalCert|LDAPTrustedMode|LDAPVerifyServerCert|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine|LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|LogFormat|LogLevel|LogMessage|LuaAuthzProvider|LuaCodeCache|LuaHookAccessChecker|LuaHookAuthChecker|LuaHookCheckUserID|LuaHookFixups|LuaHookInsertFilter|LuaHookLog|LuaHookMapToStorage|LuaHookTranslateName|LuaHookTypeChecker|LuaInherit|LuaInputFilter|LuaMapHandler|LuaOutputFilter|LuaPackageCPath|LuaPackagePath|LuaQuickHandler|LuaRoot|LuaScope|MaxConnectionsPerChild|MaxKeepAliveRequests|MaxMemFree|MaxRangeOverlaps|MaxRangeReversals|MaxRanges|MaxRequestWorkers|MaxSpareServers|MaxSpareThreads|MaxThreads|MergeTrailers|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads|MMapFile|ModemStandard|ModMimeUsePathInfo|MultiviewsMatch|Mutex|NameVirtualHost|NoProxy|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|OutputSed|PassEnv|PidFile|PrivilegesMode|Protocol|ProtocolEcho|ProxyAddHeaders|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyExpressDBMFile|ProxyExpressDBMType|ProxyExpressEnable|ProxyFtpDirCharset|ProxyFtpEscapeWildcards|ProxyFtpListOnWildcard|ProxyHTMLBufSize|ProxyHTMLCharsetOut|ProxyHTMLDocType|ProxyHTMLEnable|ProxyHTMLEvents|ProxyHTMLExtended|ProxyHTMLFixups|ProxyHTMLInterp|ProxyHTMLLinks|ProxyHTMLMeta|ProxyHTMLStripComments|ProxyHTMLURLMap|ProxyIOBufferSize|ProxyMaxForwards|ProxyPass|ProxyPassInherit|ProxyPassInterpolateEnv|ProxyPassMatch|ProxyPassReverse|ProxyPassReverseCookieDomain|ProxyPassReverseCookiePath|ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxySCGIInternalRedirect|ProxySCGISendfile|ProxySet|ProxySourceAddress|ProxyStatus|ProxyTimeout|ProxyVia|ReadmeName|ReceiveBufferSize|Redirect|RedirectMatch|RedirectPermanent|RedirectTemp|ReflectorHeader|RemoteIPHeader|RemoteIPInternalProxy|RemoteIPInternalProxyList|RemoteIPProxiesHeader|RemoteIPTrustedProxy|RemoteIPTrustedProxyList|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader|RequestReadTimeout|Require|RewriteBase|RewriteCond|RewriteEngine|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC|Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen|SeeRequestTail|SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|Session|SessionCookieName|SessionCookieName2|SessionCookieRemove|SessionCryptoCipher|SessionCryptoDriver|SessionCryptoPassphrase|SessionCryptoPassphraseFile|SessionDBDCookieName|SessionDBDCookieName2|SessionDBDCookieRemove|SessionDBDDeleteLabel|SessionDBDInsertLabel|SessionDBDPerUser|SessionDBDSelectLabel|SessionDBDUpdateLabel|SessionEnv|SessionExclude|SessionHeader|SessionInclude|SessionMaxAge|SetEnv|SetEnvIf|SetEnvIfExpr|SetEnvIfNoCase|SetHandler|SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIETag|SSILastModified|SSILegacyExprParser|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath|SSLCADNRequestFile|SSLCADNRequestPath|SSLCARevocationCheck|SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLCompression|SSLCryptoDevice|SSLEngine|SSLFIPS|SSLHonorCipherOrder|SSLInsecureRenegotiation|SSLOCSPDefaultResponder|SSLOCSPEnable|SSLOCSPOverrideResponder|SSLOCSPResponderTimeout|SSLOCSPResponseMaxAge|SSLOCSPResponseTimeSkew|SSLOCSPUseRequestNonce|SSLOpenSSLConfCmd|SSLOptions|SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationCheck|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCheckPeerCN|SSLProxyCheckPeerExpire|SSLProxyCheckPeerName|SSLProxyCipherSuite|SSLProxyEngine|SSLProxyMachineCertificateChainFile|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRenegBufferSize|SSLRequire|SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLSessionTicketKeyFile|SSLSRPUnknownUserSeed|SSLSRPVerifierFile|SSLStaplingCache|SSLStaplingErrorCacheTimeout|SSLStaplingFakeTryLater|SSLStaplingForceURL|SSLStaplingResponderTimeout|SSLStaplingResponseMaxAge|SSLStaplingResponseTimeSkew|SSLStaplingReturnResponderErrors|SSLStaplingStandardCacheTimeout|SSLStrictSNIVHostCheck|SSLUserName|SSLUseStapling|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|Substitute|Suexec|SuexecUserGroup|ThreadLimit|ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnDefine|UndefMacro|UnsetEnv|Use|UseCanonicalName|UseCanonicalPhysicalPort|User|UserDir|VHostCGIMode|VHostCGIPrivs|VHostGroup|VHostPrivs|VHostSecure|VHostUser|VirtualDocumentRoot|VirtualDocumentRootIP|VirtualScriptAlias|VirtualScriptAliasIP|WatchdogInterval|XBitHack|xml2EncAlias|xml2EncDefault|xml2StartParse)\b/im,alias:"property"},"directive-block":{pattern:/<\/?\b(AuthnProviderAlias|AuthzProviderAlias|Directory|DirectoryMatch|Else|ElseIf|Files|FilesMatch|If|IfDefine|IfModule|IfVersion|Limit|LimitExcept|Location|LocationMatch|Macro|Proxy|RequireAll|RequireAny|RequireNone|VirtualHost)\b *.*>/i,inside:{"directive-block":{pattern:/^<\/?\w+/,inside:{punctuation:/^<\/?/},alias:"tag"},"directive-block-parameter":{pattern:/.*[^>]/,inside:{punctuation:/:/,string:{pattern:/("|').*\1/,inside:{variable:/(\$|%)\{?(\w\.?(\+|\-|:)?)+\}?/}}},alias:"attr-value"},punctuation:/>/},alias:"tag"},"directive-flags":{pattern:/\[(\w,?)+\]/,alias:"keyword"},string:{pattern:/("|').*\1/,inside:{variable:/(\$|%)\{?(\w\.?(\+|\-|:)?)+\}?/}},variable:/(\$|%)\{?(\w\.?(\+|\-|:)?)+\}?/,regex:/\^?.*\$|\^.*\$?/};
\ No newline at end of file
+Prism.languages.apacheconf={comment:/#.*/,"directive-inline":{pattern:/^(\s*)\b(AcceptFilter|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding|AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch|Allow|AllowCONNECT|AllowEncodedSlashes|AllowMethods|AllowOverride|AllowOverrideList|Anonymous|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID|Anonymous_VerifyEmail|AsyncRequestWorkerFactor|AuthBasicAuthoritative|AuthBasicFake|AuthBasicProvider|AuthBasicUseDigestAlgorithm|AuthDBDUserPWQuery|AuthDBDUserRealmQuery|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm|AuthDigestDomain|AuthDigestNonceLifetime|AuthDigestProvider|AuthDigestQop|AuthDigestShmemSize|AuthFormAuthoritative|AuthFormBody|AuthFormDisableNoStore|AuthFormFakeBasicAuth|AuthFormLocation|AuthFormLoginRequiredLocation|AuthFormLoginSuccessLocation|AuthFormLogoutLocation|AuthFormMethod|AuthFormMimetype|AuthFormPassword|AuthFormProvider|AuthFormSitePassphrase|AuthFormSize|AuthFormUsername|AuthGroupFile|AuthLDAPAuthorizePrefix|AuthLDAPBindAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareAsUser|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPInitialBindAsUser|AuthLDAPInitialBindPattern|AuthLDAPMaxSubGroupDepth|AuthLDAPRemoteUserAttribute|AuthLDAPRemoteUserIsDN|AuthLDAPSearchAsUser|AuthLDAPSubGroupAttribute|AuthLDAPSubGroupClass|AuthLDAPUrl|AuthMerging|AuthName|AuthnCacheContext|AuthnCacheEnable|AuthnCacheProvideFor|AuthnCacheSOCache|AuthnCacheTimeout|AuthnzFcgiCheckAuthnProvider|AuthnzFcgiDefineProvider|AuthType|AuthUserFile|AuthzDBDLoginToReferer|AuthzDBDQuery|AuthzDBDRedirectQuery|AuthzDBMType|AuthzSendForbiddenOnFailure|BalancerGrowth|BalancerInherit|BalancerMember|BalancerPersist|BrowserMatch|BrowserMatchNoCase|BufferedLogs|BufferSize|CacheDefaultExpire|CacheDetailHeader|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheFile|CacheHeader|CacheIgnoreCacheControl|CacheIgnoreHeaders|CacheIgnoreNoLastMod|CacheIgnoreQueryString|CacheIgnoreURLSessionIdentifiers|CacheKeyBaseURL|CacheLastModifiedFactor|CacheLock|CacheLockMaxAge|CacheLockPath|CacheMaxExpire|CacheMaxFileSize|CacheMinExpire|CacheMinFileSize|CacheNegotiatedDocs|CacheQuickHandler|CacheReadSize|CacheReadTime|CacheRoot|CacheSocache|CacheSocacheMaxSize|CacheSocacheMaxTime|CacheSocacheMinTime|CacheSocacheReadSize|CacheSocacheReadTime|CacheStaleOnError|CacheStoreExpired|CacheStoreNoStore|CacheStorePrivate|CGIDScriptTimeout|CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckCaseOnly|CheckSpelling|ChrootDir|ContentDigest|CookieDomain|CookieExpires|CookieName|CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavGenericLockDB|DavLockDB|DavMinTimeout|DBDExptime|DBDInitSQL|DBDKeep|DBDMax|DBDMin|DBDParams|DBDPersist|DBDPrepareSQL|DBDriver|DefaultIcon|DefaultLanguage|DefaultRuntimeDir|DefaultType|Define|DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateInflateLimitRequestBody|DeflateInflateRatioBurst|DeflateInflateRatioLimit|DeflateMemLevel|DeflateWindowSize|Deny|DirectoryCheckHandler|DirectoryIndex|DirectoryIndexRedirect|DirectorySlash|DocumentRoot|DTracePrivileges|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|Error|ErrorDocument|ErrorLog|ErrorLogFormat|Example|ExpiresActive|ExpiresByType|ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FallbackResource|FileETag|FilterChain|FilterDeclare|FilterProtocol|FilterProvider|FilterTrace|ForceLanguagePriority|ForceType|ForensicLog|GprofDir|GracefulShutdownTimeout|Group|Header|HeaderName|HeartbeatAddress|HeartbeatListen|HeartbeatMaxServers|HeartbeatStorage|HeartbeatStorage|HostnameLookups|IdentityCheck|IdentityCheckTimeout|ImapBase|ImapDefault|ImapMenu|Include|IncludeOptional|IndexHeadInsert|IndexIgnore|IndexIgnoreReset|IndexOptions|IndexOrderDefault|IndexStyleSheet|InputSed|ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout|KeptBodySize|LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionPoolTTL|LDAPConnectionTimeout|LDAPLibraryDebug|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPReferralHopLimit|LDAPReferrals|LDAPRetries|LDAPRetryDelay|LDAPSharedCacheFile|LDAPSharedCacheSize|LDAPTimeout|LDAPTrustedClientCert|LDAPTrustedGlobalCert|LDAPTrustedMode|LDAPVerifyServerCert|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine|LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|LogFormat|LogLevel|LogMessage|LuaAuthzProvider|LuaCodeCache|LuaHookAccessChecker|LuaHookAuthChecker|LuaHookCheckUserID|LuaHookFixups|LuaHookInsertFilter|LuaHookLog|LuaHookMapToStorage|LuaHookTranslateName|LuaHookTypeChecker|LuaInherit|LuaInputFilter|LuaMapHandler|LuaOutputFilter|LuaPackageCPath|LuaPackagePath|LuaQuickHandler|LuaRoot|LuaScope|MaxConnectionsPerChild|MaxKeepAliveRequests|MaxMemFree|MaxRangeOverlaps|MaxRangeReversals|MaxRanges|MaxRequestWorkers|MaxSpareServers|MaxSpareThreads|MaxThreads|MergeTrailers|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads|MMapFile|ModemStandard|ModMimeUsePathInfo|MultiviewsMatch|Mutex|NameVirtualHost|NoProxy|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|OutputSed|PassEnv|PidFile|PrivilegesMode|Protocol|ProtocolEcho|ProxyAddHeaders|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyExpressDBMFile|ProxyExpressDBMType|ProxyExpressEnable|ProxyFtpDirCharset|ProxyFtpEscapeWildcards|ProxyFtpListOnWildcard|ProxyHTMLBufSize|ProxyHTMLCharsetOut|ProxyHTMLDocType|ProxyHTMLEnable|ProxyHTMLEvents|ProxyHTMLExtended|ProxyHTMLFixups|ProxyHTMLInterp|ProxyHTMLLinks|ProxyHTMLMeta|ProxyHTMLStripComments|ProxyHTMLURLMap|ProxyIOBufferSize|ProxyMaxForwards|ProxyPass|ProxyPassInherit|ProxyPassInterpolateEnv|ProxyPassMatch|ProxyPassReverse|ProxyPassReverseCookieDomain|ProxyPassReverseCookiePath|ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxySCGIInternalRedirect|ProxySCGISendfile|ProxySet|ProxySourceAddress|ProxyStatus|ProxyTimeout|ProxyVia|ReadmeName|ReceiveBufferSize|Redirect|RedirectMatch|RedirectPermanent|RedirectTemp|ReflectorHeader|RemoteIPHeader|RemoteIPInternalProxy|RemoteIPInternalProxyList|RemoteIPProxiesHeader|RemoteIPTrustedProxy|RemoteIPTrustedProxyList|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader|RequestReadTimeout|Require|RewriteBase|RewriteCond|RewriteEngine|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC|Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen|SeeRequestTail|SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|Session|SessionCookieName|SessionCookieName2|SessionCookieRemove|SessionCryptoCipher|SessionCryptoDriver|SessionCryptoPassphrase|SessionCryptoPassphraseFile|SessionDBDCookieName|SessionDBDCookieName2|SessionDBDCookieRemove|SessionDBDDeleteLabel|SessionDBDInsertLabel|SessionDBDPerUser|SessionDBDSelectLabel|SessionDBDUpdateLabel|SessionEnv|SessionExclude|SessionHeader|SessionInclude|SessionMaxAge|SetEnv|SetEnvIf|SetEnvIfExpr|SetEnvIfNoCase|SetHandler|SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIETag|SSILastModified|SSILegacyExprParser|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath|SSLCADNRequestFile|SSLCADNRequestPath|SSLCARevocationCheck|SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLCompression|SSLCryptoDevice|SSLEngine|SSLFIPS|SSLHonorCipherOrder|SSLInsecureRenegotiation|SSLOCSPDefaultResponder|SSLOCSPEnable|SSLOCSPOverrideResponder|SSLOCSPResponderTimeout|SSLOCSPResponseMaxAge|SSLOCSPResponseTimeSkew|SSLOCSPUseRequestNonce|SSLOpenSSLConfCmd|SSLOptions|SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationCheck|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCheckPeerCN|SSLProxyCheckPeerExpire|SSLProxyCheckPeerName|SSLProxyCipherSuite|SSLProxyEngine|SSLProxyMachineCertificateChainFile|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRenegBufferSize|SSLRequire|SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLSessionTicketKeyFile|SSLSRPUnknownUserSeed|SSLSRPVerifierFile|SSLStaplingCache|SSLStaplingErrorCacheTimeout|SSLStaplingFakeTryLater|SSLStaplingForceURL|SSLStaplingResponderTimeout|SSLStaplingResponseMaxAge|SSLStaplingResponseTimeSkew|SSLStaplingReturnResponderErrors|SSLStaplingStandardCacheTimeout|SSLStrictSNIVHostCheck|SSLUserName|SSLUseStapling|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|Substitute|Suexec|SuexecUserGroup|ThreadLimit|ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnDefine|UndefMacro|UnsetEnv|Use|UseCanonicalName|UseCanonicalPhysicalPort|User|UserDir|VHostCGIMode|VHostCGIPrivs|VHostGroup|VHostPrivs|VHostSecure|VHostUser|VirtualDocumentRoot|VirtualDocumentRootIP|VirtualScriptAlias|VirtualScriptAliasIP|WatchdogInterval|XBitHack|xml2EncAlias|xml2EncDefault|xml2StartParse)\b/im,lookbehind:!0,alias:"property"},"directive-block":{pattern:/<\/?\b(AuthnProviderAlias|AuthzProviderAlias|Directory|DirectoryMatch|Else|ElseIf|Files|FilesMatch|If|IfDefine|IfModule|IfVersion|Limit|LimitExcept|Location|LocationMatch|Macro|Proxy|RequireAll|RequireAny|RequireNone|VirtualHost)\b *.*>/i,inside:{"directive-block":{pattern:/^<\/?\w+/,inside:{punctuation:/^<\/?/},alias:"tag"},"directive-block-parameter":{pattern:/.*[^>]/,inside:{punctuation:/:/,string:{pattern:/("|').*\1/,inside:{variable:/(\$|%)\{?(\w\.?(\+|\-|:)?)+\}?/}}},alias:"attr-value"},punctuation:/>/},alias:"tag"},"directive-flags":{pattern:/\[(\w,?)+\]/,alias:"keyword"},string:{pattern:/("|').*\1/,inside:{variable:/(\$|%)\{?(\w\.?(\+|\-|:)?)+\}?/}},variable:/(\$|%)\{?(\w\.?(\+|\-|:)?)+\}?/,regex:/\^?.*\$|\^.*\$?/};
\ No newline at end of file

From 65894c599fbf4d330fa0f76a6e75b8911a24d7c9 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 08:11:33 +0200
Subject: [PATCH 092/310] AppleScript: Allow one level of nesting in block
 comments

---
 components/prism-applescript.js     | 7 ++-----
 components/prism-applescript.min.js | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/components/prism-applescript.js b/components/prism-applescript.js
index 5d74020431..06338599cc 100644
--- a/components/prism-applescript.js
+++ b/components/prism-applescript.js
@@ -1,10 +1,7 @@
-/* TODO
-	Add support for nested block comments...
-*/
-
 Prism.languages.applescript = {
 	'comment': [
-		/\(\*[\w\W]*?\*\)/,
+		// Allow one level of nesting
+		/\(\*(?:\(\*[\w\W]*?\*\)|[\w\W])*?\*\)/,
 		/--.+/,
 		/#.+/
 	],
diff --git a/components/prism-applescript.min.js b/components/prism-applescript.min.js
index 30e1ffd7e4..ff9c1595f7 100644
--- a/components/prism-applescript.min.js
+++ b/components/prism-applescript.min.js
@@ -1 +1 @@
-Prism.languages.applescript={comment:[/\(\*[\w\W]*?\*\)/,/--.+/,/#.+/],string:/"(?:\\?.)*?"/,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/],keyword:/\b(?:about|above|after|against|and|apart from|around|as|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|contain|contains|continue|copy|div|does|eighth|else|end|equal|equals|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|mod|my|ninth|not|of|on|onto|or|out of|over|prop|property|put|ref|reference|repeat|return|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class":{pattern:/\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,alias:"builtin"},number:/\b-?\d*\.?\d+([Ee]-?\d+)?\b/,punctuation:/[{}():,¬«»《》]/};
\ No newline at end of file
+Prism.languages.applescript={comment:[/\(\*(?:\(\*[\w\W]*?\*\)|[\w\W])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\?.)*?"/,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/],keyword:/\b(?:about|above|after|against|and|apart from|around|as|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|contain|contains|continue|copy|div|does|eighth|else|end|equal|equals|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|mod|my|ninth|not|of|on|onto|or|out of|over|prop|property|put|ref|reference|repeat|return|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class":{pattern:/\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,alias:"builtin"},number:/\b-?\d*\.?\d+([Ee]-?\d+)?\b/,punctuation:/[{}():,¬«»《》]/};
\ No newline at end of file

From 1ec5a81ea0056ffe4316282b77b30f6242069130 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 09:12:47 +0200
Subject: [PATCH 093/310] AppleScript: Removed duplicates between operators and
 keywords

---
 components/prism-applescript.js     | 2 +-
 components/prism-applescript.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-applescript.js b/components/prism-applescript.js
index 06338599cc..5ac745f6c5 100644
--- a/components/prism-applescript.js
+++ b/components/prism-applescript.js
@@ -10,7 +10,7 @@ Prism.languages.applescript = {
 		/[&=≠≤≥*+\-\/÷^]|[<>]=?/,
 		/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/
 	],
-	'keyword': /\b(?:about|above|after|against|and|apart from|around|as|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|contain|contains|continue|copy|div|does|eighth|else|end|equal|equals|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|mod|my|ninth|not|of|on|onto|or|out of|over|prop|property|put|ref|reference|repeat|return|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,
+	'keyword': /\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|reference|repeat|return|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,
 	'class': {
 		pattern: /\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,
 		alias: 'builtin'
diff --git a/components/prism-applescript.min.js b/components/prism-applescript.min.js
index ff9c1595f7..0c7cd2abbb 100644
--- a/components/prism-applescript.min.js
+++ b/components/prism-applescript.min.js
@@ -1 +1 @@
-Prism.languages.applescript={comment:[/\(\*(?:\(\*[\w\W]*?\*\)|[\w\W])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\?.)*?"/,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/],keyword:/\b(?:about|above|after|against|and|apart from|around|as|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|contain|contains|continue|copy|div|does|eighth|else|end|equal|equals|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|mod|my|ninth|not|of|on|onto|or|out of|over|prop|property|put|ref|reference|repeat|return|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class":{pattern:/\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,alias:"builtin"},number:/\b-?\d*\.?\d+([Ee]-?\d+)?\b/,punctuation:/[{}():,¬«»《》]/};
\ No newline at end of file
+Prism.languages.applescript={comment:[/\(\*(?:\(\*[\w\W]*?\*\)|[\w\W])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\?.)*?"/,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/],keyword:/\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|reference|repeat|return|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class":{pattern:/\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,alias:"builtin"},number:/\b-?\d*\.?\d+([Ee]-?\d+)?\b/,punctuation:/[{}():,¬«»《》]/};
\ No newline at end of file

From e8d09f6aa34a78d19ea361c36c7c70c3275d56f3 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 09:18:50 +0200
Subject: [PATCH 094/310] AppleScript: Removed duplicates between keywords and
 classes

---
 components/prism-applescript.js     | 2 +-
 components/prism-applescript.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-applescript.js b/components/prism-applescript.js
index 5ac745f6c5..9acaf5db13 100644
--- a/components/prism-applescript.js
+++ b/components/prism-applescript.js
@@ -10,7 +10,7 @@ Prism.languages.applescript = {
 		/[&=≠≤≥*+\-\/÷^]|[<>]=?/,
 		/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/
 	],
-	'keyword': /\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|reference|repeat|return|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,
+	'keyword': /\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|repeat|return|returning|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,
 	'class': {
 		pattern: /\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,
 		alias: 'builtin'
diff --git a/components/prism-applescript.min.js b/components/prism-applescript.min.js
index 0c7cd2abbb..5d8bbb7ff8 100644
--- a/components/prism-applescript.min.js
+++ b/components/prism-applescript.min.js
@@ -1 +1 @@
-Prism.languages.applescript={comment:[/\(\*(?:\(\*[\w\W]*?\*\)|[\w\W])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\?.)*?"/,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/],keyword:/\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|reference|repeat|return|returning|script|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class":{pattern:/\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,alias:"builtin"},number:/\b-?\d*\.?\d+([Ee]-?\d+)?\b/,punctuation:/[{}():,¬«»《》]/};
\ No newline at end of file
+Prism.languages.applescript={comment:[/\(\*(?:\(\*[\w\W]*?\*\)|[\w\W])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\?.)*?"/,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/],keyword:/\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|repeat|return|returning|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class":{pattern:/\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,alias:"builtin"},number:/\b-?\d*\.?\d+([Ee]-?\d+)?\b/,punctuation:/[{}():,¬«»《》]/};
\ No newline at end of file

From 66dac311516091fb3726440439c403961b508cd8 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 09:23:11 +0200
Subject: [PATCH 095/310] AppleScript: Move numbers up so they are not broken
 by operator pattern

---
 components/prism-applescript.js     | 2 +-
 components/prism-applescript.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-applescript.js b/components/prism-applescript.js
index 9acaf5db13..52d0aeee04 100644
--- a/components/prism-applescript.js
+++ b/components/prism-applescript.js
@@ -6,6 +6,7 @@ Prism.languages.applescript = {
 		/#.+/
 	],
 	'string': /"(?:\\?.)*?"/,
+	'number': /\b-?\d*\.?\d+([Ee]-?\d+)?\b/,
 	'operator': [
 		/[&=≠≤≥*+\-\/÷^]|[<>]=?/,
 		/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/
@@ -15,6 +16,5 @@ Prism.languages.applescript = {
 		pattern: /\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,
 		alias: 'builtin'
 	},
-	'number': /\b-?\d*\.?\d+([Ee]-?\d+)?\b/,
 	'punctuation': /[{}():,¬«»《》]/
 };
\ No newline at end of file
diff --git a/components/prism-applescript.min.js b/components/prism-applescript.min.js
index 5d8bbb7ff8..9bcb2cbb33 100644
--- a/components/prism-applescript.min.js
+++ b/components/prism-applescript.min.js
@@ -1 +1 @@
-Prism.languages.applescript={comment:[/\(\*(?:\(\*[\w\W]*?\*\)|[\w\W])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\?.)*?"/,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/],keyword:/\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|repeat|return|returning|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class":{pattern:/\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,alias:"builtin"},number:/\b-?\d*\.?\d+([Ee]-?\d+)?\b/,punctuation:/[{}():,¬«»《》]/};
\ No newline at end of file
+Prism.languages.applescript={comment:[/\(\*(?:\(\*[\w\W]*?\*\)|[\w\W])*?\*\)/,/--.+/,/#.+/],string:/"(?:\\?.)*?"/,number:/\b-?\d*\.?\d+([Ee]-?\d+)?\b/,operator:[/[&=≠≤≥*+\-\/÷^]|[<>]=?/,/\b(?:(?:start|begin|end)s? with|(?:(?:does not|doesn't) contain|contains?)|(?:is|isn't|is not) (?:in|contained by)|(?:(?:is|isn't|is not) )?(?:greater|less) than(?: or equal)?(?: to)?|(?:(?:does not|doesn't) come|comes) (?:before|after)|(?:is|isn't|is not) equal(?: to)?|(?:(?:does not|doesn't) equal|equals|equal to|isn't|is not)|(?:a )?(?:ref(?: to)?|reference to)|(?:and|or|div|mod|as|not))\b/],keyword:/\b(?:about|above|after|against|apart from|around|aside from|at|back|before|beginning|behind|below|beneath|beside|between|but|by|considering|continue|copy|does|eighth|else|end|equal|error|every|exit|false|fifth|first|for|fourth|from|front|get|given|global|if|ignoring|in|instead of|into|is|it|its|last|local|me|middle|my|ninth|of|on|onto|out of|over|prop|property|put|repeat|return|returning|second|set|seventh|since|sixth|some|tell|tenth|that|the|then|third|through|thru|timeout|times|to|transaction|true|try|until|where|while|whose|with|without)\b/,"class":{pattern:/\b(?:alias|application|boolean|class|constant|date|file|integer|list|number|POSIX file|real|record|reference|RGB color|script|text|centimetres|centimeters|feet|inches|kilometres|kilometers|metres|meters|miles|yards|square feet|square kilometres|square kilometers|square metres|square meters|square miles|square yards|cubic centimetres|cubic centimeters|cubic feet|cubic inches|cubic metres|cubic meters|cubic yards|gallons|litres|liters|quarts|grams|kilograms|ounces|pounds|degrees Celsius|degrees Fahrenheit|degrees Kelvin)\b/,alias:"builtin"},punctuation:/[{}():,¬«»《》]/};
\ No newline at end of file

From 7bf6b880639fac824c863591bdc255722207189c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 10:23:26 +0200
Subject: [PATCH 096/310] Run gulp task

---
 components/prism-ruby.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-ruby.min.js b/components/prism-ruby.min.js
index 4e551c4db2..f8f899dcd3 100644
--- a/components/prism-ruby.min.js
+++ b/components/prism-ruby.min.js
@@ -1 +1 @@
-Prism.languages.ruby=Prism.languages.extend("clike",{comment:/#[^\r\n]*(\r?\n|$)/,keyword:/\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/,builtin:/\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,constant:/\b[A-Z][a-zA-Z_0-9]*[?!]?\b/}),Prism.languages.insertBefore("ruby","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0},variable:/[@$]+\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/,symbol:/:\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/});
\ No newline at end of file
+Prism.languages.ruby=Prism.languages.extend("clike",{comment:/#(?!\{[^\r\n]*?\})[^\r\n]*(\r?\n|$)/,keyword:/\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/,builtin:/\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,constant:/\b[A-Z][a-zA-Z_0-9]*[?!]?\b/}),Prism.languages.insertBefore("ruby","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0},variable:/[@$]+\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/,symbol:/:\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/}),Prism.languages.ruby.string={pattern:/("|')(#\{[^}]+\}|\\\n|\\?.)*?\1/,inside:{interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"tag"},rest:Prism.util.clone(Prism.languages.ruby)}}}};
\ No newline at end of file

From fbf5cdae62752021fadd78af3a68bbfa3c48f8d0 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 18:48:48 +0200
Subject: [PATCH 097/310] ASP.NET: Prevent Markup tags from breaking ASP tags +
 fix MasterType directive

---
 components/prism-aspnet.js     | 4 +++-
 components/prism-aspnet.min.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/prism-aspnet.js b/components/prism-aspnet.js
index 534a46ceba..291823e2a5 100644
--- a/components/prism-aspnet.js
+++ b/components/prism-aspnet.js
@@ -2,7 +2,7 @@ Prism.languages.aspnet = Prism.languages.extend('markup', {
 	'page-directive tag': {
 		pattern: /<%\s*@.*%>/i,
 		inside: {
-			'page-directive tag': /<%\s*@\s*(?:Assembly|Control|Implements|Import|Master|MasterType|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,
+			'page-directive tag': /<%\s*@\s*(?:Assembly|Control|Implements|Import|Master(?:Type)?|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,
 			rest: Prism.languages.markup.tag.inside
 		}
 	},
@@ -14,6 +14,8 @@ Prism.languages.aspnet = Prism.languages.extend('markup', {
 		}
 	}
 });
+// Regexp copied from prism-markup, with a negative look-ahead added
+Prism.languages.aspnet.tag.pattern = /<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i;
 
 // match directives of attribute value foo="<% Bar %>"
 Prism.languages.insertBefore('inside', 'punctuation', {
diff --git a/components/prism-aspnet.min.js b/components/prism-aspnet.min.js
index 71adac9259..f315148d36 100644
--- a/components/prism-aspnet.min.js
+++ b/components/prism-aspnet.min.js
@@ -1 +1 @@
-Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/<%\s*@.*%>/i,inside:{"page-directive tag":/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master|MasterType|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/<%.*%>/i,inside:{"directive tag":/<%\s*?[$=%#:]{0,2}|%>/i,rest:Prism.languages.csharp}}}),Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]),Prism.languages.insertBefore("aspnet","comment",{"asp comment":/<%--[\w\W]*?--%>/}),Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,inside:Prism.languages.aspnet.tag.inside},rest:Prism.languages.csharp||{}}}}),Prism.languages.aspnet.style&&(Prism.languages.aspnet.style.inside.tag.pattern=/<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,Prism.languages.aspnet.style.inside.tag.inside=Prism.languages.aspnet.tag.inside),Prism.languages.aspnet.script&&(Prism.languages.aspnet.script.inside.tag.pattern=Prism.languages.aspnet["asp script"].inside.tag.pattern,Prism.languages.aspnet.script.inside.tag.inside=Prism.languages.aspnet.tag.inside);
\ No newline at end of file
+Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/<%\s*@.*%>/i,inside:{"page-directive tag":/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master(?:Type)?|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/<%.*%>/i,inside:{"directive tag":/<%\s*?[$=%#:]{0,2}|%>/i,rest:Prism.languages.csharp}}}),Prism.languages.aspnet.tag.pattern=/<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]),Prism.languages.insertBefore("aspnet","comment",{"asp comment":/<%--[\w\W]*?--%>/}),Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,inside:Prism.languages.aspnet.tag.inside},rest:Prism.languages.csharp||{}}}}),Prism.languages.aspnet.style&&(Prism.languages.aspnet.style.inside.tag.pattern=/<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,Prism.languages.aspnet.style.inside.tag.inside=Prism.languages.aspnet.tag.inside),Prism.languages.aspnet.script&&(Prism.languages.aspnet.script.inside.tag.pattern=Prism.languages.aspnet["asp script"].inside.tag.pattern,Prism.languages.aspnet.script.inside.tag.inside=Prism.languages.aspnet.tag.inside);
\ No newline at end of file

From 1f0a3364eed3939dfaea1fe3b1b274473c976e70 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 18:50:14 +0200
Subject: [PATCH 098/310] ASP.NET: Prevent Markup tags from breaking ASP tags +
 fix MasterType directive

---
 components/prism-aspnet.js     | 4 +++-
 components/prism-aspnet.min.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/prism-aspnet.js b/components/prism-aspnet.js
index 534a46ceba..291823e2a5 100644
--- a/components/prism-aspnet.js
+++ b/components/prism-aspnet.js
@@ -2,7 +2,7 @@ Prism.languages.aspnet = Prism.languages.extend('markup', {
 	'page-directive tag': {
 		pattern: /<%\s*@.*%>/i,
 		inside: {
-			'page-directive tag': /<%\s*@\s*(?:Assembly|Control|Implements|Import|Master|MasterType|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,
+			'page-directive tag': /<%\s*@\s*(?:Assembly|Control|Implements|Import|Master(?:Type)?|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,
 			rest: Prism.languages.markup.tag.inside
 		}
 	},
@@ -14,6 +14,8 @@ Prism.languages.aspnet = Prism.languages.extend('markup', {
 		}
 	}
 });
+// Regexp copied from prism-markup, with a negative look-ahead added
+Prism.languages.aspnet.tag.pattern = /<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i;
 
 // match directives of attribute value foo="<% Bar %>"
 Prism.languages.insertBefore('inside', 'punctuation', {
diff --git a/components/prism-aspnet.min.js b/components/prism-aspnet.min.js
index 71adac9259..f315148d36 100644
--- a/components/prism-aspnet.min.js
+++ b/components/prism-aspnet.min.js
@@ -1 +1 @@
-Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/<%\s*@.*%>/i,inside:{"page-directive tag":/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master|MasterType|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/<%.*%>/i,inside:{"directive tag":/<%\s*?[$=%#:]{0,2}|%>/i,rest:Prism.languages.csharp}}}),Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]),Prism.languages.insertBefore("aspnet","comment",{"asp comment":/<%--[\w\W]*?--%>/}),Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,inside:Prism.languages.aspnet.tag.inside},rest:Prism.languages.csharp||{}}}}),Prism.languages.aspnet.style&&(Prism.languages.aspnet.style.inside.tag.pattern=/<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,Prism.languages.aspnet.style.inside.tag.inside=Prism.languages.aspnet.tag.inside),Prism.languages.aspnet.script&&(Prism.languages.aspnet.script.inside.tag.pattern=Prism.languages.aspnet["asp script"].inside.tag.pattern,Prism.languages.aspnet.script.inside.tag.inside=Prism.languages.aspnet.tag.inside);
\ No newline at end of file
+Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/<%\s*@.*%>/i,inside:{"page-directive tag":/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master(?:Type)?|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/<%.*%>/i,inside:{"directive tag":/<%\s*?[$=%#:]{0,2}|%>/i,rest:Prism.languages.csharp}}}),Prism.languages.aspnet.tag.pattern=/<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]),Prism.languages.insertBefore("aspnet","comment",{"asp comment":/<%--[\w\W]*?--%>/}),Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,inside:Prism.languages.aspnet.tag.inside},rest:Prism.languages.csharp||{}}}}),Prism.languages.aspnet.style&&(Prism.languages.aspnet.style.inside.tag.pattern=/<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,Prism.languages.aspnet.style.inside.tag.inside=Prism.languages.aspnet.tag.inside),Prism.languages.aspnet.script&&(Prism.languages.aspnet.script.inside.tag.pattern=Prism.languages.aspnet["asp script"].inside.tag.pattern,Prism.languages.aspnet.script.inside.tag.inside=Prism.languages.aspnet.tag.inside);
\ No newline at end of file

From d4194c93cfec0982a851a8a3dc1e89842ee72a64 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 18:56:55 +0200
Subject: [PATCH 099/310] C-like: use look-ahead instead of inside to match
 functions

---
 components/prism-clike.js     | 7 +------
 components/prism-clike.min.js | 2 +-
 prism.js                      | 7 +------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index 57679cf2bc..c497995abc 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -19,12 +19,7 @@ Prism.languages.clike = {
 	},
 	'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
 	'boolean': /\b(true|false)\b/,
-	'function': {
-		pattern: /[a-z0-9_]+\(/i,
-		inside: {
-			punctuation: /\(/
-		}
-	},
+	'function': /[a-z0-9_]+(?=\()/i,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
 	'operator': /[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,
 	'punctuation': /[{}[\];(),.:]/
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index abae2a8322..f79d3a4aea 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":{pattern:/[a-z0-9_]+\(/i,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index bca193ab34..91fa896622 100644
--- a/prism.js
+++ b/prism.js
@@ -561,12 +561,7 @@ Prism.languages.clike = {
 	},
 	'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
 	'boolean': /\b(true|false)\b/,
-	'function': {
-		pattern: /[a-z0-9_]+\(/i,
-		inside: {
-			punctuation: /\(/
-		}
-	},
+	'function': /[a-z0-9_]+(?=\()/i,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
 	'operator': /[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,
 	'punctuation': /[{}[\];(),.:]/

From 4e42e260c6d9ac597f1f3e322402808cbf6393e7 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 19:11:45 +0200
Subject: [PATCH 100/310] SCSS: Match placeholders inside selectors + alias
 other placeholders as selectors (fix #238)

---
 components/prism-scss.js     | 12 ++++++++++--
 components/prism-scss.min.js |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/prism-scss.js b/components/prism-scss.js
index c798ff86e6..b7a872ac1e 100644
--- a/components/prism-scss.js
+++ b/components/prism-scss.js
@@ -19,7 +19,12 @@ Prism.languages.scss = Prism.languages.extend('css', {
 	// the end of a selector is found when there is no rules in it ( {} or {\s}) or if there is a property (because an interpolated var
 	// can "pass" as a selector- e.g: proper#{$erty})
 	// this one was ard to do, so please be careful if you edit this one :)
-	'selector': /([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m
+	'selector': {
+		pattern: /([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m,
+		inside: {
+			'placeholder': /%[-_\w]+/i
+		}
+	}
 });
 
 Prism.languages.insertBefore('scss', 'atrule', {
@@ -32,7 +37,10 @@ Prism.languages.insertBefore('scss', 'property', {
 });
 
 Prism.languages.insertBefore('scss', 'function', {
-	'placeholder': /%[-_\w]+/i,
+	'placeholder': {
+		pattern: /%[-_\w]+/i,
+		alias: 'selector'
+	},
 	'statement': /\B!(default|optional)\b/i,
 	'boolean': /\b(true|false)\b/,
 	'null': /\b(null)\b/,
diff --git a/components/prism-scss.min.js b/components/prism-scss.min.js
index a7469c723c..d8837a441e 100644
--- a/components/prism-scss.min.js
+++ b/components/prism-scss.min.js
@@ -1 +1 @@
-Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,inside:{rule:/@[\w-]+/}},url:/([-a-z]+-)*url(?=\()/i,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/}),Prism.languages.scss.atrule.inside.rest=Prism.util.clone(Prism.languages.scss);
\ No newline at end of file
+Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,inside:{rule:/@[\w-]+/}},url:/([-a-z]+-)*url(?=\()/i,selector:{pattern:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m,inside:{placeholder:/%[-_\w]+/i}}}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:{pattern:/%[-_\w]+/i,alias:"selector"},statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/}),Prism.languages.scss.atrule.inside.rest=Prism.util.clone(Prism.languages.scss);
\ No newline at end of file

From 0a1fc4b32d536ded55b946c97aa66dd1f16cb41f Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 19:29:50 +0200
Subject: [PATCH 101/310] AutoHotkey: allow tags (labels) to be highlighted at
 the end of the code

---
 components/prism-autohotkey.js     | 2 +-
 components/prism-autohotkey.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-autohotkey.js b/components/prism-autohotkey.js
index c3bdebe65e..4b8694411d 100644
--- a/components/prism-autohotkey.js
+++ b/components/prism-autohotkey.js
@@ -6,7 +6,7 @@ Prism.languages.autohotkey= {
 	},
 	'string': /"(([^"\n\r]|"")*)"/m,
 	'function': /[^\(\); \t,\n\+\*\-=\?>:\\\/<&%\[\]]+?(?=\()/m,  //function - don't use .*\) in the end bcoz string locks it
-	'tag': /^[ \t]*[^\s:]+?(?=:[^:])/m,  //labels
+	'tag': /^[ \t]*[^\s:]+?(?=:(?:[^:]|$))/m,  //labels
 	'variable': /%\w+%/,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
 	'operator': /[\+\-\*\\\/:=\?&\|<>]/,
diff --git a/components/prism-autohotkey.min.js b/components/prism-autohotkey.min.js
index be036372ef..4d00538940 100644
--- a/components/prism-autohotkey.min.js
+++ b/components/prism-autohotkey.min.js
@@ -1 +1 @@
-Prism.languages.autohotkey={comment:{pattern:/(^[^";\n]*("[^"\n]*?"[^"\n]*?)*)(;.*$|^\s*\/\*[\s\S]*\n\*\/)/m,lookbehind:!0},string:/"(([^"\n\r]|"")*)"/m,"function":/[^\(\); \t,\n\+\*\-=\?>:\\\/<&%\[\]]+?(?=\()/m,tag:/^[ \t]*[^\s:]+?(?=:[^:])/m,variable:/%\w+%/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[\+\-\*\\\/:=\?&\|<>]/,punctuation:/[\{}[\]\(\):]/,"boolean":/\b(true|false)\b/,selector:/\b(AutoTrim|BlockInput|Break|Click|ClipWait|Continue|Control|ControlClick|ControlFocus|ControlGet|ControlGetFocus|ControlGetPos|ControlGetText|ControlMove|ControlSend|ControlSendRaw|ControlSetText|CoordMode|Critical|DetectHiddenText|DetectHiddenWindows|Drive|DriveGet|DriveSpaceFree|EnvAdd|EnvDiv|EnvGet|EnvMult|EnvSet|EnvSub|EnvUpdate|Exit|ExitApp|FileAppend|FileCopy|FileCopyDir|FileCreateDir|FileCreateShortcut|FileDelete|FileEncoding|FileGetAttrib|FileGetShortcut|FileGetSize|FileGetTime|FileGetVersion|FileInstall|FileMove|FileMoveDir|FileRead|FileReadLine|FileRecycle|FileRecycleEmpty|FileRemoveDir|FileSelectFile|FileSelectFolder|FileSetAttrib|FileSetTime|FormatTime|GetKeyState|Gosub|Goto|GroupActivate|GroupAdd|GroupClose|GroupDeactivate|Gui|GuiControl|GuiControlGet|Hotkey|ImageSearch|IniDelete|IniRead|IniWrite|Input|InputBox|KeyWait|ListHotkeys|ListLines|ListVars|Loop|Menu|MouseClick|MouseClickDrag|MouseGetPos|MouseMove|MsgBox|OnExit|OutputDebug|Pause|PixelGetColor|PixelSearch|PostMessage|Process|Progress|Random|RegDelete|RegRead|RegWrite|Reload|Repeat|Return|Run|RunAs|RunWait|Send|SendEvent|SendInput|SendMessage|SendMode|SendPlay|SendRaw|SetBatchLines|SetCapslockState|SetControlDelay|SetDefaultMouseSpeed|SetEnv|SetFormat|SetKeyDelay|SetMouseDelay|SetNumlockState|SetScrollLockState|SetStoreCapslockMode|SetTimer|SetTitleMatchMode|SetWinDelay|SetWorkingDir|Shutdown|Sleep|Sort|SoundBeep|SoundGet|SoundGetWaveVolume|SoundPlay|SoundSet|SoundSetWaveVolume|SplashImage|SplashTextOff|SplashTextOn|SplitPath|StatusBarGetText|StatusBarWait|StringCaseSense|StringGetPos|StringLeft|StringLen|StringLower|StringMid|StringReplace|StringRight|StringSplit|StringTrimLeft|StringTrimRight|StringUpper|Suspend|SysGet|Thread|ToolTip|Transform|TrayTip|URLDownloadToFile|WinActivate|WinActivateBottom|WinClose|WinGet|WinGetActiveStats|WinGetActiveTitle|WinGetClass|WinGetPos|WinGetText|WinGetTitle|WinHide|WinKill|WinMaximize|WinMenuSelectItem|WinMinimize|WinMinimizeAll|WinMinimizeAllUndo|WinMove|WinRestore|WinSet|WinSetTitle|WinShow|WinWait|WinWaitActive|WinWaitClose|WinWaitNotActive)\b/i,constant:/\b(a_ahkpath|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelay|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|programfiles|a_programfiles|a_programs|a_programscommon|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel)\b/i,builtin:/\b(abs|acos|asc|asin|atan|ceil|chr|class|cos|dllcall|exp|fileexist|Fileopen|floor|getkeystate|il_add|il_create|il_destroy|instr|substr|isfunc|islabel|IsObject|ln|log|lv_add|lv_delete|lv_deletecol|lv_getcount|lv_getnext|lv_gettext|lv_insert|lv_insertcol|lv_modify|lv_modifycol|lv_setimagelist|mod|onmessage|numget|numput|registercallback|regexmatch|regexreplace|round|sin|tan|sqrt|strlen|sb_seticon|sb_setparts|sb_settext|strsplit|tv_add|tv_delete|tv_getchild|tv_getcount|tv_getnext|tv_get|tv_getparent|tv_getprev|tv_getselection|tv_gettext|tv_modify|varsetcapacity|winactive|winexist|__New|__Call|__Get|__Set)\b/i,symbol:/\b(alt|altdown|altup|appskey|backspace|browser_back|browser_favorites|browser_forward|browser_home|browser_refresh|browser_search|browser_stop|bs|capslock|control|ctrl|ctrlbreak|ctrldown|ctrlup|del|delete|down|end|enter|esc|escape|f1|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f2|f20|f21|f22|f23|f24|f3|f4|f5|f6|f7|f8|f9|home|ins|insert|joy1|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy2|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy3|joy30|joy31|joy32|joy4|joy5|joy6|joy7|joy8|joy9|joyaxes|joybuttons|joyinfo|joyname|joypov|joyr|joyu|joyv|joyx|joyy|joyz|lalt|launch_app1|launch_app2|launch_mail|launch_media|lbutton|lcontrol|lctrl|left|lshift|lwin|lwindown|lwinup|mbutton|media_next|media_play_pause|media_prev|media_stop|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadadd|numpadclear|numpaddel|numpaddiv|numpaddot|numpaddown|numpadend|numpadenter|numpadhome|numpadins|numpadleft|numpadmult|numpadpgdn|numpadpgup|numpadright|numpadsub|numpadup|pause|pgdn|pgup|printscreen|ralt|rbutton|rcontrol|rctrl|right|rshift|rwin|rwindown|rwinup|scrolllock|shift|shiftdown|shiftup|space|tab|up|volume_down|volume_mute|volume_up|wheeldown|wheelleft|wheelright|wheelup|xbutton1|xbutton2)\b/i,important:/#\b(AllowSameLineComments|ClipboardTimeout|CommentFlag|ErrorStdOut|EscapeChar|HotkeyInterval|HotkeyModifierTimeout|Hotstring|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Include|IncludeAgain|InstallKeybdHook|InstallMouseHook|KeyHistory|LTrim|MaxHotkeysPerInterval|MaxMem|MaxThreads|MaxThreadsBuffer|MaxThreadsPerHotkey|NoEnv|NoTrayIcon|Persistent|SingleInstance|UseHook|WinActivateForce)\b/i,keyword:/\b(Abort|AboveNormal|Add|ahk_class|ahk_group|ahk_id|ahk_pid|All|Alnum|Alpha|AltSubmit|AltTab|AltTabAndMenu|AltTabMenu|AltTabMenuDismiss|AlwaysOnTop|AutoSize|Background|BackgroundTrans|BelowNormal|between|BitAnd|BitNot|BitOr|BitShiftLeft|BitShiftRight|BitXOr|Bold|Border|Button|ByRef|Checkbox|Checked|CheckedGray|Choose|ChooseString|Click|Close|Color|ComboBox|Contains|ControlList|Count|Date|DateTime|Days|DDL|Default|Delete|DeleteAll|Delimiter|Deref|Destroy|Digit|Disable|Disabled|DropDownList|Edit|Eject|Else|Enable|Enabled|Error|Exist|Exp|Expand|ExStyle|FileSystem|First|Flash|Float|FloatFast|Focus|Font|for|global|Grid|Group|GroupBox|GuiClose|GuiContextMenu|GuiDropFiles|GuiEscape|GuiSize|Hdr|Hidden|Hide|High|HKCC|HKCR|HKCU|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_LOCAL_MACHINE|HKEY_USERS|HKLM|HKU|Hours|HScroll|Icon|IconSmall|ID|IDLast|If|IfEqual|IfExist|IfGreater|IfGreaterOrEqual|IfInString|IfLess|IfLessOrEqual|IfMsgBox|IfNotEqual|IfNotExist|IfNotInString|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Ignore|ImageList|in|Integer|IntegerFast|Interrupt|is|italic|Join|Label|LastFound|LastFoundExist|Limit|Lines|List|ListBox|ListView|Ln|local|Lock|Logoff|Low|Lower|Lowercase|MainWindow|Margin|Maximize|MaximizeBox|MaxSize|Minimize|MinimizeBox|MinMax|MinSize|Minutes|MonthCal|Mouse|Move|Multi|NA|No|NoActivate|NoDefault|NoHide|NoIcon|NoMainWindow|norm|Normal|NoSort|NoSortHdr|NoStandard|Not|NoTab|NoTimers|Number|Off|Ok|On|OwnDialogs|Owner|Parse|Password|Picture|Pixel|Pos|Pow|Priority|ProcessName|Radio|Range|Read|ReadOnly|Realtime|Redraw|REG_BINARY|REG_DWORD|REG_EXPAND_SZ|REG_MULTI_SZ|REG_SZ|Region|Relative|Rename|Report|Resize|Restore|Retry|RGB|Right|Screen|Seconds|Section|Serial|SetLabel|ShiftAltTab|Show|Single|Slider|SortDesc|Standard|static|Status|StatusBar|StatusCD|strike|Style|Submit|SysMenu|Tab|Tab2|TabStop|Text|Theme|Tile|ToggleCheck|ToggleEnable|ToolWindow|Top|Topmost|TransColor|Transparent|Tray|TreeView|TryAgain|Type|UnCheck|underline|Unicode|Unlock|UpDown|Upper|Uppercase|UseErrorLevel|Vis|VisFirst|Visible|VScroll|Wait|WaitClose|WantCtrlA|WantF2|WantReturn|While|Wrap|Xdigit|xm|xp|xs|Yes|ym|yp|ys)\b/i};
\ No newline at end of file
+Prism.languages.autohotkey={comment:{pattern:/(^[^";\n]*("[^"\n]*?"[^"\n]*?)*)(;.*$|^\s*\/\*[\s\S]*\n\*\/)/m,lookbehind:!0},string:/"(([^"\n\r]|"")*)"/m,"function":/[^\(\); \t,\n\+\*\-=\?>:\\\/<&%\[\]]+?(?=\()/m,tag:/^[ \t]*[^\s:]+?(?=:(?:[^:]|$))/m,variable:/%\w+%/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[\+\-\*\\\/:=\?&\|<>]/,punctuation:/[\{}[\]\(\):]/,"boolean":/\b(true|false)\b/,selector:/\b(AutoTrim|BlockInput|Break|Click|ClipWait|Continue|Control|ControlClick|ControlFocus|ControlGet|ControlGetFocus|ControlGetPos|ControlGetText|ControlMove|ControlSend|ControlSendRaw|ControlSetText|CoordMode|Critical|DetectHiddenText|DetectHiddenWindows|Drive|DriveGet|DriveSpaceFree|EnvAdd|EnvDiv|EnvGet|EnvMult|EnvSet|EnvSub|EnvUpdate|Exit|ExitApp|FileAppend|FileCopy|FileCopyDir|FileCreateDir|FileCreateShortcut|FileDelete|FileEncoding|FileGetAttrib|FileGetShortcut|FileGetSize|FileGetTime|FileGetVersion|FileInstall|FileMove|FileMoveDir|FileRead|FileReadLine|FileRecycle|FileRecycleEmpty|FileRemoveDir|FileSelectFile|FileSelectFolder|FileSetAttrib|FileSetTime|FormatTime|GetKeyState|Gosub|Goto|GroupActivate|GroupAdd|GroupClose|GroupDeactivate|Gui|GuiControl|GuiControlGet|Hotkey|ImageSearch|IniDelete|IniRead|IniWrite|Input|InputBox|KeyWait|ListHotkeys|ListLines|ListVars|Loop|Menu|MouseClick|MouseClickDrag|MouseGetPos|MouseMove|MsgBox|OnExit|OutputDebug|Pause|PixelGetColor|PixelSearch|PostMessage|Process|Progress|Random|RegDelete|RegRead|RegWrite|Reload|Repeat|Return|Run|RunAs|RunWait|Send|SendEvent|SendInput|SendMessage|SendMode|SendPlay|SendRaw|SetBatchLines|SetCapslockState|SetControlDelay|SetDefaultMouseSpeed|SetEnv|SetFormat|SetKeyDelay|SetMouseDelay|SetNumlockState|SetScrollLockState|SetStoreCapslockMode|SetTimer|SetTitleMatchMode|SetWinDelay|SetWorkingDir|Shutdown|Sleep|Sort|SoundBeep|SoundGet|SoundGetWaveVolume|SoundPlay|SoundSet|SoundSetWaveVolume|SplashImage|SplashTextOff|SplashTextOn|SplitPath|StatusBarGetText|StatusBarWait|StringCaseSense|StringGetPos|StringLeft|StringLen|StringLower|StringMid|StringReplace|StringRight|StringSplit|StringTrimLeft|StringTrimRight|StringUpper|Suspend|SysGet|Thread|ToolTip|Transform|TrayTip|URLDownloadToFile|WinActivate|WinActivateBottom|WinClose|WinGet|WinGetActiveStats|WinGetActiveTitle|WinGetClass|WinGetPos|WinGetText|WinGetTitle|WinHide|WinKill|WinMaximize|WinMenuSelectItem|WinMinimize|WinMinimizeAll|WinMinimizeAllUndo|WinMove|WinRestore|WinSet|WinSetTitle|WinShow|WinWait|WinWaitActive|WinWaitClose|WinWaitNotActive)\b/i,constant:/\b(a_ahkpath|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelay|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|programfiles|a_programfiles|a_programs|a_programscommon|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel)\b/i,builtin:/\b(abs|acos|asc|asin|atan|ceil|chr|class|cos|dllcall|exp|fileexist|Fileopen|floor|getkeystate|il_add|il_create|il_destroy|instr|substr|isfunc|islabel|IsObject|ln|log|lv_add|lv_delete|lv_deletecol|lv_getcount|lv_getnext|lv_gettext|lv_insert|lv_insertcol|lv_modify|lv_modifycol|lv_setimagelist|mod|onmessage|numget|numput|registercallback|regexmatch|regexreplace|round|sin|tan|sqrt|strlen|sb_seticon|sb_setparts|sb_settext|strsplit|tv_add|tv_delete|tv_getchild|tv_getcount|tv_getnext|tv_get|tv_getparent|tv_getprev|tv_getselection|tv_gettext|tv_modify|varsetcapacity|winactive|winexist|__New|__Call|__Get|__Set)\b/i,symbol:/\b(alt|altdown|altup|appskey|backspace|browser_back|browser_favorites|browser_forward|browser_home|browser_refresh|browser_search|browser_stop|bs|capslock|control|ctrl|ctrlbreak|ctrldown|ctrlup|del|delete|down|end|enter|esc|escape|f1|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f2|f20|f21|f22|f23|f24|f3|f4|f5|f6|f7|f8|f9|home|ins|insert|joy1|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy2|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy3|joy30|joy31|joy32|joy4|joy5|joy6|joy7|joy8|joy9|joyaxes|joybuttons|joyinfo|joyname|joypov|joyr|joyu|joyv|joyx|joyy|joyz|lalt|launch_app1|launch_app2|launch_mail|launch_media|lbutton|lcontrol|lctrl|left|lshift|lwin|lwindown|lwinup|mbutton|media_next|media_play_pause|media_prev|media_stop|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadadd|numpadclear|numpaddel|numpaddiv|numpaddot|numpaddown|numpadend|numpadenter|numpadhome|numpadins|numpadleft|numpadmult|numpadpgdn|numpadpgup|numpadright|numpadsub|numpadup|pause|pgdn|pgup|printscreen|ralt|rbutton|rcontrol|rctrl|right|rshift|rwin|rwindown|rwinup|scrolllock|shift|shiftdown|shiftup|space|tab|up|volume_down|volume_mute|volume_up|wheeldown|wheelleft|wheelright|wheelup|xbutton1|xbutton2)\b/i,important:/#\b(AllowSameLineComments|ClipboardTimeout|CommentFlag|ErrorStdOut|EscapeChar|HotkeyInterval|HotkeyModifierTimeout|Hotstring|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Include|IncludeAgain|InstallKeybdHook|InstallMouseHook|KeyHistory|LTrim|MaxHotkeysPerInterval|MaxMem|MaxThreads|MaxThreadsBuffer|MaxThreadsPerHotkey|NoEnv|NoTrayIcon|Persistent|SingleInstance|UseHook|WinActivateForce)\b/i,keyword:/\b(Abort|AboveNormal|Add|ahk_class|ahk_group|ahk_id|ahk_pid|All|Alnum|Alpha|AltSubmit|AltTab|AltTabAndMenu|AltTabMenu|AltTabMenuDismiss|AlwaysOnTop|AutoSize|Background|BackgroundTrans|BelowNormal|between|BitAnd|BitNot|BitOr|BitShiftLeft|BitShiftRight|BitXOr|Bold|Border|Button|ByRef|Checkbox|Checked|CheckedGray|Choose|ChooseString|Click|Close|Color|ComboBox|Contains|ControlList|Count|Date|DateTime|Days|DDL|Default|Delete|DeleteAll|Delimiter|Deref|Destroy|Digit|Disable|Disabled|DropDownList|Edit|Eject|Else|Enable|Enabled|Error|Exist|Exp|Expand|ExStyle|FileSystem|First|Flash|Float|FloatFast|Focus|Font|for|global|Grid|Group|GroupBox|GuiClose|GuiContextMenu|GuiDropFiles|GuiEscape|GuiSize|Hdr|Hidden|Hide|High|HKCC|HKCR|HKCU|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_LOCAL_MACHINE|HKEY_USERS|HKLM|HKU|Hours|HScroll|Icon|IconSmall|ID|IDLast|If|IfEqual|IfExist|IfGreater|IfGreaterOrEqual|IfInString|IfLess|IfLessOrEqual|IfMsgBox|IfNotEqual|IfNotExist|IfNotInString|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Ignore|ImageList|in|Integer|IntegerFast|Interrupt|is|italic|Join|Label|LastFound|LastFoundExist|Limit|Lines|List|ListBox|ListView|Ln|local|Lock|Logoff|Low|Lower|Lowercase|MainWindow|Margin|Maximize|MaximizeBox|MaxSize|Minimize|MinimizeBox|MinMax|MinSize|Minutes|MonthCal|Mouse|Move|Multi|NA|No|NoActivate|NoDefault|NoHide|NoIcon|NoMainWindow|norm|Normal|NoSort|NoSortHdr|NoStandard|Not|NoTab|NoTimers|Number|Off|Ok|On|OwnDialogs|Owner|Parse|Password|Picture|Pixel|Pos|Pow|Priority|ProcessName|Radio|Range|Read|ReadOnly|Realtime|Redraw|REG_BINARY|REG_DWORD|REG_EXPAND_SZ|REG_MULTI_SZ|REG_SZ|Region|Relative|Rename|Report|Resize|Restore|Retry|RGB|Right|Screen|Seconds|Section|Serial|SetLabel|ShiftAltTab|Show|Single|Slider|SortDesc|Standard|static|Status|StatusBar|StatusCD|strike|Style|Submit|SysMenu|Tab|Tab2|TabStop|Text|Theme|Tile|ToggleCheck|ToggleEnable|ToolWindow|Top|Topmost|TransColor|Transparent|Tray|TreeView|TryAgain|Type|UnCheck|underline|Unicode|Unlock|UpDown|Upper|Uppercase|UseErrorLevel|Vis|VisFirst|Visible|VScroll|Wait|WaitClose|WantCtrlA|WantF2|WantReturn|While|Wrap|Xdigit|xm|xp|xs|Yes|ym|yp|ys)\b/i};
\ No newline at end of file

From f0ccb1b0fe390e7840769f5beccc2b83330f5fa8 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 19:48:16 +0200
Subject: [PATCH 102/310] AutoHotkey: match all operators + add comma to
 punctuation

---
 components/prism-autohotkey.js     | 4 ++--
 components/prism-autohotkey.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-autohotkey.js b/components/prism-autohotkey.js
index 4b8694411d..223309527f 100644
--- a/components/prism-autohotkey.js
+++ b/components/prism-autohotkey.js
@@ -9,8 +9,8 @@ Prism.languages.autohotkey= {
 	'tag': /^[ \t]*[^\s:]+?(?=:(?:[^:]|$))/m,  //labels
 	'variable': /%\w+%/,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
-	'operator': /[\+\-\*\\\/:=\?&\|<>]/,
-	'punctuation': /[\{}[\]\(\):]/,
+	'operator': /\?|\/\/?=?|:=|\|[=|]?|&[=&]?|\+[=+]?|-[=-]?|\*[=*]?|<(?:<=?|>|=)?|>>?=?|[.^!=~]=?|\b(?:AND|NOT|OR)\b/,
+	'punctuation': /[\{}[\]\(\):,]/,
 	'boolean': /\b(true|false)\b/,
 
 	'selector': /\b(AutoTrim|BlockInput|Break|Click|ClipWait|Continue|Control|ControlClick|ControlFocus|ControlGet|ControlGetFocus|ControlGetPos|ControlGetText|ControlMove|ControlSend|ControlSendRaw|ControlSetText|CoordMode|Critical|DetectHiddenText|DetectHiddenWindows|Drive|DriveGet|DriveSpaceFree|EnvAdd|EnvDiv|EnvGet|EnvMult|EnvSet|EnvSub|EnvUpdate|Exit|ExitApp|FileAppend|FileCopy|FileCopyDir|FileCreateDir|FileCreateShortcut|FileDelete|FileEncoding|FileGetAttrib|FileGetShortcut|FileGetSize|FileGetTime|FileGetVersion|FileInstall|FileMove|FileMoveDir|FileRead|FileReadLine|FileRecycle|FileRecycleEmpty|FileRemoveDir|FileSelectFile|FileSelectFolder|FileSetAttrib|FileSetTime|FormatTime|GetKeyState|Gosub|Goto|GroupActivate|GroupAdd|GroupClose|GroupDeactivate|Gui|GuiControl|GuiControlGet|Hotkey|ImageSearch|IniDelete|IniRead|IniWrite|Input|InputBox|KeyWait|ListHotkeys|ListLines|ListVars|Loop|Menu|MouseClick|MouseClickDrag|MouseGetPos|MouseMove|MsgBox|OnExit|OutputDebug|Pause|PixelGetColor|PixelSearch|PostMessage|Process|Progress|Random|RegDelete|RegRead|RegWrite|Reload|Repeat|Return|Run|RunAs|RunWait|Send|SendEvent|SendInput|SendMessage|SendMode|SendPlay|SendRaw|SetBatchLines|SetCapslockState|SetControlDelay|SetDefaultMouseSpeed|SetEnv|SetFormat|SetKeyDelay|SetMouseDelay|SetNumlockState|SetScrollLockState|SetStoreCapslockMode|SetTimer|SetTitleMatchMode|SetWinDelay|SetWorkingDir|Shutdown|Sleep|Sort|SoundBeep|SoundGet|SoundGetWaveVolume|SoundPlay|SoundSet|SoundSetWaveVolume|SplashImage|SplashTextOff|SplashTextOn|SplitPath|StatusBarGetText|StatusBarWait|StringCaseSense|StringGetPos|StringLeft|StringLen|StringLower|StringMid|StringReplace|StringRight|StringSplit|StringTrimLeft|StringTrimRight|StringUpper|Suspend|SysGet|Thread|ToolTip|Transform|TrayTip|URLDownloadToFile|WinActivate|WinActivateBottom|WinClose|WinGet|WinGetActiveStats|WinGetActiveTitle|WinGetClass|WinGetPos|WinGetText|WinGetTitle|WinHide|WinKill|WinMaximize|WinMenuSelectItem|WinMinimize|WinMinimizeAll|WinMinimizeAllUndo|WinMove|WinRestore|WinSet|WinSetTitle|WinShow|WinWait|WinWaitActive|WinWaitClose|WinWaitNotActive)\b/i,
diff --git a/components/prism-autohotkey.min.js b/components/prism-autohotkey.min.js
index 4d00538940..c15fa0f54e 100644
--- a/components/prism-autohotkey.min.js
+++ b/components/prism-autohotkey.min.js
@@ -1 +1 @@
-Prism.languages.autohotkey={comment:{pattern:/(^[^";\n]*("[^"\n]*?"[^"\n]*?)*)(;.*$|^\s*\/\*[\s\S]*\n\*\/)/m,lookbehind:!0},string:/"(([^"\n\r]|"")*)"/m,"function":/[^\(\); \t,\n\+\*\-=\?>:\\\/<&%\[\]]+?(?=\()/m,tag:/^[ \t]*[^\s:]+?(?=:(?:[^:]|$))/m,variable:/%\w+%/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[\+\-\*\\\/:=\?&\|<>]/,punctuation:/[\{}[\]\(\):]/,"boolean":/\b(true|false)\b/,selector:/\b(AutoTrim|BlockInput|Break|Click|ClipWait|Continue|Control|ControlClick|ControlFocus|ControlGet|ControlGetFocus|ControlGetPos|ControlGetText|ControlMove|ControlSend|ControlSendRaw|ControlSetText|CoordMode|Critical|DetectHiddenText|DetectHiddenWindows|Drive|DriveGet|DriveSpaceFree|EnvAdd|EnvDiv|EnvGet|EnvMult|EnvSet|EnvSub|EnvUpdate|Exit|ExitApp|FileAppend|FileCopy|FileCopyDir|FileCreateDir|FileCreateShortcut|FileDelete|FileEncoding|FileGetAttrib|FileGetShortcut|FileGetSize|FileGetTime|FileGetVersion|FileInstall|FileMove|FileMoveDir|FileRead|FileReadLine|FileRecycle|FileRecycleEmpty|FileRemoveDir|FileSelectFile|FileSelectFolder|FileSetAttrib|FileSetTime|FormatTime|GetKeyState|Gosub|Goto|GroupActivate|GroupAdd|GroupClose|GroupDeactivate|Gui|GuiControl|GuiControlGet|Hotkey|ImageSearch|IniDelete|IniRead|IniWrite|Input|InputBox|KeyWait|ListHotkeys|ListLines|ListVars|Loop|Menu|MouseClick|MouseClickDrag|MouseGetPos|MouseMove|MsgBox|OnExit|OutputDebug|Pause|PixelGetColor|PixelSearch|PostMessage|Process|Progress|Random|RegDelete|RegRead|RegWrite|Reload|Repeat|Return|Run|RunAs|RunWait|Send|SendEvent|SendInput|SendMessage|SendMode|SendPlay|SendRaw|SetBatchLines|SetCapslockState|SetControlDelay|SetDefaultMouseSpeed|SetEnv|SetFormat|SetKeyDelay|SetMouseDelay|SetNumlockState|SetScrollLockState|SetStoreCapslockMode|SetTimer|SetTitleMatchMode|SetWinDelay|SetWorkingDir|Shutdown|Sleep|Sort|SoundBeep|SoundGet|SoundGetWaveVolume|SoundPlay|SoundSet|SoundSetWaveVolume|SplashImage|SplashTextOff|SplashTextOn|SplitPath|StatusBarGetText|StatusBarWait|StringCaseSense|StringGetPos|StringLeft|StringLen|StringLower|StringMid|StringReplace|StringRight|StringSplit|StringTrimLeft|StringTrimRight|StringUpper|Suspend|SysGet|Thread|ToolTip|Transform|TrayTip|URLDownloadToFile|WinActivate|WinActivateBottom|WinClose|WinGet|WinGetActiveStats|WinGetActiveTitle|WinGetClass|WinGetPos|WinGetText|WinGetTitle|WinHide|WinKill|WinMaximize|WinMenuSelectItem|WinMinimize|WinMinimizeAll|WinMinimizeAllUndo|WinMove|WinRestore|WinSet|WinSetTitle|WinShow|WinWait|WinWaitActive|WinWaitClose|WinWaitNotActive)\b/i,constant:/\b(a_ahkpath|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelay|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|programfiles|a_programfiles|a_programs|a_programscommon|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel)\b/i,builtin:/\b(abs|acos|asc|asin|atan|ceil|chr|class|cos|dllcall|exp|fileexist|Fileopen|floor|getkeystate|il_add|il_create|il_destroy|instr|substr|isfunc|islabel|IsObject|ln|log|lv_add|lv_delete|lv_deletecol|lv_getcount|lv_getnext|lv_gettext|lv_insert|lv_insertcol|lv_modify|lv_modifycol|lv_setimagelist|mod|onmessage|numget|numput|registercallback|regexmatch|regexreplace|round|sin|tan|sqrt|strlen|sb_seticon|sb_setparts|sb_settext|strsplit|tv_add|tv_delete|tv_getchild|tv_getcount|tv_getnext|tv_get|tv_getparent|tv_getprev|tv_getselection|tv_gettext|tv_modify|varsetcapacity|winactive|winexist|__New|__Call|__Get|__Set)\b/i,symbol:/\b(alt|altdown|altup|appskey|backspace|browser_back|browser_favorites|browser_forward|browser_home|browser_refresh|browser_search|browser_stop|bs|capslock|control|ctrl|ctrlbreak|ctrldown|ctrlup|del|delete|down|end|enter|esc|escape|f1|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f2|f20|f21|f22|f23|f24|f3|f4|f5|f6|f7|f8|f9|home|ins|insert|joy1|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy2|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy3|joy30|joy31|joy32|joy4|joy5|joy6|joy7|joy8|joy9|joyaxes|joybuttons|joyinfo|joyname|joypov|joyr|joyu|joyv|joyx|joyy|joyz|lalt|launch_app1|launch_app2|launch_mail|launch_media|lbutton|lcontrol|lctrl|left|lshift|lwin|lwindown|lwinup|mbutton|media_next|media_play_pause|media_prev|media_stop|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadadd|numpadclear|numpaddel|numpaddiv|numpaddot|numpaddown|numpadend|numpadenter|numpadhome|numpadins|numpadleft|numpadmult|numpadpgdn|numpadpgup|numpadright|numpadsub|numpadup|pause|pgdn|pgup|printscreen|ralt|rbutton|rcontrol|rctrl|right|rshift|rwin|rwindown|rwinup|scrolllock|shift|shiftdown|shiftup|space|tab|up|volume_down|volume_mute|volume_up|wheeldown|wheelleft|wheelright|wheelup|xbutton1|xbutton2)\b/i,important:/#\b(AllowSameLineComments|ClipboardTimeout|CommentFlag|ErrorStdOut|EscapeChar|HotkeyInterval|HotkeyModifierTimeout|Hotstring|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Include|IncludeAgain|InstallKeybdHook|InstallMouseHook|KeyHistory|LTrim|MaxHotkeysPerInterval|MaxMem|MaxThreads|MaxThreadsBuffer|MaxThreadsPerHotkey|NoEnv|NoTrayIcon|Persistent|SingleInstance|UseHook|WinActivateForce)\b/i,keyword:/\b(Abort|AboveNormal|Add|ahk_class|ahk_group|ahk_id|ahk_pid|All|Alnum|Alpha|AltSubmit|AltTab|AltTabAndMenu|AltTabMenu|AltTabMenuDismiss|AlwaysOnTop|AutoSize|Background|BackgroundTrans|BelowNormal|between|BitAnd|BitNot|BitOr|BitShiftLeft|BitShiftRight|BitXOr|Bold|Border|Button|ByRef|Checkbox|Checked|CheckedGray|Choose|ChooseString|Click|Close|Color|ComboBox|Contains|ControlList|Count|Date|DateTime|Days|DDL|Default|Delete|DeleteAll|Delimiter|Deref|Destroy|Digit|Disable|Disabled|DropDownList|Edit|Eject|Else|Enable|Enabled|Error|Exist|Exp|Expand|ExStyle|FileSystem|First|Flash|Float|FloatFast|Focus|Font|for|global|Grid|Group|GroupBox|GuiClose|GuiContextMenu|GuiDropFiles|GuiEscape|GuiSize|Hdr|Hidden|Hide|High|HKCC|HKCR|HKCU|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_LOCAL_MACHINE|HKEY_USERS|HKLM|HKU|Hours|HScroll|Icon|IconSmall|ID|IDLast|If|IfEqual|IfExist|IfGreater|IfGreaterOrEqual|IfInString|IfLess|IfLessOrEqual|IfMsgBox|IfNotEqual|IfNotExist|IfNotInString|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Ignore|ImageList|in|Integer|IntegerFast|Interrupt|is|italic|Join|Label|LastFound|LastFoundExist|Limit|Lines|List|ListBox|ListView|Ln|local|Lock|Logoff|Low|Lower|Lowercase|MainWindow|Margin|Maximize|MaximizeBox|MaxSize|Minimize|MinimizeBox|MinMax|MinSize|Minutes|MonthCal|Mouse|Move|Multi|NA|No|NoActivate|NoDefault|NoHide|NoIcon|NoMainWindow|norm|Normal|NoSort|NoSortHdr|NoStandard|Not|NoTab|NoTimers|Number|Off|Ok|On|OwnDialogs|Owner|Parse|Password|Picture|Pixel|Pos|Pow|Priority|ProcessName|Radio|Range|Read|ReadOnly|Realtime|Redraw|REG_BINARY|REG_DWORD|REG_EXPAND_SZ|REG_MULTI_SZ|REG_SZ|Region|Relative|Rename|Report|Resize|Restore|Retry|RGB|Right|Screen|Seconds|Section|Serial|SetLabel|ShiftAltTab|Show|Single|Slider|SortDesc|Standard|static|Status|StatusBar|StatusCD|strike|Style|Submit|SysMenu|Tab|Tab2|TabStop|Text|Theme|Tile|ToggleCheck|ToggleEnable|ToolWindow|Top|Topmost|TransColor|Transparent|Tray|TreeView|TryAgain|Type|UnCheck|underline|Unicode|Unlock|UpDown|Upper|Uppercase|UseErrorLevel|Vis|VisFirst|Visible|VScroll|Wait|WaitClose|WantCtrlA|WantF2|WantReturn|While|Wrap|Xdigit|xm|xp|xs|Yes|ym|yp|ys)\b/i};
\ No newline at end of file
+Prism.languages.autohotkey={comment:{pattern:/(^[^";\n]*("[^"\n]*?"[^"\n]*?)*)(;.*$|^\s*\/\*[\s\S]*\n\*\/)/m,lookbehind:!0},string:/"(([^"\n\r]|"")*)"/m,"function":/[^\(\); \t,\n\+\*\-=\?>:\\\/<&%\[\]]+?(?=\()/m,tag:/^[ \t]*[^\s:]+?(?=:(?:[^:]|$))/m,variable:/%\w+%/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/\?|\/\/?=?|:=|\|[=|]?|&[=&]?|\+[=+]?|-[=-]?|\*[=*]?|<(?:<=?|>|=)?|>>?=?|[.^!=~]=?|\b(?:AND|NOT|OR)\b/,punctuation:/[\{}[\]\(\):,]/,"boolean":/\b(true|false)\b/,selector:/\b(AutoTrim|BlockInput|Break|Click|ClipWait|Continue|Control|ControlClick|ControlFocus|ControlGet|ControlGetFocus|ControlGetPos|ControlGetText|ControlMove|ControlSend|ControlSendRaw|ControlSetText|CoordMode|Critical|DetectHiddenText|DetectHiddenWindows|Drive|DriveGet|DriveSpaceFree|EnvAdd|EnvDiv|EnvGet|EnvMult|EnvSet|EnvSub|EnvUpdate|Exit|ExitApp|FileAppend|FileCopy|FileCopyDir|FileCreateDir|FileCreateShortcut|FileDelete|FileEncoding|FileGetAttrib|FileGetShortcut|FileGetSize|FileGetTime|FileGetVersion|FileInstall|FileMove|FileMoveDir|FileRead|FileReadLine|FileRecycle|FileRecycleEmpty|FileRemoveDir|FileSelectFile|FileSelectFolder|FileSetAttrib|FileSetTime|FormatTime|GetKeyState|Gosub|Goto|GroupActivate|GroupAdd|GroupClose|GroupDeactivate|Gui|GuiControl|GuiControlGet|Hotkey|ImageSearch|IniDelete|IniRead|IniWrite|Input|InputBox|KeyWait|ListHotkeys|ListLines|ListVars|Loop|Menu|MouseClick|MouseClickDrag|MouseGetPos|MouseMove|MsgBox|OnExit|OutputDebug|Pause|PixelGetColor|PixelSearch|PostMessage|Process|Progress|Random|RegDelete|RegRead|RegWrite|Reload|Repeat|Return|Run|RunAs|RunWait|Send|SendEvent|SendInput|SendMessage|SendMode|SendPlay|SendRaw|SetBatchLines|SetCapslockState|SetControlDelay|SetDefaultMouseSpeed|SetEnv|SetFormat|SetKeyDelay|SetMouseDelay|SetNumlockState|SetScrollLockState|SetStoreCapslockMode|SetTimer|SetTitleMatchMode|SetWinDelay|SetWorkingDir|Shutdown|Sleep|Sort|SoundBeep|SoundGet|SoundGetWaveVolume|SoundPlay|SoundSet|SoundSetWaveVolume|SplashImage|SplashTextOff|SplashTextOn|SplitPath|StatusBarGetText|StatusBarWait|StringCaseSense|StringGetPos|StringLeft|StringLen|StringLower|StringMid|StringReplace|StringRight|StringSplit|StringTrimLeft|StringTrimRight|StringUpper|Suspend|SysGet|Thread|ToolTip|Transform|TrayTip|URLDownloadToFile|WinActivate|WinActivateBottom|WinClose|WinGet|WinGetActiveStats|WinGetActiveTitle|WinGetClass|WinGetPos|WinGetText|WinGetTitle|WinHide|WinKill|WinMaximize|WinMenuSelectItem|WinMinimize|WinMinimizeAll|WinMinimizeAllUndo|WinMove|WinRestore|WinSet|WinSetTitle|WinShow|WinWait|WinWaitActive|WinWaitClose|WinWaitNotActive)\b/i,constant:/\b(a_ahkpath|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelay|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|programfiles|a_programfiles|a_programs|a_programscommon|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel)\b/i,builtin:/\b(abs|acos|asc|asin|atan|ceil|chr|class|cos|dllcall|exp|fileexist|Fileopen|floor|getkeystate|il_add|il_create|il_destroy|instr|substr|isfunc|islabel|IsObject|ln|log|lv_add|lv_delete|lv_deletecol|lv_getcount|lv_getnext|lv_gettext|lv_insert|lv_insertcol|lv_modify|lv_modifycol|lv_setimagelist|mod|onmessage|numget|numput|registercallback|regexmatch|regexreplace|round|sin|tan|sqrt|strlen|sb_seticon|sb_setparts|sb_settext|strsplit|tv_add|tv_delete|tv_getchild|tv_getcount|tv_getnext|tv_get|tv_getparent|tv_getprev|tv_getselection|tv_gettext|tv_modify|varsetcapacity|winactive|winexist|__New|__Call|__Get|__Set)\b/i,symbol:/\b(alt|altdown|altup|appskey|backspace|browser_back|browser_favorites|browser_forward|browser_home|browser_refresh|browser_search|browser_stop|bs|capslock|control|ctrl|ctrlbreak|ctrldown|ctrlup|del|delete|down|end|enter|esc|escape|f1|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f2|f20|f21|f22|f23|f24|f3|f4|f5|f6|f7|f8|f9|home|ins|insert|joy1|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy2|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy3|joy30|joy31|joy32|joy4|joy5|joy6|joy7|joy8|joy9|joyaxes|joybuttons|joyinfo|joyname|joypov|joyr|joyu|joyv|joyx|joyy|joyz|lalt|launch_app1|launch_app2|launch_mail|launch_media|lbutton|lcontrol|lctrl|left|lshift|lwin|lwindown|lwinup|mbutton|media_next|media_play_pause|media_prev|media_stop|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadadd|numpadclear|numpaddel|numpaddiv|numpaddot|numpaddown|numpadend|numpadenter|numpadhome|numpadins|numpadleft|numpadmult|numpadpgdn|numpadpgup|numpadright|numpadsub|numpadup|pause|pgdn|pgup|printscreen|ralt|rbutton|rcontrol|rctrl|right|rshift|rwin|rwindown|rwinup|scrolllock|shift|shiftdown|shiftup|space|tab|up|volume_down|volume_mute|volume_up|wheeldown|wheelleft|wheelright|wheelup|xbutton1|xbutton2)\b/i,important:/#\b(AllowSameLineComments|ClipboardTimeout|CommentFlag|ErrorStdOut|EscapeChar|HotkeyInterval|HotkeyModifierTimeout|Hotstring|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Include|IncludeAgain|InstallKeybdHook|InstallMouseHook|KeyHistory|LTrim|MaxHotkeysPerInterval|MaxMem|MaxThreads|MaxThreadsBuffer|MaxThreadsPerHotkey|NoEnv|NoTrayIcon|Persistent|SingleInstance|UseHook|WinActivateForce)\b/i,keyword:/\b(Abort|AboveNormal|Add|ahk_class|ahk_group|ahk_id|ahk_pid|All|Alnum|Alpha|AltSubmit|AltTab|AltTabAndMenu|AltTabMenu|AltTabMenuDismiss|AlwaysOnTop|AutoSize|Background|BackgroundTrans|BelowNormal|between|BitAnd|BitNot|BitOr|BitShiftLeft|BitShiftRight|BitXOr|Bold|Border|Button|ByRef|Checkbox|Checked|CheckedGray|Choose|ChooseString|Click|Close|Color|ComboBox|Contains|ControlList|Count|Date|DateTime|Days|DDL|Default|Delete|DeleteAll|Delimiter|Deref|Destroy|Digit|Disable|Disabled|DropDownList|Edit|Eject|Else|Enable|Enabled|Error|Exist|Exp|Expand|ExStyle|FileSystem|First|Flash|Float|FloatFast|Focus|Font|for|global|Grid|Group|GroupBox|GuiClose|GuiContextMenu|GuiDropFiles|GuiEscape|GuiSize|Hdr|Hidden|Hide|High|HKCC|HKCR|HKCU|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_LOCAL_MACHINE|HKEY_USERS|HKLM|HKU|Hours|HScroll|Icon|IconSmall|ID|IDLast|If|IfEqual|IfExist|IfGreater|IfGreaterOrEqual|IfInString|IfLess|IfLessOrEqual|IfMsgBox|IfNotEqual|IfNotExist|IfNotInString|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Ignore|ImageList|in|Integer|IntegerFast|Interrupt|is|italic|Join|Label|LastFound|LastFoundExist|Limit|Lines|List|ListBox|ListView|Ln|local|Lock|Logoff|Low|Lower|Lowercase|MainWindow|Margin|Maximize|MaximizeBox|MaxSize|Minimize|MinimizeBox|MinMax|MinSize|Minutes|MonthCal|Mouse|Move|Multi|NA|No|NoActivate|NoDefault|NoHide|NoIcon|NoMainWindow|norm|Normal|NoSort|NoSortHdr|NoStandard|Not|NoTab|NoTimers|Number|Off|Ok|On|OwnDialogs|Owner|Parse|Password|Picture|Pixel|Pos|Pow|Priority|ProcessName|Radio|Range|Read|ReadOnly|Realtime|Redraw|REG_BINARY|REG_DWORD|REG_EXPAND_SZ|REG_MULTI_SZ|REG_SZ|Region|Relative|Rename|Report|Resize|Restore|Retry|RGB|Right|Screen|Seconds|Section|Serial|SetLabel|ShiftAltTab|Show|Single|Slider|SortDesc|Standard|static|Status|StatusBar|StatusCD|strike|Style|Submit|SysMenu|Tab|Tab2|TabStop|Text|Theme|Tile|ToggleCheck|ToggleEnable|ToolWindow|Top|Topmost|TransColor|Transparent|Tray|TreeView|TryAgain|Type|UnCheck|underline|Unicode|Unlock|UpDown|Upper|Uppercase|UseErrorLevel|Vis|VisFirst|Visible|VScroll|Wait|WaitClose|WantCtrlA|WantF2|WantReturn|While|Wrap|Xdigit|xm|xp|xs|Yes|ym|yp|ys)\b/i};
\ No newline at end of file

From fe0a068a6198a823b3286da374237a2e9e0ec662 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 11 Jul 2015 20:02:03 +0200
Subject: [PATCH 103/310] AutoHotkey: removed duplicates in keywords lists

---
 components/prism-autohotkey.js     | 6 +++---
 components/prism-autohotkey.min.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/prism-autohotkey.js b/components/prism-autohotkey.js
index 223309527f..69491eada8 100644
--- a/components/prism-autohotkey.js
+++ b/components/prism-autohotkey.js
@@ -17,11 +17,11 @@ Prism.languages.autohotkey= {
 
 	'constant': /\b(a_ahkpath|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelay|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|programfiles|a_programfiles|a_programs|a_programscommon|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel)\b/i,
 
-	'builtin': /\b(abs|acos|asc|asin|atan|ceil|chr|class|cos|dllcall|exp|fileexist|Fileopen|floor|getkeystate|il_add|il_create|il_destroy|instr|substr|isfunc|islabel|IsObject|ln|log|lv_add|lv_delete|lv_deletecol|lv_getcount|lv_getnext|lv_gettext|lv_insert|lv_insertcol|lv_modify|lv_modifycol|lv_setimagelist|mod|onmessage|numget|numput|registercallback|regexmatch|regexreplace|round|sin|tan|sqrt|strlen|sb_seticon|sb_setparts|sb_settext|strsplit|tv_add|tv_delete|tv_getchild|tv_getcount|tv_getnext|tv_get|tv_getparent|tv_getprev|tv_getselection|tv_gettext|tv_modify|varsetcapacity|winactive|winexist|__New|__Call|__Get|__Set)\b/i,
+	'builtin': /\b(abs|acos|asc|asin|atan|ceil|chr|class|cos|dllcall|exp|fileexist|Fileopen|floor|il_add|il_create|il_destroy|instr|substr|isfunc|islabel|IsObject|ln|log|lv_add|lv_delete|lv_deletecol|lv_getcount|lv_getnext|lv_gettext|lv_insert|lv_insertcol|lv_modify|lv_modifycol|lv_setimagelist|mod|onmessage|numget|numput|registercallback|regexmatch|regexreplace|round|sin|tan|sqrt|strlen|sb_seticon|sb_setparts|sb_settext|strsplit|tv_add|tv_delete|tv_getchild|tv_getcount|tv_getnext|tv_get|tv_getparent|tv_getprev|tv_getselection|tv_gettext|tv_modify|varsetcapacity|winactive|winexist|__New|__Call|__Get|__Set)\b/i,
 
-	'symbol': /\b(alt|altdown|altup|appskey|backspace|browser_back|browser_favorites|browser_forward|browser_home|browser_refresh|browser_search|browser_stop|bs|capslock|control|ctrl|ctrlbreak|ctrldown|ctrlup|del|delete|down|end|enter|esc|escape|f1|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f2|f20|f21|f22|f23|f24|f3|f4|f5|f6|f7|f8|f9|home|ins|insert|joy1|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy2|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy3|joy30|joy31|joy32|joy4|joy5|joy6|joy7|joy8|joy9|joyaxes|joybuttons|joyinfo|joyname|joypov|joyr|joyu|joyv|joyx|joyy|joyz|lalt|launch_app1|launch_app2|launch_mail|launch_media|lbutton|lcontrol|lctrl|left|lshift|lwin|lwindown|lwinup|mbutton|media_next|media_play_pause|media_prev|media_stop|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadadd|numpadclear|numpaddel|numpaddiv|numpaddot|numpaddown|numpadend|numpadenter|numpadhome|numpadins|numpadleft|numpadmult|numpadpgdn|numpadpgup|numpadright|numpadsub|numpadup|pause|pgdn|pgup|printscreen|ralt|rbutton|rcontrol|rctrl|right|rshift|rwin|rwindown|rwinup|scrolllock|shift|shiftdown|shiftup|space|tab|up|volume_down|volume_mute|volume_up|wheeldown|wheelleft|wheelright|wheelup|xbutton1|xbutton2)\b/i,
+	'symbol': /\b(alt|altdown|altup|appskey|backspace|browser_back|browser_favorites|browser_forward|browser_home|browser_refresh|browser_search|browser_stop|bs|capslock|ctrl|ctrlbreak|ctrldown|ctrlup|del|delete|down|end|enter|esc|escape|f1|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f2|f20|f21|f22|f23|f24|f3|f4|f5|f6|f7|f8|f9|home|ins|insert|joy1|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy2|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy3|joy30|joy31|joy32|joy4|joy5|joy6|joy7|joy8|joy9|joyaxes|joybuttons|joyinfo|joyname|joypov|joyr|joyu|joyv|joyx|joyy|joyz|lalt|launch_app1|launch_app2|launch_mail|launch_media|lbutton|lcontrol|lctrl|left|lshift|lwin|lwindown|lwinup|mbutton|media_next|media_play_pause|media_prev|media_stop|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadadd|numpadclear|numpaddel|numpaddiv|numpaddot|numpaddown|numpadend|numpadenter|numpadhome|numpadins|numpadleft|numpadmult|numpadpgdn|numpadpgup|numpadright|numpadsub|numpadup|pgdn|pgup|printscreen|ralt|rbutton|rcontrol|rctrl|right|rshift|rwin|rwindown|rwinup|scrolllock|shift|shiftdown|shiftup|space|tab|up|volume_down|volume_mute|volume_up|wheeldown|wheelleft|wheelright|wheelup|xbutton1|xbutton2)\b/i,
 
 	'important': /#\b(AllowSameLineComments|ClipboardTimeout|CommentFlag|ErrorStdOut|EscapeChar|HotkeyInterval|HotkeyModifierTimeout|Hotstring|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Include|IncludeAgain|InstallKeybdHook|InstallMouseHook|KeyHistory|LTrim|MaxHotkeysPerInterval|MaxMem|MaxThreads|MaxThreadsBuffer|MaxThreadsPerHotkey|NoEnv|NoTrayIcon|Persistent|SingleInstance|UseHook|WinActivateForce)\b/i,
 
-	'keyword': /\b(Abort|AboveNormal|Add|ahk_class|ahk_group|ahk_id|ahk_pid|All|Alnum|Alpha|AltSubmit|AltTab|AltTabAndMenu|AltTabMenu|AltTabMenuDismiss|AlwaysOnTop|AutoSize|Background|BackgroundTrans|BelowNormal|between|BitAnd|BitNot|BitOr|BitShiftLeft|BitShiftRight|BitXOr|Bold|Border|Button|ByRef|Checkbox|Checked|CheckedGray|Choose|ChooseString|Click|Close|Color|ComboBox|Contains|ControlList|Count|Date|DateTime|Days|DDL|Default|Delete|DeleteAll|Delimiter|Deref|Destroy|Digit|Disable|Disabled|DropDownList|Edit|Eject|Else|Enable|Enabled|Error|Exist|Exp|Expand|ExStyle|FileSystem|First|Flash|Float|FloatFast|Focus|Font|for|global|Grid|Group|GroupBox|GuiClose|GuiContextMenu|GuiDropFiles|GuiEscape|GuiSize|Hdr|Hidden|Hide|High|HKCC|HKCR|HKCU|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_LOCAL_MACHINE|HKEY_USERS|HKLM|HKU|Hours|HScroll|Icon|IconSmall|ID|IDLast|If|IfEqual|IfExist|IfGreater|IfGreaterOrEqual|IfInString|IfLess|IfLessOrEqual|IfMsgBox|IfNotEqual|IfNotExist|IfNotInString|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Ignore|ImageList|in|Integer|IntegerFast|Interrupt|is|italic|Join|Label|LastFound|LastFoundExist|Limit|Lines|List|ListBox|ListView|Ln|local|Lock|Logoff|Low|Lower|Lowercase|MainWindow|Margin|Maximize|MaximizeBox|MaxSize|Minimize|MinimizeBox|MinMax|MinSize|Minutes|MonthCal|Mouse|Move|Multi|NA|No|NoActivate|NoDefault|NoHide|NoIcon|NoMainWindow|norm|Normal|NoSort|NoSortHdr|NoStandard|Not|NoTab|NoTimers|Number|Off|Ok|On|OwnDialogs|Owner|Parse|Password|Picture|Pixel|Pos|Pow|Priority|ProcessName|Radio|Range|Read|ReadOnly|Realtime|Redraw|REG_BINARY|REG_DWORD|REG_EXPAND_SZ|REG_MULTI_SZ|REG_SZ|Region|Relative|Rename|Report|Resize|Restore|Retry|RGB|Right|Screen|Seconds|Section|Serial|SetLabel|ShiftAltTab|Show|Single|Slider|SortDesc|Standard|static|Status|StatusBar|StatusCD|strike|Style|Submit|SysMenu|Tab|Tab2|TabStop|Text|Theme|Tile|ToggleCheck|ToggleEnable|ToolWindow|Top|Topmost|TransColor|Transparent|Tray|TreeView|TryAgain|Type|UnCheck|underline|Unicode|Unlock|UpDown|Upper|Uppercase|UseErrorLevel|Vis|VisFirst|Visible|VScroll|Wait|WaitClose|WantCtrlA|WantF2|WantReturn|While|Wrap|Xdigit|xm|xp|xs|Yes|ym|yp|ys)\b/i
+	'keyword': /\b(Abort|AboveNormal|Add|ahk_class|ahk_group|ahk_id|ahk_pid|All|Alnum|Alpha|AltSubmit|AltTab|AltTabAndMenu|AltTabMenu|AltTabMenuDismiss|AlwaysOnTop|AutoSize|Background|BackgroundTrans|BelowNormal|between|BitAnd|BitNot|BitOr|BitShiftLeft|BitShiftRight|BitXOr|Bold|Border|Button|ByRef|Checkbox|Checked|CheckedGray|Choose|ChooseString|Close|Color|ComboBox|Contains|ControlList|Count|Date|DateTime|Days|DDL|Default|DeleteAll|Delimiter|Deref|Destroy|Digit|Disable|Disabled|DropDownList|Edit|Eject|Else|Enable|Enabled|Error|Exist|Expand|ExStyle|FileSystem|First|Flash|Float|FloatFast|Focus|Font|for|global|Grid|Group|GroupBox|GuiClose|GuiContextMenu|GuiDropFiles|GuiEscape|GuiSize|Hdr|Hidden|Hide|High|HKCC|HKCR|HKCU|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_LOCAL_MACHINE|HKEY_USERS|HKLM|HKU|Hours|HScroll|Icon|IconSmall|ID|IDLast|If|IfEqual|IfExist|IfGreater|IfGreaterOrEqual|IfInString|IfLess|IfLessOrEqual|IfMsgBox|IfNotEqual|IfNotExist|IfNotInString|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Ignore|ImageList|in|Integer|IntegerFast|Interrupt|is|italic|Join|Label|LastFound|LastFoundExist|Limit|Lines|List|ListBox|ListView|local|Lock|Logoff|Low|Lower|Lowercase|MainWindow|Margin|Maximize|MaximizeBox|MaxSize|Minimize|MinimizeBox|MinMax|MinSize|Minutes|MonthCal|Mouse|Move|Multi|NA|No|NoActivate|NoDefault|NoHide|NoIcon|NoMainWindow|norm|Normal|NoSort|NoSortHdr|NoStandard|Not|NoTab|NoTimers|Number|Off|Ok|On|OwnDialogs|Owner|Parse|Password|Picture|Pixel|Pos|Pow|Priority|ProcessName|Radio|Range|Read|ReadOnly|Realtime|Redraw|REG_BINARY|REG_DWORD|REG_EXPAND_SZ|REG_MULTI_SZ|REG_SZ|Region|Relative|Rename|Report|Resize|Restore|Retry|RGB|Screen|Seconds|Section|Serial|SetLabel|ShiftAltTab|Show|Single|Slider|SortDesc|Standard|static|Status|StatusBar|StatusCD|strike|Style|Submit|SysMenu|Tab2|TabStop|Text|Theme|Tile|ToggleCheck|ToggleEnable|ToolWindow|Top|Topmost|TransColor|Transparent|Tray|TreeView|TryAgain|Type|UnCheck|underline|Unicode|Unlock|UpDown|Upper|Uppercase|UseErrorLevel|Vis|VisFirst|Visible|VScroll|Wait|WaitClose|WantCtrlA|WantF2|WantReturn|While|Wrap|Xdigit|xm|xp|xs|Yes|ym|yp|ys)\b/i
 };
\ No newline at end of file
diff --git a/components/prism-autohotkey.min.js b/components/prism-autohotkey.min.js
index c15fa0f54e..d4d9685b8b 100644
--- a/components/prism-autohotkey.min.js
+++ b/components/prism-autohotkey.min.js
@@ -1 +1 @@
-Prism.languages.autohotkey={comment:{pattern:/(^[^";\n]*("[^"\n]*?"[^"\n]*?)*)(;.*$|^\s*\/\*[\s\S]*\n\*\/)/m,lookbehind:!0},string:/"(([^"\n\r]|"")*)"/m,"function":/[^\(\); \t,\n\+\*\-=\?>:\\\/<&%\[\]]+?(?=\()/m,tag:/^[ \t]*[^\s:]+?(?=:(?:[^:]|$))/m,variable:/%\w+%/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/\?|\/\/?=?|:=|\|[=|]?|&[=&]?|\+[=+]?|-[=-]?|\*[=*]?|<(?:<=?|>|=)?|>>?=?|[.^!=~]=?|\b(?:AND|NOT|OR)\b/,punctuation:/[\{}[\]\(\):,]/,"boolean":/\b(true|false)\b/,selector:/\b(AutoTrim|BlockInput|Break|Click|ClipWait|Continue|Control|ControlClick|ControlFocus|ControlGet|ControlGetFocus|ControlGetPos|ControlGetText|ControlMove|ControlSend|ControlSendRaw|ControlSetText|CoordMode|Critical|DetectHiddenText|DetectHiddenWindows|Drive|DriveGet|DriveSpaceFree|EnvAdd|EnvDiv|EnvGet|EnvMult|EnvSet|EnvSub|EnvUpdate|Exit|ExitApp|FileAppend|FileCopy|FileCopyDir|FileCreateDir|FileCreateShortcut|FileDelete|FileEncoding|FileGetAttrib|FileGetShortcut|FileGetSize|FileGetTime|FileGetVersion|FileInstall|FileMove|FileMoveDir|FileRead|FileReadLine|FileRecycle|FileRecycleEmpty|FileRemoveDir|FileSelectFile|FileSelectFolder|FileSetAttrib|FileSetTime|FormatTime|GetKeyState|Gosub|Goto|GroupActivate|GroupAdd|GroupClose|GroupDeactivate|Gui|GuiControl|GuiControlGet|Hotkey|ImageSearch|IniDelete|IniRead|IniWrite|Input|InputBox|KeyWait|ListHotkeys|ListLines|ListVars|Loop|Menu|MouseClick|MouseClickDrag|MouseGetPos|MouseMove|MsgBox|OnExit|OutputDebug|Pause|PixelGetColor|PixelSearch|PostMessage|Process|Progress|Random|RegDelete|RegRead|RegWrite|Reload|Repeat|Return|Run|RunAs|RunWait|Send|SendEvent|SendInput|SendMessage|SendMode|SendPlay|SendRaw|SetBatchLines|SetCapslockState|SetControlDelay|SetDefaultMouseSpeed|SetEnv|SetFormat|SetKeyDelay|SetMouseDelay|SetNumlockState|SetScrollLockState|SetStoreCapslockMode|SetTimer|SetTitleMatchMode|SetWinDelay|SetWorkingDir|Shutdown|Sleep|Sort|SoundBeep|SoundGet|SoundGetWaveVolume|SoundPlay|SoundSet|SoundSetWaveVolume|SplashImage|SplashTextOff|SplashTextOn|SplitPath|StatusBarGetText|StatusBarWait|StringCaseSense|StringGetPos|StringLeft|StringLen|StringLower|StringMid|StringReplace|StringRight|StringSplit|StringTrimLeft|StringTrimRight|StringUpper|Suspend|SysGet|Thread|ToolTip|Transform|TrayTip|URLDownloadToFile|WinActivate|WinActivateBottom|WinClose|WinGet|WinGetActiveStats|WinGetActiveTitle|WinGetClass|WinGetPos|WinGetText|WinGetTitle|WinHide|WinKill|WinMaximize|WinMenuSelectItem|WinMinimize|WinMinimizeAll|WinMinimizeAllUndo|WinMove|WinRestore|WinSet|WinSetTitle|WinShow|WinWait|WinWaitActive|WinWaitClose|WinWaitNotActive)\b/i,constant:/\b(a_ahkpath|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelay|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|programfiles|a_programfiles|a_programs|a_programscommon|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel)\b/i,builtin:/\b(abs|acos|asc|asin|atan|ceil|chr|class|cos|dllcall|exp|fileexist|Fileopen|floor|getkeystate|il_add|il_create|il_destroy|instr|substr|isfunc|islabel|IsObject|ln|log|lv_add|lv_delete|lv_deletecol|lv_getcount|lv_getnext|lv_gettext|lv_insert|lv_insertcol|lv_modify|lv_modifycol|lv_setimagelist|mod|onmessage|numget|numput|registercallback|regexmatch|regexreplace|round|sin|tan|sqrt|strlen|sb_seticon|sb_setparts|sb_settext|strsplit|tv_add|tv_delete|tv_getchild|tv_getcount|tv_getnext|tv_get|tv_getparent|tv_getprev|tv_getselection|tv_gettext|tv_modify|varsetcapacity|winactive|winexist|__New|__Call|__Get|__Set)\b/i,symbol:/\b(alt|altdown|altup|appskey|backspace|browser_back|browser_favorites|browser_forward|browser_home|browser_refresh|browser_search|browser_stop|bs|capslock|control|ctrl|ctrlbreak|ctrldown|ctrlup|del|delete|down|end|enter|esc|escape|f1|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f2|f20|f21|f22|f23|f24|f3|f4|f5|f6|f7|f8|f9|home|ins|insert|joy1|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy2|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy3|joy30|joy31|joy32|joy4|joy5|joy6|joy7|joy8|joy9|joyaxes|joybuttons|joyinfo|joyname|joypov|joyr|joyu|joyv|joyx|joyy|joyz|lalt|launch_app1|launch_app2|launch_mail|launch_media|lbutton|lcontrol|lctrl|left|lshift|lwin|lwindown|lwinup|mbutton|media_next|media_play_pause|media_prev|media_stop|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadadd|numpadclear|numpaddel|numpaddiv|numpaddot|numpaddown|numpadend|numpadenter|numpadhome|numpadins|numpadleft|numpadmult|numpadpgdn|numpadpgup|numpadright|numpadsub|numpadup|pause|pgdn|pgup|printscreen|ralt|rbutton|rcontrol|rctrl|right|rshift|rwin|rwindown|rwinup|scrolllock|shift|shiftdown|shiftup|space|tab|up|volume_down|volume_mute|volume_up|wheeldown|wheelleft|wheelright|wheelup|xbutton1|xbutton2)\b/i,important:/#\b(AllowSameLineComments|ClipboardTimeout|CommentFlag|ErrorStdOut|EscapeChar|HotkeyInterval|HotkeyModifierTimeout|Hotstring|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Include|IncludeAgain|InstallKeybdHook|InstallMouseHook|KeyHistory|LTrim|MaxHotkeysPerInterval|MaxMem|MaxThreads|MaxThreadsBuffer|MaxThreadsPerHotkey|NoEnv|NoTrayIcon|Persistent|SingleInstance|UseHook|WinActivateForce)\b/i,keyword:/\b(Abort|AboveNormal|Add|ahk_class|ahk_group|ahk_id|ahk_pid|All|Alnum|Alpha|AltSubmit|AltTab|AltTabAndMenu|AltTabMenu|AltTabMenuDismiss|AlwaysOnTop|AutoSize|Background|BackgroundTrans|BelowNormal|between|BitAnd|BitNot|BitOr|BitShiftLeft|BitShiftRight|BitXOr|Bold|Border|Button|ByRef|Checkbox|Checked|CheckedGray|Choose|ChooseString|Click|Close|Color|ComboBox|Contains|ControlList|Count|Date|DateTime|Days|DDL|Default|Delete|DeleteAll|Delimiter|Deref|Destroy|Digit|Disable|Disabled|DropDownList|Edit|Eject|Else|Enable|Enabled|Error|Exist|Exp|Expand|ExStyle|FileSystem|First|Flash|Float|FloatFast|Focus|Font|for|global|Grid|Group|GroupBox|GuiClose|GuiContextMenu|GuiDropFiles|GuiEscape|GuiSize|Hdr|Hidden|Hide|High|HKCC|HKCR|HKCU|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_LOCAL_MACHINE|HKEY_USERS|HKLM|HKU|Hours|HScroll|Icon|IconSmall|ID|IDLast|If|IfEqual|IfExist|IfGreater|IfGreaterOrEqual|IfInString|IfLess|IfLessOrEqual|IfMsgBox|IfNotEqual|IfNotExist|IfNotInString|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Ignore|ImageList|in|Integer|IntegerFast|Interrupt|is|italic|Join|Label|LastFound|LastFoundExist|Limit|Lines|List|ListBox|ListView|Ln|local|Lock|Logoff|Low|Lower|Lowercase|MainWindow|Margin|Maximize|MaximizeBox|MaxSize|Minimize|MinimizeBox|MinMax|MinSize|Minutes|MonthCal|Mouse|Move|Multi|NA|No|NoActivate|NoDefault|NoHide|NoIcon|NoMainWindow|norm|Normal|NoSort|NoSortHdr|NoStandard|Not|NoTab|NoTimers|Number|Off|Ok|On|OwnDialogs|Owner|Parse|Password|Picture|Pixel|Pos|Pow|Priority|ProcessName|Radio|Range|Read|ReadOnly|Realtime|Redraw|REG_BINARY|REG_DWORD|REG_EXPAND_SZ|REG_MULTI_SZ|REG_SZ|Region|Relative|Rename|Report|Resize|Restore|Retry|RGB|Right|Screen|Seconds|Section|Serial|SetLabel|ShiftAltTab|Show|Single|Slider|SortDesc|Standard|static|Status|StatusBar|StatusCD|strike|Style|Submit|SysMenu|Tab|Tab2|TabStop|Text|Theme|Tile|ToggleCheck|ToggleEnable|ToolWindow|Top|Topmost|TransColor|Transparent|Tray|TreeView|TryAgain|Type|UnCheck|underline|Unicode|Unlock|UpDown|Upper|Uppercase|UseErrorLevel|Vis|VisFirst|Visible|VScroll|Wait|WaitClose|WantCtrlA|WantF2|WantReturn|While|Wrap|Xdigit|xm|xp|xs|Yes|ym|yp|ys)\b/i};
\ No newline at end of file
+Prism.languages.autohotkey={comment:{pattern:/(^[^";\n]*("[^"\n]*?"[^"\n]*?)*)(;.*$|^\s*\/\*[\s\S]*\n\*\/)/m,lookbehind:!0},string:/"(([^"\n\r]|"")*)"/m,"function":/[^\(\); \t,\n\+\*\-=\?>:\\\/<&%\[\]]+?(?=\()/m,tag:/^[ \t]*[^\s:]+?(?=:(?:[^:]|$))/m,variable:/%\w+%/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/\?|\/\/?=?|:=|\|[=|]?|&[=&]?|\+[=+]?|-[=-]?|\*[=*]?|<(?:<=?|>|=)?|>>?=?|[.^!=~]=?|\b(?:AND|NOT|OR)\b/,punctuation:/[\{}[\]\(\):,]/,"boolean":/\b(true|false)\b/,selector:/\b(AutoTrim|BlockInput|Break|Click|ClipWait|Continue|Control|ControlClick|ControlFocus|ControlGet|ControlGetFocus|ControlGetPos|ControlGetText|ControlMove|ControlSend|ControlSendRaw|ControlSetText|CoordMode|Critical|DetectHiddenText|DetectHiddenWindows|Drive|DriveGet|DriveSpaceFree|EnvAdd|EnvDiv|EnvGet|EnvMult|EnvSet|EnvSub|EnvUpdate|Exit|ExitApp|FileAppend|FileCopy|FileCopyDir|FileCreateDir|FileCreateShortcut|FileDelete|FileEncoding|FileGetAttrib|FileGetShortcut|FileGetSize|FileGetTime|FileGetVersion|FileInstall|FileMove|FileMoveDir|FileRead|FileReadLine|FileRecycle|FileRecycleEmpty|FileRemoveDir|FileSelectFile|FileSelectFolder|FileSetAttrib|FileSetTime|FormatTime|GetKeyState|Gosub|Goto|GroupActivate|GroupAdd|GroupClose|GroupDeactivate|Gui|GuiControl|GuiControlGet|Hotkey|ImageSearch|IniDelete|IniRead|IniWrite|Input|InputBox|KeyWait|ListHotkeys|ListLines|ListVars|Loop|Menu|MouseClick|MouseClickDrag|MouseGetPos|MouseMove|MsgBox|OnExit|OutputDebug|Pause|PixelGetColor|PixelSearch|PostMessage|Process|Progress|Random|RegDelete|RegRead|RegWrite|Reload|Repeat|Return|Run|RunAs|RunWait|Send|SendEvent|SendInput|SendMessage|SendMode|SendPlay|SendRaw|SetBatchLines|SetCapslockState|SetControlDelay|SetDefaultMouseSpeed|SetEnv|SetFormat|SetKeyDelay|SetMouseDelay|SetNumlockState|SetScrollLockState|SetStoreCapslockMode|SetTimer|SetTitleMatchMode|SetWinDelay|SetWorkingDir|Shutdown|Sleep|Sort|SoundBeep|SoundGet|SoundGetWaveVolume|SoundPlay|SoundSet|SoundSetWaveVolume|SplashImage|SplashTextOff|SplashTextOn|SplitPath|StatusBarGetText|StatusBarWait|StringCaseSense|StringGetPos|StringLeft|StringLen|StringLower|StringMid|StringReplace|StringRight|StringSplit|StringTrimLeft|StringTrimRight|StringUpper|Suspend|SysGet|Thread|ToolTip|Transform|TrayTip|URLDownloadToFile|WinActivate|WinActivateBottom|WinClose|WinGet|WinGetActiveStats|WinGetActiveTitle|WinGetClass|WinGetPos|WinGetText|WinGetTitle|WinHide|WinKill|WinMaximize|WinMenuSelectItem|WinMinimize|WinMinimizeAll|WinMinimizeAllUndo|WinMove|WinRestore|WinSet|WinSetTitle|WinShow|WinWait|WinWaitActive|WinWaitClose|WinWaitNotActive)\b/i,constant:/\b(a_ahkpath|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelay|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|programfiles|a_programfiles|a_programs|a_programscommon|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel)\b/i,builtin:/\b(abs|acos|asc|asin|atan|ceil|chr|class|cos|dllcall|exp|fileexist|Fileopen|floor|il_add|il_create|il_destroy|instr|substr|isfunc|islabel|IsObject|ln|log|lv_add|lv_delete|lv_deletecol|lv_getcount|lv_getnext|lv_gettext|lv_insert|lv_insertcol|lv_modify|lv_modifycol|lv_setimagelist|mod|onmessage|numget|numput|registercallback|regexmatch|regexreplace|round|sin|tan|sqrt|strlen|sb_seticon|sb_setparts|sb_settext|strsplit|tv_add|tv_delete|tv_getchild|tv_getcount|tv_getnext|tv_get|tv_getparent|tv_getprev|tv_getselection|tv_gettext|tv_modify|varsetcapacity|winactive|winexist|__New|__Call|__Get|__Set)\b/i,symbol:/\b(alt|altdown|altup|appskey|backspace|browser_back|browser_favorites|browser_forward|browser_home|browser_refresh|browser_search|browser_stop|bs|capslock|ctrl|ctrlbreak|ctrldown|ctrlup|del|delete|down|end|enter|esc|escape|f1|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f2|f20|f21|f22|f23|f24|f3|f4|f5|f6|f7|f8|f9|home|ins|insert|joy1|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy2|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy3|joy30|joy31|joy32|joy4|joy5|joy6|joy7|joy8|joy9|joyaxes|joybuttons|joyinfo|joyname|joypov|joyr|joyu|joyv|joyx|joyy|joyz|lalt|launch_app1|launch_app2|launch_mail|launch_media|lbutton|lcontrol|lctrl|left|lshift|lwin|lwindown|lwinup|mbutton|media_next|media_play_pause|media_prev|media_stop|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadadd|numpadclear|numpaddel|numpaddiv|numpaddot|numpaddown|numpadend|numpadenter|numpadhome|numpadins|numpadleft|numpadmult|numpadpgdn|numpadpgup|numpadright|numpadsub|numpadup|pgdn|pgup|printscreen|ralt|rbutton|rcontrol|rctrl|right|rshift|rwin|rwindown|rwinup|scrolllock|shift|shiftdown|shiftup|space|tab|up|volume_down|volume_mute|volume_up|wheeldown|wheelleft|wheelright|wheelup|xbutton1|xbutton2)\b/i,important:/#\b(AllowSameLineComments|ClipboardTimeout|CommentFlag|ErrorStdOut|EscapeChar|HotkeyInterval|HotkeyModifierTimeout|Hotstring|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Include|IncludeAgain|InstallKeybdHook|InstallMouseHook|KeyHistory|LTrim|MaxHotkeysPerInterval|MaxMem|MaxThreads|MaxThreadsBuffer|MaxThreadsPerHotkey|NoEnv|NoTrayIcon|Persistent|SingleInstance|UseHook|WinActivateForce)\b/i,keyword:/\b(Abort|AboveNormal|Add|ahk_class|ahk_group|ahk_id|ahk_pid|All|Alnum|Alpha|AltSubmit|AltTab|AltTabAndMenu|AltTabMenu|AltTabMenuDismiss|AlwaysOnTop|AutoSize|Background|BackgroundTrans|BelowNormal|between|BitAnd|BitNot|BitOr|BitShiftLeft|BitShiftRight|BitXOr|Bold|Border|Button|ByRef|Checkbox|Checked|CheckedGray|Choose|ChooseString|Close|Color|ComboBox|Contains|ControlList|Count|Date|DateTime|Days|DDL|Default|DeleteAll|Delimiter|Deref|Destroy|Digit|Disable|Disabled|DropDownList|Edit|Eject|Else|Enable|Enabled|Error|Exist|Expand|ExStyle|FileSystem|First|Flash|Float|FloatFast|Focus|Font|for|global|Grid|Group|GroupBox|GuiClose|GuiContextMenu|GuiDropFiles|GuiEscape|GuiSize|Hdr|Hidden|Hide|High|HKCC|HKCR|HKCU|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_LOCAL_MACHINE|HKEY_USERS|HKLM|HKU|Hours|HScroll|Icon|IconSmall|ID|IDLast|If|IfEqual|IfExist|IfGreater|IfGreaterOrEqual|IfInString|IfLess|IfLessOrEqual|IfMsgBox|IfNotEqual|IfNotExist|IfNotInString|IfWinActive|IfWinExist|IfWinNotActive|IfWinNotExist|Ignore|ImageList|in|Integer|IntegerFast|Interrupt|is|italic|Join|Label|LastFound|LastFoundExist|Limit|Lines|List|ListBox|ListView|local|Lock|Logoff|Low|Lower|Lowercase|MainWindow|Margin|Maximize|MaximizeBox|MaxSize|Minimize|MinimizeBox|MinMax|MinSize|Minutes|MonthCal|Mouse|Move|Multi|NA|No|NoActivate|NoDefault|NoHide|NoIcon|NoMainWindow|norm|Normal|NoSort|NoSortHdr|NoStandard|Not|NoTab|NoTimers|Number|Off|Ok|On|OwnDialogs|Owner|Parse|Password|Picture|Pixel|Pos|Pow|Priority|ProcessName|Radio|Range|Read|ReadOnly|Realtime|Redraw|REG_BINARY|REG_DWORD|REG_EXPAND_SZ|REG_MULTI_SZ|REG_SZ|Region|Relative|Rename|Report|Resize|Restore|Retry|RGB|Screen|Seconds|Section|Serial|SetLabel|ShiftAltTab|Show|Single|Slider|SortDesc|Standard|static|Status|StatusBar|StatusCD|strike|Style|Submit|SysMenu|Tab2|TabStop|Text|Theme|Tile|ToggleCheck|ToggleEnable|ToolWindow|Top|Topmost|TransColor|Transparent|Tray|TreeView|TryAgain|Type|UnCheck|underline|Unicode|Unlock|UpDown|Upper|Uppercase|UseErrorLevel|Vis|VisFirst|Visible|VScroll|Wait|WaitClose|WantCtrlA|WantF2|WantReturn|While|Wrap|Xdigit|xm|xp|xs|Yes|ym|yp|ys)\b/i};
\ No newline at end of file

From 27009818641cb3c08529feebaec8639072c40293 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 12 Jul 2015 07:59:33 +0200
Subject: [PATCH 104/310] Bash: simplify comment regex

---
 components/prism-bash.js     | 2 +-
 components/prism-bash.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-bash.js b/components/prism-bash.js
index 5ca19ead88..8b52cf32c2 100644
--- a/components/prism-bash.js
+++ b/components/prism-bash.js
@@ -1,6 +1,6 @@
 Prism.languages.bash = Prism.languages.extend('clike', {
 	'comment': {
-		pattern: /(^|[^"{\\])(#.*?(\r?\n|$))/,
+		pattern: /(^|[^"{\\])#.*/,
 		lookbehind: true
 	},
 	'string': {
diff --git a/components/prism-bash.min.js b/components/prism-bash.min.js
index 1571eec822..46564c2028 100644
--- a/components/prism-bash.min.js
+++ b/components/prism-bash.min.js
@@ -1 +1 @@
-Prism.languages.bash=Prism.languages.extend("clike",{comment:{pattern:/(^|[^"{\\])(#.*?(\r?\n|$))/,lookbehind:!0},string:{pattern:/("|')(\\?[\s\S])*?\1/,inside:{property:/\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^\}]+\})/}},number:{pattern:/([^\w\.])-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,lookbehind:!0},"function":/\b(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|cut|date|dc|dd|ddrescue|declare|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|echo|egrep|eject|enable|env|ethtool|eval|exec|exit|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|select|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|until|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)\b/,keyword:/\b(if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)\b/}),Prism.languages.insertBefore("bash","keyword",{property:/\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^}]+\})/}),Prism.languages.insertBefore("bash","comment",{important:/(^#!\s*\/bin\/bash)|(^#!\s*\/bin\/sh)/});
\ No newline at end of file
+Prism.languages.bash=Prism.languages.extend("clike",{comment:{pattern:/(^|[^"{\\])#.*/,lookbehind:!0},string:{pattern:/("|')(\\?[\s\S])*?\1/,inside:{property:/\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^\}]+\})/}},number:{pattern:/([^\w\.])-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,lookbehind:!0},"function":/\b(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|cut|date|dc|dd|ddrescue|declare|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|echo|egrep|eject|enable|env|ethtool|eval|exec|exit|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|select|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|until|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)\b/,keyword:/\b(if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)\b/}),Prism.languages.insertBefore("bash","keyword",{property:/\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^}]+\})/}),Prism.languages.insertBefore("bash","comment",{important:/(^#!\s*\/bin\/bash)|(^#!\s*\/bin\/sh)/});
\ No newline at end of file

From 903b8a42c363b0d6ca27e19c54f962d21f34e405 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 12 Jul 2015 08:11:33 +0200
Subject: [PATCH 105/310] Bash: removed duplicates in keywords + removed
 unneeded parentheses

---
 components/prism-bash.js     | 4 ++--
 components/prism-bash.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-bash.js b/components/prism-bash.js
index 8b52cf32c2..5b6486d619 100644
--- a/components/prism-bash.js
+++ b/components/prism-bash.js
@@ -17,7 +17,7 @@ Prism.languages.bash = Prism.languages.extend('clike', {
 		lookbehind: true
 	},
 	// Originally based on http://ss64.com/bash/
-	'function': /\b(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|cut|date|dc|dd|ddrescue|declare|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|echo|egrep|eject|enable|env|ethtool|eval|exec|exit|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|select|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|until|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)\b/,
+	'function': /\b(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|cut|date|dc|dd|ddrescue|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|enable|env|ethtool|eval|exec|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)\b/,
 	'keyword': /\b(if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)\b/
 });
 
@@ -27,5 +27,5 @@ Prism.languages.insertBefore('bash', 'keyword', {
 });
 Prism.languages.insertBefore('bash', 'comment', {
 	//shebang must be before comment, 'important' class from css reused
-	'important': /(^#!\s*\/bin\/bash)|(^#!\s*\/bin\/sh)/
+	'important': /^#!\s*\/bin\/bash|^#!\s*\/bin\/sh/
 });
diff --git a/components/prism-bash.min.js b/components/prism-bash.min.js
index 46564c2028..21bc732884 100644
--- a/components/prism-bash.min.js
+++ b/components/prism-bash.min.js
@@ -1 +1 @@
-Prism.languages.bash=Prism.languages.extend("clike",{comment:{pattern:/(^|[^"{\\])#.*/,lookbehind:!0},string:{pattern:/("|')(\\?[\s\S])*?\1/,inside:{property:/\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^\}]+\})/}},number:{pattern:/([^\w\.])-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,lookbehind:!0},"function":/\b(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|cut|date|dc|dd|ddrescue|declare|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|echo|egrep|eject|enable|env|ethtool|eval|exec|exit|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|select|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|until|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)\b/,keyword:/\b(if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)\b/}),Prism.languages.insertBefore("bash","keyword",{property:/\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^}]+\})/}),Prism.languages.insertBefore("bash","comment",{important:/(^#!\s*\/bin\/bash)|(^#!\s*\/bin\/sh)/});
\ No newline at end of file
+Prism.languages.bash=Prism.languages.extend("clike",{comment:{pattern:/(^|[^"{\\])#.*/,lookbehind:!0},string:{pattern:/("|')(\\?[\s\S])*?\1/,inside:{property:/\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^\}]+\})/}},number:{pattern:/([^\w\.])-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,lookbehind:!0},"function":/\b(?:alias|apropos|apt-get|aptitude|aspell|awk|basename|bash|bc|bg|builtin|bzip2|cal|cat|cd|cfdisk|chgrp|chmod|chown|chroot|chkconfig|cksum|clear|cmp|comm|command|cp|cron|crontab|csplit|cut|date|dc|dd|ddrescue|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|enable|env|ethtool|eval|exec|expand|expect|export|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|getopts|git|grep|groupadd|groupdel|groupmod|groups|gzip|hash|head|help|hg|history|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|jobs|join|kill|killall|less|link|ln|locate|logname|logout|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|make|man|mkdir|mkfifo|mkisofs|mknod|more|most|mount|mtools|mtr|mv|mmv|nano|netstat|nice|nl|nohup|notify-send|nslookup|open|op|passwd|paste|pathchk|ping|pkill|popd|pr|printcap|printenv|printf|ps|pushd|pv|pwd|quota|quotacheck|quotactl|ram|rar|rcp|read|readarray|readonly|reboot|rename|renice|remsync|rev|rm|rmdir|rsync|screen|scp|sdiff|sed|seq|service|sftp|shift|shopt|shutdown|sleep|slocate|sort|source|split|ssh|stat|strace|su|sudo|sum|suspend|sync|tail|tar|tee|test|time|timeout|times|touch|top|traceroute|trap|tr|tsort|tty|type|ulimit|umask|umount|unalias|uname|unexpand|uniq|units|unrar|unshar|uptime|useradd|userdel|usermod|users|uuencode|uudecode|v|vdir|vi|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yes|zip)\b/,keyword:/\b(if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)\b/}),Prism.languages.insertBefore("bash","keyword",{property:/\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^}]+\})/}),Prism.languages.insertBefore("bash","comment",{important:/^#!\s*\/bin\/bash|^#!\s*\/bin\/sh/});
\ No newline at end of file

From dcce1a788b2ed1671e0b77ec859a0d29cecc0f40 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 12 Jul 2015 08:21:31 +0200
Subject: [PATCH 106/310] C: Removed string pattern (now that C-like supports
 escaped new lines) + simplified operators regexp

---
 components/prism-c.js     | 4 +---
 components/prism-c.min.js | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/prism-c.js b/components/prism-c.js
index e9a01909f4..6deb79b2f3 100644
--- a/components/prism-c.js
+++ b/components/prism-c.js
@@ -1,8 +1,6 @@
 Prism.languages.c = Prism.languages.extend('clike', {
-	// allow for c multiline strings
-	'string': /("|')([^\n\\\1]|\\.|\\\r*\n)*?\1/,
 	'keyword': /\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,
-	'operator': /[-+]{1,2}|!=?|<{1,2}=?|>{1,2}=?|\->|={1,2}|\^|~|%|&{1,2}|\|?\||\?|\*|\//
+	'operator': /\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/
 });
 
 Prism.languages.insertBefore('c', 'string', {
diff --git a/components/prism-c.min.js b/components/prism-c.min.js
index a90b67d6a5..c0e3c8d2e8 100644
--- a/components/prism-c.min.js
+++ b/components/prism-c.min.js
@@ -1 +1 @@
-Prism.languages.c=Prism.languages.extend("clike",{string:/("|')([^\n\\\1]|\\.|\\\r*\n)*?\1/,keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,operator:/[-+]{1,2}|!=?|<{1,2}=?|>{1,2}=?|\->|={1,2}|\^|~|%|&{1,2}|\|?\||\?|\*|\//}),Prism.languages.insertBefore("c","string",{property:{pattern:/((^|\n)\s*)#\s*[a-z]+([^\n\\]|\\.|\\\r*\n)*/i,lookbehind:!0,inside:{string:{pattern:/(#\s*include\s*)(<.+?>|("|')(\\?.)+?\3)/,lookbehind:!0}}}}),delete Prism.languages.c["class-name"],delete Prism.languages.c["boolean"];
\ No newline at end of file
+Prism.languages.c=Prism.languages.extend("clike",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,operator:/\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/}),Prism.languages.insertBefore("c","string",{property:{pattern:/((^|\n)\s*)#\s*[a-z]+([^\n\\]|\\.|\\\r*\n)*/i,lookbehind:!0,inside:{string:{pattern:/(#\s*include\s*)(<.+?>|("|')(\\?.)+?\3)/,lookbehind:!0}}}}),delete Prism.languages.c["class-name"],delete Prism.languages.c["boolean"];
\ No newline at end of file

From 48686353c6229d5f0a1ddac95a17616e212c7d88 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 12 Jul 2015 08:30:48 +0200
Subject: [PATCH 107/310] C: Used property as an alias for macro statements +
 added support for \r in macros

---
 components/prism-c.js     | 6 +++---
 components/prism-c.min.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/prism-c.js b/components/prism-c.js
index 6deb79b2f3..eb5f115be0 100644
--- a/components/prism-c.js
+++ b/components/prism-c.js
@@ -4,12 +4,12 @@ Prism.languages.c = Prism.languages.extend('clike', {
 });
 
 Prism.languages.insertBefore('c', 'string', {
-	// property class reused for macro statements
-	'property': {
+	'macro': {
 		// allow for multiline macro definitions
 		// spaces after the # character compile fine with gcc
-		pattern: /((^|\n)\s*)#\s*[a-z]+([^\n\\]|\\.|\\\r*\n)*/i,
+		pattern: /(^\s*)#\s*[a-z]+([^\r\n\\]|\\.|\\(?:\r\n?|\n))*/im,
 		lookbehind: true,
+		alias: 'property',
 		inside: {
 			// highlight the path of the include statement as a string
 			'string': {
diff --git a/components/prism-c.min.js b/components/prism-c.min.js
index c0e3c8d2e8..0cbfbf7a93 100644
--- a/components/prism-c.min.js
+++ b/components/prism-c.min.js
@@ -1 +1 @@
-Prism.languages.c=Prism.languages.extend("clike",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,operator:/\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/}),Prism.languages.insertBefore("c","string",{property:{pattern:/((^|\n)\s*)#\s*[a-z]+([^\n\\]|\\.|\\\r*\n)*/i,lookbehind:!0,inside:{string:{pattern:/(#\s*include\s*)(<.+?>|("|')(\\?.)+?\3)/,lookbehind:!0}}}}),delete Prism.languages.c["class-name"],delete Prism.languages.c["boolean"];
\ No newline at end of file
+Prism.languages.c=Prism.languages.extend("clike",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,operator:/\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/}),Prism.languages.insertBefore("c","string",{macro:{pattern:/(^\s*)#\s*[a-z]+([^\r\n\\]|\\.|\\(?:\r\n?|\n))*/im,lookbehind:!0,alias:"property",inside:{string:{pattern:/(#\s*include\s*)(<.+?>|("|')(\\?.)+?\3)/,lookbehind:!0}}}}),delete Prism.languages.c["class-name"],delete Prism.languages.c["boolean"];
\ No newline at end of file

From cb6b824254eae66c441bb434ccf89935d5cfc9d8 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 12 Jul 2015 08:38:38 +0200
Subject: [PATCH 108/310] CoffeeScript: prevent strings from ending with a
 backslash.

---
 components/prism-coffeescript.js     | 4 ++--
 components/prism-coffeescript.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-coffeescript.js b/components/prism-coffeescript.js
index da31f6b329..6e9bdeb66c 100644
--- a/components/prism-coffeescript.js
+++ b/components/prism-coffeescript.js
@@ -12,11 +12,11 @@ Prism.languages.coffeescript = Prism.languages.extend('javascript', {
 	'string': [
 
 		// Strings are multiline
-		/'(?:\\?[\s\S])*?'/,
+		/'(?:\\?[^\\])*?'/,
 
 		{
 			// Strings are multiline
-			pattern: /"(?:\\?[\s\S])*?"/,
+			pattern: /"(?:\\?[^\\])*?"/,
 			inside: {
 				'interpolation': interpolation
 			}
diff --git a/components/prism-coffeescript.min.js b/components/prism-coffeescript.min.js
index 7819039b99..a0ec71e0da 100644
--- a/components/prism-coffeescript.min.js
+++ b/components/prism-coffeescript.min.js
@@ -1 +1 @@
-!function(e){var n=/#(?!\{).+/,t={pattern:/#\{[^}]+\}/,alias:"variable"};e.languages.coffeescript=e.languages.extend("javascript",{comment:n,string:[/'(?:\\?[\s\S])*?'/,{pattern:/"(?:\\?[\s\S])*?"/,inside:{interpolation:t}}],keyword:/\b(and|break|by|catch|class|continue|debugger|delete|do|each|else|extend|extends|false|finally|for|if|in|instanceof|is|isnt|let|loop|namespace|new|no|not|null|of|off|on|or|own|return|super|switch|then|this|throw|true|try|typeof|undefined|unless|until|when|while|window|with|yes|yield)\b/,"class-member":{pattern:/@(?!\d)\w+/,alias:"variable"}}),e.languages.insertBefore("coffeescript","comment",{"multiline-comment":{pattern:/###[\s\S]+?###/,alias:"comment"},"block-regex":{pattern:/\/{3}[\s\S]*?\/{3}/,alias:"regex",inside:{comment:n,interpolation:t}}}),e.languages.insertBefore("coffeescript","string",{"inline-javascript":{pattern:/`(?:\\?[\s\S])*?`/,inside:{delimiter:{pattern:/^`|`$/,alias:"punctuation"},rest:e.languages.javascript}},"multiline-string":[{pattern:/'''[\s\S]*?'''/,alias:"string"},{pattern:/"""[\s\S]*?"""/,alias:"string",inside:{interpolation:t}}]}),e.languages.insertBefore("coffeescript","keyword",{property:/(?!\d)\w+(?=\s*:(?!:))/})}(Prism);
\ No newline at end of file
+!function(e){var n=/#(?!\{).+/,t={pattern:/#\{[^}]+\}/,alias:"variable"};e.languages.coffeescript=e.languages.extend("javascript",{comment:n,string:[/'(?:\\?[^\\])*?'/,{pattern:/"(?:\\?[^\\])*?"/,inside:{interpolation:t}}],keyword:/\b(and|break|by|catch|class|continue|debugger|delete|do|each|else|extend|extends|false|finally|for|if|in|instanceof|is|isnt|let|loop|namespace|new|no|not|null|of|off|on|or|own|return|super|switch|then|this|throw|true|try|typeof|undefined|unless|until|when|while|window|with|yes|yield)\b/,"class-member":{pattern:/@(?!\d)\w+/,alias:"variable"}}),e.languages.insertBefore("coffeescript","comment",{"multiline-comment":{pattern:/###[\s\S]+?###/,alias:"comment"},"block-regex":{pattern:/\/{3}[\s\S]*?\/{3}/,alias:"regex",inside:{comment:n,interpolation:t}}}),e.languages.insertBefore("coffeescript","string",{"inline-javascript":{pattern:/`(?:\\?[\s\S])*?`/,inside:{delimiter:{pattern:/^`|`$/,alias:"punctuation"},rest:e.languages.javascript}},"multiline-string":[{pattern:/'''[\s\S]*?'''/,alias:"string"},{pattern:/"""[\s\S]*?"""/,alias:"string",inside:{interpolation:t}}]}),e.languages.insertBefore("coffeescript","keyword",{property:/(?!\d)\w+(?=\s*:(?!:))/})}(Prism);
\ No newline at end of file

From 42fbeef51b668373fe41b0b42ffa6df7ec31e098 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 12 Jul 2015 09:10:18 +0200
Subject: [PATCH 109/310] C++: Removed delete[] and new[] broken keywords.
 They'll be highlighted as keyword+punctuation.

---
 components/prism-cpp.js     | 2 +-
 components/prism-cpp.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-cpp.js b/components/prism-cpp.js
index ba0707c94a..8ce28f628e 100644
--- a/components/prism-cpp.js
+++ b/components/prism-cpp.js
@@ -1,5 +1,5 @@
 Prism.languages.cpp = Prism.languages.extend('c', {
-	'keyword': /\b(alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|delete\[\]|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|new\[\]|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,
+	'keyword': /\b(alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,
 	'boolean': /\b(true|false)\b/,
 	'operator': /[-+]{1,2}|!=?|<{1,2}=?|>{1,2}=?|\->|:{1,2}|={1,2}|\^|~|%|&{1,2}|\|?\||\?|\*|\/|\b(and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/
 });
diff --git a/components/prism-cpp.min.js b/components/prism-cpp.min.js
index 3d02e12825..44b49fb8e0 100644
--- a/components/prism-cpp.min.js
+++ b/components/prism-cpp.min.js
@@ -1 +1 @@
-Prism.languages.cpp=Prism.languages.extend("c",{keyword:/\b(alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|delete\[\]|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|new\[\]|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,"boolean":/\b(true|false)\b/,operator:/[-+]{1,2}|!=?|<{1,2}=?|>{1,2}=?|\->|:{1,2}|={1,2}|\^|~|%|&{1,2}|\|?\||\?|\*|\/|\b(and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/}),Prism.languages.insertBefore("cpp","keyword",{"class-name":{pattern:/(class\s+)[a-z0-9_]+/i,lookbehind:!0}});
\ No newline at end of file
+Prism.languages.cpp=Prism.languages.extend("c",{keyword:/\b(alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,"boolean":/\b(true|false)\b/,operator:/[-+]{1,2}|!=?|<{1,2}=?|>{1,2}=?|\->|:{1,2}|={1,2}|\^|~|%|&{1,2}|\|?\||\?|\*|\/|\b(and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/}),Prism.languages.insertBefore("cpp","keyword",{"class-name":{pattern:/(class\s+)[a-z0-9_]+/i,lookbehind:!0}});
\ No newline at end of file

From 9619d4cb37dda40f1553c156a7b2658f1c1117e1 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Tue, 14 Jul 2015 10:46:57 +0200
Subject: [PATCH 110/310] Implement support for simplifying nested token
 streams

---
 tests/helper/test-case.js             | 39 ++++++++++++++++++++-------
 tests/languages/apacheconf/test2.test |  6 +++++
 2 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 tests/languages/apacheconf/test2.test

diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index 095cba0eda..92a9951508 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -55,7 +55,7 @@ module.exports = {
 		var languages = languageIdentifier.split("+");
 
 		if (null === testCase) {
-			throw new Error("Test case file has invalid format, please read the docs.");
+			throw new Error("Test case file has invalid format (or the provided token stream is invalid JSON), please read the docs.");
 		}
 
 		var Prism = PrismLoader.createInstance(languages);
@@ -72,20 +72,41 @@ module.exports = {
 	 * Simplifies the token stream to ease the matching with the expected token stream
 	 *
 	 * @param {string} tokenStream
-	 * @returns {Array.<string[]>}
+	 * @returns {Array.<string[]|Array>}
 	 */
 	transformCompiledTokenStream: function (tokenStream) {
+		// First filter all top-level non-objects as non-objects are not-identified tokens
+		//
+		// we don't want to filter them in the lower levels as we want to support nested content-structures
 		return tokenStream.filter(
 			function (token) {
-				// only support objects
 				return (typeof token === "object");
 			}
-		).map(
-			function (entry)
-			{
-				return [entry.type, entry.content];
-			}
-		);
+		).map(this.transformCompiledRecursivelyTokenStream.bind(this));
+	},
+
+
+	/**
+	 * Walks the token stream and recursively simplifies it
+	 *
+	 * @private
+	 * @param {Array|{type: string, content: *}|string} token
+	 * @returns {Array|string}
+	 */
+	transformCompiledRecursivelyTokenStream: function (token)
+	{
+		if (Array.isArray(token))
+		{
+			return token.map(this.transformCompiledRecursivelyTokenStream.bind(this));
+		}
+		else if (typeof token === "object")
+		{
+			return [token.type, this.transformCompiledRecursivelyTokenStream(token.content)];
+		}
+		else
+		{
+			return token;
+		}
 	},
 
 
diff --git a/tests/languages/apacheconf/test2.test b/tests/languages/apacheconf/test2.test
new file mode 100644
index 0000000000..fbc0728b0b
--- /dev/null
+++ b/tests/languages/apacheconf/test2.test
@@ -0,0 +1,6 @@
+"foo bar"
+'foo bar'
+"%{REMOTE_HOST}"
+
+-----
+[]

From 9ce5838a4f8812462d2f664ee7b68d32c01ebe1b Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Tue, 14 Jul 2015 10:51:35 +0200
Subject: [PATCH 111/310] Catch JSON parse error to provide a unified error
 reporting in the test runner

---
 tests/helper/test-case.js | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index 92a9951508..240599e06b 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -121,23 +121,25 @@ module.exports = {
 		var testCaseSource = fs.readFileSync(filePath, "utf8");
 		var testCaseParts = testCaseSource.split(/^----*\w*$/m);
 
-		// No expected token stream found
-		if (2 > testCaseParts.length) {
-			return null;
-		}
-
-		var testCase = {
-			testSource: testCaseParts[0].trim(),
-			expectedTokenStream: JSON.parse(testCaseParts[1]),
-			comment: null
-		};
+		try {
+			var testCase = {
+				testSource: testCaseParts[0].trim(),
+				expectedTokenStream: JSON.parse(testCaseParts[1]),
+				comment: null
+			};
+
+			// if there are three parts, the third one is the comment
+			// explaining the test case
+			if (testCaseParts[2]) {
+				testCase.comment = testCaseParts[2].trim();
+			}
 
-		// if there are three parts, the third one is the comment
-		// explaining the test case
-		if (testCaseParts[2]) {
-			testCase.comment = testCaseParts[2].trim();
+			return testCase;
+		}
+		catch (e)
+		{
+			// the JSON can't be parsed (e.g. it could be empty)
+			return null;
 		}
-
-		return testCase;
 	}
 };

From ea2349349b677b5f07822bbf1161533348aeb486 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Tue, 14 Jul 2015 10:51:56 +0200
Subject: [PATCH 112/310] Fully defined Apacheconf test case

---
 tests/languages/apacheconf/test2.test | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/languages/apacheconf/test2.test b/tests/languages/apacheconf/test2.test
index fbc0728b0b..a136917c03 100644
--- a/tests/languages/apacheconf/test2.test
+++ b/tests/languages/apacheconf/test2.test
@@ -3,4 +3,14 @@
 "%{REMOTE_HOST}"
 
 -----
-[]
+[
+    ["string", ["\"foo bar\""]],
+    ["string", ["'foo bar'"]],
+    [
+        "string", [
+            "\"",
+            ["variable", "%{REMOTE_HOST}"],
+            "\""
+        ]
+    ]
+]

From 5c2f9e0a500661473fc9ca068b90e3afa2eb5c77 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Wed, 15 Jul 2015 19:29:27 +0200
Subject: [PATCH 113/310] Use consistent quote style

---
 tests/helper/components.js     | 2 +-
 tests/helper/prism-loader.js   | 2 +-
 tests/helper/test-discovery.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/helper/components.js b/tests/helper/components.js
index 274ad146f7..09dd6aa957 100644
--- a/tests/helper/components.js
+++ b/tests/helper/components.js
@@ -1,7 +1,7 @@
 "use strict";
 
 var fs = require("fs");
-var vm = require('vm');
+var vm = require("vm");
 
 var fileContent = fs.readFileSync(__dirname + "/../../components.js", "utf8");
 var context = {};
diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
index 87739fd2e9..ea82c0bc47 100644
--- a/tests/helper/prism-loader.js
+++ b/tests/helper/prism-loader.js
@@ -1,7 +1,7 @@
 "use strict";
 
 var fs = require("fs");
-var vm = require('vm');
+var vm = require("vm");
 var components = require("./components");
 var languagesCatalog = components.languages;
 
diff --git a/tests/helper/test-discovery.js b/tests/helper/test-discovery.js
index 7cbaef8193..741dc7591b 100644
--- a/tests/helper/test-discovery.js
+++ b/tests/helper/test-discovery.js
@@ -1,7 +1,7 @@
 "use strict";
 
 var fs = require("fs");
-var path = require('path');
+var path = require("path");
 
 
 module.exports = {

From 3a3cd26838a2c8181c050dfc437d24d8cd4e153c Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Wed, 15 Jul 2015 19:35:07 +0200
Subject: [PATCH 114/310] Extract simplification of token stream

Pull the token stream transformation out of the test case into its own component.
---
 tests/helper/test-case.js                | 44 ++---------------------
 tests/helper/token-stream-transformer.js | 45 ++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 42 deletions(-)
 create mode 100644 tests/helper/token-stream-transformer.js

diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index 240599e06b..b62d230da9 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -3,6 +3,7 @@
 var fs = require("fs");
 var assert = require("chai").assert;
 var PrismLoader = require("./prism-loader");
+var TokenStreamTransformer = require("./token-stream-transformer");
 
 /**
  * Handles parsing of a test case file.
@@ -62,53 +63,12 @@ module.exports = {
 		// the first language is the main language to highlight
 		var mainLanguageGrammar = Prism.languages[languages[0]];
 		var compiledTokenStream = Prism.tokenize(testCase.testSource, mainLanguageGrammar);
-		var simplifiedTokenStream = this.transformCompiledTokenStream(compiledTokenStream);
+		var simplifiedTokenStream = TokenStreamTransformer.simplify(compiledTokenStream);
 
 		assert.deepEqual(simplifiedTokenStream, testCase.expectedTokenStream, testCase.comment);
 	},
 
 
-	/**
-	 * Simplifies the token stream to ease the matching with the expected token stream
-	 *
-	 * @param {string} tokenStream
-	 * @returns {Array.<string[]|Array>}
-	 */
-	transformCompiledTokenStream: function (tokenStream) {
-		// First filter all top-level non-objects as non-objects are not-identified tokens
-		//
-		// we don't want to filter them in the lower levels as we want to support nested content-structures
-		return tokenStream.filter(
-			function (token) {
-				return (typeof token === "object");
-			}
-		).map(this.transformCompiledRecursivelyTokenStream.bind(this));
-	},
-
-
-	/**
-	 * Walks the token stream and recursively simplifies it
-	 *
-	 * @private
-	 * @param {Array|{type: string, content: *}|string} token
-	 * @returns {Array|string}
-	 */
-	transformCompiledRecursivelyTokenStream: function (token)
-	{
-		if (Array.isArray(token))
-		{
-			return token.map(this.transformCompiledRecursivelyTokenStream.bind(this));
-		}
-		else if (typeof token === "object")
-		{
-			return [token.type, this.transformCompiledRecursivelyTokenStream(token.content)];
-		}
-		else
-		{
-			return token;
-		}
-	},
-
 
 	/**
 	 * Parses the test case from the given test case file
diff --git a/tests/helper/token-stream-transformer.js b/tests/helper/token-stream-transformer.js
new file mode 100644
index 0000000000..fdc635bf5d
--- /dev/null
+++ b/tests/helper/token-stream-transformer.js
@@ -0,0 +1,45 @@
+"use strict";
+
+
+module.exports = {
+	/**
+	 * Simplifies the token stream to ease the matching with the expected token stream
+	 *
+	 * @param {string} tokenStream
+	 * @returns {Array.<string[]|Array>}
+	 */
+	simplify: function (tokenStream) {
+		// First filter all top-level non-objects as non-objects are not-identified tokens
+		//
+		// we don't want to filter them in the lower levels as we want to support nested content-structures
+		return tokenStream.filter(
+			function (token) {
+				return (typeof token === "object");
+			}
+		).map(this.simplifyRecursively.bind(this));
+	},
+
+
+	/**
+	 * Walks the token stream and recursively simplifies it
+	 *
+	 * @private
+	 * @param {Array|{type: string, content: *}|string} token
+	 * @returns {Array|string}
+	 */
+	simplifyRecursively: function (token)
+	{
+		if (Array.isArray(token))
+		{
+			return token.map(this.simplifyRecursively.bind(this));
+		}
+		else if (typeof token === "object")
+		{
+			return [token.type, this.simplifyRecursively(token.content)];
+		}
+		else
+		{
+			return token;
+		}
+	}
+};

From f05e0797648e816d38c86edaead9095c71cfdbf7 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Wed, 15 Jul 2015 20:01:39 +0200
Subject: [PATCH 115/310] Updated simplification of token stream

It now strips empty values
---
 tests/helper/token-stream-transformer.js | 45 ++++++++++--------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/tests/helper/token-stream-transformer.js b/tests/helper/token-stream-transformer.js
index fdc635bf5d..38aa77ca24 100644
--- a/tests/helper/token-stream-transformer.js
+++ b/tests/helper/token-stream-transformer.js
@@ -3,43 +3,34 @@
 
 module.exports = {
 	/**
-	 * Simplifies the token stream to ease the matching with the expected token stream
+	 * Simplifies the token stream to ease the matching with the expected token stream.
 	 *
-	 * @param {string} tokenStream
+	 * * Strings are kept as-is
+	 * * In arrays each value is transformed individually
+	 * * Values that are empty (empty arrays or strings only containing whitespace)
+	 *
+	 *
+	 * @param {Array} tokenStream
 	 * @returns {Array.<string[]|Array>}
 	 */
 	simplify: function (tokenStream) {
-		// First filter all top-level non-objects as non-objects are not-identified tokens
-		//
-		// we don't want to filter them in the lower levels as we want to support nested content-structures
-		return tokenStream.filter(
-			function (token) {
-				return (typeof token === "object");
-			}
-		).map(this.simplifyRecursively.bind(this));
-	},
-
-
-	/**
-	 * Walks the token stream and recursively simplifies it
-	 *
-	 * @private
-	 * @param {Array|{type: string, content: *}|string} token
-	 * @returns {Array|string}
-	 */
-	simplifyRecursively: function (token)
-	{
-		if (Array.isArray(token))
+		if (Array.isArray(tokenStream))
 		{
-			return token.map(this.simplifyRecursively.bind(this));
+			return tokenStream
+				.map(this.simplify.bind(this))
+				.filter(function(value)
+				{
+					return !(Array.isArray(value) && !value.length) && !(typeof value === "string" && !value.trim().length);
+				}
+			);
 		}
-		else if (typeof token === "object")
+		else if (typeof tokenStream === "object")
 		{
-			return [token.type, this.simplifyRecursively(token.content)];
+			return [tokenStream.type, this.simplify(tokenStream.content)];
 		}
 		else
 		{
-			return token;
+			return tokenStream;
 		}
 	}
 };

From 8bdf4c87d899692e6ce4422309531ecae25cc9a4 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Wed, 15 Jul 2015 20:02:49 +0200
Subject: [PATCH 116/310] Test the test runner itself

We are at a point where we probably should test the test runner (especially the token stream transformer) itself.
---
 package.json              |  2 +-
 tests/testrunner-tests.js | 91 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 tests/testrunner-tests.js

diff --git a/package.json b/package.json
index e254ad770a..2f8af95a5f 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Lightweight, robust, elegant syntax highlighting. A spin-off project from Dabblet.",
   "main": "prism.js",
   "scripts": {
-    "test": "mocha tests/run.js"
+    "test": "mocha tests/testrunner-tests.js && mocha tests/run.js"
   },
   "repository": {
     "type": "git",
diff --git a/tests/testrunner-tests.js b/tests/testrunner-tests.js
new file mode 100644
index 0000000000..f414e8b808
--- /dev/null
+++ b/tests/testrunner-tests.js
@@ -0,0 +1,91 @@
+"use strict";
+
+var assert = require("chai").assert;
+var TokenStreamTransformer = require("./helper/token-stream-transformer");
+
+describe("The token stream transformer",
+	function ()
+	{
+		it("should handle all kinds of simple transformations",
+			function ()
+			{
+				var tokens = [
+					{type: "type", content: "content"},
+					"string"
+				];
+
+				var expected = [
+					["type", "content"],
+					"string"
+				];
+
+				assert.deepEqual(TokenStreamTransformer.simplify(tokens), expected);
+			}
+		);
+
+
+		it("should handle nested structures",
+			function ()
+			{
+				var tokens = [
+					{type: "type", content: [
+						{type: "insideType", content: [
+							{type: "insideInsideType", content: "content"}
+						]}
+					]}
+				];
+
+				var expected = [
+					["type", [
+						["insideType", [
+							["insideInsideType", "content"]
+						]]
+					]]
+				];
+
+				assert.deepEqual(TokenStreamTransformer.simplify(tokens), expected);
+			}
+		);
+
+
+		it("should strip empty tokens",
+			function ()
+			{
+				var tokenStream = [
+					"",
+					"\r\n",
+					"\t",
+					" "
+				];
+
+				var expectedSimplified = [];
+
+				assert.deepEqual(TokenStreamTransformer.simplify(tokenStream), expectedSimplified);
+			}
+		);
+
+
+		it("should strip empty token tree branches",
+			function ()
+			{
+				var tokenStream = [
+					{type: "type", content: [
+						["", ""],
+						"",
+						{type: "nested", content: [""]}
+					]},
+					[[[[[[[""]]]]]]]
+				];
+
+				var expectedSimplified = [
+					["type", [
+						["nested", []]
+					]]
+				];
+
+				assert.deepEqual(TokenStreamTransformer.simplify(tokenStream), expectedSimplified);
+			}
+		);
+	}
+);
+

From b8d92aa75ca1560aba65e0d08bf672c4baf2cf4b Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Wed, 15 Jul 2015 20:06:21 +0200
Subject: [PATCH 117/310] Verify that the token stream transfomer ignores all
 token properties except type and content

---
 tests/testrunner-tests.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/testrunner-tests.js b/tests/testrunner-tests.js
index f414e8b808..b9f79dc88e 100644
--- a/tests/testrunner-tests.js
+++ b/tests/testrunner-tests.js
@@ -86,6 +86,23 @@ describe("The token stream transformer",
 				assert.deepEqual(TokenStreamTransformer.simplify(tokenStream), expectedSimplified);
 			}
 		);
+
+
+		it("should ignore all properties in tokens except value and content",
+			function ()
+			{
+
+				var tokenStream = [
+					{type: "type", content: "content", alias: "alias"}
+				];
+
+				var expectedSimplified = [
+					["type", "content"]
+				];
+
+				assert.deepEqual(TokenStreamTransformer.simplify(tokenStream), expectedSimplified);
+			}
+		);
 	}
 );
 

From 86311f5e9ef1fbfcf016ea3fe6e3ca1c7d869dc3 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 16 Jul 2015 08:06:25 +0200
Subject: [PATCH 118/310] C#: Fix preprocessor pattern

---
 components/prism-csharp.js     | 8 +++++++-
 components/prism-csharp.min.js | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/prism-csharp.js b/components/prism-csharp.js
index 50ee493ee1..e6f83d3cc1 100644
--- a/components/prism-csharp.js
+++ b/components/prism-csharp.js
@@ -4,6 +4,12 @@ Prism.languages.csharp = Prism.languages.extend('clike', {
 		/@("|')(\1\1|\\\1|\\?(?!\1)[\s\S])*\1/,
 		/("|')(\\?.)*?\1/
 	],
-	'preprocessor': /^\s*#.*/m,
 	'number': /\b-?(0x[\da-f]+|\d*\.?\d+)\b/i
 });
+
+Prism.languages.insertBefore('csharp', 'keyword', {
+	'preprocessor': {
+		pattern: /(^\s*)#.*/m,
+		lookbehind: true
+	}
+});
diff --git a/components/prism-csharp.min.js b/components/prism-csharp.min.js
index abde3d03c6..f9b3c9bd2f 100644
--- a/components/prism-csharp.min.js
+++ b/components/prism-csharp.min.js
@@ -1 +1 @@
-Prism.languages.csharp=Prism.languages.extend("clike",{keyword:/\b(abstract|as|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|async|await|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b/,string:[/@("|')(\1\1|\\\1|\\?(?!\1)[\s\S])*\1/,/("|')(\\?.)*?\1/],preprocessor:/^\s*#.*/m,number:/\b-?(0x[\da-f]+|\d*\.?\d+)\b/i});
\ No newline at end of file
+Prism.languages.csharp=Prism.languages.extend("clike",{keyword:/\b(abstract|as|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|async|await|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b/,string:[/@("|')(\1\1|\\\1|\\?(?!\1)[\s\S])*\1/,/("|')(\\?.)*?\1/],number:/\b-?(0x[\da-f]+|\d*\.?\d+)\b/i}),Prism.languages.insertBefore("csharp","keyword",{preprocessor:{pattern:/(^\s*)#.*/m,lookbehind:!0}});
\ No newline at end of file

From 5f133c800fdd178f6899c1ffa8a38ffbdc7a746f Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 16 Jul 2015 21:09:40 +0200
Subject: [PATCH 119/310] Fixed prism-core and prism-file-highlight to prevent
 errors in IE8. Used local variable _self instead of overwriting self. Closes
 #468.

---
 components/prism-core.js                      | 25 ++---
 components/prism-core.min.js                  |  2 +-
 .../file-highlight/prism-file-highlight.js    | 76 +++++++-------
 .../prism-file-highlight.min.js               |  2 +-
 prism.js                                      | 99 ++++++++++---------
 5 files changed, 105 insertions(+), 99 deletions(-)

diff --git a/components/prism-core.js b/components/prism-core.js
index b9a0ac61a8..542464e084 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -1,4 +1,4 @@
-self = (typeof window !== 'undefined')
+var _self = (typeof window !== 'undefined')
 	? window   // if in browser
 	: (
 		(typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)
@@ -17,7 +17,7 @@ var Prism = (function(){
 // Private helper vars
 var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
 
-var _ = self.Prism = {
+var _ = _self.Prism = {
 	util: {
 		encode: function (tokens) {
 			if (tokens instanceof Token) {
@@ -50,7 +50,8 @@ var _ = self.Prism = {
 					return clone;
 
 				case 'Array':
-					return o.map(function(v) { return _.util.clone(v); });
+					// Check for existence for IE8
+					return o.map && o.map(function(v) { return _.util.clone(v); });
 			}
 
 			return o;
@@ -192,7 +193,7 @@ var _ = self.Prism = {
 
 		_.hooks.run('before-highlight', env);
 
-		if (async && self.Worker) {
+		if (async && _self.Worker) {
 			var worker = new Worker(_.filename);
 
 			worker.onmessage = function(evt) {
@@ -386,22 +387,22 @@ Token.stringify = function(o, language, parent) {
 
 };
 
-if (!self.document) {
-	if (!self.addEventListener) {
+if (!_self.document) {
+	if (!_self.addEventListener) {
 		// in Node.js
-		return self.Prism;
+		return _self.Prism;
 	}
  	// In worker
-	self.addEventListener('message', function(evt) {
+	_self.addEventListener('message', function(evt) {
 		var message = JSON.parse(evt.data),
 		    lang = message.language,
 		    code = message.code;
 
-		self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang]))));
-		self.close();
+		_self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang]))));
+		_self.close();
 	}, false);
 
-	return self.Prism;
+	return _self.Prism;
 }
 
 // Get current script and highlight
@@ -417,7 +418,7 @@ if (script) {
 	}
 }
 
-return self.Prism;
+return _self.Prism;
 
 })();
 
diff --git a/components/prism-core.min.js b/components/prism-core.min.js
index df4ccd4c43..5f781e29fe 100644
--- a/components/prism-core.min.js
+++ b/components/prism-core.min.js
@@ -1 +1 @@
-self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{};var Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var s={};for(var o in i)if(i.hasOwnProperty(o)){if(o==n)for(var l in a)a.hasOwnProperty(l)&&(s[l]=a[l]);s[o]=i[o]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=s)}),r[e]=s},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,s,o=a;o&&!e.test(o.className);)o=o.parentNode;if(o&&(l=(o.className.match(e)||[,""])[1],s=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,o=a.parentNode,/pre/i.test(o.nodeName)&&(o.className=o.className.replace(e,"").replace(/\s+/g," ")+" language-"+l),s){var u=a.textContent;if(u){u=u.replace(/^(?:\r?\n|\r)/,"");var g={element:a,language:l,grammar:s,code:u};if(t.hooks.run("before-highlight",g),r&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g)}}},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var s=n[l];s="Array"===t.util.type(s)?s:[s];for(var o=0;o<s.length;++o){var u=s[o],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var s="";for(var o in i.attributes)s+=o+'="'+(i.attributes[o]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+s+">"+i.content+"</"+i.tag+">"},!self.document)return self.addEventListener?(self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),self.close()},!1),self.Prism):self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
+var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var s={};for(var o in i)if(i.hasOwnProperty(o)){if(o==n)for(var l in a)a.hasOwnProperty(l)&&(s[l]=a[l]);s[o]=i[o]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=s)}),r[e]=s},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,s,o=a;o&&!e.test(o.className);)o=o.parentNode;if(o&&(l=(o.className.match(e)||[,""])[1],s=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,o=a.parentNode,/pre/i.test(o.nodeName)&&(o.className=o.className.replace(e,"").replace(/\s+/g," ")+" language-"+l),s){var u=a.textContent;if(u){u=u.replace(/^(?:\r?\n|\r)/,"");var g={element:a,language:l,grammar:s,code:u};if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g)}}},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var s=n[l];s="Array"===t.util.type(s)?s:[s];for(var o=0;o<s.length;++o){var u=s[o],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var s="";for(var o in i.attributes)s+=o+'="'+(i.attributes[o]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+s+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
diff --git a/plugins/file-highlight/prism-file-highlight.js b/plugins/file-highlight/prism-file-highlight.js
index 5fea85abf0..1a49254f27 100644
--- a/plugins/file-highlight/prism-file-highlight.js
+++ b/plugins/file-highlight/prism-file-highlight.js
@@ -16,56 +16,58 @@
 			'psm1': 'powershell'
 		};
 
-		Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach(function(pre) {
-			var src = pre.getAttribute('data-src');
-
-			var language, parent = pre;
-			var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
-			while (parent && !lang.test(parent.className)) {
-				parent = parent.parentNode;
-			}
+		if(Array.prototype.forEach) { // Check to prevent error in IE8
+			Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach(function (pre) {
+				var src = pre.getAttribute('data-src');
+
+				var language, parent = pre;
+				var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
+				while (parent && !lang.test(parent.className)) {
+					parent = parent.parentNode;
+				}
 
-			if (parent) {
-				language = (pre.className.match(lang) || [,''])[1];
-			}
+				if (parent) {
+					language = (pre.className.match(lang) || [, ''])[1];
+				}
 
-			if (!language) {
-				var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
-				language = Extensions[extension] || extension;
-			}
+				if (!language) {
+					var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+					language = Extensions[extension] || extension;
+				}
 
-			var code = document.createElement('code');
-			code.className = 'language-' + language;
+				var code = document.createElement('code');
+				code.className = 'language-' + language;
 
-			pre.textContent = '';
+				pre.textContent = '';
 
-			code.textContent = 'Loading…';
+				code.textContent = 'Loading…';
 
-			pre.appendChild(code);
+				pre.appendChild(code);
 
-			var xhr = new XMLHttpRequest();
+				var xhr = new XMLHttpRequest();
 
-			xhr.open('GET', src, true);
+				xhr.open('GET', src, true);
 
-			xhr.onreadystatechange = function() {
-				if (xhr.readyState == 4) {
+				xhr.onreadystatechange = function () {
+					if (xhr.readyState == 4) {
 
-					if (xhr.status < 400 && xhr.responseText) {
-						code.textContent = xhr.responseText;
+						if (xhr.status < 400 && xhr.responseText) {
+							code.textContent = xhr.responseText;
 
-						Prism.highlightElement(code);
+							Prism.highlightElement(code);
+						}
+						else if (xhr.status >= 400) {
+							code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+						}
+						else {
+							code.textContent = '✖ Error: File does not exist or is empty';
+						}
 					}
-					else if (xhr.status >= 400) {
-						code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
-					}
-					else {
-						code.textContent = '✖ Error: File does not exist or is empty';
-					}
-				}
-			};
+				};
 
-			xhr.send(null);
-		});
+				xhr.send(null);
+			});
+		}
 
 	};
 
diff --git a/plugins/file-highlight/prism-file-highlight.min.js b/plugins/file-highlight/prism-file-highlight.min.js
index 42889f90b6..2d75007f66 100644
--- a/plugins/file-highlight/prism-file-highlight.min.js
+++ b/plugins/file-highlight/prism-file-highlight.min.js
@@ -1 +1 @@
-!function(){self.Prism&&self.document&&document.querySelector&&(self.Prism.fileHighlight=function(){var e={js:"javascript",html:"markup",svg:"markup",xml:"markup",py:"python",rb:"ruby",ps1:"powershell",psm1:"powershell"};Array.prototype.slice.call(document.querySelectorAll("pre[data-src]")).forEach(function(t){for(var r,s=t.getAttribute("data-src"),a=t,n=/\blang(?:uage)?-(?!\*)(\w+)\b/i;a&&!n.test(a.className);)a=a.parentNode;if(a&&(r=(t.className.match(n)||[,""])[1]),!r){var l=(s.match(/\.(\w+)$/)||[,""])[1];r=e[l]||l}var o=document.createElement("code");o.className="language-"+r,t.textContent="",o.textContent="Loading…",t.appendChild(o);var i=new XMLHttpRequest;i.open("GET",s,!0),i.onreadystatechange=function(){4==i.readyState&&(i.status<400&&i.responseText?(o.textContent=i.responseText,Prism.highlightElement(o)):o.textContent=i.status>=400?"✖ Error "+i.status+" while fetching file: "+i.statusText:"✖ Error: File does not exist or is empty")},i.send(null)})},self.Prism.fileHighlight())}();
\ No newline at end of file
+!function(){self.Prism&&self.document&&document.querySelector&&(self.Prism.fileHighlight=function(){var e={js:"javascript",html:"markup",svg:"markup",xml:"markup",py:"python",rb:"ruby",ps1:"powershell",psm1:"powershell"};Array.prototype.forEach&&Array.prototype.slice.call(document.querySelectorAll("pre[data-src]")).forEach(function(t){for(var r,a=t.getAttribute("data-src"),s=t,n=/\blang(?:uage)?-(?!\*)(\w+)\b/i;s&&!n.test(s.className);)s=s.parentNode;if(s&&(r=(t.className.match(n)||[,""])[1]),!r){var o=(a.match(/\.(\w+)$/)||[,""])[1];r=e[o]||o}var l=document.createElement("code");l.className="language-"+r,t.textContent="",l.textContent="Loading…",t.appendChild(l);var i=new XMLHttpRequest;i.open("GET",a,!0),i.onreadystatechange=function(){4==i.readyState&&(i.status<400&&i.responseText?(l.textContent=i.responseText,Prism.highlightElement(l)):l.textContent=i.status>=400?"✖ Error "+i.status+" while fetching file: "+i.statusText:"✖ Error: File does not exist or is empty")},i.send(null)})},self.Prism.fileHighlight())}();
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 91fa896622..8282b57193 100644
--- a/prism.js
+++ b/prism.js
@@ -3,7 +3,7 @@
      Begin prism-core.js
 ********************************************** */
 
-self = (typeof window !== 'undefined')
+var _self = (typeof window !== 'undefined')
 	? window   // if in browser
 	: (
 		(typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)
@@ -22,7 +22,7 @@ var Prism = (function(){
 // Private helper vars
 var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
 
-var _ = self.Prism = {
+var _ = _self.Prism = {
 	util: {
 		encode: function (tokens) {
 			if (tokens instanceof Token) {
@@ -55,7 +55,8 @@ var _ = self.Prism = {
 					return clone;
 
 				case 'Array':
-					return o.map(function(v) { return _.util.clone(v); });
+					// Check for existence for IE8
+					return o.map && o.map(function(v) { return _.util.clone(v); });
 			}
 
 			return o;
@@ -197,7 +198,7 @@ var _ = self.Prism = {
 
 		_.hooks.run('before-highlight', env);
 
-		if (async && self.Worker) {
+		if (async && _self.Worker) {
 			var worker = new Worker(_.filename);
 
 			worker.onmessage = function(evt) {
@@ -391,22 +392,22 @@ Token.stringify = function(o, language, parent) {
 
 };
 
-if (!self.document) {
-	if (!self.addEventListener) {
+if (!_self.document) {
+	if (!_self.addEventListener) {
 		// in Node.js
-		return self.Prism;
+		return _self.Prism;
 	}
  	// In worker
-	self.addEventListener('message', function(evt) {
+	_self.addEventListener('message', function(evt) {
 		var message = JSON.parse(evt.data),
 		    lang = message.language,
 		    code = message.code;
 
-		self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang]))));
-		self.close();
+		_self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang]))));
+		_self.close();
 	}, false);
 
-	return self.Prism;
+	return _self.Prism;
 }
 
 // Get current script and highlight
@@ -422,7 +423,7 @@ if (script) {
 	}
 }
 
-return self.Prism;
+return _self.Prism;
 
 })();
 
@@ -643,56 +644,58 @@ if (Prism.languages.markup) {
 			'psm1': 'powershell'
 		};
 
-		Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach(function(pre) {
-			var src = pre.getAttribute('data-src');
+		if(Array.prototype.forEach) { // Check to prevent error in IE8
+			Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach(function (pre) {
+				var src = pre.getAttribute('data-src');
 
-			var language, parent = pre;
-			var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
-			while (parent && !lang.test(parent.className)) {
-				parent = parent.parentNode;
-			}
+				var language, parent = pre;
+				var lang = /\blang(?:uage)?-(?!\*)(\w+)\b/i;
+				while (parent && !lang.test(parent.className)) {
+					parent = parent.parentNode;
+				}
 
-			if (parent) {
-				language = (pre.className.match(lang) || [,''])[1];
-			}
+				if (parent) {
+					language = (pre.className.match(lang) || [, ''])[1];
+				}
 
-			if (!language) {
-				var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
-				language = Extensions[extension] || extension;
-			}
+				if (!language) {
+					var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
+					language = Extensions[extension] || extension;
+				}
 
-			var code = document.createElement('code');
-			code.className = 'language-' + language;
+				var code = document.createElement('code');
+				code.className = 'language-' + language;
 
-			pre.textContent = '';
+				pre.textContent = '';
 
-			code.textContent = 'Loading…';
+				code.textContent = 'Loading…';
 
-			pre.appendChild(code);
+				pre.appendChild(code);
 
-			var xhr = new XMLHttpRequest();
+				var xhr = new XMLHttpRequest();
 
-			xhr.open('GET', src, true);
+				xhr.open('GET', src, true);
 
-			xhr.onreadystatechange = function() {
-				if (xhr.readyState == 4) {
+				xhr.onreadystatechange = function () {
+					if (xhr.readyState == 4) {
 
-					if (xhr.status < 400 && xhr.responseText) {
-						code.textContent = xhr.responseText;
+						if (xhr.status < 400 && xhr.responseText) {
+							code.textContent = xhr.responseText;
 
-						Prism.highlightElement(code);
-					}
-					else if (xhr.status >= 400) {
-						code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
-					}
-					else {
-						code.textContent = '✖ Error: File does not exist or is empty';
+							Prism.highlightElement(code);
+						}
+						else if (xhr.status >= 400) {
+							code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
+						}
+						else {
+							code.textContent = '✖ Error: File does not exist or is empty';
+						}
 					}
-				}
-			};
+				};
 
-			xhr.send(null);
-		});
+				xhr.send(null);
+			});
+		}
 
 	};
 

From 7d1b8d7ec8eadc17310b4bb79c37d6a253699bce Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 17 Jul 2015 08:11:47 +0200
Subject: [PATCH 120/310] Eiffel: Fix string patterns order + fix /= operator

---
 components/prism-eiffel.js     | 8 ++++----
 components/prism-eiffel.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-eiffel.js b/components/prism-eiffel.js
index a6da3f68b3..cfdb6a5289 100644
--- a/components/prism-eiffel.js
+++ b/components/prism-eiffel.js
@@ -1,11 +1,11 @@
 Prism.languages.eiffel = {
 	'string': [
-		// Single-line string
-		/"(?:%\s+%|%"|.)*?"/,
 		// Aligned-verbatim-strings
 		/"([^[]*)\[[\s\S]+?\]\1"/,
 		// Non-aligned-verbatim-strings
-		/"([^{]*)\{[\s\S]+?\}\1"/
+		/"([^{]*)\{[\s\S]+?\}\1"/,
+		// Single-line string
+		/"(?:%\s+%|%"|.)*?"/
 	],
 	// (comments including quoted strings not supported)
 	'comment': /--.*/,
@@ -20,5 +20,5 @@ Prism.languages.eiffel = {
 		/(?:\d(?:_*\d)*)?\.(?:(?:\d(?:_*\d)*)?[eE][+-]?)?\d(?:_*\d)*|\d(?:_*\d)*\.?/
 	],
 	'punctuation': /:=|<<|>>|\(\||\|\)|->|\.(?=\w)|[{}[\];(),:?]/,
-	'operator': /\\\\|\|\.\.\||\.\.|\/[~\/]?|[><\/]=?|[-+*^=~]/
+	'operator': /\\\\|\|\.\.\||\.\.|\/[~\/=]?|[><]=?|[-+*^=~]/
 };
diff --git a/components/prism-eiffel.min.js b/components/prism-eiffel.min.js
index d9c8ab3e5b..af6d398979 100644
--- a/components/prism-eiffel.min.js
+++ b/components/prism-eiffel.min.js
@@ -1 +1 @@
-Prism.languages.eiffel={string:[/"(?:%\s+%|%"|.)*?"/,/"([^[]*)\[[\s\S]+?\]\1"/,/"([^{]*)\{[\s\S]+?\}\1"/],comment:/--.*/,"char":/'(?:%'|.)+?'/,keyword:/\b(?:across|agent|alias|all|and|attached|as|assign|attribute|check|class|convert|create|Current|debug|deferred|detachable|do|else|elseif|end|ensure|expanded|export|external|feature|from|frozen|if|implies|inherit|inspect|invariant|like|local|loop|not|note|obsolete|old|once|or|Precursor|redefine|rename|require|rescue|Result|retry|select|separate|some|then|undefine|until|variant|Void|when|xor)\b/i,"boolean":/\b(?:True|False)\b/i,number:[/\b0[xcb][\da-f](?:_*[\da-f])*\b/i,/(?:\d(?:_*\d)*)?\.(?:(?:\d(?:_*\d)*)?[eE][+-]?)?\d(?:_*\d)*|\d(?:_*\d)*\.?/],punctuation:/:=|<<|>>|\(\||\|\)|->|\.(?=\w)|[{}[\];(),:?]/,operator:/\\\\|\|\.\.\||\.\.|\/[~\/]?|[><\/]=?|[-+*^=~]/};
\ No newline at end of file
+Prism.languages.eiffel={string:[/"([^[]*)\[[\s\S]+?\]\1"/,/"([^{]*)\{[\s\S]+?\}\1"/,/"(?:%\s+%|%"|.)*?"/],comment:/--.*/,"char":/'(?:%'|.)+?'/,keyword:/\b(?:across|agent|alias|all|and|attached|as|assign|attribute|check|class|convert|create|Current|debug|deferred|detachable|do|else|elseif|end|ensure|expanded|export|external|feature|from|frozen|if|implies|inherit|inspect|invariant|like|local|loop|not|note|obsolete|old|once|or|Precursor|redefine|rename|require|rescue|Result|retry|select|separate|some|then|undefine|until|variant|Void|when|xor)\b/i,"boolean":/\b(?:True|False)\b/i,number:[/\b0[xcb][\da-f](?:_*[\da-f])*\b/i,/(?:\d(?:_*\d)*)?\.(?:(?:\d(?:_*\d)*)?[eE][+-]?)?\d(?:_*\d)*|\d(?:_*\d)*\.?/],punctuation:/:=|<<|>>|\(\||\|\)|->|\.(?=\w)|[{}[\];(),:?]/,operator:/\\\\|\|\.\.\||\.\.|\/[~\/=]?|[><]=?|[-+*^=~]/};
\ No newline at end of file

From fa286aa57f04c2e88370b9b717e5ea6d35c70334 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 17 Jul 2015 08:39:15 +0200
Subject: [PATCH 121/310] Erlang: Fixed quoted functions and quoted atoms.
 Fixed variables pattern so that it does not break atoms. Fixed operator <=.

---
 components/prism-erlang.js     | 18 ++++++++++++------
 components/prism-erlang.min.js |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/components/prism-erlang.js b/components/prism-erlang.js
index deea6aa054..5baa9d77a4 100644
--- a/components/prism-erlang.js
+++ b/components/prism-erlang.js
@@ -2,11 +2,11 @@ Prism.languages.erlang = {
 	'comment': /%.+/,
 	'string': /"(?:\\?.)*?"/,
 	'quoted-function': {
-		pattern: /'[^']+'(?=\()/,
+		pattern: /'(?:\\.|[^'\\])+'(?=\()/,
 		alias: 'function'
 	},
 	'quoted-atom': {
-		pattern: /'[^']+'/,
+		pattern: /'(?:\\.|[^'\\])+'/,
 		alias: 'atom'
 	},
 	'boolean': /\b(?:true|false)\b/,
@@ -17,15 +17,21 @@ Prism.languages.erlang = {
 		/(?:\b|-)\d*\.?\d+([Ee][+-]?\d+)?\b/
 	],
 	'function': /\b[a-z][\w@]*(?=\()/,
-	'variable': /(?:\b|\?)[A-Z_][\w@]*/,
+	'variable': {
+		// Look-behind is used to prevent wrong highlighting of atoms containing "@"
+		pattern: /(^|[^@])(?:\b|\?)[A-Z_][\w@]*/,
+		lookbehind: true
+	},
 	'operator': [
-		/[=\/>:]=|>=|=[:\/]=|\+\+?|--?|[=*\/!]|\b(?:bnot|div|rem|band|bor|bxor|bsl|bsr|not|and|or|xor|orelse|andalso)\b/,
+		/[=\/<>:]=|=[:\/]=|\+\+?|--?|[=*\/!]|\b(?:bnot|div|rem|band|bor|bxor|bsl|bsr|not|and|or|xor|orelse|andalso)\b/,
 		{
-			pattern: /(^|(?!<).)<(?!<)/,
+			// We don't want to match <<
+			pattern: /(^|[^<])<(?!<)/,
 			lookbehind: true
 		},
 		{
-			pattern: /(^|(?!>).)>(?!>)/,
+			// We don't want to match >>
+			pattern: /(^|[^>])>(?!>)/,
 			lookbehind: true
 		}
 	],
diff --git a/components/prism-erlang.min.js b/components/prism-erlang.min.js
index 6a072b6296..613f0f955c 100644
--- a/components/prism-erlang.min.js
+++ b/components/prism-erlang.min.js
@@ -1 +1 @@
-Prism.languages.erlang={comment:/%.+/,string:/"(?:\\?.)*?"/,"quoted-function":{pattern:/'[^']+'(?=\()/,alias:"function"},"quoted-atom":{pattern:/'[^']+'/,alias:"atom"},"boolean":/\b(?:true|false)\b/,keyword:/\b(?:fun|when|case|of|end|if|receive|after|try|catch)\b/,number:[/\$\\?./,/\d+#[a-z0-9]+/i,/(?:\b|-)\d*\.?\d+([Ee][+-]?\d+)?\b/],"function":/\b[a-z][\w@]*(?=\()/,variable:/(?:\b|\?)[A-Z_][\w@]*/,operator:[/[=\/>:]=|>=|=[:\/]=|\+\+?|--?|[=*\/!]|\b(?:bnot|div|rem|band|bor|bxor|bsl|bsr|not|and|or|xor|orelse|andalso)\b/,{pattern:/(^|(?!<).)<(?!<)/,lookbehind:!0},{pattern:/(^|(?!>).)>(?!>)/,lookbehind:!0}],atom:/\b[a-z][\w@]*/,punctuation:/[()[\]{}:;,.#|]|<<|>>/};
\ No newline at end of file
+Prism.languages.erlang={comment:/%.+/,string:/"(?:\\?.)*?"/,"quoted-function":{pattern:/'(?:\\.|[^'\\])+'(?=\()/,alias:"function"},"quoted-atom":{pattern:/'(?:\\.|[^'\\])+'/,alias:"atom"},"boolean":/\b(?:true|false)\b/,keyword:/\b(?:fun|when|case|of|end|if|receive|after|try|catch)\b/,number:[/\$\\?./,/\d+#[a-z0-9]+/i,/(?:\b|-)\d*\.?\d+([Ee][+-]?\d+)?\b/],"function":/\b[a-z][\w@]*(?=\()/,variable:{pattern:/(^|[^@])(?:\b|\?)[A-Z_][\w@]*/,lookbehind:!0},operator:[/[=\/<>:]=|=[:\/]=|\+\+?|--?|[=*\/!]|\b(?:bnot|div|rem|band|bor|bxor|bsl|bsr|not|and|or|xor|orelse|andalso)\b/,{pattern:/(^|[^<])<(?!<)/,lookbehind:!0},{pattern:/(^|[^>])>(?!>)/,lookbehind:!0}],atom:/\b[a-z][\w@]*/,punctuation:/[()[\]{}:;,.#|]|<<|>>/};
\ No newline at end of file

From 40ae21533f9a5c5f69d1da60a6a114fa500b1a30 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 18 Jul 2015 18:01:32 +0200
Subject: [PATCH 122/310] Fortran: more bullet-proof pattern for comments
 inside strings.

---
 components/prism-fortran.js     | 7 +++++--
 components/prism-fortran.min.js | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/prism-fortran.js b/components/prism-fortran.js
index 6448dad2e2..0d5e83ca35 100644
--- a/components/prism-fortran.js
+++ b/components/prism-fortran.js
@@ -4,9 +4,12 @@ Prism.languages.fortran = {
 		alias: 'number'
 	},
 	'string': {
-		pattern: /(?:\w+_)?(['"])(?:\1\1|&\n(?:\s*!.+\n)?|(?!\1).)*(?:\1|&)/,
+		pattern: /(?:\w+_)?(['"])(?:\1\1|&(?:\r\n?|\n)(?:\s*!.+(?:\r\n?|\n))?|(?!\1).)*(?:\1|&)/,
 		inside: {
-			'comment': /!.*/
+			'comment': {
+				pattern: /(&(?:\r\n?|\n)\s*)!.*/,
+				lookbehind: true
+			}
 		}
 	},
 	'comment': /!.*/,
diff --git a/components/prism-fortran.min.js b/components/prism-fortran.min.js
index 407cc9603c..ac54b0f513 100644
--- a/components/prism-fortran.min.js
+++ b/components/prism-fortran.min.js
@@ -1 +1 @@
-Prism.languages.fortran={"quoted-number":{pattern:/[BOZ](['"])[A-F0-9]+\1/i,alias:"number"},string:{pattern:/(?:\w+_)?(['"])(?:\1\1|&\n(?:\s*!.+\n)?|(?!\1).)*(?:\1|&)/,inside:{comment:/!.*/}},comment:/!.*/,"boolean":/\.(?:TRUE|FALSE)\.(?:_\w+)?/i,number:/(?:\b|[+-])(?:\d+(?:\.\d*)?|\.\d+)(?:[ED][+-]?\d+)?(?:_\w+)?/i,keyword:[/\b(?:INTEGER|REAL|DOUBLE ?PRECISION|COMPLEX|CHARACTER|LOGICAL)\b/i,/\b(?:ALLOCATABLE|ALLOCATE|BACKSPACE|CALL|CASE|CLOSE|COMMON|CONTAINS|CONTINUE|CYCLE|DATA|DEALLOCATE|DIMENSION|DO|END|EQUIVALENCE|EXIT|EXTERNAL|FORMAT|GO ?TO|IMPLICIT(?: NONE)?|INQUIRE|INTENT|INTRINSIC|MODULE PROCEDURE|NAMELIST|NULLIFY|OPEN|OPTIONAL|PARAMETER|POINTER|PRINT|PRIVATE|PUBLIC|READ|RETURN|REWIND|SAVE|SELECT|STOP|TARGET|WHILE|WRITE)\b/i,/\b(?:END ?)?(?:BLOCK ?DATA|DO|FILE|FORALL|FUNCTION|IF|INTERFACE|MODULE|PROGRAM|SELECT|SUBROUTINE|TYPE|WHERE)\b/i,/\b(?:ASSIGNMENT|DEFAULT|ELEMENTAL|ELSE|ELSEWHERE|ELSEIF|ENTRY|IN|INCLUDE|INOUT|KIND|NULL|ONLY|OPERATOR|OUT|PURE|RECURSIVE|RESULT|SEQUENCE|STAT|THEN|USE)\b/i],operator:[/\*\*|\/\/|=>|[=\/]=|[<>]=?|::|[+\-*=%]|\.(?:EQ|NE|LT|LE|GT|GE|NOT|AND|OR|EQV|NEQV)\.|\.[A-Z]+\./i,{pattern:/(^|(?!\().)\/(?!\))/,lookbehind:!0}],punctuation:/\(\/|\/\)|[(),;:&]/};
\ No newline at end of file
+Prism.languages.fortran={"quoted-number":{pattern:/[BOZ](['"])[A-F0-9]+\1/i,alias:"number"},string:{pattern:/(?:\w+_)?(['"])(?:\1\1|&(?:\r\n?|\n)(?:\s*!.+(?:\r\n?|\n))?|(?!\1).)*(?:\1|&)/,inside:{comment:{pattern:/(&(?:\r\n?|\n)\s*)!.*/,lookbehind:!0}}},comment:/!.*/,"boolean":/\.(?:TRUE|FALSE)\.(?:_\w+)?/i,number:/(?:\b|[+-])(?:\d+(?:\.\d*)?|\.\d+)(?:[ED][+-]?\d+)?(?:_\w+)?/i,keyword:[/\b(?:INTEGER|REAL|DOUBLE ?PRECISION|COMPLEX|CHARACTER|LOGICAL)\b/i,/\b(?:ALLOCATABLE|ALLOCATE|BACKSPACE|CALL|CASE|CLOSE|COMMON|CONTAINS|CONTINUE|CYCLE|DATA|DEALLOCATE|DIMENSION|DO|END|EQUIVALENCE|EXIT|EXTERNAL|FORMAT|GO ?TO|IMPLICIT(?: NONE)?|INQUIRE|INTENT|INTRINSIC|MODULE PROCEDURE|NAMELIST|NULLIFY|OPEN|OPTIONAL|PARAMETER|POINTER|PRINT|PRIVATE|PUBLIC|READ|RETURN|REWIND|SAVE|SELECT|STOP|TARGET|WHILE|WRITE)\b/i,/\b(?:END ?)?(?:BLOCK ?DATA|DO|FILE|FORALL|FUNCTION|IF|INTERFACE|MODULE|PROGRAM|SELECT|SUBROUTINE|TYPE|WHERE)\b/i,/\b(?:ASSIGNMENT|DEFAULT|ELEMENTAL|ELSE|ELSEWHERE|ELSEIF|ENTRY|IN|INCLUDE|INOUT|KIND|NULL|ONLY|OPERATOR|OUT|PURE|RECURSIVE|RESULT|SEQUENCE|STAT|THEN|USE)\b/i],operator:[/\*\*|\/\/|=>|[=\/]=|[<>]=?|::|[+\-*=%]|\.(?:EQ|NE|LT|LE|GT|GE|NOT|AND|OR|EQV|NEQV)\.|\.[A-Z]+\./i,{pattern:/(^|(?!\().)\/(?!\))/,lookbehind:!0}],punctuation:/\(\/|\/\)|[(),;:&]/};
\ No newline at end of file

From 8a6d32d356d34d0fba4a1f0212d417df3527dce7 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 18 Jul 2015 18:18:14 +0200
Subject: [PATCH 123/310] Fortran: fix keyword patterns order

---
 components/prism-fortran.js     | 4 ++--
 components/prism-fortran.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-fortran.js b/components/prism-fortran.js
index 0d5e83ca35..7b417ce26e 100644
--- a/components/prism-fortran.js
+++ b/components/prism-fortran.js
@@ -18,10 +18,10 @@ Prism.languages.fortran = {
 	'keyword': [
 		// Types
 		/\b(?:INTEGER|REAL|DOUBLE ?PRECISION|COMPLEX|CHARACTER|LOGICAL)\b/i,
+		// END statements
+		/\b(?:END ?)?(?:BLOCK ?DATA|DO|FILE|FORALL|FUNCTION|IF|INTERFACE|MODULE(?! PROCEDURE)|PROGRAM|SELECT|SUBROUTINE|TYPE|WHERE)\b/i,
 		// Statements
 		/\b(?:ALLOCATABLE|ALLOCATE|BACKSPACE|CALL|CASE|CLOSE|COMMON|CONTAINS|CONTINUE|CYCLE|DATA|DEALLOCATE|DIMENSION|DO|END|EQUIVALENCE|EXIT|EXTERNAL|FORMAT|GO ?TO|IMPLICIT(?: NONE)?|INQUIRE|INTENT|INTRINSIC|MODULE PROCEDURE|NAMELIST|NULLIFY|OPEN|OPTIONAL|PARAMETER|POINTER|PRINT|PRIVATE|PUBLIC|READ|RETURN|REWIND|SAVE|SELECT|STOP|TARGET|WHILE|WRITE)\b/i,
-		// END statements
-		/\b(?:END ?)?(?:BLOCK ?DATA|DO|FILE|FORALL|FUNCTION|IF|INTERFACE|MODULE|PROGRAM|SELECT|SUBROUTINE|TYPE|WHERE)\b/i,
 		// Others
 		/\b(?:ASSIGNMENT|DEFAULT|ELEMENTAL|ELSE|ELSEWHERE|ELSEIF|ENTRY|IN|INCLUDE|INOUT|KIND|NULL|ONLY|OPERATOR|OUT|PURE|RECURSIVE|RESULT|SEQUENCE|STAT|THEN|USE)\b/i
 	],
diff --git a/components/prism-fortran.min.js b/components/prism-fortran.min.js
index ac54b0f513..6801223cce 100644
--- a/components/prism-fortran.min.js
+++ b/components/prism-fortran.min.js
@@ -1 +1 @@
-Prism.languages.fortran={"quoted-number":{pattern:/[BOZ](['"])[A-F0-9]+\1/i,alias:"number"},string:{pattern:/(?:\w+_)?(['"])(?:\1\1|&(?:\r\n?|\n)(?:\s*!.+(?:\r\n?|\n))?|(?!\1).)*(?:\1|&)/,inside:{comment:{pattern:/(&(?:\r\n?|\n)\s*)!.*/,lookbehind:!0}}},comment:/!.*/,"boolean":/\.(?:TRUE|FALSE)\.(?:_\w+)?/i,number:/(?:\b|[+-])(?:\d+(?:\.\d*)?|\.\d+)(?:[ED][+-]?\d+)?(?:_\w+)?/i,keyword:[/\b(?:INTEGER|REAL|DOUBLE ?PRECISION|COMPLEX|CHARACTER|LOGICAL)\b/i,/\b(?:ALLOCATABLE|ALLOCATE|BACKSPACE|CALL|CASE|CLOSE|COMMON|CONTAINS|CONTINUE|CYCLE|DATA|DEALLOCATE|DIMENSION|DO|END|EQUIVALENCE|EXIT|EXTERNAL|FORMAT|GO ?TO|IMPLICIT(?: NONE)?|INQUIRE|INTENT|INTRINSIC|MODULE PROCEDURE|NAMELIST|NULLIFY|OPEN|OPTIONAL|PARAMETER|POINTER|PRINT|PRIVATE|PUBLIC|READ|RETURN|REWIND|SAVE|SELECT|STOP|TARGET|WHILE|WRITE)\b/i,/\b(?:END ?)?(?:BLOCK ?DATA|DO|FILE|FORALL|FUNCTION|IF|INTERFACE|MODULE|PROGRAM|SELECT|SUBROUTINE|TYPE|WHERE)\b/i,/\b(?:ASSIGNMENT|DEFAULT|ELEMENTAL|ELSE|ELSEWHERE|ELSEIF|ENTRY|IN|INCLUDE|INOUT|KIND|NULL|ONLY|OPERATOR|OUT|PURE|RECURSIVE|RESULT|SEQUENCE|STAT|THEN|USE)\b/i],operator:[/\*\*|\/\/|=>|[=\/]=|[<>]=?|::|[+\-*=%]|\.(?:EQ|NE|LT|LE|GT|GE|NOT|AND|OR|EQV|NEQV)\.|\.[A-Z]+\./i,{pattern:/(^|(?!\().)\/(?!\))/,lookbehind:!0}],punctuation:/\(\/|\/\)|[(),;:&]/};
\ No newline at end of file
+Prism.languages.fortran={"quoted-number":{pattern:/[BOZ](['"])[A-F0-9]+\1/i,alias:"number"},string:{pattern:/(?:\w+_)?(['"])(?:\1\1|&(?:\r\n?|\n)(?:\s*!.+(?:\r\n?|\n))?|(?!\1).)*(?:\1|&)/,inside:{comment:{pattern:/(&(?:\r\n?|\n)\s*)!.*/,lookbehind:!0}}},comment:/!.*/,"boolean":/\.(?:TRUE|FALSE)\.(?:_\w+)?/i,number:/(?:\b|[+-])(?:\d+(?:\.\d*)?|\.\d+)(?:[ED][+-]?\d+)?(?:_\w+)?/i,keyword:[/\b(?:INTEGER|REAL|DOUBLE ?PRECISION|COMPLEX|CHARACTER|LOGICAL)\b/i,/\b(?:END ?)?(?:BLOCK ?DATA|DO|FILE|FORALL|FUNCTION|IF|INTERFACE|MODULE(?! PROCEDURE)|PROGRAM|SELECT|SUBROUTINE|TYPE|WHERE)\b/i,/\b(?:ALLOCATABLE|ALLOCATE|BACKSPACE|CALL|CASE|CLOSE|COMMON|CONTAINS|CONTINUE|CYCLE|DATA|DEALLOCATE|DIMENSION|DO|END|EQUIVALENCE|EXIT|EXTERNAL|FORMAT|GO ?TO|IMPLICIT(?: NONE)?|INQUIRE|INTENT|INTRINSIC|MODULE PROCEDURE|NAMELIST|NULLIFY|OPEN|OPTIONAL|PARAMETER|POINTER|PRINT|PRIVATE|PUBLIC|READ|RETURN|REWIND|SAVE|SELECT|STOP|TARGET|WHILE|WRITE)\b/i,/\b(?:ASSIGNMENT|DEFAULT|ELEMENTAL|ELSE|ELSEWHERE|ELSEIF|ENTRY|IN|INCLUDE|INOUT|KIND|NULL|ONLY|OPERATOR|OUT|PURE|RECURSIVE|RESULT|SEQUENCE|STAT|THEN|USE)\b/i],operator:[/\*\*|\/\/|=>|[=\/]=|[<>]=?|::|[+\-*=%]|\.(?:EQ|NE|LT|LE|GT|GE|NOT|AND|OR|EQV|NEQV)\.|\.[A-Z]+\./i,{pattern:/(^|(?!\().)\/(?!\))/,lookbehind:!0}],punctuation:/\(\/|\/\)|[(),;:&]/};
\ No newline at end of file

From 58f6fe1fc48c633ee879f6db4b62d79d98a0f80d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 26 Jul 2015 11:24:40 +0200
Subject: [PATCH 124/310] Revert 5b29a673c468920ac68c3af6e769f72c2b895434 for
 now.

---
 themes/prism-coy.css      | 4 ++--
 themes/prism-dark.css     | 2 +-
 themes/prism-funky.css    | 2 +-
 themes/prism-okaidia.css  | 2 +-
 themes/prism-tomorrow.css | 2 +-
 themes/prism-twilight.css | 2 +-
 themes/prism.css          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/themes/prism-coy.css b/themes/prism-coy.css
index 7a325d63a8..8db555e126 100644
--- a/themes/prism-coy.css
+++ b/themes/prism-coy.css
@@ -7,7 +7,7 @@
 code[class*="language-"],
 pre[class*="language-"] {
 	color: black;
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
@@ -228,4 +228,4 @@ pre[data-line] code {
 }
 pre .line-highlight {
 	margin-top: 0;
-}
+}
\ No newline at end of file
diff --git a/themes/prism-dark.css b/themes/prism-dark.css
index 1c4daa2227..a8047fce6e 100644
--- a/themes/prism-dark.css
+++ b/themes/prism-dark.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: white;
 	text-shadow: 0 -.1em .2em black;
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-funky.css b/themes/prism-funky.css
index 30135635ee..f2614d1573 100644
--- a/themes/prism-funky.css
+++ b/themes/prism-funky.css
@@ -6,7 +6,7 @@
 
 code[class*="language-"],
 pre[class*="language-"] {
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-okaidia.css b/themes/prism-okaidia.css
index 0fac6828db..3ff2e3c772 100644
--- a/themes/prism-okaidia.css
+++ b/themes/prism-okaidia.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: #f8f8f2;
 	text-shadow: 0 1px rgba(0, 0, 0, 0.3);
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-tomorrow.css b/themes/prism-tomorrow.css
index 44f0f7edd0..c998fb22cb 100644
--- a/themes/prism-tomorrow.css
+++ b/themes/prism-tomorrow.css
@@ -7,7 +7,7 @@
 code[class*="language-"],
 pre[class*="language-"] {
 	color: #ccc;
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-twilight.css b/themes/prism-twilight.css
index ab0813410e..89dbe848b4 100644
--- a/themes/prism-twilight.css
+++ b/themes/prism-twilight.css
@@ -7,7 +7,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: white;
 	direction: ltr;
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', monospace;
 	text-align: left;
 	text-shadow: 0 -.1em .2em black;
 	white-space: pre;
diff --git a/themes/prism.css b/themes/prism.css
index 3a57f8e817..a04c82c89c 100644
--- a/themes/prism.css
+++ b/themes/prism.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: black;
 	text-shadow: 0 1px white;
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;

From ed9d7e354c20a95755af7641e3a2a0c77a713791 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 26 Jul 2015 11:26:07 +0200
Subject: [PATCH 125/310] Add Ubuntu Mono font to font stack

---
 themes/prism-coy.css      | 4 ++--
 themes/prism-dark.css     | 2 +-
 themes/prism-funky.css    | 2 +-
 themes/prism-okaidia.css  | 2 +-
 themes/prism-tomorrow.css | 2 +-
 themes/prism-twilight.css | 2 +-
 themes/prism.css          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/themes/prism-coy.css b/themes/prism-coy.css
index 8db555e126..7a325d63a8 100644
--- a/themes/prism-coy.css
+++ b/themes/prism-coy.css
@@ -7,7 +7,7 @@
 code[class*="language-"],
 pre[class*="language-"] {
 	color: black;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
@@ -228,4 +228,4 @@ pre[data-line] code {
 }
 pre .line-highlight {
 	margin-top: 0;
-}
\ No newline at end of file
+}
diff --git a/themes/prism-dark.css b/themes/prism-dark.css
index a8047fce6e..1c4daa2227 100644
--- a/themes/prism-dark.css
+++ b/themes/prism-dark.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: white;
 	text-shadow: 0 -.1em .2em black;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-funky.css b/themes/prism-funky.css
index f2614d1573..30135635ee 100644
--- a/themes/prism-funky.css
+++ b/themes/prism-funky.css
@@ -6,7 +6,7 @@
 
 code[class*="language-"],
 pre[class*="language-"] {
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-okaidia.css b/themes/prism-okaidia.css
index 3ff2e3c772..0fac6828db 100644
--- a/themes/prism-okaidia.css
+++ b/themes/prism-okaidia.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: #f8f8f2;
 	text-shadow: 0 1px rgba(0, 0, 0, 0.3);
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-tomorrow.css b/themes/prism-tomorrow.css
index c998fb22cb..44f0f7edd0 100644
--- a/themes/prism-tomorrow.css
+++ b/themes/prism-tomorrow.css
@@ -7,7 +7,7 @@
 code[class*="language-"],
 pre[class*="language-"] {
 	color: #ccc;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;
diff --git a/themes/prism-twilight.css b/themes/prism-twilight.css
index 89dbe848b4..ab0813410e 100644
--- a/themes/prism-twilight.css
+++ b/themes/prism-twilight.css
@@ -7,7 +7,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: white;
 	direction: ltr;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	text-align: left;
 	text-shadow: 0 -.1em .2em black;
 	white-space: pre;
diff --git a/themes/prism.css b/themes/prism.css
index a04c82c89c..3a57f8e817 100644
--- a/themes/prism.css
+++ b/themes/prism.css
@@ -8,7 +8,7 @@ code[class*="language-"],
 pre[class*="language-"] {
 	color: black;
 	text-shadow: 0 1px white;
-	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 	direction: ltr;
 	text-align: left;
 	white-space: pre;

From 1e0b8d9da944949e52bd7f2c5d38406e2d534f34 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sun, 26 Jul 2015 14:08:47 +0200
Subject: [PATCH 126/310] Fixed code style issues

---
 tests/helper/prism-loader.js             |  6 +--
 tests/helper/test-case.js                |  4 +-
 tests/helper/token-stream-transformer.js | 12 ++----
 tests/run.js                             |  5 +--
 tests/testrunner-tests.js                | 47 +++++++++++++-----------
 5 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
index ea82c0bc47..9bc515b425 100644
--- a/tests/helper/prism-loader.js
+++ b/tests/helper/prism-loader.js
@@ -39,8 +39,7 @@ module.exports = {
 	 * @returns {{loadedLanguages: string[], Prism: Prism}}
 	 */
 	loadLanguage: function (language, context) {
-		if (!languagesCatalog[language])
-		{
+		if (!languagesCatalog[language]) {
 			throw new Error("Language '" + language + "' not found.");
 		}
 
@@ -50,8 +49,7 @@ module.exports = {
 		}
 
 		// if the language has a dependency -> load it first
-		if (languagesCatalog[language].require)
-		{
+		if (languagesCatalog[language].require) {
 			context = this.loadLanguage(languagesCatalog[language].require, context);
 		}
 
diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index b62d230da9..ec9ae06d25 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -69,7 +69,6 @@ module.exports = {
 	},
 
 
-
 	/**
 	 * Parses the test case from the given test case file
 	 *
@@ -96,8 +95,7 @@ module.exports = {
 
 			return testCase;
 		}
-		catch (e)
-		{
+		catch (e) {
 			// the JSON can't be parsed (e.g. it could be empty)
 			return null;
 		}
diff --git a/tests/helper/token-stream-transformer.js b/tests/helper/token-stream-transformer.js
index 38aa77ca24..deb831c45b 100644
--- a/tests/helper/token-stream-transformer.js
+++ b/tests/helper/token-stream-transformer.js
@@ -14,22 +14,18 @@ module.exports = {
 	 * @returns {Array.<string[]|Array>}
 	 */
 	simplify: function (tokenStream) {
-		if (Array.isArray(tokenStream))
-		{
+		if (Array.isArray(tokenStream)) {
 			return tokenStream
 				.map(this.simplify.bind(this))
-				.filter(function(value)
-				{
+				.filter(function (value) {
 					return !(Array.isArray(value) && !value.length) && !(typeof value === "string" && !value.trim().length);
 				}
 			);
 		}
-		else if (typeof tokenStream === "object")
-		{
+		else if (typeof tokenStream === "object") {
 			return [tokenStream.type, this.simplify(tokenStream.content)];
 		}
-		else
-		{
+		else {
 			return tokenStream;
 		}
 	}
diff --git a/tests/run.js b/tests/run.js
index 0f0475fa6e..5e0050487f 100644
--- a/tests/run.js
+++ b/tests/run.js
@@ -8,14 +8,13 @@ var path = require("path");
 var testSuite = TestDiscovery.loadAllTests(__dirname + "/languages");
 
 // define tests for all tests in all languages in the test suite
-for (var language in testSuite)
-{
+for (var language in testSuite) {
 	if (!testSuite.hasOwnProperty(language)) {
 		continue;
 	}
 
 	(function (language, testFiles) {
-		describe("Testing language '" + language + "'", function() {
+		describe("Testing language '" + language + "'", function () {
 			testFiles.forEach(
 				function (filePath) {
 					var fileName = path.basename(filePath, path.extname(filePath));
diff --git a/tests/testrunner-tests.js b/tests/testrunner-tests.js
index b9f79dc88e..23731078e4 100644
--- a/tests/testrunner-tests.js
+++ b/tests/testrunner-tests.js
@@ -4,11 +4,9 @@ var assert = require("chai").assert;
 var TokenStreamTransformer = require("./helper/token-stream-transformer");
 
 describe("The token stream transformer",
-	function ()
-	{
+	function () {
 		it("should handle all kinds of simple transformations",
-			function ()
-			{
+			function () {
 				var tokens = [
 					{type: "type", content: "content"},
 					"string"
@@ -25,14 +23,19 @@ describe("The token stream transformer",
 
 
 		it("should handle nested structures",
-			function ()
-			{
+			function () {
 				var tokens = [
-					{type: "type", content: [
-						{type: "insideType", content: [
-							{type: "insideInsideType", content: "content"}
-						]}
-					]}
+					{
+						type: "type",
+						content: [
+							{
+								type: "insideType", content:
+								[
+									{type: "insideInsideType", content: "content"}
+								]
+							}
+						]
+					}
 				];
 
 				var expected = [
@@ -49,8 +52,7 @@ describe("The token stream transformer",
 
 
 		it("should strip empty tokens",
-			function ()
-			{
+			function () {
 				var tokenStream = [
 					"",
 					"\r\n",
@@ -66,14 +68,16 @@ describe("The token stream transformer",
 
 
 		it("should strip empty token tree branches",
-			function ()
-			{
+			function () {
 				var tokenStream = [
-					{type: "type", content: [
-						["", ""],
-						"",
-						{type: "nested", content: [""]}
-					]},
+					{
+						type: "type",
+						content: [
+							["", ""],
+							"",
+							{type: "nested", content: [""]}
+						]
+					},
 					[[[[[[[""]]]]]]]
 				];
 
@@ -89,8 +93,7 @@ describe("The token stream transformer",
 
 
 		it("should ignore all properties in tokens except value and content",
-			function ()
-			{
+			function () {
 
 				var tokenStream = [
 					{type: "type", content: "content", alias: "alias"}

From 799570f9cbff3b68ef8a8873977d9a78d6a584ed Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sun, 26 Jul 2015 14:25:30 +0200
Subject: [PATCH 127/310] Fixed javascript test case

---
 tests/languages/javascript/testcase1.test | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/languages/javascript/testcase1.test b/tests/languages/javascript/testcase1.test
index e6cd4a59aa..78a197175a 100644
--- a/tests/languages/javascript/testcase1.test
+++ b/tests/languages/javascript/testcase1.test
@@ -4,6 +4,7 @@ var a = 5;
 
 [
 	["keyword", "var"],
+	" a ",
 	["operator", "="],
 	["number", "5"],
 	["punctuation", ";"]
@@ -11,4 +12,4 @@ var a = 5;
 
 ----------------------------------------------------
 
-This is a comment explaining this test case.
\ No newline at end of file
+This is a comment explaining this test case.

From a13c87b9e3712233472814d536ffd45bec381c77 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sun, 26 Jul 2015 14:27:38 +0200
Subject: [PATCH 128/310] Added support for specifying the main language to
 load in test cases

You can add an exclamation mark anywhere in the name to load it as main language. If you do not specify anything, the first entry is used as main language

css+markup! --> markup is main language
css+markup  --> css is main language
---
 tests/helper/test-case.js | 48 +++++++++++++++++++++++++++++++---
 tests/testrunner-tests.js | 55 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index ec9ae06d25..34835a3326 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -53,15 +53,15 @@ module.exports = {
 	 */
 	runTestCase: function (languageIdentifier, filePath) {
 		var testCase = this.parseTestCaseFile(filePath);
-		var languages = languageIdentifier.split("+");
+		var usedLanguages = this.parseLanguageNames(languageIdentifier);
 
 		if (null === testCase) {
 			throw new Error("Test case file has invalid format (or the provided token stream is invalid JSON), please read the docs.");
 		}
 
-		var Prism = PrismLoader.createInstance(languages);
+		var Prism = PrismLoader.createInstance(usedLanguages.languages);
 		// the first language is the main language to highlight
-		var mainLanguageGrammar = Prism.languages[languages[0]];
+		var mainLanguageGrammar = Prism.languages[usedLanguages.mainLanguage];
 		var compiledTokenStream = Prism.tokenize(testCase.testSource, mainLanguageGrammar);
 		var simplifiedTokenStream = TokenStreamTransformer.simplify(compiledTokenStream);
 
@@ -69,6 +69,48 @@ module.exports = {
 	},
 
 
+	/**
+	 * Parses the language names and finds the main language.
+	 *
+	 * It is either the first language or the language followed by a exclamation mark “!”.
+	 * There should only be one language with an exclamation mark.
+	 *
+	 * @param {string} languageIdentifier
+	 *
+	 * @returns {{languages: string[], mainLanguage: string}}
+	 */
+	parseLanguageNames: function (languageIdentifier) {
+		var languages = languageIdentifier.split("+");
+		var mainLanguage = null;
+
+		languages = languages.map(
+			function (language) {
+				var pos = language.indexOf("!");
+
+				if (-1 < pos) {
+					if (mainLanguage) {
+						throw "There are multiple main languages defined.";
+					}
+
+					mainLanguage = language.replace("!", "");
+					return mainLanguage;
+				}
+
+				return language;
+			}
+		);
+
+		if (!mainLanguage) {
+			mainLanguage = languages[0];
+		}
+
+		return {
+			languages: languages,
+			mainLanguage: mainLanguage
+		};
+	},
+
+
 	/**
 	 * Parses the test case from the given test case file
 	 *
diff --git a/tests/testrunner-tests.js b/tests/testrunner-tests.js
index 23731078e4..c4e0fd51f0 100644
--- a/tests/testrunner-tests.js
+++ b/tests/testrunner-tests.js
@@ -2,7 +2,10 @@
 
 var assert = require("chai").assert;
 var TokenStreamTransformer = require("./helper/token-stream-transformer");
+var TestCase = require("./helper/test-case");
 
+
+//region Token Stream Transformer
 describe("The token stream transformer",
 	function () {
 		it("should handle all kinds of simple transformations",
@@ -108,4 +111,56 @@ describe("The token stream transformer",
 		);
 	}
 );
+//endregion
+
+
+//region Language name parsing
+describe("The language name parsing",
+	function () {
+		it("should use the first language as the main language if no language is specified",
+			function () {
+				assert.deepEqual(
+					TestCase.parseLanguageNames("a"),
+					{
+						languages: ["a"],
+						mainLanguage: "a"
+					}
+				);
+
+				assert.deepEqual(
+					TestCase.parseLanguageNames("a+b+c"),
+					{
+						languages: ["a", "b", "c"],
+						mainLanguage: "a"
+					}
+				);
+			}
+		);
+
 
+		it("should use the specified language as main language",
+			function () {
+				assert.deepEqual(
+					TestCase.parseLanguageNames("a+b!+c"),
+					{
+						languages: ["a", "b", "c"],
+						mainLanguage: "b"
+					}
+				);
+			}
+		);
+
+
+		it("should throw an error if there are multiple main languages",
+			function () {
+				assert.throw(
+					function () {
+						TestCase.parseLanguageNames("a+b!+c!");
+					},
+					"There are multiple main languages defined."
+				);
+			}
+		);
+	}
+);
+//endregion

From 9e6703ada54ec98b6c90c1127c6c4104066e5ba0 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sun, 26 Jul 2015 14:32:00 +0200
Subject: [PATCH 129/310] Added travis.yml to run tests in travis

---
 .travis.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..68fbf6d87c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: node_js
+
+node_js:
+  - "0.10"
+  - "0.12"
+
+before_script:
+  - npm install -g gulp
+  - gulp
+
+script: npm test

From 2bc551851c753b14a5cc5cd9293d4474c6656b3f Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sun, 26 Jul 2015 14:34:41 +0200
Subject: [PATCH 130/310] Improve support of node 10.x

---
 tests/helper/components.js   | 3 +--
 tests/helper/prism-loader.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/helper/components.js b/tests/helper/components.js
index 09dd6aa957..68cb7abe3a 100644
--- a/tests/helper/components.js
+++ b/tests/helper/components.js
@@ -5,7 +5,6 @@ var vm = require("vm");
 
 var fileContent = fs.readFileSync(__dirname + "/../../components.js", "utf8");
 var context = {};
-vm.createContext(context);
-vm.runInContext(fileContent, context);
+vm.runInNewContext(fileContent, context);
 
 module.exports = context.components;
diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
index 9bc515b425..31f3689d63 100644
--- a/tests/helper/prism-loader.js
+++ b/tests/helper/prism-loader.js
@@ -107,8 +107,7 @@ module.exports = {
 	 */
 	runFileWithContext: function (fileSource, context) {
 		context = context || {};
-		vm.createContext(context);
-		vm.runInContext(fileSource, context);
+		vm.runInNewContext(fileSource, context);
 		return context;
 	}
 };

From e8884a96ed6aa5fb53710078afe3aea68176ec44 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Sun, 26 Jul 2015 15:28:39 +0200
Subject: [PATCH 131/310] Added documentation about the test runner and test
 suite

---
 test-suite.html | 147 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 test-suite.html

diff --git a/test-suite.html b/test-suite.html
new file mode 100644
index 0000000000..accd149d92
--- /dev/null
+++ b/test-suite.html
@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+<meta charset="utf-8" />
+<link rel="shortcut icon" href="favicon.png" />
+<title>Running the test suite ▲ Prism</title>
+<link rel="stylesheet" href="style.css" />
+<link rel="stylesheet" href="themes/prism.css" data-noprefix />
+<script src="prefixfree.min.js"></script>
+
+<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
+<script src="http://www.google-analytics.com/ga.js" async></script>
+</head>
+<body class="language-javascript">
+
+<header>
+	<div class="intro" data-src="templates/header-main.html" data-type="text/html"></div>
+
+	<h2>Running the test suite</h2>
+	<p>Prism has a test suite, that ensures that the correct tokens are matched.</p>
+</header>
+
+<section id="running-the-test-suite">
+	<h1>Running the test suite</h1>
+
+	<p>Running the test suite is simple: just call <code class="language-bash">npm test</code>.</p>
+	<p>All test files are run in isolation. A new prism instance is created for each test case. This will slow the test runner a bit down, but we can be sure that nothing leaks into the next test case.</p>
+</section>
+
+<section id="writing-tests">
+	<h1>Writing tests</h1>
+
+	<p>Thank you for writing tests! Tests are awesome! They ensure, that we can improve the codebase without breaking anything. Also, this way, we can ensure that upgrading Prism is as painless as possible for you.</p>
+	<p>You can add new tests by creating a new test case file (with the <code>.test</code> file extension) in the tests directory which is located at <code>/tests/languages/${language}</code>.</p>
+
+	<section id="writing-tests-directories">
+		<h2>Language directories</h2>
+		<p>All tests are sorted into directories in the <code>tests/languages</code> directory. Each directory name encodes, which language you are currently testing.</p>
+		<p><strong>All language names must match the names from the definition in <code>components.js</code>.</strong></p>
+
+		<h3>Example 1: testing a language in isolation (default use case)</h3>
+		<p>Just put your test file into the directory of the language you want to test.</p>
+		<p>So, if you want to test CSS, put your test file in <code>/tests/languages/css</code> to test CSS only. If you create a test case in this directory, the test runner will ensure that the <code>css</code> language definition including all required language definitions are correctly loaded.</p>
+
+		<h3>Example 2: testing language injection</h3>
+		<p>If you want to test language injection, you typically need to load two or more languages where one language is the “main” language that is being tested, with all other languages being injected into it.</p>
+		<p>You need to define multiple languages by separating them using a <code>+</code> sign: <code>markup+php</code>.</p>
+		<p>The languages are loaded in order, so first markup (+ dependencies) is loaded, then php (+ dependencies). The test loader ensures that no language is loaded more than once (for example if two languages have the same dependencies).</p>
+		<p>By default the first language is the main language: <code>markup+php</code> will have <code>markup</code> as main language. This is equal to putting your code in the following code block:</p>
+		<pre><code class="language-markup">...
+&lt;pre>&lt;code class="language-markup">
+	&lt;!-- your code here -->
+&lt;/code>&lt;pre>
+...</code></pre>
+
+		<p>If you need to load the languages in a given order, but you don't want to use the first language as main language, you can mark the main language with an exclamation mark: <code>markup+php!</code>. This will use <code>php</code> as main language. (You can only define one main language. The test runner will fail all tests in directories with more than one main language.)</p>
+
+		<p><em>Note: by loading multiple languages you can do integration tests (ensure that loading two or more languages together won't break anything).</em></p>
+	</section>
+
+	<section id="writing-tests-creating-your-test-case-file">
+		<h2>Creating your test case file</h2>
+		<p>At first you need to create a new file in the language directory, you want to test.</p>
+		<p><strong>Use a proper name for your test case.</strong> Please use one case of the following conventions:</p>
+		<ul>
+			<li><code>issue{issueid}</code>: reference a github issue id (example: <code>issue588.test</code>).</li>
+			<li><code>{featurename}_feature</code>: group all tests to one feature in one file (example: <code>string_interpolation_feature.test</code>).</li>
+			<li><code>{language}_inclusion</code>: test inclusion of one language into the other (example: <code>markup/php_inclusion.test</code> will test php inclusion into markup).</li>
+		</ul>
+		<p>You can use all conventions as a prefix, so <code>string_interpolation_feature_inline.test</code> is possible. <strong>But please take a minute or two to think of a proper name of your test case file. You are writing code not only for the computers, but also for your fellow developers.</strong></p>
+	</section>
+
+	<section id="writing-tests-writing-your-test">
+		<h2>Writing your test</h2>
+		<p>The structure of a test case file is as follows:</p>
+		<pre><code>
+... language snippet...
+----
+... the simplified token stream you expect ...</code></pre>
+
+		<p>Your file is built up of two or three sections, separated by three or more dashes <code>-</code>, starting at the begin of the line:</p>
+		<ol>
+			<li>Your language snippet. The code you want to compile using Prism. (<strong>required</strong>)</li>
+			<li>The simplified token stream you expect. Needs to be valid JSON. (<strong>required</strong>)</li>
+			<li>A comment explaining the test case. (<em>optional</em>)</li>
+		</ol>
+		<p>The easiest way would be to look at an existing test file:</p>
+		<pre><code>var a = 5;
+
+----------------------------------------------------
+
+[
+	["keyword", "var"],
+	" a ",
+	["operator", "="],
+	["number", "5"],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+This is a comment explaining this test case.</code></pre>
+	</section>
+
+	<section>
+		<h2>Explaining the simplified token stream</h2>
+		<p>While compiling, Prism transforms your source code into a token stream. This is basically a tree of nested tokens (or arrays, or strings).</p>
+		<p>As these trees are hard to write by hand, the test runner uses a simplified version of it.</p>
+		<p>It uses the following rules:</p>
+		<ul>
+			<li><code>Token</code> objects are transformed into an array: <code>[token.type, token.content]</code> (whereas <code>token.content</code> can be a nested structure).</li>
+			<li>All strings that are either empty or only contain whitespace, are removed from the token stream.</li>
+			<li>All empty structures are removed.</li>
+		</ul>
+		<p>For further information: reading the tests of the test runner (<code>tests/testrunner-tests.js</code>) will help you understand the transformation.</p>
+	</section>
+</section>
+
+
+<section id="test-runner-tests">
+	<h2>Test runner tests</h2>
+	<p>The test runner itself is tested in a separate test case. You can find all “test core” related tests in <code>tests/testrunner-tests.js</code>.</p>
+	<p>You shouldn't need to touch this file ever, except you modify the test runner code.</p>
+</section>
+
+<section id="internal-structure">
+	<h2>Internal structure</h2>
+	<p>The global test flow is at follows:</p>
+	<ol>
+		<li>Run all internal tests (test the test runner).</li>
+		<li>Find all language tests.</li>
+		<li>Run all language tests individually.</li>
+		<li>Report the results.</li>
+	</ol>
+</section>
+
+
+<footer data-src="templates/footer.html" data-type="text/html"></footer>
+
+<script src="prism.js"></script>
+<script src="utopia.js"></script>
+<script src="components.js"></script>
+<script src="code.js"></script>
+
+</body>
+</html>

From 54cfe4fb1f437346936bc2a165df031162d4a3cb Mon Sep 17 00:00:00 2001
From: david peach <hello@davidpea.ch>
Date: Mon, 27 Jul 2015 18:34:31 +0100
Subject: [PATCH 132/310] Change the link to my article to correct URL.

My .htaccess in the old site has stopped working and so have manually edited the link here.
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index aa713a9654..407ede62fd 100644
--- a/index.html
+++ b/index.html
@@ -188,7 +188,7 @@ <h1>Third-party tutorials</h1>
 		<li><a href="http://www.stramaxon.com/2012/07/prism-syntax-highlighter-for-blogger.html">Implement PrismJs Syntax Highlighting to your Blogger/BlogSpot</a></li>
 		<li><a href="http://www.allblogtools.com/tricks-and-hacks/beautify-source-codes-in-your-posts-with-prism-syntax-highlighter-for-blogger/">Beautify Source Codes In Your Posts With Prism Syntax Highlighter For Blogger</a></li>
 		<li><a href="http://dotnordic.se/extending-and-customizing-prism-syntax-highlighter/">Extending and customizing Prism syntax highlighter</a></li>
-		<li><a href="http://davidpeach.co.uk/2013/02/prism-js-code-highlighter/">Prism JS Code Highlighter</a></li>
+		<li><a href="http://davidpea.ch/articles/287">Prism JS Code Highlighter</a></li>
 		<li><a href="http://schier.co/post/how-to-re-run-prismjs-on-ajax-content">How To Re-Run Prism.js On AJAX Content</a></li>
 		<li><a href="http://www.semisedlak.com/article/highlight-your-code-syntax-with-prismjs/">Highlight your code syntax with Prism.js</a></li>
 		<li><a href="http://gmurphey.com/2012/08/09/jekyll-plugin-syntax-highlighting-with-prism.html">Jekyll Plugin: Syntax Highlighting With Prism</a></li>

From 6fc4cf68a8f9c43ce22ec306d8d1aa26bdb3ec2c Mon Sep 17 00:00:00 2001
From: Loic Giraudel <l.giraudel@gmail.com>
Date: Sun, 2 Aug 2015 23:55:37 +0200
Subject: [PATCH 133/310] More examples for git

---
 examples/prism-git.html | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/examples/prism-git.html b/examples/prism-git.html
index c705c9d2ac..7d37d4b816 100644
--- a/examples/prism-git.html
+++ b/examples/prism-git.html
@@ -11,3 +11,32 @@ <h2>Comments</h2>
 <h2>Inserted and deleted lines</h2>
 <pre><code>- Some deleted line
 + Some added line</code></pre>
+
+<h2>Diff</h2>
+<pre><code>$ git diff
+diff --git file.txt file.txt
+index 6214953..1d54a52 100644
+--- file.txt
++++ file.txt
+@@ -1 +1,2 @@
+-Here's my tetx file
++Here's my text file
++And this is the second line</code></pre>
+
+<h2>Logs</h2>
+<pre><code>$ git log
+commit a11a14ef7e26f2ca62d4b35eac455ce636d0dc09
+Author: lgiraudel
+Date:   Mon Feb 17 11:18:34 2014 +0100
+
+    Add of a new line
+
+commit 87edc4ad8c71b95f6e46f736eb98b742859abd95
+Author: lgiraudel
+Date:   Mon Feb 17 11:18:15 2014 +0100
+
+    Typo fix
+
+commit 3102416a90c431400d2e2a14e707fb7fd6d9e06d
+Author: lgiraudel
+Date:   Mon Feb 17 10:58:11 2014 +0100</code></pre>
\ No newline at end of file

From 3ded4f2c5356f6505e1ca0956b2954e465eb1e2c Mon Sep 17 00:00:00 2001
From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 6 Aug 2015 18:37:13 -0400
Subject: [PATCH 134/310] python: Add async/await and @ operator (introduced in
 3.5)

---
 components/prism-python.js     | 8 ++++----
 components/prism-python.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-python.js b/components/prism-python.js
index b2e031f0a2..7ebc42a747 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -1,4 +1,4 @@
-Prism.languages.python= { 
+Prism.languages.python= {
 	'comment': {
 		pattern: /(^|[^\\])#.*?(\r?\n|$)/,
 		lookbehind: true
@@ -8,9 +8,9 @@ Prism.languages.python= {
 		pattern: /((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,
 		lookbehind: true
 	},
-	'keyword' : /\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
+	'keyword' : /\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
 	'boolean' : /\b(True|False)\b/,
 	'number' : /\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
-	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,
+	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,
 	'punctuation' : /[{}[\];(),.:]/
-};
\ No newline at end of file
+};
diff --git a/components/prism-python.min.js b/components/prism-python.min.js
index 888e8a3fab..087ad0dd41 100644
--- a/components/prism-python.min.js
+++ b/components/prism-python.min.js
@@ -1 +1 @@
-Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,"function":{pattern:/((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,lookbehind:!0},keyword:/\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,"function":{pattern:/((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,lookbehind:!0},keyword:/\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file

From 1c630b1d4e30bf6f33585870e1bb9dfbcf591524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20San=20Juli=C3=A1n?= <fjsanjulian@hotmail.com>
Date: Sun, 9 Aug 2015 00:05:14 +0200
Subject: [PATCH 135/310] complete hook added

---
 prism.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/prism.js b/prism.js
index 8282b57193..e6a2273c4b 100644
--- a/prism.js
+++ b/prism.js
@@ -177,10 +177,6 @@ var _ = _self.Prism = {
 			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 		}
 
-		if (!grammar) {
-			return;
-		}
-
 		var code = element.textContent;
 
 		if(!code) {
@@ -196,6 +192,11 @@ var _ = _self.Prism = {
 			code: code
 		};
 
+		if (!grammar) {
+			_.hooks.run('complete', env);
+			return;
+		}
+
 		_.hooks.run('before-highlight', env);
 
 		if (async && _self.Worker) {
@@ -228,6 +229,9 @@ var _ = _self.Prism = {
 
 			_.hooks.run('after-highlight', env);
 		}
+
+		_.hooks.run('complete', env);
+
 	},
 
 	highlight: function (text, grammar, language) {

From 3f4d9182a00bc48aa8d87377fc626ded418d0c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20San=20Juli=C3=A1n?= <fjsanjulian@hotmail.com>
Date: Sun, 9 Aug 2015 00:07:08 +0200
Subject: [PATCH 136/310] run line numbers plugin in complete hook

---
 plugins/line-numbers/prism-line-numbers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/line-numbers/prism-line-numbers.js b/plugins/line-numbers/prism-line-numbers.js
index 9443deb7dc..73884cce64 100644
--- a/plugins/line-numbers/prism-line-numbers.js
+++ b/plugins/line-numbers/prism-line-numbers.js
@@ -1,4 +1,4 @@
-Prism.hooks.add('after-highlight', function (env) {
+Prism.hooks.add('complete', function (env) {
 	// works only for <code> wrapped inside <pre> (not inline)
 	var pre = env.element.parentNode;
 	var clsReg = /\s*\bline-numbers\b\s*/;

From f237e67b8301a4252b2dca1c90f73dfcd38d2e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20San=20Juli=C3=A1n?= <fjsanjulian@hotmail.com>
Date: Sun, 9 Aug 2015 03:21:30 +0200
Subject: [PATCH 137/310] run line highlight plugin in complete hook

---
 plugins/line-highlight/prism-line-highlight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/line-highlight/prism-line-highlight.js b/plugins/line-highlight/prism-line-highlight.js
index 577d142e98..8d5faa156c 100644
--- a/plugins/line-highlight/prism-line-highlight.js
+++ b/plugins/line-highlight/prism-line-highlight.js
@@ -85,7 +85,7 @@ function applyHash() {
 
 var fakeTimer = 0; // Hack to limit the number of times applyHash() runs
 
-Prism.hooks.add('after-highlight', function(env) {
+Prism.hooks.add('complete', function(env) {
 	var pre = env.element.parentNode;
 	var lines = pre && pre.getAttribute('data-line');
 	

From c89bbdb156c867b161e55c04964f10dae9a193c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20San=20Juli=C3=A1n?= <fjsanjulian@hotmail.com>
Date: Sun, 9 Aug 2015 03:56:20 +0200
Subject: [PATCH 138/310] no line numbers if already exists

---
 plugins/line-numbers/prism-line-numbers.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/line-numbers/prism-line-numbers.js b/plugins/line-numbers/prism-line-numbers.js
index 73884cce64..5b01dceeae 100644
--- a/plugins/line-numbers/prism-line-numbers.js
+++ b/plugins/line-numbers/prism-line-numbers.js
@@ -10,6 +10,11 @@ Prism.hooks.add('complete', function (env) {
 		return;
 	}
 
+	if ( env.element.querySelector(".line-numbers-rows") ) {
+		// Abort if line numbers already exists
+		return;
+	}
+
 	if (clsReg.test(env.element.className)) {
 		// Remove the class "line-numbers" from the <code>
 		env.element.className = env.element.className.replace(clsReg, '');

From fd549959cd57d1c5de8be2f6d7600fe9bd050857 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 13 Aug 2015 08:33:48 +0200
Subject: [PATCH 139/310] Fix complete hook behaviour + run gulp task

---
 components/prism-core.js                      | 21 ++++++++++---------
 components/prism-core.min.js                  |  2 +-
 .../prism-line-highlight.min.js               |  2 +-
 plugins/line-numbers/index.html               |  6 ++++++
 .../line-numbers/prism-line-numbers.min.js    |  2 +-
 prism.js                                      | 17 +++++++--------
 6 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/components/prism-core.js b/components/prism-core.js
index 542464e084..6b5799350b 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -172,18 +172,8 @@ var _ = _self.Prism = {
 			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 		}
 
-		if (!grammar) {
-			return;
-		}
-
 		var code = element.textContent;
 
-		if(!code) {
-			return;
-		}
-
-		code = code.replace(/^(?:\r?\n|\r)/,'');
-
 		var env = {
 			element: element,
 			language: language,
@@ -191,6 +181,15 @@ var _ = _self.Prism = {
 			code: code
 		};
 
+		if(code) {
+			env.code = code.replace(/^(?:\r?\n|\r)/, '');
+		}
+
+		if (!code || !grammar) {
+			_.hooks.run('complete', env);
+			return;
+		}
+
 		_.hooks.run('before-highlight', env);
 
 		if (async && _self.Worker) {
@@ -205,6 +204,7 @@ var _ = _self.Prism = {
 
 				callback && callback.call(env.element);
 				_.hooks.run('after-highlight', env);
+				_.hooks.run('complete', env);
 			};
 
 			worker.postMessage(JSON.stringify({
@@ -222,6 +222,7 @@ var _ = _self.Prism = {
 			callback && callback.call(element);
 
 			_.hooks.run('after-highlight', env);
+			_.hooks.run('complete', env);
 		}
 	},
 
diff --git a/components/prism-core.min.js b/components/prism-core.min.js
index 5f781e29fe..bf3d9c3096 100644
--- a/components/prism-core.min.js
+++ b/components/prism-core.min.js
@@ -1 +1 @@
-var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var s={};for(var o in i)if(i.hasOwnProperty(o)){if(o==n)for(var l in a)a.hasOwnProperty(l)&&(s[l]=a[l]);s[o]=i[o]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=s)}),r[e]=s},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,s,o=a;o&&!e.test(o.className);)o=o.parentNode;if(o&&(l=(o.className.match(e)||[,""])[1],s=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,o=a.parentNode,/pre/i.test(o.nodeName)&&(o.className=o.className.replace(e,"").replace(/\s+/g," ")+" language-"+l),s){var u=a.textContent;if(u){u=u.replace(/^(?:\r?\n|\r)/,"");var g={element:a,language:l,grammar:s,code:u};if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g)}}},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var s=n[l];s="Array"===t.util.type(s)?s:[s];for(var o=0;o<s.length;++o){var u=s[o],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var s="";for(var o in i.attributes)s+=o+'="'+(i.attributes[o]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+s+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
+var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,c={element:a,language:l,grammar:o,code:u};if(u&&(c.code=u.replace(/^(?:\r?\n|\r)/,"")),!u||!o)return t.hooks.run("complete",c),void 0;if(t.hooks.run("before-highlight",c),r&&_self.Worker){var g=new Worker(t.filename);g.onmessage=function(e){c.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",c),c.element.innerHTML=c.highlightedCode,i&&i.call(c.element),t.hooks.run("after-highlight",c),t.hooks.run("complete",c)},g.postMessage(JSON.stringify({language:c.language,code:c.code}))}else c.highlightedCode=t.highlight(c.code,c.grammar,c.language),t.hooks.run("before-insert",c),c.element.innerHTML=c.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",c),t.hooks.run("complete",c)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],c=u.inside,g=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){g&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,c?t.tokenize(m,c):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
diff --git a/plugins/line-highlight/prism-line-highlight.min.js b/plugins/line-highlight/prism-line-highlight.min.js
index 83a0108a55..662768f350 100644
--- a/plugins/line-highlight/prism-line-highlight.min.js
+++ b/plugins/line-highlight/prism-line-highlight.min.js
@@ -1 +1 @@
-!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,i){for(var r,a=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,o=parseFloat(getComputedStyle(e).lineHeight),d=0;r=a[d++];){r=r.split("-");var c=+r[0],h=+r[1]||c,s=document.createElement("div");s.textContent=Array(h-c+2).join(" \n"),s.className=(i||"")+" line-highlight",t(e,"line-numbers")||(s.setAttribute("data-start",c),h>c&&s.setAttribute("data-end",h)),s.style.top=(c-l-1)*o+"px",t(e,"line-numbers")?e.appendChild(s):(e.querySelector("code")||e).appendChild(s)}}function i(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var i=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(i&&!document.getElementById(t)){var r=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(r);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,i,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var r=(crlf=/\r?\n|\r/g,0);Prism.hooks.add("after-highlight",function(t){var a=t.element.parentNode,l=a&&a.getAttribute("data-line");a&&l&&/pre/i.test(a.nodeName)&&(clearTimeout(r),e(".line-highlight",a).forEach(function(e){e.parentNode.removeChild(e)}),n(a,l),r=setTimeout(i,1))}),addEventListener("hashchange",i)}}();
\ No newline at end of file
+!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,r){for(var i,a=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,o=parseFloat(getComputedStyle(e).lineHeight),c=0;i=a[c++];){i=i.split("-");var d=+i[0],s=+i[1]||d,u=document.createElement("div");u.textContent=Array(s-d+2).join(" \n"),u.className=(r||"")+" line-highlight",t(e,"line-numbers")||(u.setAttribute("data-start",d),s>d&&u.setAttribute("data-end",s)),u.style.top=(d-l-1)*o+"px",t(e,"line-numbers")?e.appendChild(u):(e.querySelector("code")||e).appendChild(u)}}function r(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var r=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(r&&!document.getElementById(t)){var i=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(i);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,r,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var i=(crlf=/\r?\n|\r/g,0);Prism.hooks.add("complete",function(t){var a=t.element.parentNode,l=a&&a.getAttribute("data-line");a&&l&&/pre/i.test(a.nodeName)&&(clearTimeout(i),e(".line-highlight",a).forEach(function(e){e.parentNode.removeChild(e)}),n(a,l),i=setTimeout(r,1))}),addEventListener("hashchange",r)}}();
\ No newline at end of file
diff --git a/plugins/line-numbers/index.html b/plugins/line-numbers/index.html
index f22653a1d4..2d01694901 100644
--- a/plugins/line-numbers/index.html
+++ b/plugins/line-numbers/index.html
@@ -43,6 +43,12 @@ <h2>CSS</h2>
   <h2>HTML</h2>
   <p>Please note the <code>data-start="-5"</code> in the code below.</p>
   <pre class="line-numbers" data-src="plugins/line-numbers/index.html" data-start="-5"></pre>
+
+  <h2>Unknown languages</h2>
+  <pre class="language-none line-numbers"><code>This raw text
+is not highlighted
+but it still has
+lines numbers</code></pre>
 </section>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
diff --git a/plugins/line-numbers/prism-line-numbers.min.js b/plugins/line-numbers/prism-line-numbers.min.js
index 26f0a22514..7c1c19ee42 100644
--- a/plugins/line-numbers/prism-line-numbers.min.js
+++ b/plugins/line-numbers/prism-line-numbers.min.js
@@ -1 +1 @@
-Prism.hooks.add("after-highlight",function(e){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=1+e.code.split("\n").length,l=new Array(n);l=l.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}});
\ No newline at end of file
+Prism.hooks.add("complete",function(e){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=1+e.code.split("\n").length,l=new Array(n);l=l.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index e6a2273c4b..61bbaf307e 100644
--- a/prism.js
+++ b/prism.js
@@ -179,12 +179,6 @@ var _ = _self.Prism = {
 
 		var code = element.textContent;
 
-		if(!code) {
-			return;
-		}
-
-		code = code.replace(/^(?:\r?\n|\r)/,'');
-
 		var env = {
 			element: element,
 			language: language,
@@ -192,7 +186,11 @@ var _ = _self.Prism = {
 			code: code
 		};
 
-		if (!grammar) {
+		if(code) {
+			env.code = code.replace(/^(?:\r?\n|\r)/, '');
+		}
+
+		if (!code || !grammar) {
 			_.hooks.run('complete', env);
 			return;
 		}
@@ -211,6 +209,7 @@ var _ = _self.Prism = {
 
 				callback && callback.call(env.element);
 				_.hooks.run('after-highlight', env);
+				_.hooks.run('complete', env);
 			};
 
 			worker.postMessage(JSON.stringify({
@@ -228,10 +227,8 @@ var _ = _self.Prism = {
 			callback && callback.call(element);
 
 			_.hooks.run('after-highlight', env);
+			_.hooks.run('complete', env);
 		}
-
-		_.hooks.run('complete', env);
-
 	},
 
 	highlight: function (text, grammar, language) {

From 48d20e748ed96ddc94e570afb98da386b34d72c1 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 13 Aug 2015 08:56:38 +0200
Subject: [PATCH 140/310] Add tests for Markup component

---
 tests/languages/markup/cdata_feature.test     | 15 +++
 tests/languages/markup/comment_feature.test   | 16 ++++
 tests/languages/markup/doctype_feature.test   | 16 ++++
 tests/languages/markup/entity_feature.test    | 14 +++
 tests/languages/markup/issue585.test          | 63 +++++++++++++
 tests/languages/markup/prolog_feature.test    | 16 ++++
 .../markup/tag_attribute_feature.test         | 92 +++++++++++++++++++
 tests/languages/markup/tag_feature.test       | 81 ++++++++++++++++
 8 files changed, 313 insertions(+)
 create mode 100644 tests/languages/markup/cdata_feature.test
 create mode 100644 tests/languages/markup/comment_feature.test
 create mode 100644 tests/languages/markup/doctype_feature.test
 create mode 100644 tests/languages/markup/entity_feature.test
 create mode 100644 tests/languages/markup/issue585.test
 create mode 100644 tests/languages/markup/prolog_feature.test
 create mode 100644 tests/languages/markup/tag_attribute_feature.test
 create mode 100644 tests/languages/markup/tag_feature.test

diff --git a/tests/languages/markup/cdata_feature.test b/tests/languages/markup/cdata_feature.test
new file mode 100644
index 0000000000..c2854c9c62
--- /dev/null
+++ b/tests/languages/markup/cdata_feature.test
@@ -0,0 +1,15 @@
+<![CDATA[ foo bar baz ]]>
+<![CDATA[
+foo bar baz
+]]>
+
+----------------------------------------------------
+
+[
+	["cdata", "<![CDATA[ foo bar baz ]]>"],
+	["cdata", "<![CDATA[\r\nfoo bar baz\r\n]]>"]
+]
+
+----------------------------------------------------
+
+Checks for CDATA sections, single-line and multi-line.
\ No newline at end of file
diff --git a/tests/languages/markup/comment_feature.test b/tests/languages/markup/comment_feature.test
new file mode 100644
index 0000000000..8acbb0deb7
--- /dev/null
+++ b/tests/languages/markup/comment_feature.test
@@ -0,0 +1,16 @@
+<!---->
+<!-- foo bar -->
+<!-- foo bar
+baz -->
+
+----------------------------------------------------
+
+[
+	["comment", "<!---->"],
+	["comment", "<!-- foo bar -->"],
+	["comment", "<!-- foo bar\r\nbaz -->"]
+]
+
+----------------------------------------------------
+
+Checks for empty comment, single-line comment and multi-line comment.
\ No newline at end of file
diff --git a/tests/languages/markup/doctype_feature.test b/tests/languages/markup/doctype_feature.test
new file mode 100644
index 0000000000..a7212073ee
--- /dev/null
+++ b/tests/languages/markup/doctype_feature.test
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+----------------------------------------------------
+
+[
+	["doctype", "<!DOCTYPE html>"],
+	["doctype", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"],
+	["doctype", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\r\n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"]
+]
+
+----------------------------------------------------
+
+Checks for different doctypes, single-line and multi-line.
\ No newline at end of file
diff --git a/tests/languages/markup/entity_feature.test b/tests/languages/markup/entity_feature.test
new file mode 100644
index 0000000000..2212c6b10f
--- /dev/null
+++ b/tests/languages/markup/entity_feature.test
@@ -0,0 +1,14 @@
+&amp; &thetasym; &#x26f5; &#160;
+
+----------------------------------------------------
+
+[
+	["entity", "&amp;"],
+	["entity", "&thetasym;"],
+	["entity", "&#x26f5;"],
+	["entity", "&#160;"]
+]
+
+----------------------------------------------------
+
+Checks for HTML/XML character entity references.
\ No newline at end of file
diff --git a/tests/languages/markup/issue585.test b/tests/languages/markup/issue585.test
new file mode 100644
index 0000000000..090506ab06
--- /dev/null
+++ b/tests/languages/markup/issue585.test
@@ -0,0 +1,63 @@
+<Läufer>foo</Läufer>
+<tag läufer="läufer">
+<läufer:tag>baz</läufer:tag>
+
+----------------------------------------------------
+
+[
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"Läufer"
+		]],
+		["punctuation", ">"]
+	]],
+	"foo",
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			"Läufer"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+        ["tag", [
+            ["punctuation", "<"],
+            "tag"
+        ]],
+        ["attr-name", [
+            "läufer"
+        ]],
+        ["attr-value", [
+            ["punctuation", "="],
+            ["punctuation", "\""],
+            "läufer",
+            ["punctuation", "\""]
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["tag", [
+		["tag", [
+			["punctuation", "<"],
+			["namespace", "läufer:"],
+			"tag"
+		]],
+		["punctuation", ">"]
+	]],
+	"baz",
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			["namespace", "läufer:"],
+			"tag"
+		]],
+		["punctuation", ">"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for tags, attributes and namespaces containing unicode characters.
+See #585 for details.
\ No newline at end of file
diff --git a/tests/languages/markup/prolog_feature.test b/tests/languages/markup/prolog_feature.test
new file mode 100644
index 0000000000..bb3f5a52a1
--- /dev/null
+++ b/tests/languages/markup/prolog_feature.test
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="tei2html.xsl"
+type="text/xsl"?>
+
+----------------------------------------------------
+
+[
+	["prolog", "<?xml version=\"1.0\"?>"],
+	["prolog", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"],
+	["prolog", "<?xml-stylesheet href=\"tei2html.xsl\"\r\ntype=\"text/xsl\"?>"]
+]
+
+----------------------------------------------------
+
+Checks for different XML prologs, single-line and multi-line.
\ No newline at end of file
diff --git a/tests/languages/markup/tag_attribute_feature.test b/tests/languages/markup/tag_attribute_feature.test
new file mode 100644
index 0000000000..57eba1abf6
--- /dev/null
+++ b/tests/languages/markup/tag_attribute_feature.test
@@ -0,0 +1,92 @@
+<div class="test" foo bar=baz>
+<div foo='bar'>
+<div class="foo
+bar
+baz">
+<div foo:bar=42>
+
+----------------------------------------------------
+
+[
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			"class"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "\""],
+			"test",
+			["punctuation", "\""]
+		]],
+		["attr-name", [
+			"foo"
+		]],
+		["attr-name", [
+			"bar"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			"baz"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			"foo"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "'"],
+			"bar",
+			["punctuation", "'"]
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			"class"
+		]],
+        ["attr-value", [
+            ["punctuation", "="],
+            ["punctuation", "\""],
+            "foo\r\nbar\r\nbaz",
+            ["punctuation", "\""]
+        ]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			["namespace", "foo:"],
+			"bar"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			"42"
+		]],
+		["punctuation", ">"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for single-quoted, double-quoted and unquoted attributes, attributes without value and
+namespaced attributes.
\ No newline at end of file
diff --git a/tests/languages/markup/tag_feature.test b/tests/languages/markup/tag_feature.test
new file mode 100644
index 0000000000..110de1df87
--- /dev/null
+++ b/tests/languages/markup/tag_feature.test
@@ -0,0 +1,81 @@
+<p></p>
+<div>dummy</div>
+<div
+> </div
+>
+<foo:bar> </foo:bar>
+<div
+
+
+----------------------------------------------------
+
+[
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"p"
+		]],
+		["punctuation", ">"]
+	]],
+	["tag", [
+        ["tag", [
+            ["punctuation", "</"],
+            "p"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["punctuation", ">"]
+	]],
+	"dummy",
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			"div"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["punctuation", ">"]
+	]],
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			"div"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			["namespace", "foo:"],
+			"bar"
+		]],
+		["punctuation", ">"]
+	]],
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			["namespace", "foo:"],
+			"bar"
+		]],
+		["punctuation", ">"]
+	]],
+	"\r\n<div"
+]
+
+----------------------------------------------------
+
+Checks for empty tags, tags that span multiple lines and namespaces in tag names.
+Also checks that unclosed tags (e.g. "<div") are not highlighted.
\ No newline at end of file

From cba03451bacd376e47ada24e3b0812b9c7f6bd6a Mon Sep 17 00:00:00 2001
From: Ryan Zec <code@ryanzec.com>
Date: Sat, 15 Aug 2015 05:03:55 -0400
Subject: [PATCH 141/310] changed parseFloat to parseInt to prevent some
 inconsistency issue with different font sizes

---
 plugins/line-highlight/prism-line-highlight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/line-highlight/prism-line-highlight.js b/plugins/line-highlight/prism-line-highlight.js
index 8d5faa156c..b89028a1b8 100644
--- a/plugins/line-highlight/prism-line-highlight.js
+++ b/plugins/line-highlight/prism-line-highlight.js
@@ -19,7 +19,7 @@ function highlightLines(pre, lines, classes) {
 	var ranges = lines.replace(/\s+/g, '').split(','),
 	    offset = +pre.getAttribute('data-line-offset') || 0;
 	
-	var lineHeight = parseFloat(getComputedStyle(pre).lineHeight);
+	var lineHeight = parseInt(getComputedStyle(pre).lineHeight);
 
 	for (var i=0, range; range = ranges[i++];) {
 		range = range.split('-');

From 28e329cf3b4f21eb971363091a7e0e15a191c3a1 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 15 Aug 2015 13:15:08 +0200
Subject: [PATCH 142/310] Run gulp task

---
 plugins/line-highlight/prism-line-highlight.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/line-highlight/prism-line-highlight.min.js b/plugins/line-highlight/prism-line-highlight.min.js
index 662768f350..380776b0a0 100644
--- a/plugins/line-highlight/prism-line-highlight.min.js
+++ b/plugins/line-highlight/prism-line-highlight.min.js
@@ -1 +1 @@
-!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,r){for(var i,a=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,o=parseFloat(getComputedStyle(e).lineHeight),c=0;i=a[c++];){i=i.split("-");var d=+i[0],s=+i[1]||d,u=document.createElement("div");u.textContent=Array(s-d+2).join(" \n"),u.className=(r||"")+" line-highlight",t(e,"line-numbers")||(u.setAttribute("data-start",d),s>d&&u.setAttribute("data-end",s)),u.style.top=(d-l-1)*o+"px",t(e,"line-numbers")?e.appendChild(u):(e.querySelector("code")||e).appendChild(u)}}function r(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var r=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(r&&!document.getElementById(t)){var i=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(i);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,r,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var i=(crlf=/\r?\n|\r/g,0);Prism.hooks.add("complete",function(t){var a=t.element.parentNode,l=a&&a.getAttribute("data-line");a&&l&&/pre/i.test(a.nodeName)&&(clearTimeout(i),e(".line-highlight",a).forEach(function(e){e.parentNode.removeChild(e)}),n(a,l),i=setTimeout(r,1))}),addEventListener("hashchange",r)}}();
\ No newline at end of file
+!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,r){for(var i,a=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,o=parseInt(getComputedStyle(e).lineHeight),c=0;i=a[c++];){i=i.split("-");var d=+i[0],s=+i[1]||d,u=document.createElement("div");u.textContent=Array(s-d+2).join(" \n"),u.className=(r||"")+" line-highlight",t(e,"line-numbers")||(u.setAttribute("data-start",d),s>d&&u.setAttribute("data-end",s)),u.style.top=(d-l-1)*o+"px",t(e,"line-numbers")?e.appendChild(u):(e.querySelector("code")||e).appendChild(u)}}function r(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var r=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(r&&!document.getElementById(t)){var i=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(i);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,r,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var i=(crlf=/\r?\n|\r/g,0);Prism.hooks.add("complete",function(t){var a=t.element.parentNode,l=a&&a.getAttribute("data-line");a&&l&&/pre/i.test(a.nodeName)&&(clearTimeout(i),e(".line-highlight",a).forEach(function(e){e.parentNode.removeChild(e)}),n(a,l),i=setTimeout(r,1))}),addEventListener("hashchange",r)}}();
\ No newline at end of file

From ee463e8e7b5522dfa09154b77c9cc1918afeee23 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 15 Aug 2015 17:25:47 +0200
Subject: [PATCH 143/310] Line-numbers: Abort if element is empty. Fixex #669

---
 plugins/line-numbers/prism-line-numbers.js     | 4 ++++
 plugins/line-numbers/prism-line-numbers.min.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/line-numbers/prism-line-numbers.js b/plugins/line-numbers/prism-line-numbers.js
index 5b01dceeae..b526da5222 100644
--- a/plugins/line-numbers/prism-line-numbers.js
+++ b/plugins/line-numbers/prism-line-numbers.js
@@ -1,4 +1,8 @@
 Prism.hooks.add('complete', function (env) {
+	if (!env.code) {
+		return;
+	}
+
 	// works only for <code> wrapped inside <pre> (not inline)
 	var pre = env.element.parentNode;
 	var clsReg = /\s*\bline-numbers\b\s*/;
diff --git a/plugins/line-numbers/prism-line-numbers.min.js b/plugins/line-numbers/prism-line-numbers.min.js
index 7c1c19ee42..12841b15da 100644
--- a/plugins/line-numbers/prism-line-numbers.min.js
+++ b/plugins/line-numbers/prism-line-numbers.min.js
@@ -1 +1 @@
-Prism.hooks.add("complete",function(e){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=1+e.code.split("\n").length,l=new Array(n);l=l.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}});
\ No newline at end of file
+Prism.hooks.add("complete",function(e){if(e.code){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=1+e.code.split("\n").length,l=new Array(n);l=l.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}}});
\ No newline at end of file

From 14f3f80df4d58dd6e556f022f43029fac4ffb1ec Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 17 Aug 2015 08:28:57 +0200
Subject: [PATCH 144/310] Correct calculation for number of lines (manual
 merge, fix #385)

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

diff --git a/plugins/line-numbers/prism-line-numbers.js b/plugins/line-numbers/prism-line-numbers.js
index b526da5222..9cf273fce4 100644
--- a/plugins/line-numbers/prism-line-numbers.js
+++ b/plugins/line-numbers/prism-line-numbers.js
@@ -28,10 +28,10 @@ Prism.hooks.add('complete', function (env) {
 		pre.className += ' line-numbers';
 	}
 
-	var linesNum = (1 + env.code.split('\n').length);
+	var linesNum = env.code.match(/\n(?!$)/g).length + 1;
 	var lineNumbersWrapper;
 
-	var lines = new Array(linesNum);
+	var lines = new Array(linesNum + 1);
 	lines = lines.join('<span></span>');
 
 	lineNumbersWrapper = document.createElement('span');
diff --git a/plugins/line-numbers/prism-line-numbers.min.js b/plugins/line-numbers/prism-line-numbers.min.js
index 12841b15da..65f6e55b9d 100644
--- a/plugins/line-numbers/prism-line-numbers.min.js
+++ b/plugins/line-numbers/prism-line-numbers.min.js
@@ -1 +1 @@
-Prism.hooks.add("complete",function(e){if(e.code){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=1+e.code.split("\n").length,l=new Array(n);l=l.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}}});
\ No newline at end of file
+Prism.hooks.add("complete",function(e){if(e.code){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=e.code.match(/\n(?!$)/g).length+1,l=new Array(n+1);l=l.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}}});
\ No newline at end of file

From ed9f2b2179000862f7bc8c01b68676f568daa7c8 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 17 Aug 2015 08:47:32 +0200
Subject: [PATCH 145/310] Move removal of initial line feed to a plugin

---
 components.js                                 |  5 ++
 components/prism-core.js                      |  4 --
 components/prism-core.min.js                  |  2 +-
 plugins/remove-initial-line-feed/index.html   | 57 +++++++++++++++++++
 .../prism-remove-initial-line-feed.js         | 13 +++++
 .../prism-remove-initial-line-feed.min.js     |  1 +
 prism.js                                      |  4 --
 7 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 plugins/remove-initial-line-feed/index.html
 create mode 100644 plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
 create mode 100644 plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js

diff --git a/components.js b/components.js
index 919b3c13ae..1129ef8eab 100644
--- a/components.js
+++ b/components.js
@@ -377,6 +377,11 @@ var components = {
 			"title": "Highlight Keywords",
 			"owner": "vkbansal",
 			"noCSS": true
+		},
+		"remove-initial-line-feed": {
+			"title": "Remove initial line feed",
+			"owner": "Golmote",
+			"noCSS": true
 		}
 	}
 };
diff --git a/components/prism-core.js b/components/prism-core.js
index 6b5799350b..fcccccde29 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -181,10 +181,6 @@ var _ = _self.Prism = {
 			code: code
 		};
 
-		if(code) {
-			env.code = code.replace(/^(?:\r?\n|\r)/, '');
-		}
-
 		if (!code || !grammar) {
 			_.hooks.run('complete', env);
 			return;
diff --git a/components/prism-core.min.js b/components/prism-core.min.js
index bf3d9c3096..9499c01cf6 100644
--- a/components/prism-core.min.js
+++ b/components/prism-core.min.js
@@ -1 +1 @@
-var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,c={element:a,language:l,grammar:o,code:u};if(u&&(c.code=u.replace(/^(?:\r?\n|\r)/,"")),!u||!o)return t.hooks.run("complete",c),void 0;if(t.hooks.run("before-highlight",c),r&&_self.Worker){var g=new Worker(t.filename);g.onmessage=function(e){c.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",c),c.element.innerHTML=c.highlightedCode,i&&i.call(c.element),t.hooks.run("after-highlight",c),t.hooks.run("complete",c)},g.postMessage(JSON.stringify({language:c.language,code:c.code}))}else c.highlightedCode=t.highlight(c.code,c.grammar,c.language),t.hooks.run("before-insert",c),c.element.innerHTML=c.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",c),t.hooks.run("complete",c)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],c=u.inside,g=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){g&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,c?t.tokenize(m,c):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
+var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
diff --git a/plugins/remove-initial-line-feed/index.html b/plugins/remove-initial-line-feed/index.html
new file mode 100644
index 0000000000..2af0b6697a
--- /dev/null
+++ b/plugins/remove-initial-line-feed/index.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+	<meta charset="utf-8" />
+	<link rel="shortcut icon" href="favicon.png" />
+	<title>Remove initial line feed ▲ Prism plugins</title>
+	<base href="../.." />
+	<link rel="stylesheet" href="style.css" />
+	<link rel="stylesheet" href="themes/prism.css" data-noprefix />
+	<script src="prefixfree.min.js"></script>
+
+	<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
+	<script src="http://www.google-analytics.com/ga.js" async></script>
+</head>
+<body>
+
+<header>
+	<div class="intro" data-src="templates/header-plugins.html" data-type="text/html"></div>
+
+	<h2>Remove initial line feed</h2>
+	<p>Removes the initial line feed in code blocks.</p>
+</header>
+
+<section class="language-markup">
+	<h1>How to use</h1>
+
+	<p>Obviously, this is supposed to work only for code blocks (<code>&lt;pre>&lt;code></code>) and not for inline code.</p>
+	<p>Add class <strong>remove-initial-line-feed</strong> to your desired <code>&lt;pre></code>.</p>
+</section>
+
+<section>
+	<h1>Examples</h1>
+
+	<h2>Without adding the class</h2>
+	<pre class="language-markup"><code>
+&lt;div>&lt;/div>
+</code></pre>
+
+	<h2>With the class added</h2>
+	<pre class="language-markup remove-initial-line-feed"><code>
+&lt;div>&lt;/div>
+</code></pre>
+
+</section>
+
+<footer data-src="templates/footer.html" data-type="text/html"></footer>
+
+<script src="prism.js"></script>
+<script src="plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js"></script>
+<script src="utopia.js"></script>
+<script src="components.js"></script>
+<script src="code.js"></script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
new file mode 100644
index 0000000000..c4d3d0ecae
--- /dev/null
+++ b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
@@ -0,0 +1,13 @@
+Prism.hooks.add('before-highlight', function(env) {
+	if (env.code) {
+		var pre = env.element.parentNode;
+		var clsReg = /\s*\bremove-initial-line-feed\b\s*/;
+		if (
+			pre && pre.nodeName.toLowerCase() === 'pre' &&
+			// Apply only if the <pre> or the <code> have the class
+			(clsReg.test(pre.className) || clsReg.test(env.element.className))
+		) {
+			env.code = env.code.replace(/^(?:\r?\n|\r)/, '');
+		}
+	}
+});
\ No newline at end of file
diff --git a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js
new file mode 100644
index 0000000000..083381afdc
--- /dev/null
+++ b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js
@@ -0,0 +1 @@
+Prism.hooks.add("before-highlight",function(e){if(e.code){var o=e.element.parentNode,a=/\s*\bremove-initial-line-feed\b\s*/;o&&"pre"===o.nodeName.toLowerCase()&&(a.test(o.className)||a.test(e.element.className))&&(e.code=e.code.replace(/^(?:\r?\n|\r)/,""))}});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 61bbaf307e..fd979fbf77 100644
--- a/prism.js
+++ b/prism.js
@@ -186,10 +186,6 @@ var _ = _self.Prism = {
 			code: code
 		};
 
-		if(code) {
-			env.code = code.replace(/^(?:\r?\n|\r)/, '');
-		}
-
 		if (!code || !grammar) {
 			_.hooks.run('complete', env);
 			return;

From a88936ace2794a7506009f0bef9ef67af975ba82 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 17 Aug 2015 08:55:50 +0200
Subject: [PATCH 146/310] Split plugins into 3 columns on Download page

---
 download.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/download.html b/download.html
index f273c7eaa0..103d81329e 100644
--- a/download.html
+++ b/download.html
@@ -52,7 +52,8 @@
 	float: left;
 }
 
-section.options#category-languages {
+section.options#category-languages,
+section.options#category-plugins {
 	width: 100%;
 	float: none;
 	column-count: 3;
@@ -60,7 +61,12 @@
 	overflow: visible;
 }
 
-	section.options#category-languages > h1 {
+	section.options#category-languages label,
+	section.options#category-plugins label {
+		break-inside: avoid;
+	}
+	section.options#category-languages > h1,
+	section.options#category-plugins > h1 {
 		margin-top: 0;
 		column-span: all;
 	}

From b8d098e1d420715366302274c511ab4aeaeeb2fe Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 17 Aug 2015 09:03:06 +0200
Subject: [PATCH 147/310] Remove the behaviour of Remove initial line feed
 plugin (remove by default, allow to keep with a CSS class)

---
 plugins/remove-initial-line-feed/index.html                 | 5 +++--
 .../prism-remove-initial-line-feed.js                       | 6 +++---
 .../prism-remove-initial-line-feed.min.js                   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/remove-initial-line-feed/index.html b/plugins/remove-initial-line-feed/index.html
index 2af0b6697a..d981fbb770 100644
--- a/plugins/remove-initial-line-feed/index.html
+++ b/plugins/remove-initial-line-feed/index.html
@@ -26,7 +26,8 @@ <h2>Remove initial line feed</h2>
 	<h1>How to use</h1>
 
 	<p>Obviously, this is supposed to work only for code blocks (<code>&lt;pre>&lt;code></code>) and not for inline code.</p>
-	<p>Add class <strong>remove-initial-line-feed</strong> to your desired <code>&lt;pre></code>.</p>
+	<p>With this plugin included, any initial line feed will be removed by default.</p>
+	<p>To bypass this behaviour, you may add the class <strong>keep-initial-line-feed</strong> to your desired <code>&lt;pre></code>.</p>
 </section>
 
 <section>
@@ -38,7 +39,7 @@ <h2>Without adding the class</h2>
 </code></pre>
 
 	<h2>With the class added</h2>
-	<pre class="language-markup remove-initial-line-feed"><code>
+	<pre class="language-markup keep-initial-line-feed"><code>
 &lt;div>&lt;/div>
 </code></pre>
 
diff --git a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
index c4d3d0ecae..0b24fb5cc2 100644
--- a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
+++ b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
@@ -1,11 +1,11 @@
 Prism.hooks.add('before-highlight', function(env) {
 	if (env.code) {
 		var pre = env.element.parentNode;
-		var clsReg = /\s*\bremove-initial-line-feed\b\s*/;
+		var clsReg = /\s*\bkeep-initial-line-feed\b\s*/;
 		if (
 			pre && pre.nodeName.toLowerCase() === 'pre' &&
-			// Apply only if the <pre> or the <code> have the class
-			(clsReg.test(pre.className) || clsReg.test(env.element.className))
+			// Apply only if nor the <pre> or the <code> have the class
+			(!clsReg.test(pre.className) && !clsReg.test(env.element.className))
 		) {
 			env.code = env.code.replace(/^(?:\r?\n|\r)/, '');
 		}
diff --git a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js
index 083381afdc..a8930b631e 100644
--- a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js
+++ b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js
@@ -1 +1 @@
-Prism.hooks.add("before-highlight",function(e){if(e.code){var o=e.element.parentNode,a=/\s*\bremove-initial-line-feed\b\s*/;o&&"pre"===o.nodeName.toLowerCase()&&(a.test(o.className)||a.test(e.element.className))&&(e.code=e.code.replace(/^(?:\r?\n|\r)/,""))}});
\ No newline at end of file
+Prism.hooks.add("before-highlight",function(e){if(e.code){var a=e.element.parentNode,o=/\s*\bkeep-initial-line-feed\b\s*/;!a||"pre"!==a.nodeName.toLowerCase()||o.test(a.className)||o.test(e.element.className)||(e.code=e.code.replace(/^(?:\r?\n|\r)/,""))}});
\ No newline at end of file

From d1845471b61d93ff474e98ce3480fdeb7df6f9ae Mon Sep 17 00:00:00 2001
From: Joe Gibson <gibsjose@mail.gvsu.edu>
Date: Mon, 17 Aug 2015 14:59:31 -0400
Subject: [PATCH 148/310] Added 'self' as keyword and added 'class-name'
 matching

---
 components/prism-python.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/prism-python.js b/components/prism-python.js
index 7ebc42a747..bdbce33965 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -8,9 +8,16 @@ Prism.languages.python= {
 		pattern: /((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,
 		lookbehind: true
 	},
-	'keyword' : /\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
+	'keyword' : /\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|self|try|while|with|yield)\b/,
 	'boolean' : /\b(True|False)\b/,
 	'number' : /\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
 	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,
 	'punctuation' : /[{}[\];(),.:]/
 };
+
+Prism.languages.insertBefore('python', 'keyword', {
+	'class-name': {
+		pattern: /(class\s+)[a-z0-9_]+/i,
+		lookbehind: true
+	}
+});

From 9ccb6cb6e1959c4edfe01dc68a55f1ef32fb2c67 Mon Sep 17 00:00:00 2001
From: Joe Gibson <gibsjose@mail.gvsu.edu>
Date: Mon, 17 Aug 2015 17:28:11 -0400
Subject: [PATCH 149/310] , it appears, is not actually a keyword in Python

---
 components/prism-python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-python.js b/components/prism-python.js
index bdbce33965..a3171d7cb6 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -8,7 +8,7 @@ Prism.languages.python= {
 		pattern: /((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,
 		lookbehind: true
 	},
-	'keyword' : /\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|self|try|while|with|yield)\b/,
+	'keyword' : /\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
 	'boolean' : /\b(True|False)\b/,
 	'number' : /\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
 	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,

From 8f8eb62691865067cf284fa1647678d8db80036b Mon Sep 17 00:00:00 2001
From: Joe Gibson <gibsjose@mail.gvsu.edu>
Date: Mon, 17 Aug 2015 17:30:43 -0400
Subject: [PATCH 150/310] Update to minified python

---
 components/prism-python.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-python.min.js b/components/prism-python.min.js
index 087ad0dd41..19ca5c55b5 100644
--- a/components/prism-python.min.js
+++ b/components/prism-python.min.js
@@ -1 +1 @@
-Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,"function":{pattern:/((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,lookbehind:!0},keyword:/\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,"function":{pattern:/((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,lookbehind:!0},keyword:/\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};Prism.languages.insertBefore("python","keyword",{"class-name":{pattern:/(class\s+)[a-z0-9_]+/i,lookbehind:!0}});

From 45ca8c8eee737bde813c63cf6d36b18f869552dc Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 18 Aug 2015 08:17:01 +0200
Subject: [PATCH 151/310] Add .gitattributes to prevent line ending changes in
 test files

---
 .gitattributes | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..1d598bdc92
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto
+
+# Test files should not have their line endings modified by git
+/tests/languages/**/*.test binary
\ No newline at end of file

From 788f6d5e2ae92369f9ceb2c2ca553e18542b110b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 18 Aug 2015 08:20:54 +0200
Subject: [PATCH 152/310] Commit updated line changes

---
 tests/languages/apacheconf/test2.test         |  32 +--
 tests/languages/javascript/testcase1.test     |  30 +--
 tests/languages/markup/cdata_feature.test     |  28 +--
 tests/languages/markup/comment_feature.test   |  30 +--
 tests/languages/markup/doctype_feature.test   |  30 +--
 tests/languages/markup/entity_feature.test    |  26 +--
 tests/languages/markup/issue585.test          | 124 ++++++------
 tests/languages/markup/prolog_feature.test    |  30 +--
 .../markup/tag_attribute_feature.test         | 182 +++++++++---------
 tests/languages/markup/tag_feature.test       | 160 +++++++--------
 utopia.js                                     |  30 +--
 11 files changed, 351 insertions(+), 351 deletions(-)

diff --git a/tests/languages/apacheconf/test2.test b/tests/languages/apacheconf/test2.test
index a136917c03..f03cf6781d 100644
--- a/tests/languages/apacheconf/test2.test
+++ b/tests/languages/apacheconf/test2.test
@@ -1,16 +1,16 @@
-"foo bar"
-'foo bar'
-"%{REMOTE_HOST}"
-
------
-[
-    ["string", ["\"foo bar\""]],
-    ["string", ["'foo bar'"]],
-    [
-        "string", [
-            "\"",
-            ["variable", "%{REMOTE_HOST}"],
-            "\""
-        ]
-    ]
-]
+"foo bar"
+'foo bar'
+"%{REMOTE_HOST}"
+
+-----
+[
+    ["string", ["\"foo bar\""]],
+    ["string", ["'foo bar'"]],
+    [
+        "string", [
+            "\"",
+            ["variable", "%{REMOTE_HOST}"],
+            "\""
+        ]
+    ]
+]
diff --git a/tests/languages/javascript/testcase1.test b/tests/languages/javascript/testcase1.test
index 78a197175a..e424522129 100644
--- a/tests/languages/javascript/testcase1.test
+++ b/tests/languages/javascript/testcase1.test
@@ -1,15 +1,15 @@
-var a = 5;
-
-----------------------------------------------------
-
-[
-	["keyword", "var"],
-	" a ",
-	["operator", "="],
-	["number", "5"],
-	["punctuation", ";"]
-]
-
-----------------------------------------------------
-
-This is a comment explaining this test case.
+var a = 5;
+
+----------------------------------------------------
+
+[
+	["keyword", "var"],
+	" a ",
+	["operator", "="],
+	["number", "5"],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+This is a comment explaining this test case.
diff --git a/tests/languages/markup/cdata_feature.test b/tests/languages/markup/cdata_feature.test
index c2854c9c62..3b7fd98d34 100644
--- a/tests/languages/markup/cdata_feature.test
+++ b/tests/languages/markup/cdata_feature.test
@@ -1,15 +1,15 @@
-<![CDATA[ foo bar baz ]]>
-<![CDATA[
-foo bar baz
-]]>
-
-----------------------------------------------------
-
-[
-	["cdata", "<![CDATA[ foo bar baz ]]>"],
-	["cdata", "<![CDATA[\r\nfoo bar baz\r\n]]>"]
-]
-
-----------------------------------------------------
-
+<![CDATA[ foo bar baz ]]>
+<![CDATA[
+foo bar baz
+]]>
+
+----------------------------------------------------
+
+[
+	["cdata", "<![CDATA[ foo bar baz ]]>"],
+	["cdata", "<![CDATA[\r\nfoo bar baz\r\n]]>"]
+]
+
+----------------------------------------------------
+
 Checks for CDATA sections, single-line and multi-line.
\ No newline at end of file
diff --git a/tests/languages/markup/comment_feature.test b/tests/languages/markup/comment_feature.test
index 8acbb0deb7..1b26ae54e5 100644
--- a/tests/languages/markup/comment_feature.test
+++ b/tests/languages/markup/comment_feature.test
@@ -1,16 +1,16 @@
-<!---->
-<!-- foo bar -->
-<!-- foo bar
-baz -->
-
-----------------------------------------------------
-
-[
-	["comment", "<!---->"],
-	["comment", "<!-- foo bar -->"],
-	["comment", "<!-- foo bar\r\nbaz -->"]
-]
-
-----------------------------------------------------
-
+<!---->
+<!-- foo bar -->
+<!-- foo bar
+baz -->
+
+----------------------------------------------------
+
+[
+	["comment", "<!---->"],
+	["comment", "<!-- foo bar -->"],
+	["comment", "<!-- foo bar\r\nbaz -->"]
+]
+
+----------------------------------------------------
+
 Checks for empty comment, single-line comment and multi-line comment.
\ No newline at end of file
diff --git a/tests/languages/markup/doctype_feature.test b/tests/languages/markup/doctype_feature.test
index a7212073ee..71398c4d83 100644
--- a/tests/languages/markup/doctype_feature.test
+++ b/tests/languages/markup/doctype_feature.test
@@ -1,16 +1,16 @@
-<!DOCTYPE html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-----------------------------------------------------
-
-[
-	["doctype", "<!DOCTYPE html>"],
-	["doctype", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"],
-	["doctype", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\r\n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"]
-]
-
-----------------------------------------------------
-
+<!DOCTYPE html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+----------------------------------------------------
+
+[
+	["doctype", "<!DOCTYPE html>"],
+	["doctype", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"],
+	["doctype", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\r\n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"]
+]
+
+----------------------------------------------------
+
 Checks for different doctypes, single-line and multi-line.
\ No newline at end of file
diff --git a/tests/languages/markup/entity_feature.test b/tests/languages/markup/entity_feature.test
index 2212c6b10f..44f0f83d6a 100644
--- a/tests/languages/markup/entity_feature.test
+++ b/tests/languages/markup/entity_feature.test
@@ -1,14 +1,14 @@
-&amp; &thetasym; &#x26f5; &#160;
-
-----------------------------------------------------
-
-[
-	["entity", "&amp;"],
-	["entity", "&thetasym;"],
-	["entity", "&#x26f5;"],
-	["entity", "&#160;"]
-]
-
-----------------------------------------------------
-
+&amp; &thetasym; &#x26f5; &#160;
+
+----------------------------------------------------
+
+[
+	["entity", "&amp;"],
+	["entity", "&thetasym;"],
+	["entity", "&#x26f5;"],
+	["entity", "&#160;"]
+]
+
+----------------------------------------------------
+
 Checks for HTML/XML character entity references.
\ No newline at end of file
diff --git a/tests/languages/markup/issue585.test b/tests/languages/markup/issue585.test
index 090506ab06..bb71198c23 100644
--- a/tests/languages/markup/issue585.test
+++ b/tests/languages/markup/issue585.test
@@ -1,63 +1,63 @@
-<Läufer>foo</Läufer>
-<tag läufer="läufer">
-<läufer:tag>baz</läufer:tag>
-
-----------------------------------------------------
-
-[
-	["tag", [
-		["tag", [
-			["punctuation", "<"],
-			"Läufer"
-		]],
-		["punctuation", ">"]
-	]],
-	"foo",
-	["tag", [
-		["tag", [
-			["punctuation", "</"],
-			"Läufer"
-		]],
-		["punctuation", ">"]
-	]],
-
-	["tag", [
-        ["tag", [
-            ["punctuation", "<"],
-            "tag"
-        ]],
-        ["attr-name", [
-            "läufer"
-        ]],
-        ["attr-value", [
-            ["punctuation", "="],
-            ["punctuation", "\""],
-            "läufer",
-            ["punctuation", "\""]
-        ]],
-        ["punctuation", ">"]
-    ]],
-
-    ["tag", [
-		["tag", [
-			["punctuation", "<"],
-			["namespace", "läufer:"],
-			"tag"
-		]],
-		["punctuation", ">"]
-	]],
-	"baz",
-	["tag", [
-		["tag", [
-			["punctuation", "</"],
-			["namespace", "läufer:"],
-			"tag"
-		]],
-		["punctuation", ">"]
-	]]
-]
-
-----------------------------------------------------
-
-Checks for tags, attributes and namespaces containing unicode characters.
+<Läufer>foo</Läufer>
+<tag läufer="läufer">
+<läufer:tag>baz</läufer:tag>
+
+----------------------------------------------------
+
+[
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"Läufer"
+		]],
+		["punctuation", ">"]
+	]],
+	"foo",
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			"Läufer"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+        ["tag", [
+            ["punctuation", "<"],
+            "tag"
+        ]],
+        ["attr-name", [
+            "läufer"
+        ]],
+        ["attr-value", [
+            ["punctuation", "="],
+            ["punctuation", "\""],
+            "läufer",
+            ["punctuation", "\""]
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["tag", [
+		["tag", [
+			["punctuation", "<"],
+			["namespace", "läufer:"],
+			"tag"
+		]],
+		["punctuation", ">"]
+	]],
+	"baz",
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			["namespace", "läufer:"],
+			"tag"
+		]],
+		["punctuation", ">"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for tags, attributes and namespaces containing unicode characters.
 See #585 for details.
\ No newline at end of file
diff --git a/tests/languages/markup/prolog_feature.test b/tests/languages/markup/prolog_feature.test
index bb3f5a52a1..d7a2d3de86 100644
--- a/tests/languages/markup/prolog_feature.test
+++ b/tests/languages/markup/prolog_feature.test
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="tei2html.xsl"
-type="text/xsl"?>
-
-----------------------------------------------------
-
-[
-	["prolog", "<?xml version=\"1.0\"?>"],
-	["prolog", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"],
-	["prolog", "<?xml-stylesheet href=\"tei2html.xsl\"\r\ntype=\"text/xsl\"?>"]
-]
-
-----------------------------------------------------
-
+<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="tei2html.xsl"
+type="text/xsl"?>
+
+----------------------------------------------------
+
+[
+	["prolog", "<?xml version=\"1.0\"?>"],
+	["prolog", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"],
+	["prolog", "<?xml-stylesheet href=\"tei2html.xsl\"\r\ntype=\"text/xsl\"?>"]
+]
+
+----------------------------------------------------
+
 Checks for different XML prologs, single-line and multi-line.
\ No newline at end of file
diff --git a/tests/languages/markup/tag_attribute_feature.test b/tests/languages/markup/tag_attribute_feature.test
index 57eba1abf6..986cca8251 100644
--- a/tests/languages/markup/tag_attribute_feature.test
+++ b/tests/languages/markup/tag_attribute_feature.test
@@ -1,92 +1,92 @@
-<div class="test" foo bar=baz>
-<div foo='bar'>
-<div class="foo
-bar
-baz">
-<div foo:bar=42>
-
-----------------------------------------------------
-
-[
-	["tag", [
-		["tag", [
-			["punctuation", "<"],
-			"div"
-		]],
-		["attr-name", [
-			"class"
-		]],
-		["attr-value", [
-			["punctuation", "="],
-			["punctuation", "\""],
-			"test",
-			["punctuation", "\""]
-		]],
-		["attr-name", [
-			"foo"
-		]],
-		["attr-name", [
-			"bar"
-		]],
-		["attr-value", [
-			["punctuation", "="],
-			"baz"
-		]],
-		["punctuation", ">"]
-	]],
-
-	["tag", [
-		["tag", [
-			["punctuation", "<"],
-			"div"
-		]],
-		["attr-name", [
-			"foo"
-		]],
-		["attr-value", [
-			["punctuation", "="],
-			["punctuation", "'"],
-			"bar",
-			["punctuation", "'"]
-		]],
-		["punctuation", ">"]
-	]],
-
-	["tag", [
-		["tag", [
-			["punctuation", "<"],
-			"div"
-		]],
-		["attr-name", [
-			"class"
-		]],
-        ["attr-value", [
-            ["punctuation", "="],
-            ["punctuation", "\""],
-            "foo\r\nbar\r\nbaz",
-            ["punctuation", "\""]
-        ]],
-		["punctuation", ">"]
-	]],
-
-	["tag", [
-		["tag", [
-			["punctuation", "<"],
-			"div"
-		]],
-		["attr-name", [
-			["namespace", "foo:"],
-			"bar"
-		]],
-		["attr-value", [
-			["punctuation", "="],
-			"42"
-		]],
-		["punctuation", ">"]
-	]]
-]
-
-----------------------------------------------------
-
-Checks for single-quoted, double-quoted and unquoted attributes, attributes without value and
+<div class="test" foo bar=baz>
+<div foo='bar'>
+<div class="foo
+bar
+baz">
+<div foo:bar=42>
+
+----------------------------------------------------
+
+[
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			"class"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "\""],
+			"test",
+			["punctuation", "\""]
+		]],
+		["attr-name", [
+			"foo"
+		]],
+		["attr-name", [
+			"bar"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			"baz"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			"foo"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "'"],
+			"bar",
+			["punctuation", "'"]
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			"class"
+		]],
+        ["attr-value", [
+            ["punctuation", "="],
+            ["punctuation", "\""],
+            "foo\r\nbar\r\nbaz",
+            ["punctuation", "\""]
+        ]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", [
+			["namespace", "foo:"],
+			"bar"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			"42"
+		]],
+		["punctuation", ">"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for single-quoted, double-quoted and unquoted attributes, attributes without value and
 namespaced attributes.
\ No newline at end of file
diff --git a/tests/languages/markup/tag_feature.test b/tests/languages/markup/tag_feature.test
index 110de1df87..43089ad640 100644
--- a/tests/languages/markup/tag_feature.test
+++ b/tests/languages/markup/tag_feature.test
@@ -1,81 +1,81 @@
-<p></p>
-<div>dummy</div>
-<div
-> </div
->
-<foo:bar> </foo:bar>
-<div
-
-
-----------------------------------------------------
-
-[
-	["tag", [
-		["tag", [
-			["punctuation", "<"],
-			"p"
-		]],
-		["punctuation", ">"]
-	]],
-	["tag", [
-        ["tag", [
-            ["punctuation", "</"],
-            "p"
-        ]],
-        ["punctuation", ">"]
-    ]],
-
-    ["tag", [
-		["tag", [
-			["punctuation", "<"],
-			"div"
-		]],
-		["punctuation", ">"]
-	]],
-	"dummy",
-	["tag", [
-		["tag", [
-			["punctuation", "</"],
-			"div"
-		]],
-		["punctuation", ">"]
-	]],
-
-	["tag", [
-		["tag", [
-			["punctuation", "<"],
-			"div"
-		]],
-		["punctuation", ">"]
-	]],
-	["tag", [
-		["tag", [
-			["punctuation", "</"],
-			"div"
-		]],
-		["punctuation", ">"]
-	]],
-
-	["tag", [
-		["tag", [
-			["punctuation", "<"],
-			["namespace", "foo:"],
-			"bar"
-		]],
-		["punctuation", ">"]
-	]],
-	["tag", [
-		["tag", [
-			["punctuation", "</"],
-			["namespace", "foo:"],
-			"bar"
-		]],
-		["punctuation", ">"]
-	]],
-	"\r\n<div"
-]
-
-----------------------------------------------------
-
-Checks for empty tags, tags that span multiple lines and namespaces in tag names.
+<p></p>
+<div>dummy</div>
+<div
+> </div
+>
+<foo:bar> </foo:bar>
+<div
+
+
+----------------------------------------------------
+
+[
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"p"
+		]],
+		["punctuation", ">"]
+	]],
+	["tag", [
+        ["tag", [
+            ["punctuation", "</"],
+            "p"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["punctuation", ">"]
+	]],
+	"dummy",
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			"div"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["punctuation", ">"]
+	]],
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			"div"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			["namespace", "foo:"],
+			"bar"
+		]],
+		["punctuation", ">"]
+	]],
+	["tag", [
+		["tag", [
+			["punctuation", "</"],
+			["namespace", "foo:"],
+			"bar"
+		]],
+		["punctuation", ">"]
+	]],
+	"\r\n<div"
+]
+
+----------------------------------------------------
+
+Checks for empty tags, tags that span multiple lines and namespaces in tag names.
 Also checks that unclosed tags (e.g. "<div") are not highlighted.
\ No newline at end of file
diff --git a/utopia.js b/utopia.js
index 2843d2da65..f168d5b8b9 100644
--- a/utopia.js
+++ b/utopia.js
@@ -1,10 +1,10 @@
-/**
- * Utopia: A JavaScript util library that assumes modern standards support and doesn't fix any browser bugs
+/**
+ * Utopia: A JavaScript util library that assumes modern standards support and doesn't fix any browser bugs
  * @author Lea Verou (http://lea.verou.me)
- * MIT license (http://www.opensource.org/licenses/mit-license.php)
+ * MIT license (http://www.opensource.org/licenses/mit-license.php)
  * Last update: 2012-4-29
- */
- 
+ */
+ 
 function $(expr, con) {
 	return typeof expr === 'string'? (con || document).querySelector(expr) : expr;
 }
@@ -44,10 +44,10 @@ String.prototype.splice = function(i, remove, add) {
 	add = add || '';
 	
 	return this.slice(0,i) + add + this.slice(i + remove);
-};
+};
 
 (function(){
-
+
 var _ = window.Utopia = {
 	/**
 	 * Returns the [[Class]] of an object in lowercase (eg. array, date, regexp, string etc)
@@ -141,11 +141,11 @@ var _ = window.Utopia = {
 		return object;
 	},
 	
-	element: {
-		/**
-		 * Creates a new DOM element
-		 * @param options {Object} A set of key/value pairs for attributes, properties, contents, placement in the DOM etc
-		 * @return The new DOM element
+	element: {
+		/**
+		 * Creates a new DOM element
+		 * @param options {Object} A set of key/value pairs for attributes, properties, contents, placement in the DOM etc
+		 * @return The new DOM element
 		 */
 		create: function() {
 			var options;
@@ -440,7 +440,7 @@ var _ = window.Utopia = {
 	    	bottom: innerHeight - top - element.offsetHeight,
 	    	left: left,
 	    };
-	}
+	}
 };
 
 ['set', 'prop', 'attr', 'contents'].forEach(function(method) {
@@ -456,8 +456,8 @@ var _ = window.Utopia = {
 		
 		return elements;
 	}
-});
-
+});
+
 })();
 
 window.$u = window.$u || Utopia;
\ No newline at end of file

From 57f431633dce97ad53e795fa56c8d69a3d2c2d66 Mon Sep 17 00:00:00 2001
From: Malash <i@malash.me>
Date: Tue, 18 Aug 2015 14:39:45 +0800
Subject: [PATCH 153/310] remove code comments in components.js

---
 components.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components.js b/components.js
index 1129ef8eab..169d432532 100644
--- a/components.js
+++ b/components.js
@@ -54,9 +54,6 @@ var components = {
 			"option": "default",
 			"require": "clike"
 		},
-
-		// ---
-
 		"actionscript": {
 			"title": "ActionScript",
 			"require": "javascript",

From 39bd8278ec700dd651bf99e60f62bea0ffb9b378 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 18 Aug 2015 19:00:24 +0200
Subject: [PATCH 154/310] Add gulp task to build languages map in Show language
 plugin (Fix #671)

---
 components.js                                 |  3 ++
 gulpfile.js                                   | 47 ++++++++++++++++++-
 package.json                                  |  1 +
 plugins/show-language/prism-show-language.js  |  8 ++--
 .../show-language/prism-show-language.min.js  |  2 +-
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/components.js b/components.js
index 169d432532..b9ce823bbf 100644
--- a/components.js
+++ b/components.js
@@ -54,6 +54,9 @@ var components = {
 			"option": "default",
 			"require": "clike"
 		},
+
+
+
 		"actionscript": {
 			"title": "ActionScript",
 			"require": "javascript",
diff --git a/gulpfile.js b/gulpfile.js
index 25de6e500d..51af93c33f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,8 +3,11 @@ var gulp   = require('gulp'),
 	uglify = require('gulp-uglify'),
 	header = require('gulp-header'),
 	concat = require('gulp-concat'),
+	replace = require('gulp-replace'),
+	fs = require('fs'),
 
 	paths  = {
+		componentsFile: 'components.js',
 		components: ['components/**/*.js', '!components/**/*.min.js'],
 		main: [
 			'components/prism-core.js',
@@ -14,7 +17,8 @@ var gulp   = require('gulp'),
 			'components/prism-javascript.js',
 			'plugins/file-highlight/prism-file-highlight.js'
 		],
-		plugins: ['plugins/**/*.js', '!plugins/**/*.min.js']
+		plugins: ['plugins/**/*.js', '!plugins/**/*.min.js'],
+		showLanguagePlugin: 'plugins/show-language/prism-show-language.js'
 	};
 
 gulp.task('components', function() {
@@ -33,7 +37,7 @@ gulp.task('build', function() {
 		.pipe(gulp.dest('./'));
 });
 
-gulp.task('plugins', function() {
+gulp.task('plugins', ['show-language-plugin'], function() {
 	return gulp.src(paths.plugins)
 		.pipe(uglify())
 		.pipe(rename({ suffix: '.min' }))
@@ -45,4 +49,43 @@ gulp.task('watch', function() {
 	gulp.watch(paths.plugins, ['plugins', 'build']);
 });
 
+gulp.task('show-language-plugin', function (cb) {
+	fs.readFile(paths.componentsFile, {
+		encoding: 'utf-8'
+	}, function (err, data) {
+		if (!err) {
+			data = data.replace(/^var\s+components\s*=\s*|;\s*$/g, '');
+			try {
+				data = JSON.parse(data);
+
+				var languagesMap = {};
+				for (var p in data.languages) {
+					if (p !== 'meta') {
+						var title = data.languages[p].displayTitle || data.languages[p].title;
+						var ucfirst = p.substring(0, 1).toUpperCase() + p.substring(1);
+						if (title !== ucfirst) {
+							languagesMap[p] = title;
+						}
+					}
+				}
+
+				var jsonLanguages = JSON.stringify(languagesMap);
+				var stream = gulp.src(paths.showLanguagePlugin)
+					.pipe(replace(
+						/\/\*languages_placeholder\[\*\/[\s\S]*?\/\*\]\*\//,
+						'/*languages_placeholder[*/' + jsonLanguages + '/*]*/'
+					))
+					.pipe(gulp.dest(paths.showLanguagePlugin.substring(0, paths.showLanguagePlugin.lastIndexOf('/'))));
+				stream.on('error', cb);
+				stream.on('end', cb);
+
+			} catch (e) {
+				cb(e);
+			}
+		} else {
+			cb(err);
+		}
+	});
+});
+
 gulp.task('default', ['components', 'plugins', 'build']);
diff --git a/package.json b/package.json
index 2f8af95a5f..b00ea8fd2a 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "gulp-header": "^1.0.5",
     "gulp-rename": "^1.2.0",
     "gulp-uglify": "^0.3.1",
+    "gulp-replace": "^0.5.4",
     "mocha": "^2.2.5"
   }
 }
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
index 7b345d39be..ac43bd6675 100644
--- a/plugins/show-language/prism-show-language.js
+++ b/plugins/show-language/prism-show-language.js
@@ -4,16 +4,14 @@ if (!self.Prism) {
 	return;
 }
 
-var Languages = {
-	'csharp': 'C#',
-	'cpp': 'C++'
-};
+// The languages map is built automatically with gulp
+var Languages = /*languages_placeholder[*/{"css":"CSS","clike":"C-like","javascript":"JavaScript","actionscript":"ActionScript","apacheconf":"Apache Configuration","applescript":"AppleScript","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","css-extras":"CSS Extras","fsharp":"F#","http":"HTTP","latex":"LaTeX","lolcode":"LOLCODE","matlab":"MATLAB","nasm":"NASM","nsis":"NSIS","objectivec":"Objective-C","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","jsx":"React JSX","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vhdl":"VHDL","wiki":"Wiki markup","yaml":"YAML"}/*]*/;
 Prism.hooks.add('before-highlight', function(env) {
 	var pre = env.element.parentNode;
 	if (!pre || !/pre/i.test(pre.nodeName)) {
 		return;
 	}
-	var language = Languages[env.language] || env.language;
+	var language = Languages[env.language] || (env.language.substring(0, 1).toUpperCase() + env.language.substring(1));
 	pre.setAttribute('data-language', language);
 });
 
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
index 3f9280d985..849fc6d14a 100644
--- a/plugins/show-language/prism-show-language.min.js
+++ b/plugins/show-language/prism-show-language.min.js
@@ -1 +1 @@
-!function(){if(self.Prism){var e={csharp:"C#",cpp:"C++"};Prism.hooks.add("before-highlight",function(a){var t=a.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var i=e[a.language]||a.language;t.setAttribute("data-language",i)}})}}();
\ No newline at end of file
+!function(){if(self.Prism){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file

From 8ed7ce3a6d11d68d6c65801459d4aed78455baad Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 18 Aug 2015 19:57:17 +0200
Subject: [PATCH 155/310] Test for rounded line-height to fix positions in Line
 Highlight plugin

---
 .../line-highlight/prism-line-highlight.js    | 29 ++++++++++++++++---
 .../prism-line-highlight.min.js               |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/plugins/line-highlight/prism-line-highlight.js b/plugins/line-highlight/prism-line-highlight.js
index b89028a1b8..a0bd34bae3 100644
--- a/plugins/line-highlight/prism-line-highlight.js
+++ b/plugins/line-highlight/prism-line-highlight.js
@@ -13,13 +13,34 @@ function hasClass(element, className) {
   return (" " + element.className + " ").replace(/[\n\t]/g, " ").indexOf(className) > -1
 }
 
-var CRLF = crlf = /\r?\n|\r/g;
-    
+// Some browsers round the line-height, others don't.
+// We need to test for it to position the elements properly.
+var isLineHeightRounded = (function() {
+	var res;
+	return function() {
+		if(typeof res === 'undefined') {
+			var d = document.createElement('div');
+			d.style.fontSize = '13px';
+			d.style.lineHeight = '1.5';
+			d.style.padding = 0;
+			d.style.border = 0;
+			d.innerHTML = '&nbsp;<br />&nbsp;';
+			document.body.appendChild(d);
+			// Browsers that round the line-height should have offsetHeight === 38
+			// The others should have 39.
+			res = d.offsetHeight === 38;
+			document.body.removeChild(d);
+		}
+		return res;
+	}
+}());
+
 function highlightLines(pre, lines, classes) {
 	var ranges = lines.replace(/\s+/g, '').split(','),
 	    offset = +pre.getAttribute('data-line-offset') || 0;
-	
-	var lineHeight = parseInt(getComputedStyle(pre).lineHeight);
+
+	var parseMethod = isLineHeightRounded() ? parseInt : parseFloat;
+	var lineHeight = parseMethod(getComputedStyle(pre).lineHeight);
 
 	for (var i=0, range; range = ranges[i++];) {
 		range = range.split('-');
diff --git a/plugins/line-highlight/prism-line-highlight.min.js b/plugins/line-highlight/prism-line-highlight.min.js
index 380776b0a0..1018af46bd 100644
--- a/plugins/line-highlight/prism-line-highlight.min.js
+++ b/plugins/line-highlight/prism-line-highlight.min.js
@@ -1 +1 @@
-!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,r){for(var i,a=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,o=parseInt(getComputedStyle(e).lineHeight),c=0;i=a[c++];){i=i.split("-");var d=+i[0],s=+i[1]||d,u=document.createElement("div");u.textContent=Array(s-d+2).join(" \n"),u.className=(r||"")+" line-highlight",t(e,"line-numbers")||(u.setAttribute("data-start",d),s>d&&u.setAttribute("data-end",s)),u.style.top=(d-l-1)*o+"px",t(e,"line-numbers")?e.appendChild(u):(e.querySelector("code")||e).appendChild(u)}}function r(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var r=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(r&&!document.getElementById(t)){var i=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(i);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,r,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var i=(crlf=/\r?\n|\r/g,0);Prism.hooks.add("complete",function(t){var a=t.element.parentNode,l=a&&a.getAttribute("data-line");a&&l&&/pre/i.test(a.nodeName)&&(clearTimeout(i),e(".line-highlight",a).forEach(function(e){e.parentNode.removeChild(e)}),n(a,l),i=setTimeout(r,1))}),addEventListener("hashchange",r)}}();
\ No newline at end of file
+!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,i){for(var a,o=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,d=r()?parseInt:parseFloat,c=d(getComputedStyle(e).lineHeight),s=0;a=o[s++];){a=a.split("-");var u=+a[0],h=+a[1]||u,m=document.createElement("div");m.textContent=Array(h-u+2).join(" \n"),m.className=(i||"")+" line-highlight",t(e,"line-numbers")||(m.setAttribute("data-start",u),h>u&&m.setAttribute("data-end",h)),m.style.top=(u-l-1)*c+"px",t(e,"line-numbers")?e.appendChild(m):(e.querySelector("code")||e).appendChild(m)}}function i(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var i=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(i&&!document.getElementById(t)){var r=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(r);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,i,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var r=function(){var e;return function(){if("undefined"==typeof e){var t=document.createElement("div");t.style.fontSize="13px",t.style.lineHeight="1.5",t.style.padding=0,t.style.border=0,t.innerHTML="&nbsp;<br />&nbsp;",document.body.appendChild(t),e=38===t.offsetHeight,document.body.removeChild(t)}return e}}(),a=0;Prism.hooks.add("complete",function(t){var r=t.element.parentNode,o=r&&r.getAttribute("data-line");r&&o&&/pre/i.test(r.nodeName)&&(clearTimeout(a),e(".line-highlight",r).forEach(function(e){e.parentNode.removeChild(e)}),n(r,o),a=setTimeout(i,1))}),addEventListener("hashchange",i)}}();
\ No newline at end of file

From 1388256b465362241b960d160b5a4e828ddbe1fe Mon Sep 17 00:00:00 2001
From: Golmote <yann.logan@live.fr>
Date: Tue, 18 Aug 2015 23:54:14 +0200
Subject: [PATCH 156/310] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3c97a681ef..3406859cf7 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,12 @@ Why another syntax highlighter?: http://lea.verou.me/2012/07/introducing-prism-a
 Prism depends on community contributions to expand and cover a wider array of use cases. If you like it, considering giving back by sending a pull request. Here are a few tips:
 
 - Read the [documentation](http://prismjs.com/extending.html). Prism was designed to be extensible.
-- Do not edit prism.js, it’s just the version of Prism used by the Prism website and is built automatically. Limit your changes to the unminified files in the components/ folder. The minified files are also generated automatically.
-- Currently the build system building prism.js and the minified files is just a bunch of local settings in CodeKit. If someone wants to help export them to a config file, please contact me by opening an issue.
+- Do not edit `prism.js`, it’s just the version of Prism used by the Prism website and is built automatically. Limit your changes to the unminified files in the components/ folder. The minified files are also generated automatically.
+- The build system uses [gulp](https://github.com/gulpjs/gulp) to minify the files and build `prism.js`. Having gulp installed, you just need to run the command `gulp`.
 - Please follow the code conventions used in the files already. For example, I use [tabs for indentation and spaces for alignment](http://lea.verou.me/2012/01/why-tabs-are-clearly-superior/). Opening braces are on the same line, closing braces on their own line regardless of construct. There is a space before the opening brace. etc etc.
 - Please try to err towards more smaller PRs rather than few huge PRs. If a PR includes changes I want to merge and changes I don't, handling it becomes difficult.
 - My time is very limited these days, so it might take a long time to review longer PRs (short ones are usually merged very quickly), especially those modifying the Prism Core. This doesn't mean your PR is rejected.
-- If you contribute a new language definition, you will be responsible for handling bug reports about that language definition. Soon I plan to add usernames of project owners for themes, plugins and language definitions so this becomes more clear to users.
+- If you contribute a new language definition, you will be responsible for handling bug reports about that language definition.
 - If you add a new language definition, theme or plugin, you need to add it to `components.js` as well, so that it becomes available to the download build page.
 
 Thank you so much for contributing!!

From 3fb26cc72e17632767ff7385dd70022edc06117c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 18 Aug 2015 23:58:50 +0200
Subject: [PATCH 157/310] Add tests for CSS

---
 .../!markup+css/markup+css_usage.test         | 71 +++++++++++++++++++
 tests/languages/css/atrule_feature.test       | 47 ++++++++++++
 tests/languages/css/comment_feature.test      | 16 +++++
 tests/languages/css/function_feature.test     | 35 +++++++++
 tests/languages/css/important_feature.test    | 21 ++++++
 tests/languages/css/property_feature.test     | 24 +++++++
 tests/languages/css/selector_feature.test     | 25 +++++++
 tests/languages/css/string_feature.test       | 19 +++++
 tests/languages/css/url_feature.test          | 21 ++++++
 9 files changed, 279 insertions(+)
 create mode 100644 tests/languages/!markup+css/markup+css_usage.test
 create mode 100644 tests/languages/css/atrule_feature.test
 create mode 100644 tests/languages/css/comment_feature.test
 create mode 100644 tests/languages/css/function_feature.test
 create mode 100644 tests/languages/css/important_feature.test
 create mode 100644 tests/languages/css/property_feature.test
 create mode 100644 tests/languages/css/selector_feature.test
 create mode 100644 tests/languages/css/string_feature.test
 create mode 100644 tests/languages/css/url_feature.test

diff --git a/tests/languages/!markup+css/markup+css_usage.test b/tests/languages/!markup+css/markup+css_usage.test
new file mode 100644
index 0000000000..b606f11470
--- /dev/null
+++ b/tests/languages/!markup+css/markup+css_usage.test
@@ -0,0 +1,71 @@
+<style type="text/css">
+foo {
+	bar: baz;
+}
+</style>
+
+<foo style="bar:baz;">
+
+----------------------------------------------------
+
+[
+	["style", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"style"
+			]],
+			["attr-name", [
+				"type"
+			]],
+			["attr-value", [
+				["punctuation", "="],
+				["punctuation", "\""],
+				"text/css",
+				["punctuation", "\""]
+			]],
+			["punctuation", ">"]
+		]],
+		["selector", "foo"],
+		["punctuation", "{"],
+		["property", "bar"],
+		["punctuation", ":"],
+		" baz",
+		["punctuation", ";"],
+		["punctuation", "}"],
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"style"
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"foo"
+		]],
+		["style-attr", [
+			["attr-name", [
+				["attr-name", [
+					"style"
+				]]
+			]],
+			["punctuation", "=\""],
+			["attr-value", [
+				["property", "bar"],
+				["punctuation", ":"],
+				"baz",
+				["punctuation", ";"]
+			]],
+			["punctuation", "\""]
+		]],
+		["punctuation", ">"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for CSS usage inside Markup, using <style> tag and style attribute.
\ No newline at end of file
diff --git a/tests/languages/css/atrule_feature.test b/tests/languages/css/atrule_feature.test
new file mode 100644
index 0000000000..abc75def35
--- /dev/null
+++ b/tests/languages/css/atrule_feature.test
@@ -0,0 +1,47 @@
+@import url(foo.css);
+@media print {}
+@media (min-width: 640px) and (min-height: 1000px) {}
+@main-color: red;
+
+----------------------------------------------------
+
+[
+	["atrule", [
+		["rule", "@import"],
+		["url", "url(foo.css)"],
+		["punctuation", ";"]
+	]],
+	["atrule", [
+		["rule", "@media"],
+		" print"
+	]],
+	["punctuation", "{"],
+	["punctuation", "}"],
+	["atrule", [
+		["rule", "@media"],
+		["punctuation", "("],
+		["property", "min-width"],
+		["punctuation", ":"],
+		" 640px",
+		["punctuation", ")"],
+		" and ",
+		["punctuation", "("],
+        ["property", "min-height"],
+        ["punctuation", ":"],
+        " 1000px",
+        ["punctuation", ")"]
+	]],
+	["punctuation", "{"],
+    ["punctuation", "}"],
+	["atrule", [
+		["rule", "@main-color"],
+		["punctuation", ":"],
+		" red",
+		["punctuation", ";"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for at-rules.
+Also checks for LESS variables.
\ No newline at end of file
diff --git a/tests/languages/css/comment_feature.test b/tests/languages/css/comment_feature.test
new file mode 100644
index 0000000000..a3899eddb2
--- /dev/null
+++ b/tests/languages/css/comment_feature.test
@@ -0,0 +1,16 @@
+/**/
+/* foo */
+/* foo
+bar */
+
+----------------------------------------------------
+
+[
+	["comment", "/**/"],
+	["comment", "/* foo */"],
+	["comment", "/* foo\r\nbar */"]
+]
+
+----------------------------------------------------
+
+Checks for empty comment, single-line comment and multi-line comment.
\ No newline at end of file
diff --git a/tests/languages/css/function_feature.test b/tests/languages/css/function_feature.test
new file mode 100644
index 0000000000..0ed4f12bfc
--- /dev/null
+++ b/tests/languages/css/function_feature.test
@@ -0,0 +1,35 @@
+transform: translate(-50%);
+background: rgba(0, 0, 0, 0.2);
+filter: opacity(alpha=0);
+
+----------------------------------------------------
+
+[
+	["property", "transform"],
+	["punctuation", ":"],
+	["function", "translate"],
+	["punctuation", "("],
+	"-50%",
+	["punctuation", ")"],
+	["punctuation", ";"],
+
+	["property", "background"],
+	["punctuation", ":"],
+	["function", "rgba"],
+	["punctuation", "("],
+	"0, 0, 0, 0.2",
+	["punctuation", ")"],
+	["punctuation", ";"],
+
+	["property", "filter"],
+	["punctuation", ":"],
+	["function", "opacity"],
+	["punctuation", "("],
+	"alpha=0",
+	["punctuation", ")"],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for functions.
\ No newline at end of file
diff --git a/tests/languages/css/important_feature.test b/tests/languages/css/important_feature.test
new file mode 100644
index 0000000000..ad69c39a43
--- /dev/null
+++ b/tests/languages/css/important_feature.test
@@ -0,0 +1,21 @@
+color: red !important;
+padding: 10px 20px 30px !important;
+
+----------------------------------------------------
+
+[
+	["property", "color"],
+	["punctuation", ":"],
+	" red ",
+	["important", "!important"],
+	["punctuation", ";"],
+	["property", "padding"],
+    ["punctuation", ":"],
+    " 10px 20px 30px ",
+    ["important", "!important"],
+    ["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for !important rule.
\ No newline at end of file
diff --git a/tests/languages/css/property_feature.test b/tests/languages/css/property_feature.test
new file mode 100644
index 0000000000..30ff466ac3
--- /dev/null
+++ b/tests/languages/css/property_feature.test
@@ -0,0 +1,24 @@
+color: red;
+background-color: blue;
+-webkit-transform: none;
+
+----------------------------------------------------
+
+[
+	["property", "color"],
+	["punctuation", ":"],
+	" red",
+	["punctuation", ";"],
+	["property", "background-color"],
+	["punctuation", ":"],
+	" blue",
+    ["punctuation", ";"],
+	["property", "-webkit-transform"],
+	["punctuation", ":"],
+	" none",
+    ["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for properties.
\ No newline at end of file
diff --git a/tests/languages/css/selector_feature.test b/tests/languages/css/selector_feature.test
new file mode 100644
index 0000000000..5a59720135
--- /dev/null
+++ b/tests/languages/css/selector_feature.test
@@ -0,0 +1,25 @@
+foo{
+foo + bar {
+foo:first-child:hover {
+* {
+foo,
+bar{
+
+----------------------------------------------------
+
+[
+	["selector", "foo"],
+	["punctuation", "{"],
+	["selector", "foo + bar"],
+	["punctuation", "{"],
+	["selector", "foo:first-child:hover"],
+	["punctuation", "{"],
+	["selector", "*"],
+	["punctuation", "{"],
+	["selector", "foo,\r\nbar"],
+	["punctuation", "{"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line selectors.
\ No newline at end of file
diff --git a/tests/languages/css/string_feature.test b/tests/languages/css/string_feature.test
new file mode 100644
index 0000000000..c7dee29274
--- /dev/null
+++ b/tests/languages/css/string_feature.test
@@ -0,0 +1,19 @@
+"f\"oo"
+'f\'oo'
+"foo\
+bar"
+'foo\
+bar'
+
+----------------------------------------------------
+
+[
+	["string", "\"f\\\"oo\""],
+	["string", "'f\\'oo'"],
+	["string", "\"foo\\\r\nbar\""],
+    ["string", "'foo\\\r\nbar'"]
+]
+
+----------------------------------------------------
+
+Checks for single-quoted and double-quoted strings.
\ No newline at end of file
diff --git a/tests/languages/css/url_feature.test b/tests/languages/css/url_feature.test
new file mode 100644
index 0000000000..05ce8f9f74
--- /dev/null
+++ b/tests/languages/css/url_feature.test
@@ -0,0 +1,21 @@
+url(foo.png)
+url('foo.png')
+url("foo.png")
+url('foo\
+bar.png')
+url("foo\
+bar.png")
+
+----------------------------------------------------
+
+[
+	["url", "url(foo.png)"],
+	["url", "url('foo.png')"],
+	["url", "url(\"foo.png\")"],
+	["url", "url('foo\\\r\nbar.png')"],
+	["url", "url(\"foo\\\r\nbar.png\")"]
+]
+
+----------------------------------------------------
+
+Checks for url(), unquoted, single-quoted and double-quoted.
\ No newline at end of file

From 26ad4f31076a88762c1b974b9c14098e31b43f15 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 18 Aug 2015 23:59:12 +0200
Subject: [PATCH 158/310] Add tests for JavaScript + remove example

---
 .../markup+javascript_usage.test              | 58 +++++++++++++++
 .../javascript/function_feature.test          | 20 ++++++
 .../languages/javascript/keyword_feature.test | 72 +++++++++++++++++++
 .../languages/javascript/number_feature.test  | 32 +++++++++
 tests/languages/javascript/regex_feature.test | 15 ++++
 .../javascript/template-string_feature.test   | 42 +++++++++++
 tests/languages/javascript/testcase1.test     | 15 ----
 7 files changed, 239 insertions(+), 15 deletions(-)
 create mode 100644 tests/languages/!markup+javascript/markup+javascript_usage.test
 create mode 100644 tests/languages/javascript/function_feature.test
 create mode 100644 tests/languages/javascript/keyword_feature.test
 create mode 100644 tests/languages/javascript/number_feature.test
 create mode 100644 tests/languages/javascript/regex_feature.test
 create mode 100644 tests/languages/javascript/template-string_feature.test
 delete mode 100644 tests/languages/javascript/testcase1.test

diff --git a/tests/languages/!markup+javascript/markup+javascript_usage.test b/tests/languages/!markup+javascript/markup+javascript_usage.test
new file mode 100644
index 0000000000..0aeeb0e01a
--- /dev/null
+++ b/tests/languages/!markup+javascript/markup+javascript_usage.test
@@ -0,0 +1,58 @@
+<script type="text/javascript">foo()</script>
+<script>
+"foo bar"
+</script>
+
+----------------------------------------------------
+
+[
+	["script", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"script"
+			]],
+			["attr-name", [
+				"type"
+			]],
+			["attr-value", [
+				["punctuation", "="],
+				["punctuation", "\""],
+				"text/javascript",
+                ["punctuation", "\""]
+			]],
+			["punctuation", ">"]
+		]],
+		["function", "foo"],
+		["punctuation", "("],
+		["punctuation", ")"],
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"script"
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+	["script", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"script"
+			]],
+			["punctuation", ">"]
+		]],
+		["string", "\"foo bar\""],
+		["tag", [
+            ["tag", [
+                ["punctuation", "</"],
+                "script"
+            ]],
+            ["punctuation", ">"]
+        ]]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for Javascript usage inside Markup, using <script> tags.
\ No newline at end of file
diff --git a/tests/languages/javascript/function_feature.test b/tests/languages/javascript/function_feature.test
new file mode 100644
index 0000000000..fca4a30048
--- /dev/null
+++ b/tests/languages/javascript/function_feature.test
@@ -0,0 +1,20 @@
+foo()
+foo_bar()
+f42()
+_()
+$()
+
+----------------------------------------------------
+
+[
+	["function", "foo"], ["punctuation", "("], ["punctuation", ")"],
+	["function", "foo_bar"], ["punctuation", "("], ["punctuation", ")"],
+	["function", "f42"], ["punctuation", "("], ["punctuation", ")"],
+	["function", "_"], ["punctuation", "("], ["punctuation", ")"],
+	["function", "$"], ["punctuation", "("], ["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for functions.
+Also checks that function starting with a number are not highlighted.
\ No newline at end of file
diff --git a/tests/languages/javascript/keyword_feature.test b/tests/languages/javascript/keyword_feature.test
new file mode 100644
index 0000000000..13f7bf7136
--- /dev/null
+++ b/tests/languages/javascript/keyword_feature.test
@@ -0,0 +1,72 @@
+as; async; await; break; case;
+catch; class; const; continue; debugger;
+default; delete; do; else; enum;
+export; extends; false; finally; for;
+from; function; get; if; implements;
+import; in; instanceof; interface; let;
+new; null; of; package; private;
+protected; public; return; set; static;
+super; switch; this; throw; true;
+try; typeof; var; void; while;
+with; yield;
+
+----------------------------------------------------
+
+[
+	["keyword", "as"], ["punctuation", ";"],
+	["keyword", "async"], ["punctuation", ";"],
+	["keyword", "await"], ["punctuation", ";"],
+	["keyword", "break"], ["punctuation", ";"],
+	["keyword", "case"], ["punctuation", ";"],
+	["keyword", "catch"], ["punctuation", ";"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "const"], ["punctuation", ";"],
+	["keyword", "continue"], ["punctuation", ";"],
+	["keyword", "debugger"], ["punctuation", ";"],
+	["keyword", "default"], ["punctuation", ";"],
+	["keyword", "delete"], ["punctuation", ";"],
+	["keyword", "do"], ["punctuation", ";"],
+	["keyword", "else"], ["punctuation", ";"],
+	["keyword", "enum"], ["punctuation", ";"],
+	["keyword", "export"], ["punctuation", ";"],
+	["keyword", "extends"], ["punctuation", ";"],
+	["keyword", "false"], ["punctuation", ";"],
+	["keyword", "finally"], ["punctuation", ";"],
+	["keyword", "for"], ["punctuation", ";"],
+	["keyword", "from"], ["punctuation", ";"],
+	["keyword", "function"], ["punctuation", ";"],
+	["keyword", "get"], ["punctuation", ";"],
+	["keyword", "if"], ["punctuation", ";"],
+	["keyword", "implements"], ["punctuation", ";"],
+	["keyword", "import"], ["punctuation", ";"],
+	["keyword", "in"], ["punctuation", ";"],
+	["keyword", "instanceof"], ["punctuation", ";"],
+	["keyword", "interface"], ["punctuation", ";"],
+	["keyword", "let"], ["punctuation", ";"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "null"], ["punctuation", ";"],
+	["keyword", "of"], ["punctuation", ";"],
+	["keyword", "package"], ["punctuation", ";"],
+	["keyword", "private"], ["punctuation", ";"],
+	["keyword", "protected"], ["punctuation", ";"],
+	["keyword", "public"], ["punctuation", ";"],
+	["keyword", "return"], ["punctuation", ";"],
+	["keyword", "set"], ["punctuation", ";"],
+	["keyword", "static"], ["punctuation", ";"],
+	["keyword", "super"], ["punctuation", ";"],
+	["keyword", "switch"], ["punctuation", ";"],
+	["keyword", "this"], ["punctuation", ";"],
+	["keyword", "throw"], ["punctuation", ";"],
+	["keyword", "true"], ["punctuation", ";"],
+	["keyword", "try"], ["punctuation", ";"],
+	["keyword", "typeof"], ["punctuation", ";"],
+	["keyword", "var"], ["punctuation", ";"],
+	["keyword", "void"], ["punctuation", ";"],
+	["keyword", "while"], ["punctuation", ";"],
+	["keyword", "with"], ["punctuation", ";"],
+	["keyword", "yield"], ["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/javascript/number_feature.test b/tests/languages/javascript/number_feature.test
new file mode 100644
index 0000000000..b832787882
--- /dev/null
+++ b/tests/languages/javascript/number_feature.test
@@ -0,0 +1,32 @@
+42
+3.14159
+4e10
+3.2E+6
+2.1e-10
+0b1101
+0o571
+0xbabe
+0xBABE
+NaN
+Infinity
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "4e10"],
+	["number", "3.2E+6"],
+	["number", "2.1e-10"],
+	["number", "0b1101"],
+	["number", "0o571"],
+	["number", "0xbabe"],
+	["number", "0xBABE"],
+	["number", "NaN"],
+	["number", "Infinity"]
+]
+
+----------------------------------------------------
+
+Checks for decimal numbers, binary numbers, octal numbers, hexadecimal numbers.
+Also checks for keywords representing numbers.
\ No newline at end of file
diff --git a/tests/languages/javascript/regex_feature.test b/tests/languages/javascript/regex_feature.test
new file mode 100644
index 0000000000..a1268d40fb
--- /dev/null
+++ b/tests/languages/javascript/regex_feature.test
@@ -0,0 +1,15 @@
+/foo bar/
+/foo/gimyu,
+/[\[\]]{2,4}(?:foo)*/;
+
+----------------------------------------------------
+
+[
+	["regex", "/foo bar/"],
+	["regex", "/foo/gimyu"], ["punctuation", ","],
+	["regex", "/[\\[\\]]{2,4}(?:foo)*/"], ["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for regex.
\ No newline at end of file
diff --git a/tests/languages/javascript/template-string_feature.test b/tests/languages/javascript/template-string_feature.test
new file mode 100644
index 0000000000..753374e3b8
--- /dev/null
+++ b/tests/languages/javascript/template-string_feature.test
@@ -0,0 +1,42 @@
+`foo bar`
+`foo
+bar`
+`40+2=${40+2}`
+`${foo()}`
+
+----------------------------------------------------
+
+[
+	["template-string", [
+		["string", "`foo bar`"]
+	]],
+	["template-string", [
+		["string", "`foo\r\nbar`"]
+	]],
+	["template-string", [
+		["string", "`40+2="],
+		["interpolation", [
+			["interpolation-punctuation", "${"],
+			["number", "40"],
+			["operator", "+"],
+			["number", "2"],
+			["interpolation-punctuation", "}"]
+		]],
+		["string", "`"]
+	]],
+	["template-string", [
+        ["string", "`"],
+        ["interpolation", [
+            ["interpolation-punctuation", "${"],
+            ["function", "foo"],
+            ["punctuation", "("],
+            ["punctuation", ")"],
+            ["interpolation-punctuation", "}"]
+        ]],
+        ["string", "`"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line template strings.
\ No newline at end of file
diff --git a/tests/languages/javascript/testcase1.test b/tests/languages/javascript/testcase1.test
deleted file mode 100644
index e424522129..0000000000
--- a/tests/languages/javascript/testcase1.test
+++ /dev/null
@@ -1,15 +0,0 @@
-var a = 5;
-
-----------------------------------------------------
-
-[
-	["keyword", "var"],
-	" a ",
-	["operator", "="],
-	["number", "5"],
-	["punctuation", ";"]
-]
-
-----------------------------------------------------
-
-This is a comment explaining this test case.

From d1b2e2065aa1eb2b98567fc855cd62b166c45ef0 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:19:45 +0200
Subject: [PATCH 159/310] Fix test runner: it must use the last language by
 default

---
 tests/helper/test-case.js | 2 +-
 tests/testrunner-tests.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index 34835a3326..1fbe8c4b7d 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -101,7 +101,7 @@ module.exports = {
 		);
 
 		if (!mainLanguage) {
-			mainLanguage = languages[0];
+			mainLanguage = languages[languages.length-1];
 		}
 
 		return {
diff --git a/tests/testrunner-tests.js b/tests/testrunner-tests.js
index c4e0fd51f0..24ad32cd8a 100644
--- a/tests/testrunner-tests.js
+++ b/tests/testrunner-tests.js
@@ -117,7 +117,7 @@ describe("The token stream transformer",
 //region Language name parsing
 describe("The language name parsing",
 	function () {
-		it("should use the first language as the main language if no language is specified",
+		it("should use the last language as the main language if no language is specified",
 			function () {
 				assert.deepEqual(
 					TestCase.parseLanguageNames("a"),
@@ -131,7 +131,7 @@ describe("The language name parsing",
 					TestCase.parseLanguageNames("a+b+c"),
 					{
 						languages: ["a", "b", "c"],
-						mainLanguage: "a"
+						mainLanguage: "c"
 					}
 				);
 			}

From c28d45475d7af63156f7b71b60caff33ddfb769b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:21:28 +0200
Subject: [PATCH 160/310] Move main language specifier char, it gives better
 readability

---
 .../languages/{!markup+css => markup!+css}/markup+css_usage.test  | 0
 .../markup+javascript_usage.test                                  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/languages/{!markup+css => markup!+css}/markup+css_usage.test (100%)
 rename tests/languages/{!markup+javascript => markup!+javascript}/markup+javascript_usage.test (100%)

diff --git a/tests/languages/!markup+css/markup+css_usage.test b/tests/languages/markup!+css/markup+css_usage.test
similarity index 100%
rename from tests/languages/!markup+css/markup+css_usage.test
rename to tests/languages/markup!+css/markup+css_usage.test
diff --git a/tests/languages/!markup+javascript/markup+javascript_usage.test b/tests/languages/markup!+javascript/markup+javascript_usage.test
similarity index 100%
rename from tests/languages/!markup+javascript/markup+javascript_usage.test
rename to tests/languages/markup!+javascript/markup+javascript_usage.test

From 94c349ea00178f1d20a2a3703b460a931b0bbf58 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:23:28 +0200
Subject: [PATCH 161/310] Add tests for ActionScript

---
 .../actionscript/keyword_feature.test         | 71 +++++++++++++++++++
 .../actionscript/operator_feature.test        | 29 ++++++++
 .../markup+actionscript/xml_feature.test      | 64 +++++++++++++++++
 3 files changed, 164 insertions(+)
 create mode 100644 tests/languages/actionscript/keyword_feature.test
 create mode 100644 tests/languages/actionscript/operator_feature.test
 create mode 100644 tests/languages/markup+actionscript/xml_feature.test

diff --git a/tests/languages/actionscript/keyword_feature.test b/tests/languages/actionscript/keyword_feature.test
new file mode 100644
index 0000000000..c41a8524e5
--- /dev/null
+++ b/tests/languages/actionscript/keyword_feature.test
@@ -0,0 +1,71 @@
+as; break; case; catch; class;
+const; default; delete; do; else;
+extends; finally; for; function; if;
+implements; import; in; instanceof; interface;
+internal; is; native; new; null;
+package; private; protected; public; return;
+super; switch; this; throw; try;
+typeof; use; var; void; while;
+with; dynamic; each; final; get;
+include; namespace; native; override; set;
+static;
+
+----------------------------------------------------
+
+[
+	["keyword", "as"], ["punctuation", ";"],
+	["keyword", "break"], ["punctuation", ";"],
+	["keyword", "case"], ["punctuation", ";"],
+	["keyword", "catch"], ["punctuation", ";"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "const"], ["punctuation", ";"],
+	["keyword", "default"], ["punctuation", ";"],
+	["keyword", "delete"], ["punctuation", ";"],
+	["keyword", "do"], ["punctuation", ";"],
+	["keyword", "else"], ["punctuation", ";"],
+	["keyword", "extends"], ["punctuation", ";"],
+	["keyword", "finally"], ["punctuation", ";"],
+	["keyword", "for"], ["punctuation", ";"],
+	["keyword", "function"], ["punctuation", ";"],
+	["keyword", "if"], ["punctuation", ";"],
+	["keyword", "implements"], ["punctuation", ";"],
+	["keyword", "import"], ["punctuation", ";"],
+	["keyword", "in"], ["punctuation", ";"],
+	["keyword", "instanceof"], ["punctuation", ";"],
+	["keyword", "interface"], ["punctuation", ";"],
+	["keyword", "internal"], ["punctuation", ";"],
+	["keyword", "is"], ["punctuation", ";"],
+	["keyword", "native"], ["punctuation", ";"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "null"], ["punctuation", ";"],
+	["keyword", "package"], ["punctuation", ";"],
+	["keyword", "private"], ["punctuation", ";"],
+	["keyword", "protected"], ["punctuation", ";"],
+	["keyword", "public"], ["punctuation", ";"],
+	["keyword", "return"], ["punctuation", ";"],
+	["keyword", "super"], ["punctuation", ";"],
+	["keyword", "switch"], ["punctuation", ";"],
+	["keyword", "this"], ["punctuation", ";"],
+	["keyword", "throw"], ["punctuation", ";"],
+	["keyword", "try"], ["punctuation", ";"],
+	["keyword", "typeof"], ["punctuation", ";"],
+	["keyword", "use"], ["punctuation", ";"],
+	["keyword", "var"], ["punctuation", ";"],
+	["keyword", "void"], ["punctuation", ";"],
+	["keyword", "while"], ["punctuation", ";"],
+	["keyword", "with"], ["punctuation", ";"],
+	["keyword", "dynamic"], ["punctuation", ";"],
+	["keyword", "each"], ["punctuation", ";"],
+	["keyword", "final"], ["punctuation", ";"],
+	["keyword", "get"], ["punctuation", ";"],
+	["keyword", "include"], ["punctuation", ";"],
+	["keyword", "namespace"], ["punctuation", ";"],
+	["keyword", "native"], ["punctuation", ";"],
+	["keyword", "override"], ["punctuation", ";"],
+	["keyword", "set"], ["punctuation", ";"],
+	["keyword", "static"], ["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/actionscript/operator_feature.test b/tests/languages/actionscript/operator_feature.test
new file mode 100644
index 0000000000..14c007c75b
--- /dev/null
+++ b/tests/languages/actionscript/operator_feature.test
@@ -0,0 +1,29 @@
++ - * / % ^
++= -= *= /= %= ^=
+& && | ||
+&= &&= |= ||=
+< << > >> >>>
+<= <<= >= >>= >>>=
+! != = ==
+!== ===
+~ ? @
+++ --
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "-"], ["operator", "*"], ["operator", "/"], ["operator", "%"], ["operator", "^"],
+	["operator", "+="], ["operator", "-="], ["operator", "*="], ["operator", "/="], ["operator", "%="], ["operator", "^="],
+	["operator", "&"], ["operator", "&&"], ["operator", "|"], ["operator", "||"],
+	["operator", "&="], ["operator", "&&="], ["operator", "|="], ["operator", "||="],
+	["operator", "<"], ["operator", "<<"], ["operator", ">"], ["operator", ">>"], ["operator", ">>>"],
+	["operator", "<="], ["operator", "<<="], ["operator", ">="], ["operator", ">>="], ["operator", ">>>="],
+	["operator", "!"], ["operator", "!="], ["operator", "="], ["operator", "=="],
+	["operator", "!=="], ["operator", "==="],
+	["operator", "~"], ["operator", "?"], ["operator", "@"],
+	["operator", "++"], ["operator", "--"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/markup+actionscript/xml_feature.test b/tests/languages/markup+actionscript/xml_feature.test
new file mode 100644
index 0000000000..8686652429
--- /dev/null
+++ b/tests/languages/markup+actionscript/xml_feature.test
@@ -0,0 +1,64 @@
+var employees:XML =
+	<employees>
+		<employee ssn="123-123-1234"></employee>
+	</employees>;
+
+----------------------------------------------------
+
+[
+	["keyword", "var"],
+	" employees",
+	["punctuation", ":"],
+	"XML ",
+	["operator", "="],
+	["xml", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"employees"
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+	["xml", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"employee"
+			]],
+			["attr-name", [
+				"ssn"
+			]],
+			["attr-value", [
+				["punctuation", "="],
+				["punctuation", "\""],
+				"123-123-1234",
+				["punctuation", "\""]
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+	["xml", [
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"employee"
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+	["xml", [
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"employees"
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for XML variables in ActionScript.
\ No newline at end of file

From eb0307e6ccc141869c2fa4668f94ba1d2fa0b12e Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:25:40 +0200
Subject: [PATCH 162/310] Add tests for Apache Configuration

---
 .../languages/apacheconf/comment_feature.test |   15 +
 .../apacheconf/directive-block_feature.test   |  469 +++++++
 .../apacheconf/directive-flags_feature.test   |   13 +
 .../apacheconf/directive-inline_feature.test  | 1163 +++++++++++++++++
 tests/languages/apacheconf/regex_feature.test |   15 +
 .../languages/apacheconf/string_feature.test  |   24 +
 tests/languages/apacheconf/test2.test         |   16 -
 .../apacheconf/variable_feature.test          |   15 +
 8 files changed, 1714 insertions(+), 16 deletions(-)
 create mode 100644 tests/languages/apacheconf/comment_feature.test
 create mode 100644 tests/languages/apacheconf/directive-block_feature.test
 create mode 100644 tests/languages/apacheconf/directive-flags_feature.test
 create mode 100644 tests/languages/apacheconf/directive-inline_feature.test
 create mode 100644 tests/languages/apacheconf/regex_feature.test
 create mode 100644 tests/languages/apacheconf/string_feature.test
 delete mode 100644 tests/languages/apacheconf/test2.test
 create mode 100644 tests/languages/apacheconf/variable_feature.test

diff --git a/tests/languages/apacheconf/comment_feature.test b/tests/languages/apacheconf/comment_feature.test
new file mode 100644
index 0000000000..bde22880ad
--- /dev/null
+++ b/tests/languages/apacheconf/comment_feature.test
@@ -0,0 +1,15 @@
+#foo
+# bar
+# Redirect 301 /2006/oldfile.html http://subdomain.domain.tld/newfile.html
+
+----------------------------------------------------
+
+[
+	["comment", "#foo"],
+	["comment", "# bar"],
+	["comment", "# Redirect 301 /2006/oldfile.html http://subdomain.domain.tld/newfile.html"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/apacheconf/directive-block_feature.test b/tests/languages/apacheconf/directive-block_feature.test
new file mode 100644
index 0000000000..1af6addd42
--- /dev/null
+++ b/tests/languages/apacheconf/directive-block_feature.test
@@ -0,0 +1,469 @@
+<AuthnProviderAlias file file2>
+</AuthnProviderAlias>
+<AuthzProviderAlias ldap-group ldap-group-alias1 "cn=my-group,o=ctx">
+</AuthzProviderAlias>
+<Directory "/webpages/secure">
+</Directory>
+<DirectoryMatch "^/www/(.+/)?[0-9]{3}">
+</DirectoryMatch>
+<Else>
+</Else>
+<ElseIf "-R '10.0.0.0/8'">
+</ElseIf>
+<Files ~ "\.(gif|jpe?g|png)$">
+</Files>
+<FilesMatch ".+\.(gif|jpe?g|png)$">
+</FilesMatch>
+<If "-z req('Host')">
+</If>
+<IfDefine !MemCache>
+</IfDefine>
+<IfModule mod_rewrite.c>
+</IfModule>
+<IfVersion 2.1.0>
+</IfVersion>
+<Limit POST PUT DELETE>
+</Limit>
+<LimitExcept POST GET>
+</LimitExcept>
+<Location /private1>
+</Location>
+<LocationMatch "/(extra|special)/data">
+</LocationMatch>
+<Macro LocalAccessPolicy>
+</Macro>
+<Proxy "*">
+</Proxy>
+<RequireAll>
+</RequireAll>
+<RequireAny>
+</RequireAny>
+<RequireNone>
+</RequireNone>
+<VirtualHost [2001:db8::a00:20ff:fea7:ccea]:80>
+</VirtualHost>
+
+----------------------------------------------------
+
+[
+	["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"AuthnProviderAlias"
+		]],
+		["directive-block-parameter", [
+			" file file2"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+		["directive-block", [
+			["punctuation", "</"],
+			"AuthnProviderAlias"
+		]],
+		["punctuation", ">"]
+	]],
+
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "<"],
+            "AuthzProviderAlias"
+        ]],
+        ["directive-block-parameter", [
+            " ldap-group ldap-group-alias1 ",
+            ["string", [
+                "\"cn=my-group,o=ctx\""
+            ]]
+        ]],
+        ["punctuation", ">"]
+    ]],
+    ["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "AuthzProviderAlias"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"Directory"
+		]],
+		["directive-block-parameter", [
+			["string", [
+				"\"/webpages/secure\""
+			]]
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "Directory"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"DirectoryMatch"
+		]],
+		["directive-block-parameter", [
+			["string", [
+				"\"^/www/(.+/)?[0-9]{3}\""
+			]]
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "DirectoryMatch"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"Else"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "Else"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"ElseIf"
+		]],
+		["directive-block-parameter", [
+			["string", [
+				"\"-R '10.0.0.0/8'\""
+			]]
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "ElseIf"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"Files"
+		]],
+		["directive-block-parameter", [
+			" ~ ",
+			["string", [
+				"\"\\.(gif|jpe?g|png)$\""
+			]]
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "Files"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"FilesMatch"
+		]],
+		["directive-block-parameter", [
+			["string", [
+				"\".+\\.(gif|jpe?g|png)$\""
+			]]
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "FilesMatch"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"If"
+		]],
+		["directive-block-parameter", [
+			["string", [
+				"\"-z req('Host')\""
+			]]
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "If"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"IfDefine"
+		]],
+		["directive-block-parameter", [
+			" !MemCache"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "IfDefine"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"IfModule"
+		]],
+		["directive-block-parameter", [
+			" mod_rewrite.c"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "IfModule"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"IfVersion"
+		]],
+		["directive-block-parameter", [
+			" 2.1.0"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "IfVersion"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"Limit"
+		]],
+		["directive-block-parameter", [
+			" POST PUT DELETE"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "Limit"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"LimitExcept"
+		]],
+		["directive-block-parameter", [
+			" POST GET"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "LimitExcept"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"Location"
+		]],
+		["directive-block-parameter", [
+			" /private1"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "Location"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"LocationMatch"
+		]],
+		["directive-block-parameter", [
+			["string", [
+				"\"/(extra|special)/data\""
+			]]
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "LocationMatch"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"Macro"
+		]],
+		["directive-block-parameter", [
+			" LocalAccessPolicy"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "Macro"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"Proxy"
+		]],
+		["directive-block-parameter", [
+			["string", [
+				"\"*\""
+			]]
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "Proxy"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"RequireAll"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "RequireAll"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"RequireAny"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "RequireAny"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"RequireNone"
+		]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "RequireNone"
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive-block", [
+		["directive-block", [
+			["punctuation", "<"],
+			"VirtualHost"
+		]],
+		["directive-block-parameter", [
+			" [2001",
+            ["punctuation", ":"],
+            "db8",
+            ["punctuation", ":"],
+            ["punctuation", ":"],
+            "a00",
+            ["punctuation", ":"],
+            "20ff",
+            ["punctuation", ":"],
+            "fea7",
+            ["punctuation", ":"],
+            "ccea]",
+            ["punctuation", ":"],
+            "80"
+        ]],
+		["punctuation", ">"]
+	]],
+	["directive-block", [
+        ["directive-block", [
+            ["punctuation", "</"],
+            "VirtualHost"
+        ]],
+        ["punctuation", ">"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for directive blocks.
\ No newline at end of file
diff --git a/tests/languages/apacheconf/directive-flags_feature.test b/tests/languages/apacheconf/directive-flags_feature.test
new file mode 100644
index 0000000000..0bb206ecba
--- /dev/null
+++ b/tests/languages/apacheconf/directive-flags_feature.test
@@ -0,0 +1,13 @@
+[OR]
+[L,QSA]
+
+----------------------------------------------------
+
+[
+	["directive-flags", "[OR]"],
+	["directive-flags", "[L,QSA]"]
+]
+
+----------------------------------------------------
+
+Checks for directive flags.
\ No newline at end of file
diff --git a/tests/languages/apacheconf/directive-inline_feature.test b/tests/languages/apacheconf/directive-inline_feature.test
new file mode 100644
index 0000000000..6b4df43b26
--- /dev/null
+++ b/tests/languages/apacheconf/directive-inline_feature.test
@@ -0,0 +1,1163 @@
+AcceptFilter
+AcceptPathInfo
+AccessFileName
+Action
+AddAlt
+AddAltByEncoding
+AddAltByType
+AddCharset
+AddDefaultCharset
+AddDescription
+AddEncoding
+AddHandler
+AddIcon
+AddIconByEncoding
+AddIconByType
+AddInputFilter
+AddLanguage
+AddModuleInfo
+AddOutputFilter
+AddOutputFilterByType
+AddType
+Alias
+AliasMatch
+Allow
+AllowCONNECT
+AllowEncodedSlashes
+AllowMethods
+AllowOverride
+AllowOverrideList
+Anonymous
+Anonymous_LogEmail
+Anonymous_MustGiveEmail
+Anonymous_NoUserID
+Anonymous_VerifyEmail
+AsyncRequestWorkerFactor
+AuthBasicAuthoritative
+AuthBasicFake
+AuthBasicProvider
+AuthBasicUseDigestAlgorithm
+AuthDBDUserPWQuery
+AuthDBDUserRealmQuery
+AuthDBMGroupFile
+AuthDBMType
+AuthDBMUserFile
+AuthDigestAlgorithm
+AuthDigestDomain
+AuthDigestNonceLifetime
+AuthDigestProvider
+AuthDigestQop
+AuthDigestShmemSize
+AuthFormAuthoritative
+AuthFormBody
+AuthFormDisableNoStore
+AuthFormFakeBasicAuth
+AuthFormLocation
+AuthFormLoginRequiredLocation
+AuthFormLoginSuccessLocation
+AuthFormLogoutLocation
+AuthFormMethod
+AuthFormMimetype
+AuthFormPassword
+AuthFormProvider
+AuthFormSitePassphrase
+AuthFormSize
+AuthFormUsername
+AuthGroupFile
+AuthLDAPAuthorizePrefix
+AuthLDAPBindAuthoritative
+AuthLDAPBindDN
+AuthLDAPBindPassword
+AuthLDAPCharsetConfig
+AuthLDAPCompareAsUser
+AuthLDAPCompareDNOnServer
+AuthLDAPDereferenceAliases
+AuthLDAPGroupAttribute
+AuthLDAPGroupAttributeIsDN
+AuthLDAPInitialBindAsUser
+AuthLDAPInitialBindPattern
+AuthLDAPMaxSubGroupDepth
+AuthLDAPRemoteUserAttribute
+AuthLDAPRemoteUserIsDN
+AuthLDAPSearchAsUser
+AuthLDAPSubGroupAttribute
+AuthLDAPSubGroupClass
+AuthLDAPUrl
+AuthMerging
+AuthName
+AuthnCacheContext
+AuthnCacheEnable
+AuthnCacheProvideFor
+AuthnCacheSOCache
+AuthnCacheTimeout
+AuthnzFcgiCheckAuthnProvider
+AuthnzFcgiDefineProvider
+AuthType
+AuthUserFile
+AuthzDBDLoginToReferer
+AuthzDBDQuery
+AuthzDBDRedirectQuery
+AuthzDBMType
+AuthzSendForbiddenOnFailure
+BalancerGrowth
+BalancerInherit
+BalancerMember
+BalancerPersist
+BrowserMatch
+BrowserMatchNoCase
+BufferedLogs
+BufferSize
+CacheDefaultExpire
+CacheDetailHeader
+CacheDirLength
+CacheDirLevels
+CacheDisable
+CacheEnable
+CacheFile
+CacheHeader
+CacheIgnoreCacheControl
+CacheIgnoreHeaders
+CacheIgnoreNoLastMod
+CacheIgnoreQueryString
+CacheIgnoreURLSessionIdentifiers
+CacheKeyBaseURL
+CacheLastModifiedFactor
+CacheLock
+CacheLockMaxAge
+CacheLockPath
+CacheMaxExpire
+CacheMaxFileSize
+CacheMinExpire
+CacheMinFileSize
+CacheNegotiatedDocs
+CacheQuickHandler
+CacheReadSize
+CacheReadTime
+CacheRoot
+CacheSocache
+CacheSocacheMaxSize
+CacheSocacheMaxTime
+CacheSocacheMinTime
+CacheSocacheReadSize
+CacheSocacheReadTime
+CacheStaleOnError
+CacheStoreExpired
+CacheStoreNoStore
+CacheStorePrivate
+CGIDScriptTimeout
+CGIMapExtension
+CharsetDefault
+CharsetOptions
+CharsetSourceEnc
+CheckCaseOnly
+CheckSpelling
+ChrootDir
+ContentDigest
+CookieDomain
+CookieExpires
+CookieName
+CookieStyle
+CookieTracking
+CoreDumpDirectory
+CustomLog
+Dav
+DavDepthInfinity
+DavGenericLockDB
+DavLockDB
+DavMinTimeout
+DBDExptime
+DBDInitSQL
+DBDKeep
+DBDMax
+DBDMin
+DBDParams
+DBDPersist
+DBDPrepareSQL
+DBDriver
+DefaultIcon
+DefaultLanguage
+DefaultRuntimeDir
+DefaultType
+Define
+DeflateBufferSize
+DeflateCompressionLevel
+DeflateFilterNote
+DeflateInflateLimitRequestBody
+DeflateInflateRatioBurst
+DeflateInflateRatioLimit
+DeflateMemLevel
+DeflateWindowSize
+Deny
+DirectoryCheckHandler
+DirectoryIndex
+DirectoryIndexRedirect
+DirectorySlash
+DocumentRoot
+DTracePrivileges
+DumpIOInput
+DumpIOOutput
+EnableExceptionHook
+EnableMMAP
+EnableSendfile
+Error
+ErrorDocument
+ErrorLog
+ErrorLogFormat
+Example
+ExpiresActive
+ExpiresByType
+ExpiresDefault
+ExtendedStatus
+ExtFilterDefine
+ExtFilterOptions
+FallbackResource
+FileETag
+FilterChain
+FilterDeclare
+FilterProtocol
+FilterProvider
+FilterTrace
+ForceLanguagePriority
+ForceType
+ForensicLog
+GprofDir
+GracefulShutdownTimeout
+Group
+Header
+HeaderName
+HeartbeatAddress
+HeartbeatListen
+HeartbeatMaxServers
+HeartbeatStorage
+HeartbeatStorage
+HostnameLookups
+IdentityCheck
+IdentityCheckTimeout
+ImapBase
+ImapDefault
+ImapMenu
+Include
+IncludeOptional
+IndexHeadInsert
+IndexIgnore
+IndexIgnoreReset
+IndexOptions
+IndexOrderDefault
+IndexStyleSheet
+InputSed
+ISAPIAppendLogToErrors
+ISAPIAppendLogToQuery
+ISAPICacheFile
+ISAPIFakeAsync
+ISAPILogNotSupported
+ISAPIReadAheadBuffer
+KeepAlive
+KeepAliveTimeout
+KeptBodySize
+LanguagePriority
+LDAPCacheEntries
+LDAPCacheTTL
+LDAPConnectionPoolTTL
+LDAPConnectionTimeout
+LDAPLibraryDebug
+LDAPOpCacheEntries
+LDAPOpCacheTTL
+LDAPReferralHopLimit
+LDAPReferrals
+LDAPRetries
+LDAPRetryDelay
+LDAPSharedCacheFile
+LDAPSharedCacheSize
+LDAPTimeout
+LDAPTrustedClientCert
+LDAPTrustedGlobalCert
+LDAPTrustedMode
+LDAPVerifyServerCert
+LimitInternalRecursion
+LimitRequestBody
+LimitRequestFields
+LimitRequestFieldSize
+LimitRequestLine
+LimitXMLRequestBody
+Listen
+ListenBackLog
+LoadFile
+LoadModule
+LogFormat
+LogLevel
+LogMessage
+LuaAuthzProvider
+LuaCodeCache
+LuaHookAccessChecker
+LuaHookAuthChecker
+LuaHookCheckUserID
+LuaHookFixups
+LuaHookInsertFilter
+LuaHookLog
+LuaHookMapToStorage
+LuaHookTranslateName
+LuaHookTypeChecker
+LuaInherit
+LuaInputFilter
+LuaMapHandler
+LuaOutputFilter
+LuaPackageCPath
+LuaPackagePath
+LuaQuickHandler
+LuaRoot
+LuaScope
+MaxConnectionsPerChild
+MaxKeepAliveRequests
+MaxMemFree
+MaxRangeOverlaps
+MaxRangeReversals
+MaxRanges
+MaxRequestWorkers
+MaxSpareServers
+MaxSpareThreads
+MaxThreads
+MergeTrailers
+MetaDir
+MetaFiles
+MetaSuffix
+MimeMagicFile
+MinSpareServers
+MinSpareThreads
+MMapFile
+ModemStandard
+ModMimeUsePathInfo
+MultiviewsMatch
+Mutex
+NameVirtualHost
+NoProxy
+NWSSLTrustedCerts
+NWSSLUpgradeable
+Options
+Order
+OutputSed
+PassEnv
+PidFile
+PrivilegesMode
+Protocol
+ProtocolEcho
+ProxyAddHeaders
+ProxyBadHeader
+ProxyBlock
+ProxyDomain
+ProxyErrorOverride
+ProxyExpressDBMFile
+ProxyExpressDBMType
+ProxyExpressEnable
+ProxyFtpDirCharset
+ProxyFtpEscapeWildcards
+ProxyFtpListOnWildcard
+ProxyHTMLBufSize
+ProxyHTMLCharsetOut
+ProxyHTMLDocType
+ProxyHTMLEnable
+ProxyHTMLEvents
+ProxyHTMLExtended
+ProxyHTMLFixups
+ProxyHTMLInterp
+ProxyHTMLLinks
+ProxyHTMLMeta
+ProxyHTMLStripComments
+ProxyHTMLURLMap
+ProxyIOBufferSize
+ProxyMaxForwards
+ProxyPass
+ProxyPassInherit
+ProxyPassInterpolateEnv
+ProxyPassMatch
+ProxyPassReverse
+ProxyPassReverseCookieDomain
+ProxyPassReverseCookiePath
+ProxyPreserveHost
+ProxyReceiveBufferSize
+ProxyRemote
+ProxyRemoteMatch
+ProxyRequests
+ProxySCGIInternalRedirect
+ProxySCGISendfile
+ProxySet
+ProxySourceAddress
+ProxyStatus
+ProxyTimeout
+ProxyVia
+ReadmeName
+ReceiveBufferSize
+Redirect
+RedirectMatch
+RedirectPermanent
+RedirectTemp
+ReflectorHeader
+RemoteIPHeader
+RemoteIPInternalProxy
+RemoteIPInternalProxyList
+RemoteIPProxiesHeader
+RemoteIPTrustedProxy
+RemoteIPTrustedProxyList
+RemoveCharset
+RemoveEncoding
+RemoveHandler
+RemoveInputFilter
+RemoveLanguage
+RemoveOutputFilter
+RemoveType
+RequestHeader
+RequestReadTimeout
+Require
+RewriteBase
+RewriteCond
+RewriteEngine
+RewriteMap
+RewriteOptions
+RewriteRule
+RLimitCPU
+RLimitMEM
+RLimitNPROC
+Satisfy
+ScoreBoardFile
+Script
+ScriptAlias
+ScriptAliasMatch
+ScriptInterpreterSource
+ScriptLog
+ScriptLogBuffer
+ScriptLogLength
+ScriptSock
+SecureListen
+SeeRequestTail
+SendBufferSize
+ServerAdmin
+ServerAlias
+ServerLimit
+ServerName
+ServerPath
+ServerRoot
+ServerSignature
+ServerTokens
+Session
+SessionCookieName
+SessionCookieName2
+SessionCookieRemove
+SessionCryptoCipher
+SessionCryptoDriver
+SessionCryptoPassphrase
+SessionCryptoPassphraseFile
+SessionDBDCookieName
+SessionDBDCookieName2
+SessionDBDCookieRemove
+SessionDBDDeleteLabel
+SessionDBDInsertLabel
+SessionDBDPerUser
+SessionDBDSelectLabel
+SessionDBDUpdateLabel
+SessionEnv
+SessionExclude
+SessionHeader
+SessionInclude
+SessionMaxAge
+SetEnv
+SetEnvIf
+SetEnvIfExpr
+SetEnvIfNoCase
+SetHandler
+SetInputFilter
+SetOutputFilter
+SSIEndTag
+SSIErrorMsg
+SSIETag
+SSILastModified
+SSILegacyExprParser
+SSIStartTag
+SSITimeFormat
+SSIUndefinedEcho
+SSLCACertificateFile
+SSLCACertificatePath
+SSLCADNRequestFile
+SSLCADNRequestPath
+SSLCARevocationCheck
+SSLCARevocationFile
+SSLCARevocationPath
+SSLCertificateChainFile
+SSLCertificateFile
+SSLCertificateKeyFile
+SSLCipherSuite
+SSLCompression
+SSLCryptoDevice
+SSLEngine
+SSLFIPS
+SSLHonorCipherOrder
+SSLInsecureRenegotiation
+SSLOCSPDefaultResponder
+SSLOCSPEnable
+SSLOCSPOverrideResponder
+SSLOCSPResponderTimeout
+SSLOCSPResponseMaxAge
+SSLOCSPResponseTimeSkew
+SSLOCSPUseRequestNonce
+SSLOpenSSLConfCmd
+SSLOptions
+SSLPassPhraseDialog
+SSLProtocol
+SSLProxyCACertificateFile
+SSLProxyCACertificatePath
+SSLProxyCARevocationCheck
+SSLProxyCARevocationFile
+SSLProxyCARevocationPath
+SSLProxyCheckPeerCN
+SSLProxyCheckPeerExpire
+SSLProxyCheckPeerName
+SSLProxyCipherSuite
+SSLProxyEngine
+SSLProxyMachineCertificateChainFile
+SSLProxyMachineCertificateFile
+SSLProxyMachineCertificatePath
+SSLProxyProtocol
+SSLProxyVerify
+SSLProxyVerifyDepth
+SSLRandomSeed
+SSLRenegBufferSize
+SSLRequire
+SSLRequireSSL
+SSLSessionCache
+SSLSessionCacheTimeout
+SSLSessionTicketKeyFile
+SSLSRPUnknownUserSeed
+SSLSRPVerifierFile
+SSLStaplingCache
+SSLStaplingErrorCacheTimeout
+SSLStaplingFakeTryLater
+SSLStaplingForceURL
+SSLStaplingResponderTimeout
+SSLStaplingResponseMaxAge
+SSLStaplingResponseTimeSkew
+SSLStaplingReturnResponderErrors
+SSLStaplingStandardCacheTimeout
+SSLStrictSNIVHostCheck
+SSLUserName
+SSLUseStapling
+SSLVerifyClient
+SSLVerifyDepth
+StartServers
+StartThreads
+Substitute
+Suexec
+SuexecUserGroup
+ThreadLimit
+ThreadsPerChild
+ThreadStackSize
+TimeOut
+TraceEnable
+TransferLog
+TypesConfig
+UnDefine
+UndefMacro
+UnsetEnv
+Use
+UseCanonicalName
+UseCanonicalPhysicalPort
+User
+UserDir
+VHostCGIMode
+VHostCGIPrivs
+VHostGroup
+VHostPrivs
+VHostSecure
+VHostUser
+VirtualDocumentRoot
+VirtualDocumentRootIP
+VirtualScriptAlias
+VirtualScriptAliasIP
+WatchdogInterval
+XBitHack
+xml2EncAlias
+xml2EncDefault
+xml2StartParse
+
+----------------------------------------------------
+
+[
+	["directive-inline", "AcceptFilter"],
+	["directive-inline", "AcceptPathInfo"],
+	["directive-inline", "AccessFileName"],
+	["directive-inline", "Action"],
+	["directive-inline", "AddAlt"],
+	["directive-inline", "AddAltByEncoding"],
+	["directive-inline", "AddAltByType"],
+	["directive-inline", "AddCharset"],
+	["directive-inline", "AddDefaultCharset"],
+	["directive-inline", "AddDescription"],
+	["directive-inline", "AddEncoding"],
+	["directive-inline", "AddHandler"],
+	["directive-inline", "AddIcon"],
+	["directive-inline", "AddIconByEncoding"],
+	["directive-inline", "AddIconByType"],
+	["directive-inline", "AddInputFilter"],
+	["directive-inline", "AddLanguage"],
+	["directive-inline", "AddModuleInfo"],
+	["directive-inline", "AddOutputFilter"],
+	["directive-inline", "AddOutputFilterByType"],
+	["directive-inline", "AddType"],
+	["directive-inline", "Alias"],
+	["directive-inline", "AliasMatch"],
+	["directive-inline", "Allow"],
+	["directive-inline", "AllowCONNECT"],
+	["directive-inline", "AllowEncodedSlashes"],
+	["directive-inline", "AllowMethods"],
+	["directive-inline", "AllowOverride"],
+	["directive-inline", "AllowOverrideList"],
+	["directive-inline", "Anonymous"],
+	["directive-inline", "Anonymous_LogEmail"],
+	["directive-inline", "Anonymous_MustGiveEmail"],
+	["directive-inline", "Anonymous_NoUserID"],
+	["directive-inline", "Anonymous_VerifyEmail"],
+	["directive-inline", "AsyncRequestWorkerFactor"],
+	["directive-inline", "AuthBasicAuthoritative"],
+	["directive-inline", "AuthBasicFake"],
+	["directive-inline", "AuthBasicProvider"],
+	["directive-inline", "AuthBasicUseDigestAlgorithm"],
+	["directive-inline", "AuthDBDUserPWQuery"],
+	["directive-inline", "AuthDBDUserRealmQuery"],
+	["directive-inline", "AuthDBMGroupFile"],
+	["directive-inline", "AuthDBMType"],
+	["directive-inline", "AuthDBMUserFile"],
+	["directive-inline", "AuthDigestAlgorithm"],
+	["directive-inline", "AuthDigestDomain"],
+	["directive-inline", "AuthDigestNonceLifetime"],
+	["directive-inline", "AuthDigestProvider"],
+	["directive-inline", "AuthDigestQop"],
+	["directive-inline", "AuthDigestShmemSize"],
+	["directive-inline", "AuthFormAuthoritative"],
+	["directive-inline", "AuthFormBody"],
+	["directive-inline", "AuthFormDisableNoStore"],
+	["directive-inline", "AuthFormFakeBasicAuth"],
+	["directive-inline", "AuthFormLocation"],
+	["directive-inline", "AuthFormLoginRequiredLocation"],
+	["directive-inline", "AuthFormLoginSuccessLocation"],
+	["directive-inline", "AuthFormLogoutLocation"],
+	["directive-inline", "AuthFormMethod"],
+	["directive-inline", "AuthFormMimetype"],
+	["directive-inline", "AuthFormPassword"],
+	["directive-inline", "AuthFormProvider"],
+	["directive-inline", "AuthFormSitePassphrase"],
+	["directive-inline", "AuthFormSize"],
+	["directive-inline", "AuthFormUsername"],
+	["directive-inline", "AuthGroupFile"],
+	["directive-inline", "AuthLDAPAuthorizePrefix"],
+	["directive-inline", "AuthLDAPBindAuthoritative"],
+	["directive-inline", "AuthLDAPBindDN"],
+	["directive-inline", "AuthLDAPBindPassword"],
+	["directive-inline", "AuthLDAPCharsetConfig"],
+	["directive-inline", "AuthLDAPCompareAsUser"],
+	["directive-inline", "AuthLDAPCompareDNOnServer"],
+	["directive-inline", "AuthLDAPDereferenceAliases"],
+	["directive-inline", "AuthLDAPGroupAttribute"],
+	["directive-inline", "AuthLDAPGroupAttributeIsDN"],
+	["directive-inline", "AuthLDAPInitialBindAsUser"],
+	["directive-inline", "AuthLDAPInitialBindPattern"],
+	["directive-inline", "AuthLDAPMaxSubGroupDepth"],
+	["directive-inline", "AuthLDAPRemoteUserAttribute"],
+	["directive-inline", "AuthLDAPRemoteUserIsDN"],
+	["directive-inline", "AuthLDAPSearchAsUser"],
+	["directive-inline", "AuthLDAPSubGroupAttribute"],
+	["directive-inline", "AuthLDAPSubGroupClass"],
+	["directive-inline", "AuthLDAPUrl"],
+	["directive-inline", "AuthMerging"],
+	["directive-inline", "AuthName"],
+	["directive-inline", "AuthnCacheContext"],
+	["directive-inline", "AuthnCacheEnable"],
+	["directive-inline", "AuthnCacheProvideFor"],
+	["directive-inline", "AuthnCacheSOCache"],
+	["directive-inline", "AuthnCacheTimeout"],
+	["directive-inline", "AuthnzFcgiCheckAuthnProvider"],
+	["directive-inline", "AuthnzFcgiDefineProvider"],
+	["directive-inline", "AuthType"],
+	["directive-inline", "AuthUserFile"],
+	["directive-inline", "AuthzDBDLoginToReferer"],
+	["directive-inline", "AuthzDBDQuery"],
+	["directive-inline", "AuthzDBDRedirectQuery"],
+	["directive-inline", "AuthzDBMType"],
+	["directive-inline", "AuthzSendForbiddenOnFailure"],
+	["directive-inline", "BalancerGrowth"],
+	["directive-inline", "BalancerInherit"],
+	["directive-inline", "BalancerMember"],
+	["directive-inline", "BalancerPersist"],
+	["directive-inline", "BrowserMatch"],
+	["directive-inline", "BrowserMatchNoCase"],
+	["directive-inline", "BufferedLogs"],
+	["directive-inline", "BufferSize"],
+	["directive-inline", "CacheDefaultExpire"],
+	["directive-inline", "CacheDetailHeader"],
+	["directive-inline", "CacheDirLength"],
+	["directive-inline", "CacheDirLevels"],
+	["directive-inline", "CacheDisable"],
+	["directive-inline", "CacheEnable"],
+	["directive-inline", "CacheFile"],
+	["directive-inline", "CacheHeader"],
+	["directive-inline", "CacheIgnoreCacheControl"],
+	["directive-inline", "CacheIgnoreHeaders"],
+	["directive-inline", "CacheIgnoreNoLastMod"],
+	["directive-inline", "CacheIgnoreQueryString"],
+	["directive-inline", "CacheIgnoreURLSessionIdentifiers"],
+	["directive-inline", "CacheKeyBaseURL"],
+	["directive-inline", "CacheLastModifiedFactor"],
+	["directive-inline", "CacheLock"],
+	["directive-inline", "CacheLockMaxAge"],
+	["directive-inline", "CacheLockPath"],
+	["directive-inline", "CacheMaxExpire"],
+	["directive-inline", "CacheMaxFileSize"],
+	["directive-inline", "CacheMinExpire"],
+	["directive-inline", "CacheMinFileSize"],
+	["directive-inline", "CacheNegotiatedDocs"],
+	["directive-inline", "CacheQuickHandler"],
+	["directive-inline", "CacheReadSize"],
+	["directive-inline", "CacheReadTime"],
+	["directive-inline", "CacheRoot"],
+	["directive-inline", "CacheSocache"],
+	["directive-inline", "CacheSocacheMaxSize"],
+	["directive-inline", "CacheSocacheMaxTime"],
+	["directive-inline", "CacheSocacheMinTime"],
+	["directive-inline", "CacheSocacheReadSize"],
+	["directive-inline", "CacheSocacheReadTime"],
+	["directive-inline", "CacheStaleOnError"],
+	["directive-inline", "CacheStoreExpired"],
+	["directive-inline", "CacheStoreNoStore"],
+	["directive-inline", "CacheStorePrivate"],
+	["directive-inline", "CGIDScriptTimeout"],
+	["directive-inline", "CGIMapExtension"],
+	["directive-inline", "CharsetDefault"],
+	["directive-inline", "CharsetOptions"],
+	["directive-inline", "CharsetSourceEnc"],
+	["directive-inline", "CheckCaseOnly"],
+	["directive-inline", "CheckSpelling"],
+	["directive-inline", "ChrootDir"],
+	["directive-inline", "ContentDigest"],
+	["directive-inline", "CookieDomain"],
+	["directive-inline", "CookieExpires"],
+	["directive-inline", "CookieName"],
+	["directive-inline", "CookieStyle"],
+	["directive-inline", "CookieTracking"],
+	["directive-inline", "CoreDumpDirectory"],
+	["directive-inline", "CustomLog"],
+	["directive-inline", "Dav"],
+	["directive-inline", "DavDepthInfinity"],
+	["directive-inline", "DavGenericLockDB"],
+	["directive-inline", "DavLockDB"],
+	["directive-inline", "DavMinTimeout"],
+	["directive-inline", "DBDExptime"],
+	["directive-inline", "DBDInitSQL"],
+	["directive-inline", "DBDKeep"],
+	["directive-inline", "DBDMax"],
+	["directive-inline", "DBDMin"],
+	["directive-inline", "DBDParams"],
+	["directive-inline", "DBDPersist"],
+	["directive-inline", "DBDPrepareSQL"],
+	["directive-inline", "DBDriver"],
+	["directive-inline", "DefaultIcon"],
+	["directive-inline", "DefaultLanguage"],
+	["directive-inline", "DefaultRuntimeDir"],
+	["directive-inline", "DefaultType"],
+	["directive-inline", "Define"],
+	["directive-inline", "DeflateBufferSize"],
+	["directive-inline", "DeflateCompressionLevel"],
+	["directive-inline", "DeflateFilterNote"],
+	["directive-inline", "DeflateInflateLimitRequestBody"],
+	["directive-inline", "DeflateInflateRatioBurst"],
+	["directive-inline", "DeflateInflateRatioLimit"],
+	["directive-inline", "DeflateMemLevel"],
+	["directive-inline", "DeflateWindowSize"],
+	["directive-inline", "Deny"],
+	["directive-inline", "DirectoryCheckHandler"],
+	["directive-inline", "DirectoryIndex"],
+	["directive-inline", "DirectoryIndexRedirect"],
+	["directive-inline", "DirectorySlash"],
+	["directive-inline", "DocumentRoot"],
+	["directive-inline", "DTracePrivileges"],
+	["directive-inline", "DumpIOInput"],
+	["directive-inline", "DumpIOOutput"],
+	["directive-inline", "EnableExceptionHook"],
+	["directive-inline", "EnableMMAP"],
+	["directive-inline", "EnableSendfile"],
+	["directive-inline", "Error"],
+	["directive-inline", "ErrorDocument"],
+	["directive-inline", "ErrorLog"],
+	["directive-inline", "ErrorLogFormat"],
+	["directive-inline", "Example"],
+	["directive-inline", "ExpiresActive"],
+	["directive-inline", "ExpiresByType"],
+	["directive-inline", "ExpiresDefault"],
+	["directive-inline", "ExtendedStatus"],
+	["directive-inline", "ExtFilterDefine"],
+	["directive-inline", "ExtFilterOptions"],
+	["directive-inline", "FallbackResource"],
+	["directive-inline", "FileETag"],
+	["directive-inline", "FilterChain"],
+	["directive-inline", "FilterDeclare"],
+	["directive-inline", "FilterProtocol"],
+	["directive-inline", "FilterProvider"],
+	["directive-inline", "FilterTrace"],
+	["directive-inline", "ForceLanguagePriority"],
+	["directive-inline", "ForceType"],
+	["directive-inline", "ForensicLog"],
+	["directive-inline", "GprofDir"],
+	["directive-inline", "GracefulShutdownTimeout"],
+	["directive-inline", "Group"],
+	["directive-inline", "Header"],
+	["directive-inline", "HeaderName"],
+	["directive-inline", "HeartbeatAddress"],
+	["directive-inline", "HeartbeatListen"],
+	["directive-inline", "HeartbeatMaxServers"],
+	["directive-inline", "HeartbeatStorage"],
+	["directive-inline", "HeartbeatStorage"],
+	["directive-inline", "HostnameLookups"],
+	["directive-inline", "IdentityCheck"],
+	["directive-inline", "IdentityCheckTimeout"],
+	["directive-inline", "ImapBase"],
+	["directive-inline", "ImapDefault"],
+	["directive-inline", "ImapMenu"],
+	["directive-inline", "Include"],
+	["directive-inline", "IncludeOptional"],
+	["directive-inline", "IndexHeadInsert"],
+	["directive-inline", "IndexIgnore"],
+	["directive-inline", "IndexIgnoreReset"],
+	["directive-inline", "IndexOptions"],
+	["directive-inline", "IndexOrderDefault"],
+	["directive-inline", "IndexStyleSheet"],
+	["directive-inline", "InputSed"],
+	["directive-inline", "ISAPIAppendLogToErrors"],
+	["directive-inline", "ISAPIAppendLogToQuery"],
+	["directive-inline", "ISAPICacheFile"],
+	["directive-inline", "ISAPIFakeAsync"],
+	["directive-inline", "ISAPILogNotSupported"],
+	["directive-inline", "ISAPIReadAheadBuffer"],
+	["directive-inline", "KeepAlive"],
+	["directive-inline", "KeepAliveTimeout"],
+	["directive-inline", "KeptBodySize"],
+	["directive-inline", "LanguagePriority"],
+	["directive-inline", "LDAPCacheEntries"],
+	["directive-inline", "LDAPCacheTTL"],
+	["directive-inline", "LDAPConnectionPoolTTL"],
+	["directive-inline", "LDAPConnectionTimeout"],
+	["directive-inline", "LDAPLibraryDebug"],
+	["directive-inline", "LDAPOpCacheEntries"],
+	["directive-inline", "LDAPOpCacheTTL"],
+	["directive-inline", "LDAPReferralHopLimit"],
+	["directive-inline", "LDAPReferrals"],
+	["directive-inline", "LDAPRetries"],
+	["directive-inline", "LDAPRetryDelay"],
+	["directive-inline", "LDAPSharedCacheFile"],
+	["directive-inline", "LDAPSharedCacheSize"],
+	["directive-inline", "LDAPTimeout"],
+	["directive-inline", "LDAPTrustedClientCert"],
+	["directive-inline", "LDAPTrustedGlobalCert"],
+	["directive-inline", "LDAPTrustedMode"],
+	["directive-inline", "LDAPVerifyServerCert"],
+	["directive-inline", "LimitInternalRecursion"],
+	["directive-inline", "LimitRequestBody"],
+	["directive-inline", "LimitRequestFields"],
+	["directive-inline", "LimitRequestFieldSize"],
+	["directive-inline", "LimitRequestLine"],
+	["directive-inline", "LimitXMLRequestBody"],
+	["directive-inline", "Listen"],
+	["directive-inline", "ListenBackLog"],
+	["directive-inline", "LoadFile"],
+	["directive-inline", "LoadModule"],
+	["directive-inline", "LogFormat"],
+	["directive-inline", "LogLevel"],
+	["directive-inline", "LogMessage"],
+	["directive-inline", "LuaAuthzProvider"],
+	["directive-inline", "LuaCodeCache"],
+	["directive-inline", "LuaHookAccessChecker"],
+	["directive-inline", "LuaHookAuthChecker"],
+	["directive-inline", "LuaHookCheckUserID"],
+	["directive-inline", "LuaHookFixups"],
+	["directive-inline", "LuaHookInsertFilter"],
+	["directive-inline", "LuaHookLog"],
+	["directive-inline", "LuaHookMapToStorage"],
+	["directive-inline", "LuaHookTranslateName"],
+	["directive-inline", "LuaHookTypeChecker"],
+	["directive-inline", "LuaInherit"],
+	["directive-inline", "LuaInputFilter"],
+	["directive-inline", "LuaMapHandler"],
+	["directive-inline", "LuaOutputFilter"],
+	["directive-inline", "LuaPackageCPath"],
+	["directive-inline", "LuaPackagePath"],
+	["directive-inline", "LuaQuickHandler"],
+	["directive-inline", "LuaRoot"],
+	["directive-inline", "LuaScope"],
+	["directive-inline", "MaxConnectionsPerChild"],
+	["directive-inline", "MaxKeepAliveRequests"],
+	["directive-inline", "MaxMemFree"],
+	["directive-inline", "MaxRangeOverlaps"],
+	["directive-inline", "MaxRangeReversals"],
+	["directive-inline", "MaxRanges"],
+	["directive-inline", "MaxRequestWorkers"],
+	["directive-inline", "MaxSpareServers"],
+	["directive-inline", "MaxSpareThreads"],
+	["directive-inline", "MaxThreads"],
+	["directive-inline", "MergeTrailers"],
+	["directive-inline", "MetaDir"],
+	["directive-inline", "MetaFiles"],
+	["directive-inline", "MetaSuffix"],
+	["directive-inline", "MimeMagicFile"],
+	["directive-inline", "MinSpareServers"],
+	["directive-inline", "MinSpareThreads"],
+	["directive-inline", "MMapFile"],
+	["directive-inline", "ModemStandard"],
+	["directive-inline", "ModMimeUsePathInfo"],
+	["directive-inline", "MultiviewsMatch"],
+	["directive-inline", "Mutex"],
+	["directive-inline", "NameVirtualHost"],
+	["directive-inline", "NoProxy"],
+	["directive-inline", "NWSSLTrustedCerts"],
+	["directive-inline", "NWSSLUpgradeable"],
+	["directive-inline", "Options"],
+	["directive-inline", "Order"],
+	["directive-inline", "OutputSed"],
+	["directive-inline", "PassEnv"],
+	["directive-inline", "PidFile"],
+	["directive-inline", "PrivilegesMode"],
+	["directive-inline", "Protocol"],
+	["directive-inline", "ProtocolEcho"],
+	["directive-inline", "ProxyAddHeaders"],
+	["directive-inline", "ProxyBadHeader"],
+	["directive-inline", "ProxyBlock"],
+	["directive-inline", "ProxyDomain"],
+	["directive-inline", "ProxyErrorOverride"],
+	["directive-inline", "ProxyExpressDBMFile"],
+	["directive-inline", "ProxyExpressDBMType"],
+	["directive-inline", "ProxyExpressEnable"],
+	["directive-inline", "ProxyFtpDirCharset"],
+	["directive-inline", "ProxyFtpEscapeWildcards"],
+	["directive-inline", "ProxyFtpListOnWildcard"],
+	["directive-inline", "ProxyHTMLBufSize"],
+	["directive-inline", "ProxyHTMLCharsetOut"],
+	["directive-inline", "ProxyHTMLDocType"],
+	["directive-inline", "ProxyHTMLEnable"],
+	["directive-inline", "ProxyHTMLEvents"],
+	["directive-inline", "ProxyHTMLExtended"],
+	["directive-inline", "ProxyHTMLFixups"],
+	["directive-inline", "ProxyHTMLInterp"],
+	["directive-inline", "ProxyHTMLLinks"],
+	["directive-inline", "ProxyHTMLMeta"],
+	["directive-inline", "ProxyHTMLStripComments"],
+	["directive-inline", "ProxyHTMLURLMap"],
+	["directive-inline", "ProxyIOBufferSize"],
+	["directive-inline", "ProxyMaxForwards"],
+	["directive-inline", "ProxyPass"],
+	["directive-inline", "ProxyPassInherit"],
+	["directive-inline", "ProxyPassInterpolateEnv"],
+	["directive-inline", "ProxyPassMatch"],
+	["directive-inline", "ProxyPassReverse"],
+	["directive-inline", "ProxyPassReverseCookieDomain"],
+	["directive-inline", "ProxyPassReverseCookiePath"],
+	["directive-inline", "ProxyPreserveHost"],
+	["directive-inline", "ProxyReceiveBufferSize"],
+	["directive-inline", "ProxyRemote"],
+	["directive-inline", "ProxyRemoteMatch"],
+	["directive-inline", "ProxyRequests"],
+	["directive-inline", "ProxySCGIInternalRedirect"],
+	["directive-inline", "ProxySCGISendfile"],
+	["directive-inline", "ProxySet"],
+	["directive-inline", "ProxySourceAddress"],
+	["directive-inline", "ProxyStatus"],
+	["directive-inline", "ProxyTimeout"],
+	["directive-inline", "ProxyVia"],
+	["directive-inline", "ReadmeName"],
+	["directive-inline", "ReceiveBufferSize"],
+	["directive-inline", "Redirect"],
+	["directive-inline", "RedirectMatch"],
+	["directive-inline", "RedirectPermanent"],
+	["directive-inline", "RedirectTemp"],
+	["directive-inline", "ReflectorHeader"],
+	["directive-inline", "RemoteIPHeader"],
+	["directive-inline", "RemoteIPInternalProxy"],
+	["directive-inline", "RemoteIPInternalProxyList"],
+	["directive-inline", "RemoteIPProxiesHeader"],
+	["directive-inline", "RemoteIPTrustedProxy"],
+	["directive-inline", "RemoteIPTrustedProxyList"],
+	["directive-inline", "RemoveCharset"],
+	["directive-inline", "RemoveEncoding"],
+	["directive-inline", "RemoveHandler"],
+	["directive-inline", "RemoveInputFilter"],
+	["directive-inline", "RemoveLanguage"],
+	["directive-inline", "RemoveOutputFilter"],
+	["directive-inline", "RemoveType"],
+	["directive-inline", "RequestHeader"],
+	["directive-inline", "RequestReadTimeout"],
+	["directive-inline", "Require"],
+	["directive-inline", "RewriteBase"],
+	["directive-inline", "RewriteCond"],
+	["directive-inline", "RewriteEngine"],
+	["directive-inline", "RewriteMap"],
+	["directive-inline", "RewriteOptions"],
+	["directive-inline", "RewriteRule"],
+	["directive-inline", "RLimitCPU"],
+	["directive-inline", "RLimitMEM"],
+	["directive-inline", "RLimitNPROC"],
+	["directive-inline", "Satisfy"],
+	["directive-inline", "ScoreBoardFile"],
+	["directive-inline", "Script"],
+	["directive-inline", "ScriptAlias"],
+	["directive-inline", "ScriptAliasMatch"],
+	["directive-inline", "ScriptInterpreterSource"],
+	["directive-inline", "ScriptLog"],
+	["directive-inline", "ScriptLogBuffer"],
+	["directive-inline", "ScriptLogLength"],
+	["directive-inline", "ScriptSock"],
+	["directive-inline", "SecureListen"],
+	["directive-inline", "SeeRequestTail"],
+	["directive-inline", "SendBufferSize"],
+	["directive-inline", "ServerAdmin"],
+	["directive-inline", "ServerAlias"],
+	["directive-inline", "ServerLimit"],
+	["directive-inline", "ServerName"],
+	["directive-inline", "ServerPath"],
+	["directive-inline", "ServerRoot"],
+	["directive-inline", "ServerSignature"],
+	["directive-inline", "ServerTokens"],
+	["directive-inline", "Session"],
+	["directive-inline", "SessionCookieName"],
+	["directive-inline", "SessionCookieName2"],
+	["directive-inline", "SessionCookieRemove"],
+	["directive-inline", "SessionCryptoCipher"],
+	["directive-inline", "SessionCryptoDriver"],
+	["directive-inline", "SessionCryptoPassphrase"],
+	["directive-inline", "SessionCryptoPassphraseFile"],
+	["directive-inline", "SessionDBDCookieName"],
+	["directive-inline", "SessionDBDCookieName2"],
+	["directive-inline", "SessionDBDCookieRemove"],
+	["directive-inline", "SessionDBDDeleteLabel"],
+	["directive-inline", "SessionDBDInsertLabel"],
+	["directive-inline", "SessionDBDPerUser"],
+	["directive-inline", "SessionDBDSelectLabel"],
+	["directive-inline", "SessionDBDUpdateLabel"],
+	["directive-inline", "SessionEnv"],
+	["directive-inline", "SessionExclude"],
+	["directive-inline", "SessionHeader"],
+	["directive-inline", "SessionInclude"],
+	["directive-inline", "SessionMaxAge"],
+	["directive-inline", "SetEnv"],
+	["directive-inline", "SetEnvIf"],
+	["directive-inline", "SetEnvIfExpr"],
+	["directive-inline", "SetEnvIfNoCase"],
+	["directive-inline", "SetHandler"],
+	["directive-inline", "SetInputFilter"],
+	["directive-inline", "SetOutputFilter"],
+	["directive-inline", "SSIEndTag"],
+	["directive-inline", "SSIErrorMsg"],
+	["directive-inline", "SSIETag"],
+	["directive-inline", "SSILastModified"],
+	["directive-inline", "SSILegacyExprParser"],
+	["directive-inline", "SSIStartTag"],
+	["directive-inline", "SSITimeFormat"],
+	["directive-inline", "SSIUndefinedEcho"],
+	["directive-inline", "SSLCACertificateFile"],
+	["directive-inline", "SSLCACertificatePath"],
+	["directive-inline", "SSLCADNRequestFile"],
+	["directive-inline", "SSLCADNRequestPath"],
+	["directive-inline", "SSLCARevocationCheck"],
+	["directive-inline", "SSLCARevocationFile"],
+	["directive-inline", "SSLCARevocationPath"],
+	["directive-inline", "SSLCertificateChainFile"],
+	["directive-inline", "SSLCertificateFile"],
+	["directive-inline", "SSLCertificateKeyFile"],
+	["directive-inline", "SSLCipherSuite"],
+	["directive-inline", "SSLCompression"],
+	["directive-inline", "SSLCryptoDevice"],
+	["directive-inline", "SSLEngine"],
+	["directive-inline", "SSLFIPS"],
+	["directive-inline", "SSLHonorCipherOrder"],
+	["directive-inline", "SSLInsecureRenegotiation"],
+	["directive-inline", "SSLOCSPDefaultResponder"],
+	["directive-inline", "SSLOCSPEnable"],
+	["directive-inline", "SSLOCSPOverrideResponder"],
+	["directive-inline", "SSLOCSPResponderTimeout"],
+	["directive-inline", "SSLOCSPResponseMaxAge"],
+	["directive-inline", "SSLOCSPResponseTimeSkew"],
+	["directive-inline", "SSLOCSPUseRequestNonce"],
+	["directive-inline", "SSLOpenSSLConfCmd"],
+	["directive-inline", "SSLOptions"],
+	["directive-inline", "SSLPassPhraseDialog"],
+	["directive-inline", "SSLProtocol"],
+	["directive-inline", "SSLProxyCACertificateFile"],
+	["directive-inline", "SSLProxyCACertificatePath"],
+	["directive-inline", "SSLProxyCARevocationCheck"],
+	["directive-inline", "SSLProxyCARevocationFile"],
+	["directive-inline", "SSLProxyCARevocationPath"],
+	["directive-inline", "SSLProxyCheckPeerCN"],
+	["directive-inline", "SSLProxyCheckPeerExpire"],
+	["directive-inline", "SSLProxyCheckPeerName"],
+	["directive-inline", "SSLProxyCipherSuite"],
+	["directive-inline", "SSLProxyEngine"],
+	["directive-inline", "SSLProxyMachineCertificateChainFile"],
+	["directive-inline", "SSLProxyMachineCertificateFile"],
+	["directive-inline", "SSLProxyMachineCertificatePath"],
+	["directive-inline", "SSLProxyProtocol"],
+	["directive-inline", "SSLProxyVerify"],
+	["directive-inline", "SSLProxyVerifyDepth"],
+	["directive-inline", "SSLRandomSeed"],
+	["directive-inline", "SSLRenegBufferSize"],
+	["directive-inline", "SSLRequire"],
+	["directive-inline", "SSLRequireSSL"],
+	["directive-inline", "SSLSessionCache"],
+	["directive-inline", "SSLSessionCacheTimeout"],
+	["directive-inline", "SSLSessionTicketKeyFile"],
+	["directive-inline", "SSLSRPUnknownUserSeed"],
+	["directive-inline", "SSLSRPVerifierFile"],
+	["directive-inline", "SSLStaplingCache"],
+	["directive-inline", "SSLStaplingErrorCacheTimeout"],
+	["directive-inline", "SSLStaplingFakeTryLater"],
+	["directive-inline", "SSLStaplingForceURL"],
+	["directive-inline", "SSLStaplingResponderTimeout"],
+	["directive-inline", "SSLStaplingResponseMaxAge"],
+	["directive-inline", "SSLStaplingResponseTimeSkew"],
+	["directive-inline", "SSLStaplingReturnResponderErrors"],
+	["directive-inline", "SSLStaplingStandardCacheTimeout"],
+	["directive-inline", "SSLStrictSNIVHostCheck"],
+	["directive-inline", "SSLUserName"],
+	["directive-inline", "SSLUseStapling"],
+	["directive-inline", "SSLVerifyClient"],
+	["directive-inline", "SSLVerifyDepth"],
+	["directive-inline", "StartServers"],
+	["directive-inline", "StartThreads"],
+	["directive-inline", "Substitute"],
+	["directive-inline", "Suexec"],
+	["directive-inline", "SuexecUserGroup"],
+	["directive-inline", "ThreadLimit"],
+	["directive-inline", "ThreadsPerChild"],
+	["directive-inline", "ThreadStackSize"],
+	["directive-inline", "TimeOut"],
+	["directive-inline", "TraceEnable"],
+	["directive-inline", "TransferLog"],
+	["directive-inline", "TypesConfig"],
+	["directive-inline", "UnDefine"],
+	["directive-inline", "UndefMacro"],
+	["directive-inline", "UnsetEnv"],
+	["directive-inline", "Use"],
+	["directive-inline", "UseCanonicalName"],
+	["directive-inline", "UseCanonicalPhysicalPort"],
+	["directive-inline", "User"],
+	["directive-inline", "UserDir"],
+	["directive-inline", "VHostCGIMode"],
+	["directive-inline", "VHostCGIPrivs"],
+	["directive-inline", "VHostGroup"],
+	["directive-inline", "VHostPrivs"],
+	["directive-inline", "VHostSecure"],
+	["directive-inline", "VHostUser"],
+	["directive-inline", "VirtualDocumentRoot"],
+	["directive-inline", "VirtualDocumentRootIP"],
+	["directive-inline", "VirtualScriptAlias"],
+	["directive-inline", "VirtualScriptAliasIP"],
+	["directive-inline", "WatchdogInterval"],
+	["directive-inline", "XBitHack"],
+	["directive-inline", "xml2EncAlias"],
+	["directive-inline", "xml2EncDefault"],
+	["directive-inline", "xml2StartParse"]
+]
+
+----------------------------------------------------
+
+Checks for all inline directives.
\ No newline at end of file
diff --git a/tests/languages/apacheconf/regex_feature.test b/tests/languages/apacheconf/regex_feature.test
new file mode 100644
index 0000000000..322e59f543
--- /dev/null
+++ b/tests/languages/apacheconf/regex_feature.test
@@ -0,0 +1,15 @@
+^(.*)$
+^foo
+bar$
+
+----------------------------------------------------
+
+[
+	["regex", "^(.*)$"],
+	["regex", "^foo"],
+	["regex", "bar$"]
+]
+
+----------------------------------------------------
+
+Checks for regex.
\ No newline at end of file
diff --git a/tests/languages/apacheconf/string_feature.test b/tests/languages/apacheconf/string_feature.test
new file mode 100644
index 0000000000..d2849caf0b
--- /dev/null
+++ b/tests/languages/apacheconf/string_feature.test
@@ -0,0 +1,24 @@
+"foo bar"
+'foo bar'
+"%{REMOTE_HOST}"
+
+----------------------------------------------------
+
+[
+	["string", [
+		"\"foo bar\""
+	]],
+	["string", [
+		"'foo bar'"
+	]],
+	["string", [
+		"\"",
+		["variable", "%{REMOTE_HOST}"],
+		"\""
+	]]
+]
+
+----------------------------------------------------
+
+Checks for strings.
+Also checks for variables inside strings.
\ No newline at end of file
diff --git a/tests/languages/apacheconf/test2.test b/tests/languages/apacheconf/test2.test
deleted file mode 100644
index f03cf6781d..0000000000
--- a/tests/languages/apacheconf/test2.test
+++ /dev/null
@@ -1,16 +0,0 @@
-"foo bar"
-'foo bar'
-"%{REMOTE_HOST}"
-
------
-[
-    ["string", ["\"foo bar\""]],
-    ["string", ["'foo bar'"]],
-    [
-        "string", [
-            "\"",
-            ["variable", "%{REMOTE_HOST}"],
-            "\""
-        ]
-    ]
-]
diff --git a/tests/languages/apacheconf/variable_feature.test b/tests/languages/apacheconf/variable_feature.test
new file mode 100644
index 0000000000..025fe75b7a
--- /dev/null
+++ b/tests/languages/apacheconf/variable_feature.test
@@ -0,0 +1,15 @@
+$port
+${docroot}
+%{REMOTE_HOST}
+
+----------------------------------------------------
+
+[
+	["variable", "$port"],
+	["variable", "${docroot}"],
+	["variable", "%{REMOTE_HOST}"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From 43f5829cec27612bbbb26418207ad4f3590a422b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:27:18 +0200
Subject: [PATCH 163/310] Add tests for AppleScript

---
 .../languages/applescript/class_feature.test  | 39 ++++++++++++
 .../applescript/comment_feature.test          | 21 +++++++
 .../applescript/keyword_feature.test          | 59 +++++++++++++++++++
 .../languages/applescript/number_feature.test | 17 ++++++
 .../applescript/operator_feature.test         | 48 +++++++++++++++
 .../languages/applescript/string_feature.test | 13 ++++
 6 files changed, 197 insertions(+)
 create mode 100644 tests/languages/applescript/class_feature.test
 create mode 100644 tests/languages/applescript/comment_feature.test
 create mode 100644 tests/languages/applescript/keyword_feature.test
 create mode 100644 tests/languages/applescript/number_feature.test
 create mode 100644 tests/languages/applescript/operator_feature.test
 create mode 100644 tests/languages/applescript/string_feature.test

diff --git a/tests/languages/applescript/class_feature.test b/tests/languages/applescript/class_feature.test
new file mode 100644
index 0000000000..547906deab
--- /dev/null
+++ b/tests/languages/applescript/class_feature.test
@@ -0,0 +1,39 @@
+alias application boolean class constant
+date file integer list number
+POSIX file
+real record reference
+RGB color
+script text centimetres centimeters feet
+inches kilometres kilometers metres meters
+miles yards
+square feet square kilometres square kilometers square metres
+square meters square miles square yards
+cubic centimetres cubic centimeters cubic feet cubic inches
+cubic metres cubic meters cubic yards
+gallons litres liters quarts grams
+kilograms ounces pounds
+degrees Celsius degrees Fahrenheit degrees Kelvin
+
+----------------------------------------------------
+
+[
+	["class", "alias"], ["class", "application"], ["class", "boolean"], ["class", "class"], ["class", "constant"],
+	["class", "date"], ["class", "file"], ["class", "integer"], ["class", "list"], ["class", "number"],
+	["class", "POSIX file"],
+	["class", "real"], ["class", "record"], ["class", "reference"],
+	["class", "RGB color"],
+	["class", "script"], ["class", "text"], ["class", "centimetres"], ["class", "centimeters"], ["class", "feet"],
+	["class", "inches"], ["class", "kilometres"], ["class", "kilometers"], ["class", "metres"], ["class", "meters"],
+	["class", "miles"], ["class", "yards"],
+	["class", "square feet"], ["class", "square kilometres"], ["class", "square kilometers"], ["class", "square metres"],
+	["class", "square meters"], ["class", "square miles"], ["class", "square yards"],
+	["class", "cubic centimetres"], ["class", "cubic centimeters"], ["class", "cubic feet"], ["class", "cubic inches"],
+	["class", "cubic metres"], ["class", "cubic meters"], ["class", "cubic yards"],
+	["class", "gallons"], ["class", "litres"], ["class", "liters"], ["class", "quarts"], ["class", "grams"],
+	["class", "kilograms"], ["class", "ounces"], ["class", "pounds"],
+	["class", "degrees Celsius"], ["class", "degrees Fahrenheit"], ["class", "degrees Kelvin"]
+]
+
+----------------------------------------------------
+
+Checks for all classes.
\ No newline at end of file
diff --git a/tests/languages/applescript/comment_feature.test b/tests/languages/applescript/comment_feature.test
new file mode 100644
index 0000000000..d823ba429a
--- /dev/null
+++ b/tests/languages/applescript/comment_feature.test
@@ -0,0 +1,21 @@
+-- foo bar
+# foo bar
+(* foo
+bar *)
+(* foo
+(* bar *)
+*)
+
+----------------------------------------------------
+
+[
+	["comment", "-- foo bar"],
+	["comment", "# foo bar"],
+	["comment", "(* foo\r\nbar *)"],
+	["comment", "(* foo\r\n(* bar *)\r\n*)"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
+Also checks for one level of nesting.
\ No newline at end of file
diff --git a/tests/languages/applescript/keyword_feature.test b/tests/languages/applescript/keyword_feature.test
new file mode 100644
index 0000000000..bde63a16c1
--- /dev/null
+++ b/tests/languages/applescript/keyword_feature.test
@@ -0,0 +1,59 @@
+about above after against
+apart from
+around
+aside from
+at back before beginning behind below
+beneath beside between but by
+considering continue copy
+does eighth else end
+equal error every exit
+false fifth first for fourth
+from front get given global
+if ignoring in
+instead of
+into is it its last
+local me middle my
+ninth of on onto
+out of
+over prop property put
+repeat return returning
+second set seventh since sixth
+some tell tenth that the
+then third through thru timeout
+times to transaction true try
+until where while whose with
+without
+
+----------------------------------------------------
+
+[
+	["keyword", "about"], ["keyword", "above"], ["keyword", "after"], ["keyword", "against"],
+	["keyword", "apart from"],
+	["keyword", "around"],
+	["keyword", "aside from"],
+	["keyword", "at"], ["keyword", "back"], ["keyword", "before"], ["keyword", "beginning"], ["keyword", "behind"], ["keyword", "below"],
+	["keyword", "beneath"], ["keyword", "beside"], ["keyword", "between"], ["keyword", "but"], ["keyword", "by"],
+	["keyword", "considering"], ["keyword", "continue"], ["keyword", "copy"],
+	["keyword", "does"], ["keyword", "eighth"], ["keyword", "else"], ["keyword", "end"],
+	["keyword", "equal"], ["keyword", "error"], ["keyword", "every"], ["keyword", "exit"],
+	["keyword", "false"], ["keyword", "fifth"], ["keyword", "first"], ["keyword", "for"], ["keyword", "fourth"],
+	["keyword", "from"], ["keyword", "front"], ["keyword", "get"], ["keyword", "given"], ["keyword", "global"],
+	["keyword", "if"], ["keyword", "ignoring"], ["keyword", "in"],
+	["keyword", "instead of"],
+	["keyword", "into"], ["keyword", "is"], ["keyword", "it"], ["keyword", "its"], ["keyword", "last"],
+	["keyword", "local"], ["keyword", "me"], ["keyword", "middle"], ["keyword", "my"],
+	["keyword", "ninth"], ["keyword", "of"], ["keyword", "on"], ["keyword", "onto"],
+	["keyword", "out of"],
+	["keyword", "over"], ["keyword", "prop"], ["keyword", "property"], ["keyword", "put"],
+	["keyword", "repeat"], ["keyword", "return"], ["keyword", "returning"],
+	["keyword", "second"], ["keyword", "set"], ["keyword", "seventh"], ["keyword", "since"], ["keyword", "sixth"],
+	["keyword", "some"], ["keyword", "tell"], ["keyword", "tenth"], ["keyword", "that"], ["keyword", "the"],
+	["keyword", "then"], ["keyword", "third"], ["keyword", "through"], ["keyword", "thru"], ["keyword", "timeout"],
+	["keyword", "times"], ["keyword", "to"], ["keyword", "transaction"], ["keyword", "true"], ["keyword", "try"],
+	["keyword", "until"], ["keyword", "where"], ["keyword", "while"], ["keyword", "whose"], ["keyword", "with"],
+	["keyword", "without"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/applescript/number_feature.test b/tests/languages/applescript/number_feature.test
new file mode 100644
index 0000000000..96eb6f2862
--- /dev/null
+++ b/tests/languages/applescript/number_feature.test
@@ -0,0 +1,17 @@
+42
+3.14159
+3e10
+4.2E-5
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "3e10"],
+	["number", "4.2E-5"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.
\ No newline at end of file
diff --git a/tests/languages/applescript/operator_feature.test b/tests/languages/applescript/operator_feature.test
new file mode 100644
index 0000000000..fb4acf4dbe
--- /dev/null
+++ b/tests/languages/applescript/operator_feature.test
@@ -0,0 +1,48 @@
+& = ≠ ≤ ≥
+* + - / ÷ ^
+< <= > >=
+
+start with begin with end with
+starts with begins with ends with
+does not contain doesn't contain
+contain contains
+is in isn't in is not in
+is contained by isn't contained by is not contained by
+greater than greater than or equal greater than or equal to
+less than less than or equal less than or equal to
+does not come before doesn't come before comes before
+does not come after doesn't come after comes after
+is equal isn't equal is not equal
+is equal to isn't equal to is not equal to
+does not equal doesn't equal equals
+isn't is not
+ref a ref to a reference to
+and or div mod as not
+
+----------------------------------------------------
+
+[
+	["operator", "&"], ["operator", "="], ["operator", "≠"], ["operator", "≤"], ["operator", "≥"],
+	["operator", "*"], ["operator", "+"], ["operator", "-"], ["operator", "/"], ["operator", "÷"], ["operator", "^"],
+	["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
+	["operator", "start with"], ["operator", "begin with"], ["operator", "end with"],
+	["operator", "starts with"], ["operator", "begins with"], ["operator", "ends with"],
+	["operator", "does not contain"], ["operator", "doesn't contain"],
+	["operator", "contain"], ["operator", "contains"],
+	["operator", "is in"], ["operator", "isn't in"], ["operator", "is not in"],
+	["operator", "is contained by"], ["operator", "isn't contained by"], ["operator", "is not contained by"],
+	["operator", "greater than"], ["operator", "greater than or equal"], ["operator", "greater than or equal to"],
+	["operator", "less than"], ["operator", "less than or equal"], ["operator", "less than or equal to"],
+	["operator", "does not come before"], ["operator", "doesn't come before"], ["operator", "comes before"],
+	["operator", "does not come after"], ["operator", "doesn't come after"], ["operator", "comes after"],
+	["operator", "is equal"], ["operator", "isn't equal"], ["operator", "is not equal"],
+	["operator", "is equal to"], ["operator", "isn't equal to"], ["operator", "is not equal to"],
+	["operator", "does not equal"], ["operator", "doesn't equal"], ["operator", "equals"],
+	["operator", "isn't"], ["operator", "is not"],
+	["operator", "ref"], ["operator", "a ref to"], ["operator", "a reference to"],
+	["operator", "and"], ["operator", "or"], ["operator", "div"], ["operator", "mod"], ["operator", "as"], ["operator", "not"]
+]
+
+----------------------------------------------------
+
+Checks for most of the operators.
\ No newline at end of file
diff --git a/tests/languages/applescript/string_feature.test b/tests/languages/applescript/string_feature.test
new file mode 100644
index 0000000000..42770f6156
--- /dev/null
+++ b/tests/languages/applescript/string_feature.test
@@ -0,0 +1,13 @@
+""
+"foo bar"
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"foo bar\""]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From 6bff98a47fa2887897c2c7fcb1799335cf5281f7 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:28:46 +0200
Subject: [PATCH 164/310] Add tests for ASP.NET

---
 tests/languages/aspnet/comment_feature.test   | 16 ++++
 .../aspnet/page-directive_feature.test        | 92 +++++++++++++++++++
 .../script_feature.test                       | 56 +++++++++++
 3 files changed, 164 insertions(+)
 create mode 100644 tests/languages/aspnet/comment_feature.test
 create mode 100644 tests/languages/aspnet/page-directive_feature.test
 create mode 100644 tests/languages/markup+javascript+csharp+aspnet/script_feature.test

diff --git a/tests/languages/aspnet/comment_feature.test b/tests/languages/aspnet/comment_feature.test
new file mode 100644
index 0000000000..da388e5f76
--- /dev/null
+++ b/tests/languages/aspnet/comment_feature.test
@@ -0,0 +1,16 @@
+<%----%>
+<%--foo--%>
+<%-- foo
+bar --%>
+
+----------------------------------------------------
+
+[
+	["asp comment", "<%----%>"],
+	["asp comment", "<%--foo--%>"],
+	["asp comment", "<%-- foo\r\nbar --%>"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/aspnet/page-directive_feature.test b/tests/languages/aspnet/page-directive_feature.test
new file mode 100644
index 0000000000..3d79dae938
--- /dev/null
+++ b/tests/languages/aspnet/page-directive_feature.test
@@ -0,0 +1,92 @@
+<%@Assembly foo="bar"%>
+<% @Control foo="bar" %>
+<%@ Implements%>
+<%@Import%>
+<%@Master%>
+<%@MasterType%>
+<%@OutputCache%>
+<%@Page%>
+<%@PreviousPageType%>
+<%@Reference%>
+<%@Register%>
+
+----------------------------------------------------
+
+[
+	["page-directive tag", [
+		["page-directive tag", "<%@Assembly"],
+		["attr-name", [
+			"foo"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "\""],
+			"bar",
+			["punctuation", "\""]
+		]],
+		["page-directive tag", "%>"]
+	]],
+
+	["page-directive tag", [
+        ["page-directive tag", "<% @Control"],
+        ["attr-name", [
+            "foo"
+        ]],
+        ["attr-value", [
+            ["punctuation", "="],
+            ["punctuation", "\""],
+            "bar",
+            ["punctuation", "\""]
+        ]],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@ Implements"],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@Import"],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@Master"],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@MasterType"],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@OutputCache"],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@Page"],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@PreviousPageType"],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@Reference"],
+        ["page-directive tag", "%>"]
+    ]],
+
+    ["page-directive tag", [
+        ["page-directive tag", "<%@Register"],
+        ["page-directive tag", "%>"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for all page directives.
\ No newline at end of file
diff --git a/tests/languages/markup+javascript+csharp+aspnet/script_feature.test b/tests/languages/markup+javascript+csharp+aspnet/script_feature.test
new file mode 100644
index 0000000000..80c1ef80a2
--- /dev/null
+++ b/tests/languages/markup+javascript+csharp+aspnet/script_feature.test
@@ -0,0 +1,56 @@
+<script runat="server">#foo</script>
+<script>/foo/</script>
+
+----------------------------------------------------
+
+[
+	["asp script", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"script"
+			]],
+			["attr-name", [
+				"runat"
+			]],
+			["attr-value", [
+				["punctuation", "="],
+				["punctuation", "\""],
+				"server",
+				["punctuation", "\""]
+			]],
+			["punctuation", ">"]
+		]],
+		["preprocessor", "#foo"],
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"script"
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+	["script", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"script"
+			]],
+			["punctuation", ">"]
+		]],
+		["regex", "/foo/"],
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"script"
+			]],
+			["punctuation", ">"]
+		]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for scripts containing C# code.
+Also checks that those don't break normal JS scripts.
+Note: Markup is loaded before Javascript so that scripts are added into grammar.
\ No newline at end of file

From 16e15528777b63ad5807af5cfd80271c6e847d55 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:30:07 +0200
Subject: [PATCH 165/310] Add tests for AutoHotKey

---
 .../languages/autohotkey/boolean_feature.test |  13 +
 .../languages/autohotkey/builtin_feature.test | 147 +++++
 .../languages/autohotkey/comment_feature.test |  13 +
 .../autohotkey/constant_feature.test          | 275 +++++++++
 .../autohotkey/function_feature.test          |  15 +
 .../autohotkey/important_feature.test         |  67 +++
 .../languages/autohotkey/keyword_feature.test | 537 ++++++++++++++++++
 .../languages/autohotkey/number_feature.test  |  21 +
 .../autohotkey/operator_feature.test          |  33 ++
 .../autohotkey/selector_feature.test          | 381 +++++++++++++
 .../languages/autohotkey/string_feature.test  |  15 +
 .../languages/autohotkey/symbol_feature.test  | 347 +++++++++++
 tests/languages/autohotkey/tag_feature.test   |  15 +
 .../autohotkey/variable_feature.test          |  13 +
 14 files changed, 1892 insertions(+)
 create mode 100644 tests/languages/autohotkey/boolean_feature.test
 create mode 100644 tests/languages/autohotkey/builtin_feature.test
 create mode 100644 tests/languages/autohotkey/comment_feature.test
 create mode 100644 tests/languages/autohotkey/constant_feature.test
 create mode 100644 tests/languages/autohotkey/function_feature.test
 create mode 100644 tests/languages/autohotkey/important_feature.test
 create mode 100644 tests/languages/autohotkey/keyword_feature.test
 create mode 100644 tests/languages/autohotkey/number_feature.test
 create mode 100644 tests/languages/autohotkey/operator_feature.test
 create mode 100644 tests/languages/autohotkey/selector_feature.test
 create mode 100644 tests/languages/autohotkey/string_feature.test
 create mode 100644 tests/languages/autohotkey/symbol_feature.test
 create mode 100644 tests/languages/autohotkey/tag_feature.test
 create mode 100644 tests/languages/autohotkey/variable_feature.test

diff --git a/tests/languages/autohotkey/boolean_feature.test b/tests/languages/autohotkey/boolean_feature.test
new file mode 100644
index 0000000000..6d97d4bffa
--- /dev/null
+++ b/tests/languages/autohotkey/boolean_feature.test
@@ -0,0 +1,13 @@
+true
+false
+
+----------------------------------------------------
+
+[
+	["boolean", "true"],
+	["boolean", "false"]
+]
+
+----------------------------------------------------
+
+Checks for booleans
\ No newline at end of file
diff --git a/tests/languages/autohotkey/builtin_feature.test b/tests/languages/autohotkey/builtin_feature.test
new file mode 100644
index 0000000000..afbe8d3325
--- /dev/null
+++ b/tests/languages/autohotkey/builtin_feature.test
@@ -0,0 +1,147 @@
+abs
+acos
+asc
+asin
+atan
+ceil
+chr
+class
+cos
+dllcall
+exp
+fileexist
+Fileopen
+floor
+il_add
+il_create
+il_destroy
+instr
+substr
+isfunc
+islabel
+IsObject
+ln
+log
+lv_add
+lv_delete
+lv_deletecol
+lv_getcount
+lv_getnext
+lv_gettext
+lv_insert
+lv_insertcol
+lv_modify
+lv_modifycol
+lv_setimagelist
+mod
+onmessage
+numget
+numput
+registercallback
+regexmatch
+regexreplace
+round
+sin
+tan
+sqrt
+strlen
+sb_seticon
+sb_setparts
+sb_settext
+strsplit
+tv_add
+tv_delete
+tv_getchild
+tv_getcount
+tv_getnext
+tv_get
+tv_getparent
+tv_getprev
+tv_getselection
+tv_gettext
+tv_modify
+varsetcapacity
+winactive
+winexist
+__New
+__Call
+__Get
+__Set
+
+----------------------------------------------------
+
+[
+	["builtin", "abs"],
+	["builtin", "acos"],
+	["builtin", "asc"],
+	["builtin", "asin"],
+	["builtin", "atan"],
+	["builtin", "ceil"],
+	["builtin", "chr"],
+	["builtin", "class"],
+	["builtin", "cos"],
+	["builtin", "dllcall"],
+	["builtin", "exp"],
+	["builtin", "fileexist"],
+	["builtin", "Fileopen"],
+	["builtin", "floor"],
+	["builtin", "il_add"],
+	["builtin", "il_create"],
+	["builtin", "il_destroy"],
+	["builtin", "instr"],
+	["builtin", "substr"],
+	["builtin", "isfunc"],
+	["builtin", "islabel"],
+	["builtin", "IsObject"],
+	["builtin", "ln"],
+	["builtin", "log"],
+	["builtin", "lv_add"],
+	["builtin", "lv_delete"],
+	["builtin", "lv_deletecol"],
+	["builtin", "lv_getcount"],
+	["builtin", "lv_getnext"],
+	["builtin", "lv_gettext"],
+	["builtin", "lv_insert"],
+	["builtin", "lv_insertcol"],
+	["builtin", "lv_modify"],
+	["builtin", "lv_modifycol"],
+	["builtin", "lv_setimagelist"],
+	["builtin", "mod"],
+	["builtin", "onmessage"],
+	["builtin", "numget"],
+	["builtin", "numput"],
+	["builtin", "registercallback"],
+	["builtin", "regexmatch"],
+	["builtin", "regexreplace"],
+	["builtin", "round"],
+	["builtin", "sin"],
+	["builtin", "tan"],
+	["builtin", "sqrt"],
+	["builtin", "strlen"],
+	["builtin", "sb_seticon"],
+	["builtin", "sb_setparts"],
+	["builtin", "sb_settext"],
+	["builtin", "strsplit"],
+	["builtin", "tv_add"],
+	["builtin", "tv_delete"],
+	["builtin", "tv_getchild"],
+	["builtin", "tv_getcount"],
+	["builtin", "tv_getnext"],
+	["builtin", "tv_get"],
+	["builtin", "tv_getparent"],
+	["builtin", "tv_getprev"],
+	["builtin", "tv_getselection"],
+	["builtin", "tv_gettext"],
+	["builtin", "tv_modify"],
+	["builtin", "varsetcapacity"],
+	["builtin", "winactive"],
+	["builtin", "winexist"],
+	["builtin", "__New"],
+	["builtin", "__Call"],
+	["builtin", "__Get"],
+	["builtin", "__Set"]
+]
+
+----------------------------------------------------
+
+Checks for all builtins.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/comment_feature.test b/tests/languages/autohotkey/comment_feature.test
new file mode 100644
index 0000000000..5b00ce20db
--- /dev/null
+++ b/tests/languages/autohotkey/comment_feature.test
@@ -0,0 +1,13 @@
+;foo
+; bar
+
+----------------------------------------------------
+
+[
+	["comment", ";foo"],
+	["comment", "; bar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/constant_feature.test b/tests/languages/autohotkey/constant_feature.test
new file mode 100644
index 0000000000..ab11673488
--- /dev/null
+++ b/tests/languages/autohotkey/constant_feature.test
@@ -0,0 +1,275 @@
+a_ahkpath
+a_ahkversion
+a_appdata
+a_appdatacommon
+a_autotrim
+a_batchlines
+a_caretx
+a_carety
+a_computername
+a_controldelay
+a_cursor
+a_dd
+a_ddd
+a_dddd
+a_defaultmousespeed
+a_desktop
+a_desktopcommon
+a_detecthiddentext
+a_detecthiddenwindows
+a_endchar
+a_eventinfo
+a_exitreason
+a_formatfloat
+a_formatinteger
+a_gui
+a_guievent
+a_guicontrol
+a_guicontrolevent
+a_guiheight
+a_guiwidth
+a_guix
+a_guiy
+a_hour
+a_iconfile
+a_iconhidden
+a_iconnumber
+a_icontip
+a_index
+a_ipaddress1
+a_ipaddress2
+a_ipaddress3
+a_ipaddress4
+a_isadmin
+a_iscompiled
+a_iscritical
+a_ispaused
+a_issuspended
+a_isunicode
+a_keydelay
+a_language
+a_lasterror
+a_linefile
+a_linenumber
+a_loopfield
+a_loopfileattrib
+a_loopfiledir
+a_loopfileext
+a_loopfilefullpath
+a_loopfilelongpath
+a_loopfilename
+a_loopfileshortname
+a_loopfileshortpath
+a_loopfilesize
+a_loopfilesizekb
+a_loopfilesizemb
+a_loopfiletimeaccessed
+a_loopfiletimecreated
+a_loopfiletimemodified
+a_loopreadline
+a_loopregkey
+a_loopregname
+a_loopregsubkey
+a_loopregtimemodified
+a_loopregtype
+a_mday
+a_min
+a_mm
+a_mmm
+a_mmmm
+a_mon
+a_mousedelay
+a_msec
+a_mydocuments
+a_now
+a_nowutc
+a_numbatchlines
+a_ostype
+a_osversion
+a_priorhotkey
+programfiles
+a_programfiles
+a_programs
+a_programscommon
+a_screenheight
+a_screenwidth
+a_scriptdir
+a_scriptfullpath
+a_scriptname
+a_sec
+a_space
+a_startmenu
+a_startmenucommon
+a_startup
+a_startupcommon
+a_stringcasesense
+a_tab
+a_temp
+a_thisfunc
+a_thishotkey
+a_thislabel
+a_thismenu
+a_thismenuitem
+a_thismenuitempos
+a_tickcount
+a_timeidle
+a_timeidlephysical
+a_timesincepriorhotkey
+a_timesincethishotkey
+a_titlematchmode
+a_titlematchmodespeed
+a_username
+a_wday
+a_windelay
+a_windir
+a_workingdir
+a_yday
+a_year
+a_yweek
+a_yyyy
+clipboard
+clipboardall
+comspec
+errorlevel
+
+----------------------------------------------------
+
+[
+	["constant", "a_ahkpath"],
+	["constant", "a_ahkversion"],
+	["constant", "a_appdata"],
+	["constant", "a_appdatacommon"],
+	["constant", "a_autotrim"],
+	["constant", "a_batchlines"],
+	["constant", "a_caretx"],
+	["constant", "a_carety"],
+	["constant", "a_computername"],
+	["constant", "a_controldelay"],
+	["constant", "a_cursor"],
+	["constant", "a_dd"],
+	["constant", "a_ddd"],
+	["constant", "a_dddd"],
+	["constant", "a_defaultmousespeed"],
+	["constant", "a_desktop"],
+	["constant", "a_desktopcommon"],
+	["constant", "a_detecthiddentext"],
+	["constant", "a_detecthiddenwindows"],
+	["constant", "a_endchar"],
+	["constant", "a_eventinfo"],
+	["constant", "a_exitreason"],
+	["constant", "a_formatfloat"],
+	["constant", "a_formatinteger"],
+	["constant", "a_gui"],
+	["constant", "a_guievent"],
+	["constant", "a_guicontrol"],
+	["constant", "a_guicontrolevent"],
+	["constant", "a_guiheight"],
+	["constant", "a_guiwidth"],
+	["constant", "a_guix"],
+	["constant", "a_guiy"],
+	["constant", "a_hour"],
+	["constant", "a_iconfile"],
+	["constant", "a_iconhidden"],
+	["constant", "a_iconnumber"],
+	["constant", "a_icontip"],
+	["constant", "a_index"],
+	["constant", "a_ipaddress1"],
+	["constant", "a_ipaddress2"],
+	["constant", "a_ipaddress3"],
+	["constant", "a_ipaddress4"],
+	["constant", "a_isadmin"],
+	["constant", "a_iscompiled"],
+	["constant", "a_iscritical"],
+	["constant", "a_ispaused"],
+	["constant", "a_issuspended"],
+	["constant", "a_isunicode"],
+	["constant", "a_keydelay"],
+	["constant", "a_language"],
+	["constant", "a_lasterror"],
+	["constant", "a_linefile"],
+	["constant", "a_linenumber"],
+	["constant", "a_loopfield"],
+	["constant", "a_loopfileattrib"],
+	["constant", "a_loopfiledir"],
+	["constant", "a_loopfileext"],
+	["constant", "a_loopfilefullpath"],
+	["constant", "a_loopfilelongpath"],
+	["constant", "a_loopfilename"],
+	["constant", "a_loopfileshortname"],
+	["constant", "a_loopfileshortpath"],
+	["constant", "a_loopfilesize"],
+	["constant", "a_loopfilesizekb"],
+	["constant", "a_loopfilesizemb"],
+	["constant", "a_loopfiletimeaccessed"],
+	["constant", "a_loopfiletimecreated"],
+	["constant", "a_loopfiletimemodified"],
+	["constant", "a_loopreadline"],
+	["constant", "a_loopregkey"],
+	["constant", "a_loopregname"],
+	["constant", "a_loopregsubkey"],
+	["constant", "a_loopregtimemodified"],
+	["constant", "a_loopregtype"],
+	["constant", "a_mday"],
+	["constant", "a_min"],
+	["constant", "a_mm"],
+	["constant", "a_mmm"],
+	["constant", "a_mmmm"],
+	["constant", "a_mon"],
+	["constant", "a_mousedelay"],
+	["constant", "a_msec"],
+	["constant", "a_mydocuments"],
+	["constant", "a_now"],
+	["constant", "a_nowutc"],
+	["constant", "a_numbatchlines"],
+	["constant", "a_ostype"],
+	["constant", "a_osversion"],
+	["constant", "a_priorhotkey"],
+	["constant", "programfiles"],
+	["constant", "a_programfiles"],
+	["constant", "a_programs"],
+	["constant", "a_programscommon"],
+	["constant", "a_screenheight"],
+	["constant", "a_screenwidth"],
+	["constant", "a_scriptdir"],
+	["constant", "a_scriptfullpath"],
+	["constant", "a_scriptname"],
+	["constant", "a_sec"],
+	["constant", "a_space"],
+	["constant", "a_startmenu"],
+	["constant", "a_startmenucommon"],
+	["constant", "a_startup"],
+	["constant", "a_startupcommon"],
+	["constant", "a_stringcasesense"],
+	["constant", "a_tab"],
+	["constant", "a_temp"],
+	["constant", "a_thisfunc"],
+	["constant", "a_thishotkey"],
+	["constant", "a_thislabel"],
+	["constant", "a_thismenu"],
+	["constant", "a_thismenuitem"],
+	["constant", "a_thismenuitempos"],
+	["constant", "a_tickcount"],
+	["constant", "a_timeidle"],
+	["constant", "a_timeidlephysical"],
+	["constant", "a_timesincepriorhotkey"],
+	["constant", "a_timesincethishotkey"],
+	["constant", "a_titlematchmode"],
+	["constant", "a_titlematchmodespeed"],
+	["constant", "a_username"],
+	["constant", "a_wday"],
+	["constant", "a_windelay"],
+	["constant", "a_windir"],
+	["constant", "a_workingdir"],
+	["constant", "a_yday"],
+	["constant", "a_year"],
+	["constant", "a_yweek"],
+	["constant", "a_yyyy"],
+	["constant", "clipboard"],
+	["constant", "clipboardall"],
+	["constant", "comspec"],
+	["constant", "errorlevel"]
+]
+
+----------------------------------------------------
+
+Checks for all constants.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/function_feature.test b/tests/languages/autohotkey/function_feature.test
new file mode 100644
index 0000000000..f38a186f69
--- /dev/null
+++ b/tests/languages/autohotkey/function_feature.test
@@ -0,0 +1,15 @@
+foo(
+foo_bar(
+
+----------------------------------------------------
+
+[
+	["function", "foo"],
+	["punctuation", "("],
+	["function", "foo_bar"],
+	["punctuation", "("]
+]
+
+----------------------------------------------------
+
+Checks for functions.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/important_feature.test b/tests/languages/autohotkey/important_feature.test
new file mode 100644
index 0000000000..aa9cbeb5d6
--- /dev/null
+++ b/tests/languages/autohotkey/important_feature.test
@@ -0,0 +1,67 @@
+#AllowSameLineComments
+#ClipboardTimeout
+#CommentFlag
+#ErrorStdOut
+#EscapeChar
+#HotkeyInterval
+#HotkeyModifierTimeout
+#Hotstring
+#IfWinActive
+#IfWinExist
+#IfWinNotActive
+#IfWinNotExist
+#Include
+#IncludeAgain
+#InstallKeybdHook
+#InstallMouseHook
+#KeyHistory
+#LTrim
+#MaxHotkeysPerInterval
+#MaxMem
+#MaxThreads
+#MaxThreadsBuffer
+#MaxThreadsPerHotkey
+#NoEnv
+#NoTrayIcon
+#Persistent
+#SingleInstance
+#UseHook
+#WinActivateForce
+
+----------------------------------------------------
+
+[
+	["important", "#AllowSameLineComments"],
+	["important", "#ClipboardTimeout"],
+	["important", "#CommentFlag"],
+	["important", "#ErrorStdOut"],
+	["important", "#EscapeChar"],
+	["important", "#HotkeyInterval"],
+	["important", "#HotkeyModifierTimeout"],
+	["important", "#Hotstring"],
+	["important", "#IfWinActive"],
+	["important", "#IfWinExist"],
+	["important", "#IfWinNotActive"],
+	["important", "#IfWinNotExist"],
+	["important", "#Include"],
+	["important", "#IncludeAgain"],
+	["important", "#InstallKeybdHook"],
+	["important", "#InstallMouseHook"],
+	["important", "#KeyHistory"],
+	["important", "#LTrim"],
+	["important", "#MaxHotkeysPerInterval"],
+	["important", "#MaxMem"],
+	["important", "#MaxThreads"],
+	["important", "#MaxThreadsBuffer"],
+	["important", "#MaxThreadsPerHotkey"],
+	["important", "#NoEnv"],
+	["important", "#NoTrayIcon"],
+	["important", "#Persistent"],
+	["important", "#SingleInstance"],
+	["important", "#UseHook"],
+	["important", "#WinActivateForce"]
+]
+
+----------------------------------------------------
+
+Checks for all important keywords.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/keyword_feature.test b/tests/languages/autohotkey/keyword_feature.test
new file mode 100644
index 0000000000..91671355fd
--- /dev/null
+++ b/tests/languages/autohotkey/keyword_feature.test
@@ -0,0 +1,537 @@
+Abort
+AboveNormal
+Add
+ahk_class
+ahk_group
+ahk_id
+ahk_pid
+All
+Alnum
+Alpha
+AltSubmit
+AltTab
+AltTabAndMenu
+AltTabMenu
+AltTabMenuDismiss
+AlwaysOnTop
+AutoSize
+Background
+BackgroundTrans
+BelowNormal
+between
+BitAnd
+BitNot
+BitOr
+BitShiftLeft
+BitShiftRight
+BitXOr
+Bold
+Border
+Button
+ByRef
+Checkbox
+Checked
+CheckedGray
+Choose
+ChooseString
+Close
+Color
+ComboBox
+Contains
+ControlList
+Count
+Date
+DateTime
+Days
+DDL
+Default
+DeleteAll
+Delimiter
+Deref
+Destroy
+Digit
+Disable
+Disabled
+DropDownList
+Edit
+Eject
+Else
+Enable
+Enabled
+Error
+Exist
+Expand
+ExStyle
+FileSystem
+First
+Flash
+Float
+FloatFast
+Focus
+Font
+for
+global
+Grid
+Group
+GroupBox
+GuiClose
+GuiContextMenu
+GuiDropFiles
+GuiEscape
+GuiSize
+Hdr
+Hidden
+Hide
+High
+HKCC
+HKCR
+HKCU
+HKEY_CLASSES_ROOT
+HKEY_CURRENT_CONFIG
+HKEY_CURRENT_USER
+HKEY_LOCAL_MACHINE
+HKEY_USERS
+HKLM
+HKU
+Hours
+HScroll
+Icon
+IconSmall
+ID
+IDLast
+If
+IfEqual
+IfExist
+IfGreater
+IfGreaterOrEqual
+IfInString
+IfLess
+IfLessOrEqual
+IfMsgBox
+IfNotEqual
+IfNotExist
+IfNotInString
+IfWinActive
+IfWinExist
+IfWinNotActive
+IfWinNotExist
+Ignore
+ImageList
+in
+Integer
+IntegerFast
+Interrupt
+is
+italic
+Join
+Label
+LastFound
+LastFoundExist
+Limit
+Lines
+List
+ListBox
+ListView
+local
+Lock
+Logoff
+Low
+Lower
+Lowercase
+MainWindow
+Margin
+Maximize
+MaximizeBox
+MaxSize
+Minimize
+MinimizeBox
+MinMax
+MinSize
+Minutes
+MonthCal
+Mouse
+Move
+Multi
+NA
+No
+NoActivate
+NoDefault
+NoHide
+NoIcon
+NoMainWindow
+norm
+Normal
+NoSort
+NoSortHdr
+NoStandard
+Not
+NoTab
+NoTimers
+Number
+Off
+Ok
+On
+OwnDialogs
+Owner
+Parse
+Password
+Picture
+Pixel
+Pos
+Pow
+Priority
+ProcessName
+Radio
+Range
+Read
+ReadOnly
+Realtime
+Redraw
+REG_BINARY
+REG_DWORD
+REG_EXPAND_SZ
+REG_MULTI_SZ
+REG_SZ
+Region
+Relative
+Rename
+Report
+Resize
+Restore
+Retry
+RGB
+Screen
+Seconds
+Section
+Serial
+SetLabel
+ShiftAltTab
+Show
+Single
+Slider
+SortDesc
+Standard
+static
+Status
+StatusBar
+StatusCD
+strike
+Style
+Submit
+SysMenu
+Tab2
+TabStop
+Text
+Theme
+Tile
+ToggleCheck
+ToggleEnable
+ToolWindow
+Top
+Topmost
+TransColor
+Transparent
+Tray
+TreeView
+TryAgain
+Type
+UnCheck
+underline
+Unicode
+Unlock
+UpDown
+Upper
+Uppercase
+UseErrorLevel
+Vis
+VisFirst
+Visible
+VScroll
+Wait
+WaitClose
+WantCtrlA
+WantF2
+WantReturn
+While
+Wrap
+Xdigit
+xm
+xp
+xs
+Yes
+ym
+yp
+ys
+
+----------------------------------------------------
+
+[
+	["keyword", "Abort"],
+	["keyword", "AboveNormal"],
+	["keyword", "Add"],
+	["keyword", "ahk_class"],
+	["keyword", "ahk_group"],
+	["keyword", "ahk_id"],
+	["keyword", "ahk_pid"],
+	["keyword", "All"],
+	["keyword", "Alnum"],
+	["keyword", "Alpha"],
+	["keyword", "AltSubmit"],
+	["keyword", "AltTab"],
+	["keyword", "AltTabAndMenu"],
+	["keyword", "AltTabMenu"],
+	["keyword", "AltTabMenuDismiss"],
+	["keyword", "AlwaysOnTop"],
+	["keyword", "AutoSize"],
+	["keyword", "Background"],
+	["keyword", "BackgroundTrans"],
+	["keyword", "BelowNormal"],
+	["keyword", "between"],
+	["keyword", "BitAnd"],
+	["keyword", "BitNot"],
+	["keyword", "BitOr"],
+	["keyword", "BitShiftLeft"],
+	["keyword", "BitShiftRight"],
+	["keyword", "BitXOr"],
+	["keyword", "Bold"],
+	["keyword", "Border"],
+	["keyword", "Button"],
+	["keyword", "ByRef"],
+	["keyword", "Checkbox"],
+	["keyword", "Checked"],
+	["keyword", "CheckedGray"],
+	["keyword", "Choose"],
+	["keyword", "ChooseString"],
+	["keyword", "Close"],
+	["keyword", "Color"],
+	["keyword", "ComboBox"],
+	["keyword", "Contains"],
+	["keyword", "ControlList"],
+	["keyword", "Count"],
+	["keyword", "Date"],
+	["keyword", "DateTime"],
+	["keyword", "Days"],
+	["keyword", "DDL"],
+	["keyword", "Default"],
+	["keyword", "DeleteAll"],
+	["keyword", "Delimiter"],
+	["keyword", "Deref"],
+	["keyword", "Destroy"],
+	["keyword", "Digit"],
+	["keyword", "Disable"],
+	["keyword", "Disabled"],
+	["keyword", "DropDownList"],
+	["keyword", "Edit"],
+	["keyword", "Eject"],
+	["keyword", "Else"],
+	["keyword", "Enable"],
+	["keyword", "Enabled"],
+	["keyword", "Error"],
+	["keyword", "Exist"],
+	["keyword", "Expand"],
+	["keyword", "ExStyle"],
+	["keyword", "FileSystem"],
+	["keyword", "First"],
+	["keyword", "Flash"],
+	["keyword", "Float"],
+	["keyword", "FloatFast"],
+	["keyword", "Focus"],
+	["keyword", "Font"],
+	["keyword", "for"],
+	["keyword", "global"],
+	["keyword", "Grid"],
+	["keyword", "Group"],
+	["keyword", "GroupBox"],
+	["keyword", "GuiClose"],
+	["keyword", "GuiContextMenu"],
+	["keyword", "GuiDropFiles"],
+	["keyword", "GuiEscape"],
+	["keyword", "GuiSize"],
+	["keyword", "Hdr"],
+	["keyword", "Hidden"],
+	["keyword", "Hide"],
+	["keyword", "High"],
+	["keyword", "HKCC"],
+	["keyword", "HKCR"],
+	["keyword", "HKCU"],
+	["keyword", "HKEY_CLASSES_ROOT"],
+	["keyword", "HKEY_CURRENT_CONFIG"],
+	["keyword", "HKEY_CURRENT_USER"],
+	["keyword", "HKEY_LOCAL_MACHINE"],
+	["keyword", "HKEY_USERS"],
+	["keyword", "HKLM"],
+	["keyword", "HKU"],
+	["keyword", "Hours"],
+	["keyword", "HScroll"],
+	["keyword", "Icon"],
+	["keyword", "IconSmall"],
+	["keyword", "ID"],
+	["keyword", "IDLast"],
+	["keyword", "If"],
+	["keyword", "IfEqual"],
+	["keyword", "IfExist"],
+	["keyword", "IfGreater"],
+	["keyword", "IfGreaterOrEqual"],
+	["keyword", "IfInString"],
+	["keyword", "IfLess"],
+	["keyword", "IfLessOrEqual"],
+	["keyword", "IfMsgBox"],
+	["keyword", "IfNotEqual"],
+	["keyword", "IfNotExist"],
+	["keyword", "IfNotInString"],
+	["keyword", "IfWinActive"],
+	["keyword", "IfWinExist"],
+	["keyword", "IfWinNotActive"],
+	["keyword", "IfWinNotExist"],
+	["keyword", "Ignore"],
+	["keyword", "ImageList"],
+	["keyword", "in"],
+	["keyword", "Integer"],
+	["keyword", "IntegerFast"],
+	["keyword", "Interrupt"],
+	["keyword", "is"],
+	["keyword", "italic"],
+	["keyword", "Join"],
+	["keyword", "Label"],
+	["keyword", "LastFound"],
+	["keyword", "LastFoundExist"],
+	["keyword", "Limit"],
+	["keyword", "Lines"],
+	["keyword", "List"],
+	["keyword", "ListBox"],
+	["keyword", "ListView"],
+	["keyword", "local"],
+	["keyword", "Lock"],
+	["keyword", "Logoff"],
+	["keyword", "Low"],
+	["keyword", "Lower"],
+	["keyword", "Lowercase"],
+	["keyword", "MainWindow"],
+	["keyword", "Margin"],
+	["keyword", "Maximize"],
+	["keyword", "MaximizeBox"],
+	["keyword", "MaxSize"],
+	["keyword", "Minimize"],
+	["keyword", "MinimizeBox"],
+	["keyword", "MinMax"],
+	["keyword", "MinSize"],
+	["keyword", "Minutes"],
+	["keyword", "MonthCal"],
+	["keyword", "Mouse"],
+	["keyword", "Move"],
+	["keyword", "Multi"],
+	["keyword", "NA"],
+	["keyword", "No"],
+	["keyword", "NoActivate"],
+	["keyword", "NoDefault"],
+	["keyword", "NoHide"],
+	["keyword", "NoIcon"],
+	["keyword", "NoMainWindow"],
+	["keyword", "norm"],
+	["keyword", "Normal"],
+	["keyword", "NoSort"],
+	["keyword", "NoSortHdr"],
+	["keyword", "NoStandard"],
+	["keyword", "Not"],
+	["keyword", "NoTab"],
+	["keyword", "NoTimers"],
+	["keyword", "Number"],
+	["keyword", "Off"],
+	["keyword", "Ok"],
+	["keyword", "On"],
+	["keyword", "OwnDialogs"],
+	["keyword", "Owner"],
+	["keyword", "Parse"],
+	["keyword", "Password"],
+	["keyword", "Picture"],
+	["keyword", "Pixel"],
+	["keyword", "Pos"],
+	["keyword", "Pow"],
+	["keyword", "Priority"],
+	["keyword", "ProcessName"],
+	["keyword", "Radio"],
+	["keyword", "Range"],
+	["keyword", "Read"],
+	["keyword", "ReadOnly"],
+	["keyword", "Realtime"],
+	["keyword", "Redraw"],
+	["keyword", "REG_BINARY"],
+	["keyword", "REG_DWORD"],
+	["keyword", "REG_EXPAND_SZ"],
+	["keyword", "REG_MULTI_SZ"],
+	["keyword", "REG_SZ"],
+	["keyword", "Region"],
+	["keyword", "Relative"],
+	["keyword", "Rename"],
+	["keyword", "Report"],
+	["keyword", "Resize"],
+	["keyword", "Restore"],
+	["keyword", "Retry"],
+	["keyword", "RGB"],
+	["keyword", "Screen"],
+	["keyword", "Seconds"],
+	["keyword", "Section"],
+	["keyword", "Serial"],
+	["keyword", "SetLabel"],
+	["keyword", "ShiftAltTab"],
+	["keyword", "Show"],
+	["keyword", "Single"],
+	["keyword", "Slider"],
+	["keyword", "SortDesc"],
+	["keyword", "Standard"],
+	["keyword", "static"],
+	["keyword", "Status"],
+	["keyword", "StatusBar"],
+	["keyword", "StatusCD"],
+	["keyword", "strike"],
+	["keyword", "Style"],
+	["keyword", "Submit"],
+	["keyword", "SysMenu"],
+	["keyword", "Tab2"],
+	["keyword", "TabStop"],
+	["keyword", "Text"],
+	["keyword", "Theme"],
+	["keyword", "Tile"],
+	["keyword", "ToggleCheck"],
+	["keyword", "ToggleEnable"],
+	["keyword", "ToolWindow"],
+	["keyword", "Top"],
+	["keyword", "Topmost"],
+	["keyword", "TransColor"],
+	["keyword", "Transparent"],
+	["keyword", "Tray"],
+	["keyword", "TreeView"],
+	["keyword", "TryAgain"],
+	["keyword", "Type"],
+	["keyword", "UnCheck"],
+	["keyword", "underline"],
+	["keyword", "Unicode"],
+	["keyword", "Unlock"],
+	["keyword", "UpDown"],
+	["keyword", "Upper"],
+	["keyword", "Uppercase"],
+	["keyword", "UseErrorLevel"],
+	["keyword", "Vis"],
+	["keyword", "VisFirst"],
+	["keyword", "Visible"],
+	["keyword", "VScroll"],
+	["keyword", "Wait"],
+	["keyword", "WaitClose"],
+	["keyword", "WantCtrlA"],
+	["keyword", "WantF2"],
+	["keyword", "WantReturn"],
+	["keyword", "While"],
+	["keyword", "Wrap"],
+	["keyword", "Xdigit"],
+	["keyword", "xm"],
+	["keyword", "xp"],
+	["keyword", "xs"],
+	["keyword", "Yes"],
+	["keyword", "ym"],
+	["keyword", "yp"],
+	["keyword", "ys"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/number_feature.test b/tests/languages/autohotkey/number_feature.test
new file mode 100644
index 0000000000..35a493aee9
--- /dev/null
+++ b/tests/languages/autohotkey/number_feature.test
@@ -0,0 +1,21 @@
+42
+3.14159
+3.2e10
+2.9E-7
+0xbabe
+0xBABE
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "3.2e10"],
+	["number", "2.9E-7"],
+	["number", "0xbabe"],
+	["number", "0xBABE"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/operator_feature.test b/tests/languages/autohotkey/operator_feature.test
new file mode 100644
index 0000000000..ec9e23eda1
--- /dev/null
+++ b/tests/languages/autohotkey/operator_feature.test
@@ -0,0 +1,33 @@
++ - * /
+= ? & |
+< >
+++ -- ** //
+! ~ ^ .
+<< >> <= >=
+~= == <> !=
+NOT AND && OR ||
+:= += -= *=
+/= //= .=
+|= &= ^=
+>>= <<=
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "-"], ["operator", "*"], ["operator", "/"],
+	["operator", "="], ["operator", "?"], ["operator", "&"], ["operator", "|"],
+	["operator", "<"], ["operator", ">"],
+	["operator", "++"], ["operator", "--"], ["operator", "**"], ["operator", "//"],
+	["operator", "!"], ["operator", "~"], ["operator", "^"], ["operator", "."],
+	["operator", "<<"], ["operator", ">>"], ["operator", "<="], ["operator", ">="],
+	["operator", "~="], ["operator", "=="], ["operator", "<>"], ["operator", "!="],
+	["operator", "NOT"], ["operator", "AND"], ["operator", "&&"], ["operator", "OR"], ["operator", "||"],
+	["operator", ":="], ["operator", "+="], ["operator", "-="], ["operator", "*="],
+	["operator", "/="], ["operator", "//="], ["operator", ".="],
+	["operator", "|="], ["operator", "&="], ["operator", "^="],
+	["operator", ">>="], ["operator", "<<="]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/selector_feature.test b/tests/languages/autohotkey/selector_feature.test
new file mode 100644
index 0000000000..29210c265b
--- /dev/null
+++ b/tests/languages/autohotkey/selector_feature.test
@@ -0,0 +1,381 @@
+AutoTrim
+BlockInput
+Break
+Click
+ClipWait
+Continue
+Control
+ControlClick
+ControlFocus
+ControlGet
+ControlGetFocus
+ControlGetPos
+ControlGetText
+ControlMove
+ControlSend
+ControlSendRaw
+ControlSetText
+CoordMode
+Critical
+DetectHiddenText
+DetectHiddenWindows
+Drive
+DriveGet
+DriveSpaceFree
+EnvAdd
+EnvDiv
+EnvGet
+EnvMult
+EnvSet
+EnvSub
+EnvUpdate
+Exit
+ExitApp
+FileAppend
+FileCopy
+FileCopyDir
+FileCreateDir
+FileCreateShortcut
+FileDelete
+FileEncoding
+FileGetAttrib
+FileGetShortcut
+FileGetSize
+FileGetTime
+FileGetVersion
+FileInstall
+FileMove
+FileMoveDir
+FileRead
+FileReadLine
+FileRecycle
+FileRecycleEmpty
+FileRemoveDir
+FileSelectFile
+FileSelectFolder
+FileSetAttrib
+FileSetTime
+FormatTime
+GetKeyState
+Gosub
+Goto
+GroupActivate
+GroupAdd
+GroupClose
+GroupDeactivate
+Gui
+GuiControl
+GuiControlGet
+Hotkey
+ImageSearch
+IniDelete
+IniRead
+IniWrite
+Input
+InputBox
+KeyWait
+ListHotkeys
+ListLines
+ListVars
+Loop
+Menu
+MouseClick
+MouseClickDrag
+MouseGetPos
+MouseMove
+MsgBox
+OnExit
+OutputDebug
+Pause
+PixelGetColor
+PixelSearch
+PostMessage
+Process
+Progress
+Random
+RegDelete
+RegRead
+RegWrite
+Reload
+Repeat
+Return
+Run
+RunAs
+RunWait
+Send
+SendEvent
+SendInput
+SendMessage
+SendMode
+SendPlay
+SendRaw
+SetBatchLines
+SetCapslockState
+SetControlDelay
+SetDefaultMouseSpeed
+SetEnv
+SetFormat
+SetKeyDelay
+SetMouseDelay
+SetNumlockState
+SetScrollLockState
+SetStoreCapslockMode
+SetTimer
+SetTitleMatchMode
+SetWinDelay
+SetWorkingDir
+Shutdown
+Sleep
+Sort
+SoundBeep
+SoundGet
+SoundGetWaveVolume
+SoundPlay
+SoundSet
+SoundSetWaveVolume
+SplashImage
+SplashTextOff
+SplashTextOn
+SplitPath
+StatusBarGetText
+StatusBarWait
+StringCaseSense
+StringGetPos
+StringLeft
+StringLen
+StringLower
+StringMid
+StringReplace
+StringRight
+StringSplit
+StringTrimLeft
+StringTrimRight
+StringUpper
+Suspend
+SysGet
+Thread
+ToolTip
+Transform
+TrayTip
+URLDownloadToFile
+WinActivate
+WinActivateBottom
+WinClose
+WinGet
+WinGetActiveStats
+WinGetActiveTitle
+WinGetClass
+WinGetPos
+WinGetText
+WinGetTitle
+WinHide
+WinKill
+WinMaximize
+WinMenuSelectItem
+WinMinimize
+WinMinimizeAll
+WinMinimizeAllUndo
+WinMove
+WinRestore
+WinSet
+WinSetTitle
+WinShow
+WinWait
+WinWaitActive
+WinWaitClose
+WinWaitNotActive
+
+----------------------------------------------------
+
+[
+	["selector", "AutoTrim"],
+	["selector", "BlockInput"],
+	["selector", "Break"],
+	["selector", "Click"],
+	["selector", "ClipWait"],
+	["selector", "Continue"],
+	["selector", "Control"],
+	["selector", "ControlClick"],
+	["selector", "ControlFocus"],
+	["selector", "ControlGet"],
+	["selector", "ControlGetFocus"],
+	["selector", "ControlGetPos"],
+	["selector", "ControlGetText"],
+	["selector", "ControlMove"],
+	["selector", "ControlSend"],
+	["selector", "ControlSendRaw"],
+	["selector", "ControlSetText"],
+	["selector", "CoordMode"],
+	["selector", "Critical"],
+	["selector", "DetectHiddenText"],
+	["selector", "DetectHiddenWindows"],
+	["selector", "Drive"],
+	["selector", "DriveGet"],
+	["selector", "DriveSpaceFree"],
+	["selector", "EnvAdd"],
+	["selector", "EnvDiv"],
+	["selector", "EnvGet"],
+	["selector", "EnvMult"],
+	["selector", "EnvSet"],
+	["selector", "EnvSub"],
+	["selector", "EnvUpdate"],
+	["selector", "Exit"],
+	["selector", "ExitApp"],
+	["selector", "FileAppend"],
+	["selector", "FileCopy"],
+	["selector", "FileCopyDir"],
+	["selector", "FileCreateDir"],
+	["selector", "FileCreateShortcut"],
+	["selector", "FileDelete"],
+	["selector", "FileEncoding"],
+	["selector", "FileGetAttrib"],
+	["selector", "FileGetShortcut"],
+	["selector", "FileGetSize"],
+	["selector", "FileGetTime"],
+	["selector", "FileGetVersion"],
+	["selector", "FileInstall"],
+	["selector", "FileMove"],
+	["selector", "FileMoveDir"],
+	["selector", "FileRead"],
+	["selector", "FileReadLine"],
+	["selector", "FileRecycle"],
+	["selector", "FileRecycleEmpty"],
+	["selector", "FileRemoveDir"],
+	["selector", "FileSelectFile"],
+	["selector", "FileSelectFolder"],
+	["selector", "FileSetAttrib"],
+	["selector", "FileSetTime"],
+	["selector", "FormatTime"],
+	["selector", "GetKeyState"],
+	["selector", "Gosub"],
+	["selector", "Goto"],
+	["selector", "GroupActivate"],
+	["selector", "GroupAdd"],
+	["selector", "GroupClose"],
+	["selector", "GroupDeactivate"],
+	["selector", "Gui"],
+	["selector", "GuiControl"],
+	["selector", "GuiControlGet"],
+	["selector", "Hotkey"],
+	["selector", "ImageSearch"],
+	["selector", "IniDelete"],
+	["selector", "IniRead"],
+	["selector", "IniWrite"],
+	["selector", "Input"],
+	["selector", "InputBox"],
+	["selector", "KeyWait"],
+	["selector", "ListHotkeys"],
+	["selector", "ListLines"],
+	["selector", "ListVars"],
+	["selector", "Loop"],
+	["selector", "Menu"],
+	["selector", "MouseClick"],
+	["selector", "MouseClickDrag"],
+	["selector", "MouseGetPos"],
+	["selector", "MouseMove"],
+	["selector", "MsgBox"],
+	["selector", "OnExit"],
+	["selector", "OutputDebug"],
+	["selector", "Pause"],
+	["selector", "PixelGetColor"],
+	["selector", "PixelSearch"],
+	["selector", "PostMessage"],
+	["selector", "Process"],
+	["selector", "Progress"],
+	["selector", "Random"],
+	["selector", "RegDelete"],
+	["selector", "RegRead"],
+	["selector", "RegWrite"],
+	["selector", "Reload"],
+	["selector", "Repeat"],
+	["selector", "Return"],
+	["selector", "Run"],
+	["selector", "RunAs"],
+	["selector", "RunWait"],
+	["selector", "Send"],
+	["selector", "SendEvent"],
+	["selector", "SendInput"],
+	["selector", "SendMessage"],
+	["selector", "SendMode"],
+	["selector", "SendPlay"],
+	["selector", "SendRaw"],
+	["selector", "SetBatchLines"],
+	["selector", "SetCapslockState"],
+	["selector", "SetControlDelay"],
+	["selector", "SetDefaultMouseSpeed"],
+	["selector", "SetEnv"],
+	["selector", "SetFormat"],
+	["selector", "SetKeyDelay"],
+	["selector", "SetMouseDelay"],
+	["selector", "SetNumlockState"],
+	["selector", "SetScrollLockState"],
+	["selector", "SetStoreCapslockMode"],
+	["selector", "SetTimer"],
+	["selector", "SetTitleMatchMode"],
+	["selector", "SetWinDelay"],
+	["selector", "SetWorkingDir"],
+	["selector", "Shutdown"],
+	["selector", "Sleep"],
+	["selector", "Sort"],
+	["selector", "SoundBeep"],
+	["selector", "SoundGet"],
+	["selector", "SoundGetWaveVolume"],
+	["selector", "SoundPlay"],
+	["selector", "SoundSet"],
+	["selector", "SoundSetWaveVolume"],
+	["selector", "SplashImage"],
+	["selector", "SplashTextOff"],
+	["selector", "SplashTextOn"],
+	["selector", "SplitPath"],
+	["selector", "StatusBarGetText"],
+	["selector", "StatusBarWait"],
+	["selector", "StringCaseSense"],
+	["selector", "StringGetPos"],
+	["selector", "StringLeft"],
+	["selector", "StringLen"],
+	["selector", "StringLower"],
+	["selector", "StringMid"],
+	["selector", "StringReplace"],
+	["selector", "StringRight"],
+	["selector", "StringSplit"],
+	["selector", "StringTrimLeft"],
+	["selector", "StringTrimRight"],
+	["selector", "StringUpper"],
+	["selector", "Suspend"],
+	["selector", "SysGet"],
+	["selector", "Thread"],
+	["selector", "ToolTip"],
+	["selector", "Transform"],
+	["selector", "TrayTip"],
+	["selector", "URLDownloadToFile"],
+	["selector", "WinActivate"],
+	["selector", "WinActivateBottom"],
+	["selector", "WinClose"],
+	["selector", "WinGet"],
+	["selector", "WinGetActiveStats"],
+	["selector", "WinGetActiveTitle"],
+	["selector", "WinGetClass"],
+	["selector", "WinGetPos"],
+	["selector", "WinGetText"],
+	["selector", "WinGetTitle"],
+	["selector", "WinHide"],
+	["selector", "WinKill"],
+	["selector", "WinMaximize"],
+	["selector", "WinMenuSelectItem"],
+	["selector", "WinMinimize"],
+	["selector", "WinMinimizeAll"],
+	["selector", "WinMinimizeAllUndo"],
+	["selector", "WinMove"],
+	["selector", "WinRestore"],
+	["selector", "WinSet"],
+	["selector", "WinSetTitle"],
+	["selector", "WinShow"],
+	["selector", "WinWait"],
+	["selector", "WinWaitActive"],
+	["selector", "WinWaitClose"],
+	["selector", "WinWaitNotActive"]
+]
+
+----------------------------------------------------
+
+Checks for all selectors.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/string_feature.test b/tests/languages/autohotkey/string_feature.test
new file mode 100644
index 0000000000..76168fd271
--- /dev/null
+++ b/tests/languages/autohotkey/string_feature.test
@@ -0,0 +1,15 @@
+""
+"foo"
+"foo""bar"
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"foo\""],
+	["string", "\"foo\"\"bar\""]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/symbol_feature.test b/tests/languages/autohotkey/symbol_feature.test
new file mode 100644
index 0000000000..2c47777427
--- /dev/null
+++ b/tests/languages/autohotkey/symbol_feature.test
@@ -0,0 +1,347 @@
+alt
+altdown
+altup
+appskey
+backspace
+browser_back
+browser_favorites
+browser_forward
+browser_home
+browser_refresh
+browser_search
+browser_stop
+bs
+capslock
+ctrl
+ctrlbreak
+ctrldown
+ctrlup
+del
+delete
+down
+end
+enter
+esc
+escape
+f1
+f10
+f11
+f12
+f13
+f14
+f15
+f16
+f17
+f18
+f19
+f2
+f20
+f21
+f22
+f23
+f24
+f3
+f4
+f5
+f6
+f7
+f8
+f9
+home
+ins
+insert
+joy1
+joy10
+joy11
+joy12
+joy13
+joy14
+joy15
+joy16
+joy17
+joy18
+joy19
+joy2
+joy20
+joy21
+joy22
+joy23
+joy24
+joy25
+joy26
+joy27
+joy28
+joy29
+joy3
+joy30
+joy31
+joy32
+joy4
+joy5
+joy6
+joy7
+joy8
+joy9
+joyaxes
+joybuttons
+joyinfo
+joyname
+joypov
+joyr
+joyu
+joyv
+joyx
+joyy
+joyz
+lalt
+launch_app1
+launch_app2
+launch_mail
+launch_media
+lbutton
+lcontrol
+lctrl
+left
+lshift
+lwin
+lwindown
+lwinup
+mbutton
+media_next
+media_play_pause
+media_prev
+media_stop
+numlock
+numpad0
+numpad1
+numpad2
+numpad3
+numpad4
+numpad5
+numpad6
+numpad7
+numpad8
+numpad9
+numpadadd
+numpadclear
+numpaddel
+numpaddiv
+numpaddot
+numpaddown
+numpadend
+numpadenter
+numpadhome
+numpadins
+numpadleft
+numpadmult
+numpadpgdn
+numpadpgup
+numpadright
+numpadsub
+numpadup
+pgdn
+pgup
+printscreen
+ralt
+rbutton
+rcontrol
+rctrl
+right
+rshift
+rwin
+rwindown
+rwinup
+scrolllock
+shift
+shiftdown
+shiftup
+space
+tab
+up
+volume_down
+volume_mute
+volume_up
+wheeldown
+wheelleft
+wheelright
+wheelup
+xbutton1
+xbutton2
+
+----------------------------------------------------
+
+[
+	["symbol", "alt"],
+	["symbol", "altdown"],
+	["symbol", "altup"],
+	["symbol", "appskey"],
+	["symbol", "backspace"],
+	["symbol", "browser_back"],
+	["symbol", "browser_favorites"],
+	["symbol", "browser_forward"],
+	["symbol", "browser_home"],
+	["symbol", "browser_refresh"],
+	["symbol", "browser_search"],
+	["symbol", "browser_stop"],
+	["symbol", "bs"],
+	["symbol", "capslock"],
+	["symbol", "ctrl"],
+	["symbol", "ctrlbreak"],
+	["symbol", "ctrldown"],
+	["symbol", "ctrlup"],
+	["symbol", "del"],
+	["symbol", "delete"],
+	["symbol", "down"],
+	["symbol", "end"],
+	["symbol", "enter"],
+	["symbol", "esc"],
+	["symbol", "escape"],
+	["symbol", "f1"],
+	["symbol", "f10"],
+	["symbol", "f11"],
+	["symbol", "f12"],
+	["symbol", "f13"],
+	["symbol", "f14"],
+	["symbol", "f15"],
+	["symbol", "f16"],
+	["symbol", "f17"],
+	["symbol", "f18"],
+	["symbol", "f19"],
+	["symbol", "f2"],
+	["symbol", "f20"],
+	["symbol", "f21"],
+	["symbol", "f22"],
+	["symbol", "f23"],
+	["symbol", "f24"],
+	["symbol", "f3"],
+	["symbol", "f4"],
+	["symbol", "f5"],
+	["symbol", "f6"],
+	["symbol", "f7"],
+	["symbol", "f8"],
+	["symbol", "f9"],
+	["symbol", "home"],
+	["symbol", "ins"],
+	["symbol", "insert"],
+	["symbol", "joy1"],
+	["symbol", "joy10"],
+	["symbol", "joy11"],
+	["symbol", "joy12"],
+	["symbol", "joy13"],
+	["symbol", "joy14"],
+	["symbol", "joy15"],
+	["symbol", "joy16"],
+	["symbol", "joy17"],
+	["symbol", "joy18"],
+	["symbol", "joy19"],
+	["symbol", "joy2"],
+	["symbol", "joy20"],
+	["symbol", "joy21"],
+	["symbol", "joy22"],
+	["symbol", "joy23"],
+	["symbol", "joy24"],
+	["symbol", "joy25"],
+	["symbol", "joy26"],
+	["symbol", "joy27"],
+	["symbol", "joy28"],
+	["symbol", "joy29"],
+	["symbol", "joy3"],
+	["symbol", "joy30"],
+	["symbol", "joy31"],
+	["symbol", "joy32"],
+	["symbol", "joy4"],
+	["symbol", "joy5"],
+	["symbol", "joy6"],
+	["symbol", "joy7"],
+	["symbol", "joy8"],
+	["symbol", "joy9"],
+	["symbol", "joyaxes"],
+	["symbol", "joybuttons"],
+	["symbol", "joyinfo"],
+	["symbol", "joyname"],
+	["symbol", "joypov"],
+	["symbol", "joyr"],
+	["symbol", "joyu"],
+	["symbol", "joyv"],
+	["symbol", "joyx"],
+	["symbol", "joyy"],
+	["symbol", "joyz"],
+	["symbol", "lalt"],
+	["symbol", "launch_app1"],
+	["symbol", "launch_app2"],
+	["symbol", "launch_mail"],
+	["symbol", "launch_media"],
+	["symbol", "lbutton"],
+	["symbol", "lcontrol"],
+	["symbol", "lctrl"],
+	["symbol", "left"],
+	["symbol", "lshift"],
+	["symbol", "lwin"],
+	["symbol", "lwindown"],
+	["symbol", "lwinup"],
+	["symbol", "mbutton"],
+	["symbol", "media_next"],
+	["symbol", "media_play_pause"],
+	["symbol", "media_prev"],
+	["symbol", "media_stop"],
+	["symbol", "numlock"],
+	["symbol", "numpad0"],
+	["symbol", "numpad1"],
+	["symbol", "numpad2"],
+	["symbol", "numpad3"],
+	["symbol", "numpad4"],
+	["symbol", "numpad5"],
+	["symbol", "numpad6"],
+	["symbol", "numpad7"],
+	["symbol", "numpad8"],
+	["symbol", "numpad9"],
+	["symbol", "numpadadd"],
+	["symbol", "numpadclear"],
+	["symbol", "numpaddel"],
+	["symbol", "numpaddiv"],
+	["symbol", "numpaddot"],
+	["symbol", "numpaddown"],
+	["symbol", "numpadend"],
+	["symbol", "numpadenter"],
+	["symbol", "numpadhome"],
+	["symbol", "numpadins"],
+	["symbol", "numpadleft"],
+	["symbol", "numpadmult"],
+	["symbol", "numpadpgdn"],
+	["symbol", "numpadpgup"],
+	["symbol", "numpadright"],
+	["symbol", "numpadsub"],
+	["symbol", "numpadup"],
+	["symbol", "pgdn"],
+	["symbol", "pgup"],
+	["symbol", "printscreen"],
+	["symbol", "ralt"],
+	["symbol", "rbutton"],
+	["symbol", "rcontrol"],
+	["symbol", "rctrl"],
+	["symbol", "right"],
+	["symbol", "rshift"],
+	["symbol", "rwin"],
+	["symbol", "rwindown"],
+	["symbol", "rwinup"],
+	["symbol", "scrolllock"],
+	["symbol", "shift"],
+	["symbol", "shiftdown"],
+	["symbol", "shiftup"],
+	["symbol", "space"],
+	["symbol", "tab"],
+	["symbol", "up"],
+	["symbol", "volume_down"],
+	["symbol", "volume_mute"],
+	["symbol", "volume_up"],
+	["symbol", "wheeldown"],
+	["symbol", "wheelleft"],
+	["symbol", "wheelright"],
+	["symbol", "wheelup"],
+	["symbol", "xbutton1"],
+	["symbol", "xbutton2"]
+]
+
+----------------------------------------------------
+
+Checks for all symbols.
\ No newline at end of file
diff --git a/tests/languages/autohotkey/tag_feature.test b/tests/languages/autohotkey/tag_feature.test
new file mode 100644
index 0000000000..0ca92589e4
--- /dev/null
+++ b/tests/languages/autohotkey/tag_feature.test
@@ -0,0 +1,15 @@
+foo:
+foo_bar:
+
+----------------------------------------------------
+
+[
+	["tag", "foo"],
+	["punctuation", ":"],
+	["tag", "foo_bar"],
+	["punctuation", ":"]
+]
+
+----------------------------------------------------
+
+Checks for tags (labels).
\ No newline at end of file
diff --git a/tests/languages/autohotkey/variable_feature.test b/tests/languages/autohotkey/variable_feature.test
new file mode 100644
index 0000000000..5ed8a4c518
--- /dev/null
+++ b/tests/languages/autohotkey/variable_feature.test
@@ -0,0 +1,13 @@
+%foo%
+%foo_bar%
+
+----------------------------------------------------
+
+[
+	["variable", "%foo%"],
+	["variable", "%foo_bar%"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From bbf9bdf96a6269b77b6cc8d2568737e4016f9f16 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:31:11 +0200
Subject: [PATCH 166/310] Add tests for Bash

---
 tests/languages/bash/comment_feature.test   |  13 +++
 tests/languages/bash/function_feature.test  | 101 ++++++++++++++++++++
 tests/languages/bash/important_feature.test |  11 +++
 tests/languages/bash/keyword_feature.test   |  19 ++++
 tests/languages/bash/string_feature.test    |  32 +++++++
 tests/languages/bash/variable_feature.test  |  15 +++
 6 files changed, 191 insertions(+)
 create mode 100644 tests/languages/bash/comment_feature.test
 create mode 100644 tests/languages/bash/function_feature.test
 create mode 100644 tests/languages/bash/important_feature.test
 create mode 100644 tests/languages/bash/keyword_feature.test
 create mode 100644 tests/languages/bash/string_feature.test
 create mode 100644 tests/languages/bash/variable_feature.test

diff --git a/tests/languages/bash/comment_feature.test b/tests/languages/bash/comment_feature.test
new file mode 100644
index 0000000000..58249096f0
--- /dev/null
+++ b/tests/languages/bash/comment_feature.test
@@ -0,0 +1,13 @@
+#foo
+# bar
+
+----------------------------------------------------
+
+[
+	["comment", "#foo"],
+	["comment", "# bar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/bash/function_feature.test b/tests/languages/bash/function_feature.test
new file mode 100644
index 0000000000..cb0def25ed
--- /dev/null
+++ b/tests/languages/bash/function_feature.test
@@ -0,0 +1,101 @@
+alias apropos apt-get aptitude aspell
+awk basename bash bc bg
+builtin bzip2 cal cat cd
+cfdisk chgrp chmod chown chroot
+chkconfig cksum clear cmp comm
+command cp cron crontab csplit
+cut date dc dd ddrescue
+df diff diff3 dig dir dircolors
+dirname dirs dmesg du
+egrep eject enable env ethtool
+eval exec expand expect
+export expr fdformat fdisk
+fg fgrep file find fmt
+fold format free fsck ftp
+fuser gawk getopts git grep
+groupadd groupdel groupmod groups
+gzip hash head help hg history
+hostname htop iconv id ifconfig
+ifdown ifup import install jobs
+join kill killall less link ln
+locate logname logout look lpc lpr
+lprint lprintd lprintq lprm ls
+lsof make man mkdir mkfifo
+mkisofs mknod more most mount
+mtools mtr mv mmv nano netstat
+nice nl nohup notify-send nslookup
+open op passwd paste pathchk ping
+pkill popd pr printcap printenv
+printf ps pushd pv pwd quota
+quotacheck quotactl ram rar rcp
+read readarray readonly reboot
+rename renice remsync rev rm
+rmdir rsync screen scp sdiff sed
+seq service sftp shift
+shopt shutdown sleep slocate
+sort source split ssh stat strace
+su sudo sum suspend sync tail tar
+tee test time timeout times
+touch top traceroute trap tr
+tsort tty type ulimit umask
+umount unalias uname unexpand uniq
+units unrar unshar uptime
+useradd userdel usermod users uuencode
+uudecode v vdir vi vmstat wait watch
+wc wget whereis which who whoami write
+xargs xdg-open yes zip
+
+----------------------------------------------------
+
+[
+	["function", "alias"], ["function", "apropos"], ["function", "apt-get"], ["function", "aptitude"], ["function", "aspell"],
+	["function", "awk"], ["function", "basename"], ["function", "bash"], ["function", "bc"], ["function", "bg"],
+	["function", "builtin"], ["function", "bzip2"], ["function", "cal"], ["function", "cat"], ["function", "cd"],
+	["function", "cfdisk"], ["function", "chgrp"], ["function", "chmod"], ["function", "chown"], ["function", "chroot"],
+	["function", "chkconfig"], ["function", "cksum"], ["function", "clear"], ["function", "cmp"], ["function", "comm"],
+	["function", "command"], ["function", "cp"], ["function", "cron"], ["function", "crontab"], ["function", "csplit"],
+	["function", "cut"], ["function", "date"], ["function", "dc"], ["function", "dd"], ["function", "ddrescue"],
+	["function", "df"], ["function", "diff"], ["function", "diff3"], ["function", "dig"], ["function", "dir"], ["function", "dircolors"],
+	["function", "dirname"], ["function", "dirs"], ["function", "dmesg"], ["function", "du"],
+	["function", "egrep"], ["function", "eject"], ["function", "enable"], ["function", "env"], ["function", "ethtool"],
+	["function", "eval"], ["function", "exec"], ["function", "expand"], ["function", "expect"],
+	["function", "export"], ["function", "expr"], ["function", "fdformat"], ["function", "fdisk"],
+	["function", "fg"], ["function", "fgrep"], ["function", "file"], ["function", "find"], ["function", "fmt"],
+	["function", "fold"], ["function", "format"], ["function", "free"], ["function", "fsck"], ["function", "ftp"],
+	["function", "fuser"], ["function", "gawk"], ["function", "getopts"], ["function", "git"], ["function", "grep"],
+	["function", "groupadd"], ["function", "groupdel"], ["function", "groupmod"], ["function", "groups"],
+	["function", "gzip"], ["function", "hash"], ["function", "head"], ["function", "help"], ["function", "hg"], ["function", "history"],
+	["function", "hostname"], ["function", "htop"], ["function", "iconv"], ["function", "id"], ["function", "ifconfig"],
+	["function", "ifdown"], ["function", "ifup"], ["function", "import"], ["function", "install"], ["function", "jobs"],
+	["function", "join"], ["function", "kill"], ["function", "killall"], ["function", "less"], ["function", "link"], ["function", "ln"],
+	["function", "locate"], ["function", "logname"], ["function", "logout"], ["function", "look"], ["function", "lpc"], ["function", "lpr"],
+	["function", "lprint"], ["function", "lprintd"], ["function", "lprintq"], ["function", "lprm"], ["function", "ls"],
+	["function", "lsof"], ["function", "make"], ["function", "man"], ["function", "mkdir"], ["function", "mkfifo"],
+	["function", "mkisofs"], ["function", "mknod"], ["function", "more"], ["function", "most"], ["function", "mount"],
+	["function", "mtools"], ["function", "mtr"], ["function", "mv"], ["function", "mmv"], ["function", "nano"], ["function", "netstat"],
+	["function", "nice"], ["function", "nl"], ["function", "nohup"], ["function", "notify-send"], ["function", "nslookup"],
+	["function", "open"], ["function", "op"], ["function", "passwd"], ["function", "paste"], ["function", "pathchk"], ["function", "ping"],
+	["function", "pkill"], ["function", "popd"], ["function", "pr"], ["function", "printcap"], ["function", "printenv"],
+	["function", "printf"], ["function", "ps"], ["function", "pushd"], ["function", "pv"], ["function", "pwd"], ["function", "quota"],
+	["function", "quotacheck"], ["function", "quotactl"], ["function", "ram"], ["function", "rar"], ["function", "rcp"],
+	["function", "read"], ["function", "readarray"], ["function", "readonly"], ["function", "reboot"],
+	["function", "rename"], ["function", "renice"], ["function", "remsync"], ["function", "rev"], ["function", "rm"],
+	["function", "rmdir"], ["function", "rsync"], ["function", "screen"], ["function", "scp"], ["function", "sdiff"], ["function", "sed"],
+	["function", "seq"], ["function", "service"], ["function", "sftp"], ["function", "shift"],
+	["function", "shopt"], ["function", "shutdown"], ["function", "sleep"], ["function", "slocate"],
+	["function", "sort"], ["function", "source"], ["function", "split"], ["function", "ssh"], ["function", "stat"], ["function", "strace"],
+	["function", "su"], ["function", "sudo"], ["function", "sum"], ["function", "suspend"], ["function", "sync"], ["function", "tail"], ["function", "tar"],
+	["function", "tee"], ["function", "test"], ["function", "time"], ["function", "timeout"], ["function", "times"],
+	["function", "touch"], ["function", "top"], ["function", "traceroute"], ["function", "trap"], ["function", "tr"],
+	["function", "tsort"], ["function", "tty"], ["function", "type"], ["function", "ulimit"], ["function", "umask"],
+	["function", "umount"], ["function", "unalias"], ["function", "uname"], ["function", "unexpand"], ["function", "uniq"],
+	["function", "units"], ["function", "unrar"], ["function", "unshar"], ["function", "uptime"],
+	["function", "useradd"], ["function", "userdel"], ["function", "usermod"], ["function", "users"], ["function", "uuencode"],
+	["function", "uudecode"], ["function", "v"], ["function", "vdir"], ["function", "vi"], ["function", "vmstat"], ["function", "wait"], ["function", "watch"],
+	["function", "wc"], ["function", "wget"], ["function", "whereis"], ["function", "which"], ["function", "who"], ["function", "whoami"], ["function", "write"],
+	["function", "xargs"], ["function", "xdg-open"], ["function", "yes"], ["function", "zip"]
+]
+
+----------------------------------------------------
+
+Checks for all functions.
\ No newline at end of file
diff --git a/tests/languages/bash/important_feature.test b/tests/languages/bash/important_feature.test
new file mode 100644
index 0000000000..0e03588726
--- /dev/null
+++ b/tests/languages/bash/important_feature.test
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+----------------------------------------------------
+
+[
+	["important", "#!/bin/bash"]
+]
+
+----------------------------------------------------
+
+Checks for shebang.
\ No newline at end of file
diff --git a/tests/languages/bash/keyword_feature.test b/tests/languages/bash/keyword_feature.test
new file mode 100644
index 0000000000..ce35561519
--- /dev/null
+++ b/tests/languages/bash/keyword_feature.test
@@ -0,0 +1,19 @@
+if then else elif fi
+for break continue while
+in case function select
+do done until echo exit
+return set declare
+
+----------------------------------------------------
+
+[
+	["keyword", "if"], ["keyword", "then"], ["keyword", "else"], ["keyword", "elif"], ["keyword", "fi"],
+	["keyword", "for"], ["keyword", "break"], ["keyword", "continue"], ["keyword", "while"],
+	["keyword", "in"], ["keyword", "case"], ["keyword", "function"], ["keyword", "select"],
+	["keyword", "do"], ["keyword", "done"], ["keyword", "until"], ["keyword", "echo"], ["keyword", "exit"],
+	["keyword", "return"], ["keyword", "set"], ["keyword", "declare"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/bash/string_feature.test b/tests/languages/bash/string_feature.test
new file mode 100644
index 0000000000..2426bc7280
--- /dev/null
+++ b/tests/languages/bash/string_feature.test
@@ -0,0 +1,32 @@
+""
+''
+"foo"
+'foo'
+"foo
+bar"
+'foo
+bar'
+"$@"
+"${foo}"
+
+----------------------------------------------------
+
+[
+	["string", ["\"\""]],
+	["string", ["''"]],
+	["string", ["\"foo\""]],
+	["string", ["'foo'"]],
+	["string", ["\"foo\r\nbar\""]],
+	["string", ["'foo\r\nbar'"]],
+	["string", [
+		"\"", ["property", "$@"], "\""
+	]],
+	["string", [
+		"\"", ["property", "${foo}"], "\""
+	]]
+]
+
+----------------------------------------------------
+
+Checks for single-quoted and double-quoted strings.
+Also checks for variables in strings.
\ No newline at end of file
diff --git a/tests/languages/bash/variable_feature.test b/tests/languages/bash/variable_feature.test
new file mode 100644
index 0000000000..58cca25884
--- /dev/null
+++ b/tests/languages/bash/variable_feature.test
@@ -0,0 +1,15 @@
+$foo
+$@
+${foo bar}
+
+----------------------------------------------------
+
+[
+	["property", "$foo"],
+	["property", "$@"],
+	["property", "${foo bar}"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From 10207b8e7435aa6601f4490d54600eb182c642a5 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:32:31 +0200
Subject: [PATCH 167/310] Add tests for Brainfuck

---
 tests/languages/brainfuck/all_feature.test | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/languages/brainfuck/all_feature.test

diff --git a/tests/languages/brainfuck/all_feature.test b/tests/languages/brainfuck/all_feature.test
new file mode 100644
index 0000000000..284f758aaa
--- /dev/null
+++ b/tests/languages/brainfuck/all_feature.test
@@ -0,0 +1,19 @@
+++ foobar
+[
+	>.
+	<-,
+]
+
+----------------------------------------------------
+
+[
+	["increment", "+"], ["increment", "+"], ["comment", "foobar"],
+	["branching", "["],
+	["pointer", ">"], ["operator", "."],
+	["pointer", "<"], ["decrement", "-"], ["operator", ","],
+	["branching", "]"]
+]
+
+----------------------------------------------------
+
+Checks for all patterns.
\ No newline at end of file

From c24fb46bed183f713cb8c72d07ab2577f34169ec Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:33:38 +0200
Subject: [PATCH 168/310] Add tests for C

---
 tests/languages/c/keyword_feature.test  | 23 +++++++++++++++++++++++
 tests/languages/c/macro_feature.test    | 19 +++++++++++++++++++
 tests/languages/c/operator_feature.test | 19 +++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 tests/languages/c/keyword_feature.test
 create mode 100644 tests/languages/c/macro_feature.test
 create mode 100644 tests/languages/c/operator_feature.test

diff --git a/tests/languages/c/keyword_feature.test b/tests/languages/c/keyword_feature.test
new file mode 100644
index 0000000000..3c9f6e01c6
--- /dev/null
+++ b/tests/languages/c/keyword_feature.test
@@ -0,0 +1,23 @@
+asm typeof inline auto break
+case char const continue default
+do double else enum extern
+float for goto if int
+long register return short signed
+sizeof static struct switch typedef
+union unsigned void volatile while
+
+----------------------------------------------------
+
+[
+	["keyword", "asm"], ["keyword", "typeof"], ["keyword", "inline"], ["keyword", "auto"], ["keyword", "break"],
+	["keyword", "case"], ["keyword", "char"], ["keyword", "const"], ["keyword", "continue"], ["keyword", "default"],
+	["keyword", "do"], ["keyword", "double"], ["keyword", "else"], ["keyword", "enum"], ["keyword", "extern"],
+	["keyword", "float"], ["keyword", "for"], ["keyword", "goto"], ["keyword", "if"], ["keyword", "int"],
+	["keyword", "long"], ["keyword", "register"], ["keyword", "return"], ["keyword", "short"], ["keyword", "signed"],
+	["keyword", "sizeof"], ["keyword", "static"], ["keyword", "struct"], ["keyword", "switch"], ["keyword", "typedef"],
+	["keyword", "union"], ["keyword", "unsigned"], ["keyword", "void"], ["keyword", "volatile"], ["keyword", "while"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/c/macro_feature.test b/tests/languages/c/macro_feature.test
new file mode 100644
index 0000000000..f537cb72c0
--- /dev/null
+++ b/tests/languages/c/macro_feature.test
@@ -0,0 +1,19 @@
+# include <stdio.h>
+  #define PG_locked 0
+#foo \
+bar
+
+----------------------------------------------------
+
+[
+	["macro", [
+		"# include ",
+		["string", "<stdio.h>"]
+	]],
+	["macro", ["#define PG_locked 0"]],
+	["macro", ["#foo \\\r\nbar"]]
+]
+
+----------------------------------------------------
+
+Checks for macros, multi-line macros and paths inside include statements.
\ No newline at end of file
diff --git a/tests/languages/c/operator_feature.test b/tests/languages/c/operator_feature.test
new file mode 100644
index 0000000000..fdcfb19e99
--- /dev/null
+++ b/tests/languages/c/operator_feature.test
@@ -0,0 +1,19 @@
++ - ++ -- ! !=
+< << <= <<=
+> >> >= >>=
+-> == ^ ~ %
+& && | || ? * /
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "-"], ["operator", "++"], ["operator", "--"], ["operator", "!"], ["operator", "!="],
+	["operator", "<"], ["operator", "<<"], ["operator", "<="], ["operator", "<<="],
+	["operator", ">"], ["operator", ">>"], ["operator", ">="], ["operator", ">>="],
+	["operator", "->"], ["operator", "=="], ["operator", "^"], ["operator", "~"], ["operator", "%"],
+	["operator", "&"], ["operator", "&&"], ["operator", "|"], ["operator", "||"], ["operator", "?"], ["operator", "*"], ["operator", "/"]
+]
+
+----------------------------------------------------
+
+Checks for all operators
\ No newline at end of file

From 4206d77e83286094c7610e39f3cf7e12eae0891f Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:34:33 +0200
Subject: [PATCH 169/310] Add tests for C-like

---
 tests/languages/clike/boolean_feature.test    | 12 +++++
 tests/languages/clike/class-name_feature.test | 53 +++++++++++++++++++
 tests/languages/clike/comment_feature.test    | 16 ++++++
 tests/languages/clike/function_feature.test   | 23 ++++++++
 tests/languages/clike/keyword_feature.test    | 30 +++++++++++
 tests/languages/clike/number_feature.test     | 21 ++++++++
 tests/languages/clike/operator_feature.test   | 19 +++++++
 tests/languages/clike/string_feature.test     | 24 +++++++++
 8 files changed, 198 insertions(+)
 create mode 100644 tests/languages/clike/boolean_feature.test
 create mode 100644 tests/languages/clike/class-name_feature.test
 create mode 100644 tests/languages/clike/comment_feature.test
 create mode 100644 tests/languages/clike/function_feature.test
 create mode 100644 tests/languages/clike/keyword_feature.test
 create mode 100644 tests/languages/clike/number_feature.test
 create mode 100644 tests/languages/clike/operator_feature.test
 create mode 100644 tests/languages/clike/string_feature.test

diff --git a/tests/languages/clike/boolean_feature.test b/tests/languages/clike/boolean_feature.test
new file mode 100644
index 0000000000..6a1ad0ca3d
--- /dev/null
+++ b/tests/languages/clike/boolean_feature.test
@@ -0,0 +1,12 @@
+true; false;
+
+----------------------------------------------------
+
+[
+	["boolean", "true"], ["punctuation", ";"],
+	["boolean", "false"], ["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for booleans.
\ No newline at end of file
diff --git a/tests/languages/clike/class-name_feature.test b/tests/languages/clike/class-name_feature.test
new file mode 100644
index 0000000000..04c211254e
--- /dev/null
+++ b/tests/languages/clike/class-name_feature.test
@@ -0,0 +1,53 @@
+class Foo
+interface bar
+extends Foo
+implements bar
+trait Foo
+instanceof \bar
+new \Foo
+catch (bar)
+
+----------------------------------------------------
+
+[
+	"class ",
+	["class-name", [
+		"Foo"
+	]],
+	"\r\ninterface ",
+	["class-name", [
+		"bar"
+	]],
+	"\r\nextends ",
+	["class-name", [
+		"Foo"
+	]],
+	"\r\nimplements ",
+	["class-name", [
+		"bar"
+	]],
+	"\r\ntrait ",
+	["class-name", [
+		"Foo"
+	]],
+	["keyword", "instanceof"],
+	["class-name", [
+		["punctuation", "\\"],
+		"bar"
+	]],
+	["keyword", "new"],
+	["class-name", [
+		["punctuation", "\\"],
+		"Foo"
+	]],
+	["keyword", "catch"],
+	["punctuation", "("],
+	["class-name", [
+		"bar"
+	]],
+	["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for class names.
\ No newline at end of file
diff --git a/tests/languages/clike/comment_feature.test b/tests/languages/clike/comment_feature.test
new file mode 100644
index 0000000000..00bb2894f1
--- /dev/null
+++ b/tests/languages/clike/comment_feature.test
@@ -0,0 +1,16 @@
+// foobar
+/**/
+/* foo
+bar */
+
+----------------------------------------------------
+
+[
+	["comment", "// foobar"],
+	["comment", "/**/"],
+	["comment", "/* foo\r\nbar */"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
\ No newline at end of file
diff --git a/tests/languages/clike/function_feature.test b/tests/languages/clike/function_feature.test
new file mode 100644
index 0000000000..031ed1c9d9
--- /dev/null
+++ b/tests/languages/clike/function_feature.test
@@ -0,0 +1,23 @@
+foo()
+foo_bar()
+f42()
+
+----------------------------------------------------
+
+[
+	["function", "foo"],
+	["punctuation", "("],
+	["punctuation", ")"],
+
+	["function", "foo_bar"],
+	["punctuation", "("],
+	["punctuation", ")"],
+
+	["function", "f42"],
+	["punctuation", "("],
+	["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for functions.
\ No newline at end of file
diff --git a/tests/languages/clike/keyword_feature.test b/tests/languages/clike/keyword_feature.test
new file mode 100644
index 0000000000..4313f7c9ad
--- /dev/null
+++ b/tests/languages/clike/keyword_feature.test
@@ -0,0 +1,30 @@
+if; else; while; do; for;
+return; in; instanceof; function; new;
+try; throw; catch; finally; null;
+break; continue;
+
+----------------------------------------------------
+
+[
+	["keyword", "if"], ["punctuation", ";"],
+	["keyword", "else"], ["punctuation", ";"],
+	["keyword", "while"], ["punctuation", ";"],
+	["keyword", "do"], ["punctuation", ";"],
+	["keyword", "for"], ["punctuation", ";"],
+	["keyword", "return"], ["punctuation", ";"],
+	["keyword", "in"], ["punctuation", ";"],
+	["keyword", "instanceof"], ["punctuation", ";"],
+	["keyword", "function"], ["punctuation", ";"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "try"], ["punctuation", ";"],
+	["keyword", "throw"], ["punctuation", ";"],
+	["keyword", "catch"], ["punctuation", ";"],
+	["keyword", "finally"], ["punctuation", ";"],
+	["keyword", "null"], ["punctuation", ";"],
+	["keyword", "break"], ["punctuation", ";"],
+	["keyword", "continue"], ["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/clike/number_feature.test b/tests/languages/clike/number_feature.test
new file mode 100644
index 0000000000..002a5c92c2
--- /dev/null
+++ b/tests/languages/clike/number_feature.test
@@ -0,0 +1,21 @@
+42
+3.14159
+4e10
+2.1e-10
+0xbabe
+0xBABE
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "4e10"],
+	["number", "2.1e-10"],
+	["number", "0xbabe"],
+	["number", "0xBABE"]
+]
+
+----------------------------------------------------
+
+Checks for decimal numbers and hexadecimal numbers.
\ No newline at end of file
diff --git a/tests/languages/clike/operator_feature.test b/tests/languages/clike/operator_feature.test
new file mode 100644
index 0000000000..ec68a4af2c
--- /dev/null
+++ b/tests/languages/clike/operator_feature.test
@@ -0,0 +1,19 @@
+- + -- ++
+! < <= > >=
+= == ===
+& && | ||
+? * / ~ ^ %
+
+----------------------------------------------------
+
+[
+	["operator", "-"], ["operator", "+"], ["operator", "--"], ["operator", "++"],
+	["operator", "!"], ["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
+	["operator", "="], ["operator", "=="], ["operator", "==="],
+	["operator", "&"], ["operator", "&&"], ["operator", "|"], ["operator", "||"],
+	["operator", "?"], ["operator", "*"], ["operator", "/"], ["operator", "~"], ["operator", "^"], ["operator", "%"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/clike/string_feature.test b/tests/languages/clike/string_feature.test
new file mode 100644
index 0000000000..0daabede0d
--- /dev/null
+++ b/tests/languages/clike/string_feature.test
@@ -0,0 +1,24 @@
+""
+''
+"f\"oo"
+'b\'ar'
+"foo\
+bar"
+'foo\
+bar'
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "''"],
+	["string", "\"f\\\"oo\""],
+	["string", "'b\\'ar'"],
+	["string", "\"foo\\\r\nbar\""],
+	["string", "'foo\\\r\nbar'"]
+]
+
+----------------------------------------------------
+
+Checks for empty strings, single-line strings and
+multi-line strings, both single-quoted and double-quoted.
\ No newline at end of file

From 02d4ddf68af722f248fc9b6f376b5830881286bb Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:35:57 +0200
Subject: [PATCH 170/310] Add tests for CoffeeScript

---
 .../coffeescript/block-regex_feature.test     | 33 ++++++++++++
 .../coffeescript/class-member_feature.test    | 13 +++++
 .../coffeescript/comment_feature.test         | 16 ++++++
 .../inline-javascript_feature.test            | 22 ++++++++
 .../coffeescript/keyword_feature.test         | 41 +++++++++++++++
 .../coffeescript/property_feature.test        | 15 ++++++
 .../coffeescript/string_feature.test          | 52 +++++++++++++++++++
 7 files changed, 192 insertions(+)
 create mode 100644 tests/languages/coffeescript/block-regex_feature.test
 create mode 100644 tests/languages/coffeescript/class-member_feature.test
 create mode 100644 tests/languages/coffeescript/comment_feature.test
 create mode 100644 tests/languages/coffeescript/inline-javascript_feature.test
 create mode 100644 tests/languages/coffeescript/keyword_feature.test
 create mode 100644 tests/languages/coffeescript/property_feature.test
 create mode 100644 tests/languages/coffeescript/string_feature.test

diff --git a/tests/languages/coffeescript/block-regex_feature.test b/tests/languages/coffeescript/block-regex_feature.test
new file mode 100644
index 0000000000..b01a9a42de
--- /dev/null
+++ b/tests/languages/coffeescript/block-regex_feature.test
@@ -0,0 +1,33 @@
+///foo[bar]///
+///foo
+[bar]///
+///foo
+b#{ar}baz///
+///foo #bar
+baz///
+
+----------------------------------------------------
+
+[
+	["block-regex", [
+        "///foo[bar]///"
+    ]],
+    ["block-regex", [
+        "///foo\r\n[bar]///"
+    ]],
+    ["block-regex", [
+        "///foo\r\nb",
+        ["interpolation", "#{ar}"],
+        "baz///"
+    ]],
+    ["block-regex", [
+        "///foo ",
+        ["comment", "#bar"],
+        "\r\nbaz///"
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for block regex.
+Also checks for comments and interpolations inside block regex.
\ No newline at end of file
diff --git a/tests/languages/coffeescript/class-member_feature.test b/tests/languages/coffeescript/class-member_feature.test
new file mode 100644
index 0000000000..6fdbcf3e3a
--- /dev/null
+++ b/tests/languages/coffeescript/class-member_feature.test
@@ -0,0 +1,13 @@
+@name
+@foo_bar
+
+----------------------------------------------------
+
+[
+	["class-member", "@name"],
+	["class-member", "@foo_bar"]
+]
+
+----------------------------------------------------
+
+Checks for class members.
\ No newline at end of file
diff --git a/tests/languages/coffeescript/comment_feature.test b/tests/languages/coffeescript/comment_feature.test
new file mode 100644
index 0000000000..5d034ff0f0
--- /dev/null
+++ b/tests/languages/coffeescript/comment_feature.test
@@ -0,0 +1,16 @@
+#foo
+# foo bar
+### foo bar
+baz ###
+
+----------------------------------------------------
+
+[
+	["comment", "#foo"],
+	["comment", "# foo bar"],
+	["multiline-comment", "### foo bar\r\nbaz ###"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
\ No newline at end of file
diff --git a/tests/languages/coffeescript/inline-javascript_feature.test b/tests/languages/coffeescript/inline-javascript_feature.test
new file mode 100644
index 0000000000..cf15e26c0a
--- /dev/null
+++ b/tests/languages/coffeescript/inline-javascript_feature.test
@@ -0,0 +1,22 @@
+`/* JS here */`
+`/*
+JS here */`
+
+----------------------------------------------------
+
+[
+	["inline-javascript", [
+		["delimiter", "`"],
+		["comment", "/* JS here */"],
+		["delimiter", "`"]
+	]],
+	["inline-javascript", [
+        ["delimiter", "`"],
+        ["comment", "/*\r\nJS here */"],
+        ["delimiter", "`"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for inline JavaScript.
\ No newline at end of file
diff --git a/tests/languages/coffeescript/keyword_feature.test b/tests/languages/coffeescript/keyword_feature.test
new file mode 100644
index 0000000000..3207e3982d
--- /dev/null
+++ b/tests/languages/coffeescript/keyword_feature.test
@@ -0,0 +1,41 @@
+and break by catch
+class;
+continue debugger delete
+do each else extend
+extends;
+false finally for if in
+instanceof;
+is isnt let
+loop namespace
+new;
+no not null of off on
+or own return super
+switch then this throw
+true try typeof undefined
+unless until when while
+window with yes yield
+
+----------------------------------------------------
+
+[
+	["keyword", "and"], ["keyword", "break"], ["keyword", "by"], ["keyword", "catch"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "continue"], ["keyword", "debugger"], ["keyword", "delete"],
+	["keyword", "do"], ["keyword", "each"], ["keyword", "else"], ["keyword", "extend"],
+	["keyword", "extends"], ["punctuation", ";"],
+	["keyword", "false"], ["keyword", "finally"], ["keyword", "for"], ["keyword", "if"], ["keyword", "in"],
+	["keyword", "instanceof"], ["punctuation", ";"],
+	["keyword", "is"], ["keyword", "isnt"], ["keyword", "let"],
+	["keyword", "loop"], ["keyword", "namespace"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "no"], ["keyword", "not"], ["keyword", "null"], ["keyword", "of"], ["keyword", "off"], ["keyword", "on"],
+	["keyword", "or"], ["keyword", "own"], ["keyword", "return"], ["keyword", "super"],
+	["keyword", "switch"], ["keyword", "then"], ["keyword", "this"], ["keyword", "throw"],
+	["keyword", "true"], ["keyword", "try"], ["keyword", "typeof"], ["keyword", "undefined"],
+	["keyword", "unless"], ["keyword", "until"], ["keyword", "when"], ["keyword", "while"],
+	["keyword", "window"], ["keyword", "with"], ["keyword", "yes"], ["keyword", "yield"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/coffeescript/property_feature.test b/tests/languages/coffeescript/property_feature.test
new file mode 100644
index 0000000000..0f25679876
--- /dev/null
+++ b/tests/languages/coffeescript/property_feature.test
@@ -0,0 +1,15 @@
+foo:
+foo_bar :
+
+----------------------------------------------------
+
+[
+	["property", "foo"],
+	["punctuation", ":"],
+	["property", "foo_bar"],
+	["punctuation", ":"]
+]
+
+----------------------------------------------------
+
+Checks for object properties.
\ No newline at end of file
diff --git a/tests/languages/coffeescript/string_feature.test b/tests/languages/coffeescript/string_feature.test
new file mode 100644
index 0000000000..880edf2536
--- /dev/null
+++ b/tests/languages/coffeescript/string_feature.test
@@ -0,0 +1,52 @@
+''
+'foo'
+'foo\
+bar'
+""
+"foo"
+"foo\
+bar"
+"foo #{interpolation} bar"
+''''''
+'''foo'''
+'''foo
+bar'''
+
+""""""
+"""foo"""
+"""foo
+bar"""
+"""foo #{interpolation} bar"""
+
+----------------------------------------------------
+
+[
+	["string", "''"],
+	["string", "'foo'"],
+	["string", "'foo\\\r\nbar'"],
+	["string", ["\"\""]],
+	["string", ["\"foo\""]],
+	["string", ["\"foo\\\r\nbar\""]],
+	["string", [
+		"\"foo ",
+		["interpolation", "#{interpolation}"],
+		" bar\""
+	]],
+
+	["multiline-string", "''''''"],
+	["multiline-string", "'''foo'''"],
+	["multiline-string", "'''foo\r\nbar'''"],
+	["multiline-string", ["\"\"\"\"\"\""]],
+	["multiline-string", ["\"\"\"foo\"\"\""]],
+	["multiline-string", ["\"\"\"foo\r\nbar\"\"\""]],
+	["multiline-string", [
+		"\"\"\"foo ",
+		["interpolation", "#{interpolation}"],
+		" bar\"\"\""
+	]]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line strings and block strings.
+Also checks for string interpolation inside double-quoted strings.
\ No newline at end of file

From 28f382d63e972facb14f2ae3ae1195e0ffde3867 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:36:51 +0200
Subject: [PATCH 171/310] Add tests for C++

---
 tests/languages/cpp/boolean_feature.test    | 13 ++++++
 tests/languages/cpp/class-name_feature.test | 13 ++++++
 tests/languages/cpp/keyword_feature.test    | 45 +++++++++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 tests/languages/cpp/boolean_feature.test
 create mode 100644 tests/languages/cpp/class-name_feature.test
 create mode 100644 tests/languages/cpp/keyword_feature.test

diff --git a/tests/languages/cpp/boolean_feature.test b/tests/languages/cpp/boolean_feature.test
new file mode 100644
index 0000000000..4019c444f8
--- /dev/null
+++ b/tests/languages/cpp/boolean_feature.test
@@ -0,0 +1,13 @@
+true
+false
+
+----------------------------------------------------
+
+[
+	["boolean", "true"],
+	["boolean", "false"]
+]
+
+----------------------------------------------------
+
+Checks for booleans.
\ No newline at end of file
diff --git a/tests/languages/cpp/class-name_feature.test b/tests/languages/cpp/class-name_feature.test
new file mode 100644
index 0000000000..f3d5df5f63
--- /dev/null
+++ b/tests/languages/cpp/class-name_feature.test
@@ -0,0 +1,13 @@
+class Foo
+class Foo_bar
+
+----------------------------------------------------
+
+[
+	["keyword", "class"], ["class-name", "Foo"],
+	["keyword", "class"], ["class-name", "Foo_bar"]
+]
+
+----------------------------------------------------
+
+Checks for class names.
\ No newline at end of file
diff --git a/tests/languages/cpp/keyword_feature.test b/tests/languages/cpp/keyword_feature.test
new file mode 100644
index 0000000000..e3ca630a98
--- /dev/null
+++ b/tests/languages/cpp/keyword_feature.test
@@ -0,0 +1,45 @@
+alignas alignof asm auto bool
+break case catch char char16_t char32_t
+class;
+compl const constexpr
+const_cast continue decltype default
+delete do double dynamic_cast
+else enum explicit export extern
+float for friend goto if
+inline int long mutable namespace
+new noexcept nullptr operator
+private protected public register
+reinterpret_cast return short
+signed sizeof static static_assert
+static_cast struct switch template
+this thread_local throw try
+typedef typeid typename union
+unsigned using virtual void
+volatile wchar_t while
+
+----------------------------------------------------
+
+[
+	["keyword", "alignas"], ["keyword", "alignof"], ["keyword", "asm"], ["keyword", "auto"], ["keyword", "bool"],
+	["keyword", "break"], ["keyword", "case"], ["keyword", "catch"], ["keyword", "char"], ["keyword", "char16_t"], ["keyword", "char32_t"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "compl"], ["keyword", "const"], ["keyword", "constexpr"],
+	["keyword", "const_cast"], ["keyword", "continue"], ["keyword", "decltype"], ["keyword", "default"],
+	["keyword", "delete"], ["keyword", "do"], ["keyword", "double"], ["keyword", "dynamic_cast"],
+	["keyword", "else"], ["keyword", "enum"], ["keyword", "explicit"], ["keyword", "export"], ["keyword", "extern"],
+	["keyword", "float"], ["keyword", "for"], ["keyword", "friend"], ["keyword", "goto"], ["keyword", "if"],
+	["keyword", "inline"], ["keyword", "int"], ["keyword", "long"], ["keyword", "mutable"], ["keyword", "namespace"],
+	["keyword", "new"], ["keyword", "noexcept"], ["keyword", "nullptr"], ["keyword", "operator"],
+	["keyword", "private"], ["keyword", "protected"], ["keyword", "public"], ["keyword", "register"],
+	["keyword", "reinterpret_cast"], ["keyword", "return"], ["keyword", "short"],
+	["keyword", "signed"], ["keyword", "sizeof"], ["keyword", "static"], ["keyword", "static_assert"],
+	["keyword", "static_cast"], ["keyword", "struct"], ["keyword", "switch"], ["keyword", "template"],
+	["keyword", "this"], ["keyword", "thread_local"], ["keyword", "throw"], ["keyword", "try"],
+	["keyword", "typedef"], ["keyword", "typeid"], ["keyword", "typename"], ["keyword", "union"],
+	["keyword", "unsigned"], ["keyword", "using"], ["keyword", "virtual"], ["keyword", "void"],
+	["keyword", "volatile"], ["keyword", "wchar_t"], ["keyword", "while"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords
\ No newline at end of file

From cb1485f506ea5fc3b1915b0836527afe18323b1b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:37:59 +0200
Subject: [PATCH 172/310] Add tests for C#

---
 tests/languages/csharp/keyword_feature.test   | 63 +++++++++++++++++++
 tests/languages/csharp/number_feature.test    | 17 +++++
 .../csharp/preprocessor_feature.test          | 15 +++++
 tests/languages/csharp/string_feature.test    | 32 ++++++++++
 4 files changed, 127 insertions(+)
 create mode 100644 tests/languages/csharp/keyword_feature.test
 create mode 100644 tests/languages/csharp/number_feature.test
 create mode 100644 tests/languages/csharp/preprocessor_feature.test
 create mode 100644 tests/languages/csharp/string_feature.test

diff --git a/tests/languages/csharp/keyword_feature.test b/tests/languages/csharp/keyword_feature.test
new file mode 100644
index 0000000000..1a729bc332
--- /dev/null
+++ b/tests/languages/csharp/keyword_feature.test
@@ -0,0 +1,63 @@
+abstract as async await base
+bool break byte case catch
+char checked
+class;
+const continue
+decimal default delegate do
+double else enum event explicit
+extern false finally fixed float
+for foreach goto if implicit in
+int
+interface;
+internal is lock
+long namespace
+new;
+null object
+operator out override params
+private protected public readonly
+ref return sbyte sealed short
+sizeof stackalloc static string
+struct switch this throw true
+try typeof uint ulong unchecked
+unsafe ushort using virtual void
+volatile while add alias ascending
+async await descending dynamic
+from get global group into
+join let orderby partial remove
+select set value var where yield
+
+----------------------------------------------------
+
+[
+	["keyword", "abstract"], ["keyword", "as"], ["keyword", "async"], ["keyword", "await"], ["keyword", "base"],
+	["keyword", "bool"], ["keyword", "break"], ["keyword", "byte"], ["keyword", "case"], ["keyword", "catch"],
+	["keyword", "char"], ["keyword", "checked"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "const"], ["keyword", "continue"],
+	["keyword", "decimal"], ["keyword", "default"], ["keyword", "delegate"], ["keyword", "do"],
+	["keyword", "double"], ["keyword", "else"], ["keyword", "enum"], ["keyword", "event"], ["keyword", "explicit"],
+	["keyword", "extern"], ["keyword", "false"], ["keyword", "finally"], ["keyword", "fixed"], ["keyword", "float"],
+	["keyword", "for"], ["keyword", "foreach"], ["keyword", "goto"], ["keyword", "if"], ["keyword", "implicit"], ["keyword", "in"],
+	["keyword", "int"],
+	["keyword", "interface"], ["punctuation", ";"],
+	["keyword", "internal"], ["keyword", "is"], ["keyword", "lock"],
+	["keyword", "long"], ["keyword", "namespace"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "null"], ["keyword", "object"],
+	["keyword", "operator"], ["keyword", "out"], ["keyword", "override"], ["keyword", "params"],
+	["keyword", "private"], ["keyword", "protected"], ["keyword", "public"], ["keyword", "readonly"],
+	["keyword", "ref"], ["keyword", "return"], ["keyword", "sbyte"], ["keyword", "sealed"], ["keyword", "short"],
+	["keyword", "sizeof"], ["keyword", "stackalloc"], ["keyword", "static"], ["keyword", "string"],
+	["keyword", "struct"], ["keyword", "switch"], ["keyword", "this"], ["keyword", "throw"], ["keyword", "true"],
+	["keyword", "try"], ["keyword", "typeof"], ["keyword", "uint"], ["keyword", "ulong"], ["keyword", "unchecked"],
+	["keyword", "unsafe"], ["keyword", "ushort"], ["keyword", "using"], ["keyword", "virtual"], ["keyword", "void"],
+	["keyword", "volatile"], ["keyword", "while"], ["keyword", "add"], ["keyword", "alias"], ["keyword", "ascending"],
+	["keyword", "async"], ["keyword", "await"], ["keyword", "descending"], ["keyword", "dynamic"],
+	["keyword", "from"], ["keyword", "get"], ["keyword", "global"], ["keyword", "group"], ["keyword", "into"],
+	["keyword", "join"], ["keyword", "let"], ["keyword", "orderby"], ["keyword", "partial"], ["keyword", "remove"],
+	["keyword", "select"], ["keyword", "set"], ["keyword", "value"], ["keyword", "var"], ["keyword", "where"], ["keyword", "yield"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/csharp/number_feature.test b/tests/languages/csharp/number_feature.test
new file mode 100644
index 0000000000..126808037b
--- /dev/null
+++ b/tests/languages/csharp/number_feature.test
@@ -0,0 +1,17 @@
+42
+3.14159
+0xbabe
+0XBABE
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "0xbabe"],
+	["number", "0XBABE"]
+]
+
+----------------------------------------------------
+
+Checks for decimal and hexadecimal numbers.
\ No newline at end of file
diff --git a/tests/languages/csharp/preprocessor_feature.test b/tests/languages/csharp/preprocessor_feature.test
new file mode 100644
index 0000000000..b87a253701
--- /dev/null
+++ b/tests/languages/csharp/preprocessor_feature.test
@@ -0,0 +1,15 @@
+#define DEBUG
+#if DEBUG
+#endif
+
+----------------------------------------------------
+
+[
+	["preprocessor", "#define DEBUG"],
+	["preprocessor", "#if DEBUG"],
+	["preprocessor", "#endif"]
+]
+
+----------------------------------------------------
+
+Checks for preprocessor directives.
\ No newline at end of file
diff --git a/tests/languages/csharp/string_feature.test b/tests/languages/csharp/string_feature.test
new file mode 100644
index 0000000000..2814cb561c
--- /dev/null
+++ b/tests/languages/csharp/string_feature.test
@@ -0,0 +1,32 @@
+""
+"fo\"o"
+
+@""
+@"foo"
+@"fo""o"
+@"foo
+bar"
+
+'a'
+'\''
+'\\'
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"o\""],
+
+	["string", "@\"\""],
+	["string", "@\"foo\""],
+	["string", "@\"fo\"\"o\""],
+	["string", "@\"foo\r\nbar\""],
+	["string", "'a'"],
+	["string", "'\\''"],
+	["string", "'\\\\'"]
+]
+
+----------------------------------------------------
+
+Checks for normal and verbatim strings.
+Also checks for single quoted characters.
\ No newline at end of file

From 7d515e91c0c72db879879692d5124ad97d790e00 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:39:04 +0200
Subject: [PATCH 173/310] Add test for directives in ASP.NET

---
 .../csharp+aspnet/directive_feature.test      | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 tests/languages/csharp+aspnet/directive_feature.test

diff --git a/tests/languages/csharp+aspnet/directive_feature.test b/tests/languages/csharp+aspnet/directive_feature.test
new file mode 100644
index 0000000000..9eaa0057ea
--- /dev/null
+++ b/tests/languages/csharp+aspnet/directive_feature.test
@@ -0,0 +1,71 @@
+<%: Page.Title %>
+<%#:Item.ProductID%>
+<a href="ProductDetails.aspx?productID=<%#:Item.ProductID%>">
+<% if(foo) { %>
+	foobar
+<% } %>
+
+----------------------------------------------------
+
+[
+	["directive tag", [
+		["directive tag", "<%:"],
+		" Page",
+		["punctuation", "."],
+		"Title ",
+		["directive tag", "%>"]
+	]],
+
+	["directive tag", [
+        ["directive tag", "<%#:"],
+        "Item",
+        ["punctuation", "."],
+        "ProductID",
+        ["directive tag", "%>"]
+    ]],
+
+    ["tag", [
+        ["tag", [
+            ["punctuation", "<"],
+            "a"
+        ]],
+        ["attr-name", [
+            "href"
+        ]],
+        ["attr-value", [
+            ["punctuation", "="],
+            ["punctuation", "\""],
+            "ProductDetails.aspx?productID",
+            ["punctuation", "="],
+            ["directive tag", [
+                ["directive tag", "<%#:"],
+                "Item",
+		        ["punctuation", "."],
+		        "ProductID",
+		        ["directive tag", "%>"]
+            ]],
+            ["punctuation", "\""]
+        ]],
+        ["punctuation", ">"]
+    ]],
+
+    ["directive tag", [
+        ["directive tag", "<%"],
+        ["keyword", "if"],
+        ["punctuation", "("],
+        "foo",
+        ["punctuation", ")"],
+        ["punctuation", "{"],
+        ["directive tag", "%>"]
+    ]],
+    "\r\n\tfoobar\r\n",
+    ["directive tag", [
+        ["directive tag", "<%"],
+        ["punctuation", "}"],
+        ["directive tag", "%>"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for directives.
\ No newline at end of file

From b340f939d42759444c353f47142498d2f961f9f0 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:40:11 +0200
Subject: [PATCH 174/310] Add tests for Dart

---
 tests/languages/dart/keyword_feature.test  | 49 ++++++++++++++++++++++
 tests/languages/dart/metadata_feature.test | 20 +++++++++
 tests/languages/dart/operator_feature.test | 33 +++++++++++++++
 tests/languages/dart/string_feature.test   | 25 +++++++++++
 4 files changed, 127 insertions(+)
 create mode 100644 tests/languages/dart/keyword_feature.test
 create mode 100644 tests/languages/dart/metadata_feature.test
 create mode 100644 tests/languages/dart/operator_feature.test
 create mode 100644 tests/languages/dart/string_feature.test

diff --git a/tests/languages/dart/keyword_feature.test b/tests/languages/dart/keyword_feature.test
new file mode 100644
index 0000000000..a5e3c6c2da
--- /dev/null
+++ b/tests/languages/dart/keyword_feature.test
@@ -0,0 +1,49 @@
+async* sync* yield*
+abstract assert async await
+break case catch
+class;
+const
+continue default deferred
+do dynamic else enum
+export external
+extends;
+factory final finally for
+get if
+implements;
+import
+in library
+new;
+null
+operator part rethrow return
+set static super switch this
+throw try typedef var
+void while with yield
+
+----------------------------------------------------
+
+[
+	["keyword", "async*"], ["keyword", "sync*"], ["keyword", "yield*"],
+	["keyword", "abstract"], ["keyword", "assert"], ["keyword", "async"], ["keyword", "await"],
+	["keyword", "break"], ["keyword", "case"], ["keyword", "catch"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "const"],
+	["keyword", "continue"], ["keyword", "default"], ["keyword", "deferred"],
+	["keyword", "do"], ["keyword", "dynamic"], ["keyword", "else"], ["keyword", "enum"],
+	["keyword", "export"], ["keyword", "external"],
+	["keyword", "extends"], ["punctuation", ";"],
+	["keyword", "factory"], ["keyword", "final"], ["keyword", "finally"], ["keyword", "for"],
+	["keyword", "get"], ["keyword", "if"],
+	["keyword", "implements"], ["punctuation", ";"],
+	["keyword", "import"],
+	["keyword", "in"], ["keyword", "library"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "null"],
+	["keyword", "operator"], ["keyword", "part"], ["keyword", "rethrow"], ["keyword", "return"],
+	["keyword", "set"], ["keyword", "static"], ["keyword", "super"], ["keyword", "switch"], ["keyword", "this"],
+	["keyword", "throw"], ["keyword", "try"], ["keyword", "typedef"], ["keyword", "var"],
+	["keyword", "void"], ["keyword", "while"], ["keyword", "with"], ["keyword", "yield"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/dart/metadata_feature.test b/tests/languages/dart/metadata_feature.test
new file mode 100644
index 0000000000..e88e7ba126
--- /dev/null
+++ b/tests/languages/dart/metadata_feature.test
@@ -0,0 +1,20 @@
+@deprecated
+@override
+@todo('seth', 'make this do something')
+
+----------------------------------------------------
+
+[
+	["metadata", "@deprecated"],
+	["metadata", "@override"],
+	["metadata", "@todo"],
+	["punctuation", "("],
+	["string", "'seth'"],
+	["punctuation", ","],
+	["string", "'make this do something'"],
+	["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for metadata.
\ No newline at end of file
diff --git a/tests/languages/dart/operator_feature.test b/tests/languages/dart/operator_feature.test
new file mode 100644
index 0000000000..5d631fd0bb
--- /dev/null
+++ b/tests/languages/dart/operator_feature.test
@@ -0,0 +1,33 @@
+++ --
+* / % ~/
++ - ! ~
+<< >> ?
+& ^ |
+>= > <= <
+as is is!
+== != && ||
+= *= /= ~/=
+%= += -=
+<<= >>=
+&= ^= |=
+
+----------------------------------------------------
+
+[
+	["operator", "++"], ["operator", "--"],
+	["operator", "*"], ["operator", "/"], ["operator", "%"], ["operator", "~/"],
+	["operator", "+"], ["operator", "-"], ["operator", "!"], ["operator", "~"],
+	["operator", "<<"], ["operator", ">>"], ["operator", "?"],
+	["operator", "&"], ["operator", "^"], ["operator", "|"],
+	["operator", ">="], ["operator", ">"], ["operator", "<="], ["operator", "<"],
+	["operator", "as"], ["operator", "is"], ["operator", "is!"],
+	["operator", "=="], ["operator", "!="], ["operator", "&&"], ["operator", "||"],
+	["operator", "="], ["operator", "*="], ["operator", "/="], ["operator", "~/="],
+	["operator", "%="], ["operator", "+="], ["operator", "-="],
+	["operator", "<<="], ["operator", ">>="],
+	["operator", "&="], ["operator", "^="], ["operator", "|="]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/dart/string_feature.test b/tests/languages/dart/string_feature.test
new file mode 100644
index 0000000000..feffdbce44
--- /dev/null
+++ b/tests/languages/dart/string_feature.test
@@ -0,0 +1,25 @@
+"" ''
+r"" r''
+"""""" ''''''
+r"""""" r''''''
+"fo\"o" 'fo\'o'
+"""foo
+bar"""
+'''foo
+bar'''
+
+----------------------------------------------------
+
+[
+	["string", "\"\""], ["string", "''"],
+	["string", "r\"\""], ["string", "r''"],
+	["string", "\"\"\"\"\"\""], ["string", "''''''"],
+	["string", "r\"\"\"\"\"\""], ["string", "r''''''"],
+	["string", "\"fo\\\"o\""], ["string", "'fo\\'o'"],
+	["string", "\"\"\"foo\r\nbar\"\"\""], ["string", "'''foo\r\nbar'''"]
+]
+
+----------------------------------------------------
+
+Checks for single quoted and double quoted strings,
+multi-line strings and "raw" strings.
\ No newline at end of file

From 8cc597e4fb48983a380e62527498bcdbce624fa2 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:41:34 +0200
Subject: [PATCH 175/310] Add tests for CSS extras

---
 .../css!+css-extras/entity_feature.test       | 13 +++++
 .../css!+css-extras/hexcode_feature.test      | 17 +++++++
 .../css!+css-extras/number_feature.test       | 17 +++++++
 .../css!+css-extras/selector_feature.test     | 51 +++++++++++++++++++
 4 files changed, 98 insertions(+)
 create mode 100644 tests/languages/css!+css-extras/entity_feature.test
 create mode 100644 tests/languages/css!+css-extras/hexcode_feature.test
 create mode 100644 tests/languages/css!+css-extras/number_feature.test
 create mode 100644 tests/languages/css!+css-extras/selector_feature.test

diff --git a/tests/languages/css!+css-extras/entity_feature.test b/tests/languages/css!+css-extras/entity_feature.test
new file mode 100644
index 0000000000..c1c91a290b
--- /dev/null
+++ b/tests/languages/css!+css-extras/entity_feature.test
@@ -0,0 +1,13 @@
+\0022
+\20B9
+
+----------------------------------------------------
+
+[
+	["entity", "\\0022"],
+	["entity", "\\20B9"]
+]
+
+----------------------------------------------------
+
+Checks for entities.
\ No newline at end of file
diff --git a/tests/languages/css!+css-extras/hexcode_feature.test b/tests/languages/css!+css-extras/hexcode_feature.test
new file mode 100644
index 0000000000..cac0b44b7d
--- /dev/null
+++ b/tests/languages/css!+css-extras/hexcode_feature.test
@@ -0,0 +1,17 @@
+#ff0000
+#BADA55
+#4dd
+#D0C
+
+----------------------------------------------------
+
+[
+	["hexcode", "#ff0000"],
+	["hexcode", "#BADA55"],
+	["hexcode", "#4dd"],
+	["hexcode", "#D0C"]
+]
+
+----------------------------------------------------
+
+Checks for hexadecimal colors.
\ No newline at end of file
diff --git a/tests/languages/css!+css-extras/number_feature.test b/tests/languages/css!+css-extras/number_feature.test
new file mode 100644
index 0000000000..24ed5305e2
--- /dev/null
+++ b/tests/languages/css!+css-extras/number_feature.test
@@ -0,0 +1,17 @@
+42
+3.14159
+42%
+3.14%
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "42%"],
+	["number", "3.14%"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.
diff --git a/tests/languages/css!+css-extras/selector_feature.test b/tests/languages/css!+css-extras/selector_feature.test
new file mode 100644
index 0000000000..475ed1b7c4
--- /dev/null
+++ b/tests/languages/css!+css-extras/selector_feature.test
@@ -0,0 +1,51 @@
+foo:after {
+foo::first-letter {
+
+foo:nth-child(2n+1) {
+
+foo.bar {
+
+foo#bar {
+
+#foo > .bar:not(baz):after {
+
+----------------------------------------------------
+
+[
+	["selector", [
+		"foo",
+		["pseudo-element", ":after"]
+	]], ["punctuation", "{"],
+
+	["selector", [
+		"foo",
+		["pseudo-element", "::first-letter"]
+	]], ["punctuation", "{"],
+
+	["selector", [
+		"foo",
+		["pseudo-class", ":nth-child(2n+1)"]
+	]], ["punctuation", "{"],
+
+	["selector", [
+		"foo",
+		["class", ".bar"]
+	]], ["punctuation", "{"],
+
+	["selector", [
+		"foo",
+		["id", "#bar"]
+	]], ["punctuation", "{"],
+
+	["selector", [
+		["id", "#foo"],
+		" > ",
+		["class", ".bar"],
+		["pseudo-class", ":not(baz)"],
+		["pseudo-element", ":after"]
+	]], ["punctuation", "{"]
+]
+
+----------------------------------------------------
+
+Checks for pseudo-elements, pseudo-classes, classes and ids inside selectors.
\ No newline at end of file

From 564ce6e86bcf74307f5bcb797168da80d839a81a Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:42:32 +0200
Subject: [PATCH 176/310] Add tests for Eiffel

---
 tests/languages/eiffel/boolean_feature.test  | 13 +++++++
 tests/languages/eiffel/char_feature.test     | 15 ++++++++
 tests/languages/eiffel/comment_feature.test  | 13 +++++++
 tests/languages/eiffel/keyword_feature.test  | 39 ++++++++++++++++++++
 tests/languages/eiffel/number_feature.test   | 29 +++++++++++++++
 tests/languages/eiffel/operator_feature.test | 19 ++++++++++
 tests/languages/eiffel/string_feature.test   | 30 +++++++++++++++
 7 files changed, 158 insertions(+)
 create mode 100644 tests/languages/eiffel/boolean_feature.test
 create mode 100644 tests/languages/eiffel/char_feature.test
 create mode 100644 tests/languages/eiffel/comment_feature.test
 create mode 100644 tests/languages/eiffel/keyword_feature.test
 create mode 100644 tests/languages/eiffel/number_feature.test
 create mode 100644 tests/languages/eiffel/operator_feature.test
 create mode 100644 tests/languages/eiffel/string_feature.test

diff --git a/tests/languages/eiffel/boolean_feature.test b/tests/languages/eiffel/boolean_feature.test
new file mode 100644
index 0000000000..5750be06cf
--- /dev/null
+++ b/tests/languages/eiffel/boolean_feature.test
@@ -0,0 +1,13 @@
+True
+False
+
+----------------------------------------------------
+
+[
+	["boolean", "True"],
+	["boolean", "False"]
+]
+
+----------------------------------------------------
+
+Checks for booleans.
\ No newline at end of file
diff --git a/tests/languages/eiffel/char_feature.test b/tests/languages/eiffel/char_feature.test
new file mode 100644
index 0000000000..6a9b1248c0
--- /dev/null
+++ b/tests/languages/eiffel/char_feature.test
@@ -0,0 +1,15 @@
+'a'
+'%''
+'%/123/'
+
+----------------------------------------------------
+
+[
+	["char", "'a'"],
+	["char", "'%''"],
+	["char", "'%/123/'"]
+]
+
+----------------------------------------------------
+
+Checks for chars.
\ No newline at end of file
diff --git a/tests/languages/eiffel/comment_feature.test b/tests/languages/eiffel/comment_feature.test
new file mode 100644
index 0000000000..d911aa7221
--- /dev/null
+++ b/tests/languages/eiffel/comment_feature.test
@@ -0,0 +1,13 @@
+--
+-- foo bar
+
+----------------------------------------------------
+
+[
+	["comment", "--"],
+	["comment", "-- foo bar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/eiffel/keyword_feature.test b/tests/languages/eiffel/keyword_feature.test
new file mode 100644
index 0000000000..cb6ae29832
--- /dev/null
+++ b/tests/languages/eiffel/keyword_feature.test
@@ -0,0 +1,39 @@
+across agent alias all and
+attached as assign attribute
+check class convert create
+Current debug deferred detachable
+do else elseif end ensure
+expanded export external
+feature from frozen if
+implies inherit inspect
+invariant like local loop
+not note obsolete old
+once or Precursor redefine
+rename require rescue Result
+retry select separate some
+then undefine until variant
+Void when xor
+
+----------------------------------------------------
+
+[
+	["keyword", "across"], ["keyword", "agent"], ["keyword", "alias"], ["keyword", "all"], ["keyword", "and"],
+	["keyword", "attached"], ["keyword", "as"], ["keyword", "assign"], ["keyword", "attribute"],
+	["keyword", "check"], ["keyword", "class"], ["keyword", "convert"], ["keyword", "create"],
+	["keyword", "Current"], ["keyword", "debug"], ["keyword", "deferred"], ["keyword", "detachable"],
+	["keyword", "do"], ["keyword", "else"], ["keyword", "elseif"], ["keyword", "end"], ["keyword", "ensure"],
+	["keyword", "expanded"], ["keyword", "export"], ["keyword", "external"],
+	["keyword", "feature"], ["keyword", "from"], ["keyword", "frozen"], ["keyword", "if"],
+	["keyword", "implies"], ["keyword", "inherit"], ["keyword", "inspect"],
+	["keyword", "invariant"], ["keyword", "like"], ["keyword", "local"], ["keyword", "loop"],
+	["keyword", "not"], ["keyword", "note"], ["keyword", "obsolete"], ["keyword", "old"],
+	["keyword", "once"], ["keyword", "or"], ["keyword", "Precursor"], ["keyword", "redefine"],
+	["keyword", "rename"], ["keyword", "require"], ["keyword", "rescue"], ["keyword", "Result"],
+	["keyword", "retry"], ["keyword", "select"], ["keyword", "separate"], ["keyword", "some"],
+	["keyword", "then"], ["keyword", "undefine"], ["keyword", "until"], ["keyword", "variant"],
+	["keyword", "Void"], ["keyword", "when"], ["keyword", "xor"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords
\ No newline at end of file
diff --git a/tests/languages/eiffel/number_feature.test b/tests/languages/eiffel/number_feature.test
new file mode 100644
index 0000000000..beb3cc7c5f
--- /dev/null
+++ b/tests/languages/eiffel/number_feature.test
@@ -0,0 +1,29 @@
+0xbabe
+0xBAD_A55
+0c7654_1234
+0b1111_0000_0101
+42
+42.
+.42
+1_845.123_456
+3.14e+4
+4_2.5_7e-1_0
+
+----------------------------------------------------
+
+[
+	["number", "0xbabe"],
+	["number", "0xBAD_A55"],
+	["number", "0c7654_1234"],
+	["number", "0b1111_0000_0101"],
+	["number", "42"],
+	["number", "42."],
+	["number", ".42"],
+	["number", "1_845.123_456"],
+	["number", "3.14e+4"],
+	["number", "4_2.5_7e-1_0"]
+]
+
+----------------------------------------------------
+
+Checks for hexadecimal, octal, binary and decimal numbers.
diff --git a/tests/languages/eiffel/operator_feature.test b/tests/languages/eiffel/operator_feature.test
new file mode 100644
index 0000000000..fcba4b34a2
--- /dev/null
+++ b/tests/languages/eiffel/operator_feature.test
@@ -0,0 +1,19 @@
+\\ |..| .. //
+/~ / /=
+< <= > >=
++ - *
+^ = ~
+
+----------------------------------------------------
+
+[
+	["operator", "\\\\"], ["operator", "|..|"], ["operator", ".."], ["operator", "//"],
+	["operator", "/~"], ["operator", "/"], ["operator", "/="],
+	["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
+	["operator", "+"], ["operator", "-"], ["operator", "*"],
+	["operator", "^"], ["operator", "="], ["operator", "~"]
+]
+
+----------------------------------------------------
+
+Checks for all operators
\ No newline at end of file
diff --git a/tests/languages/eiffel/string_feature.test b/tests/languages/eiffel/string_feature.test
new file mode 100644
index 0000000000..183bf99d65
--- /dev/null
+++ b/tests/languages/eiffel/string_feature.test
@@ -0,0 +1,30 @@
+""
+"fo%"o"
+"foo%
+%bar"
+
+"[fo"o
+bar]"
+"!-[fo"o[]
+bar]!-"
+"{fo"o
+bar}"
+"*?{fo"o{}
+bar}*?"
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo%\"o\""],
+	["string", "\"foo%\r\n%bar\""],
+
+	["string", "\"[fo\"o\r\nbar]\""],
+	["string", "\"!-[fo\"o[]\r\nbar]!-\""],
+	["string", "\"{fo\"o\r\nbar}\""],
+	["string", "\"*?{fo\"o{}\r\nbar}*?\""]
+]
+
+----------------------------------------------------
+
+Checks for strings, multi-line strings, and aligned and non aligned verbatim strings.
\ No newline at end of file

From 96525554e8c7ea271226f44c8523c78864249c38 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:43:37 +0200
Subject: [PATCH 177/310] Add tests for Erlang

---
 tests/languages/erlang/atom_feature.test     | 17 ++++++++++++
 tests/languages/erlang/boolean_feature.test  | 13 ++++++++++
 tests/languages/erlang/comment_feature.test  | 11 ++++++++
 tests/languages/erlang/function_feature.test | 17 ++++++++++++
 tests/languages/erlang/keyword_feature.test  | 15 +++++++++++
 tests/languages/erlang/number_feature.test   | 25 ++++++++++++++++++
 tests/languages/erlang/operator_feature.test | 27 ++++++++++++++++++++
 tests/languages/erlang/string_feature.test   | 13 ++++++++++
 tests/languages/erlang/variable_feature.test | 17 ++++++++++++
 9 files changed, 155 insertions(+)
 create mode 100644 tests/languages/erlang/atom_feature.test
 create mode 100644 tests/languages/erlang/boolean_feature.test
 create mode 100644 tests/languages/erlang/comment_feature.test
 create mode 100644 tests/languages/erlang/function_feature.test
 create mode 100644 tests/languages/erlang/keyword_feature.test
 create mode 100644 tests/languages/erlang/number_feature.test
 create mode 100644 tests/languages/erlang/operator_feature.test
 create mode 100644 tests/languages/erlang/string_feature.test
 create mode 100644 tests/languages/erlang/variable_feature.test

diff --git a/tests/languages/erlang/atom_feature.test b/tests/languages/erlang/atom_feature.test
new file mode 100644
index 0000000000..1761a8bb91
--- /dev/null
+++ b/tests/languages/erlang/atom_feature.test
@@ -0,0 +1,17 @@
+foo
+foo@_bar
+'foo bar'
+'\'\\'
+
+----------------------------------------------------
+
+[
+	["atom", "foo"],
+	["atom", "foo@_bar"],
+	["quoted-atom", "'foo bar'"],
+    ["quoted-atom", "'\\'\\\\'"]
+]
+
+----------------------------------------------------
+
+Checks for atoms and quoted atoms.
\ No newline at end of file
diff --git a/tests/languages/erlang/boolean_feature.test b/tests/languages/erlang/boolean_feature.test
new file mode 100644
index 0000000000..4019c444f8
--- /dev/null
+++ b/tests/languages/erlang/boolean_feature.test
@@ -0,0 +1,13 @@
+true
+false
+
+----------------------------------------------------
+
+[
+	["boolean", "true"],
+	["boolean", "false"]
+]
+
+----------------------------------------------------
+
+Checks for booleans.
\ No newline at end of file
diff --git a/tests/languages/erlang/comment_feature.test b/tests/languages/erlang/comment_feature.test
new file mode 100644
index 0000000000..b879c5e5d5
--- /dev/null
+++ b/tests/languages/erlang/comment_feature.test
@@ -0,0 +1,11 @@
+% foo bar
+
+----------------------------------------------------
+
+[
+	["comment", "% foo bar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/erlang/function_feature.test b/tests/languages/erlang/function_feature.test
new file mode 100644
index 0000000000..72d8857d15
--- /dev/null
+++ b/tests/languages/erlang/function_feature.test
@@ -0,0 +1,17 @@
+spawn(
+foo@_bar(
+'foo bar'(
+'\'\\'(
+
+----------------------------------------------------
+
+[
+	["function", "spawn"], ["punctuation", "("],
+	["function", "foo@_bar"], ["punctuation", "("],
+	["quoted-function", "'foo bar'"], ["punctuation", "("],
+	["quoted-function", "'\\'\\\\'"], ["punctuation", "("]
+]
+
+----------------------------------------------------
+
+Checks for functions and quoted functions.
\ No newline at end of file
diff --git a/tests/languages/erlang/keyword_feature.test b/tests/languages/erlang/keyword_feature.test
new file mode 100644
index 0000000000..3af1da3d39
--- /dev/null
+++ b/tests/languages/erlang/keyword_feature.test
@@ -0,0 +1,15 @@
+fun when case of
+end if receive
+after try catch
+
+----------------------------------------------------
+
+[
+	["keyword", "fun"], ["keyword", "when"], ["keyword", "case"], ["keyword", "of"],
+	["keyword", "end"], ["keyword", "if"], ["keyword", "receive"],
+	["keyword", "after"], ["keyword", "try"], ["keyword", "catch"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/erlang/number_feature.test b/tests/languages/erlang/number_feature.test
new file mode 100644
index 0000000000..0e5890f3fa
--- /dev/null
+++ b/tests/languages/erlang/number_feature.test
@@ -0,0 +1,25 @@
+42
+2#101
+16#1f
+2.3
+2.3e3
+2.3e-3
+$A
+$\n
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "2#101"],
+	["number", "16#1f"],
+	["number", "2.3"],
+	["number", "2.3e3"],
+	["number", "2.3e-3"],
+	["number", "$A"],
+	["number", "$\\n"]
+]
+
+----------------------------------------------------
+
+Checks for numbers and character codes.
\ No newline at end of file
diff --git a/tests/languages/erlang/operator_feature.test b/tests/languages/erlang/operator_feature.test
new file mode 100644
index 0000000000..addd5d3dd3
--- /dev/null
+++ b/tests/languages/erlang/operator_feature.test
@@ -0,0 +1,27 @@
+== /= >= :=
+=:= =/=
++ ++ - --
+= * / !
+<= < >
+bnot div rem band
+bor bxor bsl bsr
+not and or xor
+orelse andalso
+
+----------------------------------------------------
+
+[
+	["operator", "=="], ["operator", "/="], ["operator", ">="], ["operator", ":="],
+	["operator", "=:="], ["operator", "=/="],
+	["operator", "+"], ["operator", "++"], ["operator", "-"], ["operator", "--"],
+	["operator", "="], ["operator", "*"], ["operator", "/"], ["operator", "!"],
+	["operator", "<="], ["operator", "<"], ["operator", ">"],
+	["operator", "bnot"], ["operator", "div"], ["operator", "rem"], ["operator", "band"],
+	["operator", "bor"], ["operator", "bxor"], ["operator", "bsl"], ["operator", "bsr"],
+	["operator", "not"], ["operator", "and"], ["operator", "or"], ["operator", "xor"],
+	["operator", "orelse"], ["operator", "andalso"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/erlang/string_feature.test b/tests/languages/erlang/string_feature.test
new file mode 100644
index 0000000000..42770f6156
--- /dev/null
+++ b/tests/languages/erlang/string_feature.test
@@ -0,0 +1,13 @@
+""
+"foo bar"
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"foo bar\""]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file
diff --git a/tests/languages/erlang/variable_feature.test b/tests/languages/erlang/variable_feature.test
new file mode 100644
index 0000000000..f7492e4479
--- /dev/null
+++ b/tests/languages/erlang/variable_feature.test
@@ -0,0 +1,17 @@
+Foo
+?Bar
+_
+Foo@_bar
+
+----------------------------------------------------
+
+[
+	["variable", "Foo"],
+	["variable", "?Bar"],
+	["variable", "_"],
+	["variable", "Foo@_bar"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From cc5ab335777575de559fcbc59a1452e297adf204 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 00:44:40 +0200
Subject: [PATCH 178/310] Add tests for Fortran

---
 tests/languages/fortran/boolean_feature.test  |  13 ++
 tests/languages/fortran/comment_feature.test  |  13 ++
 tests/languages/fortran/keyword_feature.test  | 199 ++++++++++++++++++
 tests/languages/fortran/number_feature.test   |  37 ++++
 tests/languages/fortran/operator_feature.test |  25 +++
 tests/languages/fortran/string_feature.test   |  31 +++
 6 files changed, 318 insertions(+)
 create mode 100644 tests/languages/fortran/boolean_feature.test
 create mode 100644 tests/languages/fortran/comment_feature.test
 create mode 100644 tests/languages/fortran/keyword_feature.test
 create mode 100644 tests/languages/fortran/number_feature.test
 create mode 100644 tests/languages/fortran/operator_feature.test
 create mode 100644 tests/languages/fortran/string_feature.test

diff --git a/tests/languages/fortran/boolean_feature.test b/tests/languages/fortran/boolean_feature.test
new file mode 100644
index 0000000000..88bdb6bd10
--- /dev/null
+++ b/tests/languages/fortran/boolean_feature.test
@@ -0,0 +1,13 @@
+.TRUE.
+.false.
+
+----------------------------------------------------
+
+[
+	["boolean", ".TRUE."],
+	["boolean", ".false."]
+]
+
+----------------------------------------------------
+
+Checks for boolean.
\ No newline at end of file
diff --git a/tests/languages/fortran/comment_feature.test b/tests/languages/fortran/comment_feature.test
new file mode 100644
index 0000000000..c1fe029aa7
--- /dev/null
+++ b/tests/languages/fortran/comment_feature.test
@@ -0,0 +1,13 @@
+!
+! foobar
+
+----------------------------------------------------
+
+[
+	["comment", "!"],
+	["comment", "! foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/fortran/keyword_feature.test b/tests/languages/fortran/keyword_feature.test
new file mode 100644
index 0000000000..e3bb493bbe
--- /dev/null
+++ b/tests/languages/fortran/keyword_feature.test
@@ -0,0 +1,199 @@
+INTEGER
+REAL
+DOUBLE PRECISION
+DOUBLEPRECISION
+COMPLEX
+CHARACTER
+LOGICAL
+
+ALLOCATABLE
+ALLOCATE
+BACKSPACE
+CALL
+CASE
+CLOSE
+COMMON
+CONTAINS
+CONTINUE
+CYCLE
+DATA
+DEALLOCATE
+DIMENSION
+DO
+END
+EQUIVALENCE
+EXIT
+EXTERNAL
+FORMAT
+GO TO
+GOTO
+IMPLICIT
+IMPLICIT NONE
+INQUIRE
+INTENT
+INTRINSIC
+MODULE PROCEDURE
+NAMELIST
+NULLIFY
+OPEN
+OPTIONAL
+PARAMETER
+POINTER
+PRINT
+PRIVATE
+PUBLIC
+READ
+RETURN
+REWIND
+SAVE
+SELECT
+STOP
+TARGET
+WHILE
+WRITE
+
+BLOCK DATA
+BLOCKDATA
+END BLOCK DATA
+ENDBLOCKDATA
+DO
+ENDDO
+FILE
+FORALL
+FUNCTION
+IF
+END IF
+INTERFACE
+MODULE
+PROGRAM
+SELECT
+SUBROUTINE
+TYPE
+WHERE
+
+ASSIGNMENT
+DEFAULT
+ELEMENTAL
+ELSE
+ELSEWHERE
+ELSEIF
+ENTRY
+IN
+INCLUDE
+INOUT
+KIND
+NULL
+ONLY
+OPERATOR
+OUT
+PURE
+RECURSIVE
+RESULT
+SEQUENCE
+STAT
+THEN
+USE
+
+----------------------------------------------------
+
+[
+	["keyword", "INTEGER"],
+	["keyword", "REAL"],
+	["keyword", "DOUBLE PRECISION"],
+	["keyword", "DOUBLEPRECISION"],
+	["keyword", "COMPLEX"],
+	["keyword", "CHARACTER"],
+	["keyword", "LOGICAL"],
+
+	["keyword", "ALLOCATABLE"],
+	["keyword", "ALLOCATE"],
+	["keyword", "BACKSPACE"],
+	["keyword", "CALL"],
+	["keyword", "CASE"],
+	["keyword", "CLOSE"],
+	["keyword", "COMMON"],
+	["keyword", "CONTAINS"],
+	["keyword", "CONTINUE"],
+	["keyword", "CYCLE"],
+	["keyword", "DATA"],
+	["keyword", "DEALLOCATE"],
+	["keyword", "DIMENSION"],
+	["keyword", "DO"],
+	["keyword", "END"],
+	["keyword", "EQUIVALENCE"],
+	["keyword", "EXIT"],
+	["keyword", "EXTERNAL"],
+	["keyword", "FORMAT"],
+	["keyword", "GO TO"],
+	["keyword", "GOTO"],
+	["keyword", "IMPLICIT"],
+	["keyword", "IMPLICIT NONE"],
+	["keyword", "INQUIRE"],
+	["keyword", "INTENT"],
+	["keyword", "INTRINSIC"],
+	["keyword", "MODULE PROCEDURE"],
+	["keyword", "NAMELIST"],
+	["keyword", "NULLIFY"],
+	["keyword", "OPEN"],
+	["keyword", "OPTIONAL"],
+	["keyword", "PARAMETER"],
+	["keyword", "POINTER"],
+	["keyword", "PRINT"],
+	["keyword", "PRIVATE"],
+	["keyword", "PUBLIC"],
+	["keyword", "READ"],
+	["keyword", "RETURN"],
+	["keyword", "REWIND"],
+	["keyword", "SAVE"],
+	["keyword", "SELECT"],
+	["keyword", "STOP"],
+	["keyword", "TARGET"],
+	["keyword", "WHILE"],
+	["keyword", "WRITE"],
+
+	["keyword", "BLOCK DATA"],
+	["keyword", "BLOCKDATA"],
+	["keyword", "END BLOCK DATA"],
+	["keyword", "ENDBLOCKDATA"],
+	["keyword", "DO"],
+	["keyword", "ENDDO"],
+	["keyword", "FILE"],
+	["keyword", "FORALL"],
+	["keyword", "FUNCTION"],
+	["keyword", "IF"],
+	["keyword", "END IF"],
+	["keyword", "INTERFACE"],
+	["keyword", "MODULE"],
+	["keyword", "PROGRAM"],
+	["keyword", "SELECT"],
+	["keyword", "SUBROUTINE"],
+	["keyword", "TYPE"],
+	["keyword", "WHERE"],
+
+	["keyword", "ASSIGNMENT"],
+	["keyword", "DEFAULT"],
+	["keyword", "ELEMENTAL"],
+	["keyword", "ELSE"],
+	["keyword", "ELSEWHERE"],
+	["keyword", "ELSEIF"],
+	["keyword", "ENTRY"],
+	["keyword", "IN"],
+	["keyword", "INCLUDE"],
+	["keyword", "INOUT"],
+	["keyword", "KIND"],
+	["keyword", "NULL"],
+	["keyword", "ONLY"],
+	["keyword", "OPERATOR"],
+	["keyword", "OUT"],
+	["keyword", "PURE"],
+	["keyword", "RECURSIVE"],
+	["keyword", "RESULT"],
+	["keyword", "SEQUENCE"],
+	["keyword", "STAT"],
+	["keyword", "THEN"],
+	["keyword", "USE"]
+]
+
+----------------------------------------------------
+
+Checks for keywords.
\ No newline at end of file
diff --git a/tests/languages/fortran/number_feature.test b/tests/languages/fortran/number_feature.test
new file mode 100644
index 0000000000..c7b4a4cf3c
--- /dev/null
+++ b/tests/languages/fortran/number_feature.test
@@ -0,0 +1,37 @@
+473
+21_2
+21_SHORT
+1976354279568241_8
+1.6E3
+0.45E-4
+10.93E7_QUAD
+3E4
+B'01110'
+B"010"
+O'047'
+O"642"
+Z'F41A'
+Z"00BC"
+
+----------------------------------------------------
+
+[
+	["number", "473"],
+	["number", "21_2"],
+	["number", "21_SHORT"],
+	["number", "1976354279568241_8"],
+	["number", "1.6E3"],
+	["number", "0.45E-4"],
+	["number", "10.93E7_QUAD"],
+	["number", "3E4"],
+	["quoted-number", "B'01110'"],
+    ["quoted-number", "B\"010\""],
+    ["quoted-number", "O'047'"],
+    ["quoted-number", "O\"642\""],
+    ["quoted-number", "Z'F41A'"],
+    ["quoted-number", "Z\"00BC\""]
+]
+
+----------------------------------------------------
+
+Checks for numbers and quoted numbers.
\ No newline at end of file
diff --git a/tests/languages/fortran/operator_feature.test b/tests/languages/fortran/operator_feature.test
new file mode 100644
index 0000000000..d2d3003fab
--- /dev/null
+++ b/tests/languages/fortran/operator_feature.test
@@ -0,0 +1,25 @@
+** // =>
+== /= ::
+< <= > >=
++ - * / = %
+.EQ. .NE. .LT. .LE.
+.GT. .GE. .NOT. .AND.
+.OR. .EQV. .NEQV.
+.foobar.
+
+----------------------------------------------------
+
+[
+	["operator", "**"], ["operator", "//"], ["operator", "=>"],
+	["operator", "=="], ["operator", "/="], ["operator", "::"],
+	["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
+	["operator", "+"], ["operator", "-"], ["operator", "*"], ["operator", "/"], ["operator", "="], ["operator", "%"],
+	["operator", ".EQ."], ["operator", ".NE."], ["operator", ".LT."], ["operator", ".LE."],
+	["operator", ".GT."], ["operator", ".GE."], ["operator", ".NOT."], ["operator", ".AND."],
+	["operator", ".OR."], ["operator", ".EQV."], ["operator", ".NEQV."],
+	["operator", ".foobar."]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/fortran/string_feature.test b/tests/languages/fortran/string_feature.test
new file mode 100644
index 0000000000..3fa6f74aa2
--- /dev/null
+++ b/tests/languages/fortran/string_feature.test
@@ -0,0 +1,31 @@
+""
+''
+"foo ""bar"" baz"
+'foo ''bar'' baz'
+ITALICS_'foobar'
+"foo &
+	&bar"
+"foo &
+	! Comment
+	&bar"
+
+----------------------------------------------------
+
+[
+	["string", ["\"\""]],
+	["string", ["''"]],
+	["string", ["\"foo \"\"bar\"\" baz\""]],
+	["string", ["'foo ''bar'' baz'"]],
+	["string", ["ITALICS_'foobar'"]],
+	["string", ["\"foo &\r\n\t&bar\""]],
+	["string", [
+		"\"foo &\r\n\t",
+		["comment", "! Comment"],
+		"\r\n\t&bar\""
+	]]
+]
+
+----------------------------------------------------
+
+Checks for strings and line continuation.
+Also checks for comments inside strings.
\ No newline at end of file

From 09f20052e5b6fd70b45285fc60f579309a8692de Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 08:07:32 +0200
Subject: [PATCH 179/310] F#: fix keywords containing exclamation mark

---
 components/prism-fsharp.js     | 2 +-
 components/prism-fsharp.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-fsharp.js b/components/prism-fsharp.js
index cb4f5d5dd8..30735b8d0f 100644
--- a/components/prism-fsharp.js
+++ b/components/prism-fsharp.js
@@ -9,7 +9,7 @@ Prism.languages.fsharp = Prism.languages.extend('clike', {
 			lookbehind: true
 		}
 	],
-	'keyword': /\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|let|let!|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|return|return!|select|static|struct|then|to|true|try|type|upcast|use|use!|val|void|when|while|with|yield|yield!|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,
+	'keyword': /\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,
 	'string': /@?("""|"|')((\\|\n)?.)*?\1B?/,
 	'preprocessor': /^\s*#.*/m,
 	'number': [
diff --git a/components/prism-fsharp.min.js b/components/prism-fsharp.min.js
index 785f391d51..ea8c78c81c 100644
--- a/components/prism-fsharp.min.js
+++ b/components/prism-fsharp.min.js
@@ -1 +1 @@
-Prism.languages.fsharp=Prism.languages.extend("clike",{comment:[{pattern:/(^|[^\\])\(\*[\w\W]*?\*\)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],keyword:/\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|let|let!|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|return|return!|select|static|struct|then|to|true|try|type|upcast|use|use!|val|void|when|while|with|yield|yield!|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,string:/@?("""|"|')((\\|\n)?.)*?\1B?/,preprocessor:/^\s*#.*/m,number:[/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,/\b-?0b[01]+(y|uy)?\b/,/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/]});
\ No newline at end of file
+Prism.languages.fsharp=Prism.languages.extend("clike",{comment:[{pattern:/(^|[^\\])\(\*[\w\W]*?\*\)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],keyword:/\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,string:/@?("""|"|')((\\|\n)?.)*?\1B?/,preprocessor:/^\s*#.*/m,number:[/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,/\b-?0b[01]+(y|uy)?\b/,/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/]});
\ No newline at end of file

From 0101c89089f774fb26c4e4ebf4506b156022fde8 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 08:26:09 +0200
Subject: [PATCH 180/310] F#: improve string pattern

---
 components/prism-fsharp.js     | 2 +-
 components/prism-fsharp.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-fsharp.js b/components/prism-fsharp.js
index 30735b8d0f..ad3f7a5002 100644
--- a/components/prism-fsharp.js
+++ b/components/prism-fsharp.js
@@ -10,7 +10,7 @@ Prism.languages.fsharp = Prism.languages.extend('clike', {
 		}
 	],
 	'keyword': /\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,
-	'string': /@?("""|"|')((\\|\n)?.)*?\1B?/,
+	'string': /(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|("|')(?:\\\1|\\?(?!\1)[\s\S])*\1)B?/,
 	'preprocessor': /^\s*#.*/m,
 	'number': [
 		/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,
diff --git a/components/prism-fsharp.min.js b/components/prism-fsharp.min.js
index ea8c78c81c..607a2e957f 100644
--- a/components/prism-fsharp.min.js
+++ b/components/prism-fsharp.min.js
@@ -1 +1 @@
-Prism.languages.fsharp=Prism.languages.extend("clike",{comment:[{pattern:/(^|[^\\])\(\*[\w\W]*?\*\)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],keyword:/\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,string:/@?("""|"|')((\\|\n)?.)*?\1B?/,preprocessor:/^\s*#.*/m,number:[/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,/\b-?0b[01]+(y|uy)?\b/,/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/]});
\ No newline at end of file
+Prism.languages.fsharp=Prism.languages.extend("clike",{comment:[{pattern:/(^|[^\\])\(\*[\w\W]*?\*\)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],keyword:/\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,string:/(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|("|')(?:\\\1|\\?(?!\1)[\s\S])*\1)B?/,preprocessor:/^\s*#.*/m,number:[/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,/\b-?0b[01]+(y|uy)?\b/,/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/]});
\ No newline at end of file

From fdc94775d085c669e5e7288ddd372000460a8fb2 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 08:34:03 +0200
Subject: [PATCH 181/310] F#: insert preprocessor before keyword + don't allow
 line feeds before #

---
 components/prism-fsharp.js     | 4 +++-
 components/prism-fsharp.min.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/prism-fsharp.js b/components/prism-fsharp.js
index ad3f7a5002..02b63cb933 100644
--- a/components/prism-fsharp.js
+++ b/components/prism-fsharp.js
@@ -11,11 +11,13 @@ Prism.languages.fsharp = Prism.languages.extend('clike', {
 	],
 	'keyword': /\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,
 	'string': /(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|("|')(?:\\\1|\\?(?!\1)[\s\S])*\1)B?/,
-	'preprocessor': /^\s*#.*/m,
 	'number': [
 		/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,
 		/\b-?0b[01]+(y|uy)?\b/,
 		/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,
 		/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/
 	]
+});
+Prism.languages.insertBefore('fsharp', 'keyword', {
+	'preprocessor': /^[^\r\n\S]*#.*/m
 });
\ No newline at end of file
diff --git a/components/prism-fsharp.min.js b/components/prism-fsharp.min.js
index 607a2e957f..267f47e7ae 100644
--- a/components/prism-fsharp.min.js
+++ b/components/prism-fsharp.min.js
@@ -1 +1 @@
-Prism.languages.fsharp=Prism.languages.extend("clike",{comment:[{pattern:/(^|[^\\])\(\*[\w\W]*?\*\)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],keyword:/\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,string:/(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|("|')(?:\\\1|\\?(?!\1)[\s\S])*\1)B?/,preprocessor:/^\s*#.*/m,number:[/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,/\b-?0b[01]+(y|uy)?\b/,/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/]});
\ No newline at end of file
+Prism.languages.fsharp=Prism.languages.extend("clike",{comment:[{pattern:/(^|[^\\])\(\*[\w\W]*?\*\)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],keyword:/\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,string:/(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|("|')(?:\\\1|\\?(?!\1)[\s\S])*\1)B?/,number:[/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,/\b-?0b[01]+(y|uy)?\b/,/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/]}),Prism.languages.insertBefore("fsharp","keyword",{preprocessor:/^[^\r\n\S]*#.*/m});
\ No newline at end of file

From 0aa0791f02c56c95c3f4f327a5204c81bb2a5624 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 08:42:00 +0200
Subject: [PATCH 182/310] F#: fix numbers

---
 components/prism-fsharp.js     | 2 +-
 components/prism-fsharp.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-fsharp.js b/components/prism-fsharp.js
index 02b63cb933..7828495855 100644
--- a/components/prism-fsharp.js
+++ b/components/prism-fsharp.js
@@ -14,7 +14,7 @@ Prism.languages.fsharp = Prism.languages.extend('clike', {
 	'number': [
 		/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,
 		/\b-?0b[01]+(y|uy)?\b/,
-		/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,
+		/\b-?(\d*\.?\d+|\d+\.)([fFmM]|[eE][+-]?\d+)?\b/,
 		/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/
 	]
 });
diff --git a/components/prism-fsharp.min.js b/components/prism-fsharp.min.js
index 267f47e7ae..4a30f95f61 100644
--- a/components/prism-fsharp.min.js
+++ b/components/prism-fsharp.min.js
@@ -1 +1 @@
-Prism.languages.fsharp=Prism.languages.extend("clike",{comment:[{pattern:/(^|[^\\])\(\*[\w\W]*?\*\)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],keyword:/\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,string:/(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|("|')(?:\\\1|\\?(?!\1)[\s\S])*\1)B?/,number:[/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,/\b-?0b[01]+(y|uy)?\b/,/\b-?(\d+\.|\d*\.?\d+)([fFmM]|[eE][+-]?\d+)?\b/,/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/]}),Prism.languages.insertBefore("fsharp","keyword",{preprocessor:/^[^\r\n\S]*#.*/m});
\ No newline at end of file
+Prism.languages.fsharp=Prism.languages.extend("clike",{comment:[{pattern:/(^|[^\\])\(\*[\w\W]*?\*\)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],keyword:/\b(?:let|return|use|yield)(?:!\B|\b)|\b(abstract|and|as|assert|base|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|global|if|in|inherit|inline|interface|internal|lazy|match|member|module|mutable|namespace|new|not|null|of|open|or|override|private|public|rec|select|static|struct|then|to|true|try|type|upcast|val|void|when|while|with|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|include|method|mixin|object|parallel|process|protected|pure|sealed|tailcall|trait|virtual|volatile)\b/,string:/(?:"""[\s\S]*?"""|@"(?:""|[^"])*"|("|')(?:\\\1|\\?(?!\1)[\s\S])*\1)B?/,number:[/\b-?0x[\da-fA-F]+(un|lf|LF)?\b/,/\b-?0b[01]+(y|uy)?\b/,/\b-?(\d*\.?\d+|\d+\.)([fFmM]|[eE][+-]?\d+)?\b/,/\b-?\d+(y|uy|s|us|l|u|ul|L|UL|I)?\b/]}),Prism.languages.insertBefore("fsharp","keyword",{preprocessor:/^[^\r\n\S]*#.*/m});
\ No newline at end of file

From 9af550d41988724febb07851730f271b5d7ea611 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 08:42:25 +0200
Subject: [PATCH 183/310] Add tests for F#

---
 tests/languages/fsharp/comment_feature.test   | 16 +++++
 tests/languages/fsharp/keyword_feature.test   | 71 +++++++++++++++++++
 tests/languages/fsharp/number_feature.test    | 65 +++++++++++++++++
 .../fsharp/preprocessor_feature.test          | 15 ++++
 tests/languages/fsharp/string_feature.test    | 45 ++++++++++++
 5 files changed, 212 insertions(+)
 create mode 100644 tests/languages/fsharp/comment_feature.test
 create mode 100644 tests/languages/fsharp/keyword_feature.test
 create mode 100644 tests/languages/fsharp/number_feature.test
 create mode 100644 tests/languages/fsharp/preprocessor_feature.test
 create mode 100644 tests/languages/fsharp/string_feature.test

diff --git a/tests/languages/fsharp/comment_feature.test b/tests/languages/fsharp/comment_feature.test
new file mode 100644
index 0000000000..ff9170b6b8
--- /dev/null
+++ b/tests/languages/fsharp/comment_feature.test
@@ -0,0 +1,16 @@
+// foobar
+(**)
+(* foo
+bar *)
+
+----------------------------------------------------
+
+[
+	["comment", "// foobar"],
+	["comment", "(**)"],
+	["comment", "(* foo\r\nbar *)"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
\ No newline at end of file
diff --git a/tests/languages/fsharp/keyword_feature.test b/tests/languages/fsharp/keyword_feature.test
new file mode 100644
index 0000000000..d2ef996f47
--- /dev/null
+++ b/tests/languages/fsharp/keyword_feature.test
@@ -0,0 +1,71 @@
+abstract and as assert
+base begin
+class;
+default
+delegate do done downcast
+downto elif else end
+exception extern false finally
+for fun function global
+if in inherit inline
+interface;
+internal lazy let
+let! match member module
+mutable namespace
+new;
+not
+null of open or override
+private public rec return
+return! select static struct
+then to true try type
+upcast use use! val void
+when while with yield
+yield! asr land lor lsl
+lsr lxor mod sig atomic
+break checked component
+const constraint constructor
+continue eager event external
+fixed functor include method
+mixin object parallel process
+protected pure sealed tailcall
+trait;
+virtual volatile
+
+----------------------------------------------------
+
+[
+	["keyword", "abstract"], ["keyword", "and"], ["keyword", "as"], ["keyword", "assert"],
+	["keyword", "base"], ["keyword", "begin"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "default"],
+	["keyword", "delegate"], ["keyword", "do"], ["keyword", "done"], ["keyword", "downcast"],
+	["keyword", "downto"], ["keyword", "elif"], ["keyword", "else"], ["keyword", "end"],
+	["keyword", "exception"], ["keyword", "extern"], ["keyword", "false"], ["keyword", "finally"],
+	["keyword", "for"], ["keyword", "fun"], ["keyword", "function"], ["keyword", "global"],
+	["keyword", "if"], ["keyword", "in"], ["keyword", "inherit"], ["keyword", "inline"],
+	["keyword", "interface"], ["punctuation", ";"],
+	["keyword", "internal"], ["keyword", "lazy"], ["keyword", "let"],
+	["keyword", "let!"], ["keyword", "match"], ["keyword", "member"], ["keyword", "module"],
+	["keyword", "mutable"], ["keyword", "namespace"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "not"],
+	["keyword", "null"], ["keyword", "of"], ["keyword", "open"], ["keyword", "or"], ["keyword", "override"],
+	["keyword", "private"], ["keyword", "public"], ["keyword", "rec"], ["keyword", "return"],
+	["keyword", "return!"], ["keyword", "select"], ["keyword", "static"], ["keyword", "struct"],
+	["keyword", "then"], ["keyword", "to"], ["keyword", "true"], ["keyword", "try"], ["keyword", "type"],
+	["keyword", "upcast"], ["keyword", "use"], ["keyword", "use!"], ["keyword", "val"], ["keyword", "void"],
+	["keyword", "when"], ["keyword", "while"], ["keyword", "with"], ["keyword", "yield"],
+	["keyword", "yield!"], ["keyword", "asr"], ["keyword", "land"], ["keyword", "lor"], ["keyword", "lsl"],
+	["keyword", "lsr"], ["keyword", "lxor"], ["keyword", "mod"], ["keyword", "sig"], ["keyword", "atomic"],
+	["keyword", "break"], ["keyword", "checked"], ["keyword", "component"],
+	["keyword", "const"], ["keyword", "constraint"], ["keyword", "constructor"],
+	["keyword", "continue"], ["keyword", "eager"], ["keyword", "event"], ["keyword", "external"],
+	["keyword", "fixed"], ["keyword", "functor"], ["keyword", "include"], ["keyword", "method"],
+	["keyword", "mixin"], ["keyword", "object"], ["keyword", "parallel"], ["keyword", "process"],
+	["keyword", "protected"], ["keyword", "pure"], ["keyword", "sealed"], ["keyword", "tailcall"],
+	["keyword", "trait"], ["punctuation", ";"],
+	["keyword", "virtual"], ["keyword", "volatile"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/fsharp/number_feature.test b/tests/languages/fsharp/number_feature.test
new file mode 100644
index 0000000000..f2f86ed288
--- /dev/null
+++ b/tests/languages/fsharp/number_feature.test
@@ -0,0 +1,65 @@
+0xbabe
+0xBABEun
+0xflf
+0xfLF
+
+0b1001
+0b1001y
+0b1001uy
+
+42
+1.5
+2.3E+32
+2.3e-32
+4.14F
+4.14f
+0.7833M
+0.7833m
+
+86y
+86uy
+86s
+86us
+86l
+86u
+86ul
+86L
+86UL
+9999999999999999999999999999I
+
+----------------------------------------------------
+
+[
+	["number", "0xbabe"],
+	["number", "0xBABEun"],
+	["number", "0xflf"],
+	["number", "0xfLF"],
+
+	["number", "0b1001"],
+	["number", "0b1001y"],
+	["number", "0b1001uy"],
+
+	["number", "42"],
+	["number", "1.5"],
+	["number", "2.3E+32"],
+	["number", "2.3e-32"],
+	["number", "4.14F"],
+	["number", "4.14f"],
+	["number", "0.7833M"],
+	["number", "0.7833m"],
+
+	["number", "86y"],
+	["number", "86uy"],
+	["number", "86s"],
+	["number", "86us"],
+	["number", "86l"],
+	["number", "86u"],
+	["number", "86ul"],
+	["number", "86L"],
+	["number", "86UL"],
+	["number", "9999999999999999999999999999I"]
+]
+
+----------------------------------------------------
+
+Checks for decimal, hexadecimal and binary numbers, with all possible suffixes.
\ No newline at end of file
diff --git a/tests/languages/fsharp/preprocessor_feature.test b/tests/languages/fsharp/preprocessor_feature.test
new file mode 100644
index 0000000000..0bb16a6a24
--- /dev/null
+++ b/tests/languages/fsharp/preprocessor_feature.test
@@ -0,0 +1,15 @@
+#if foo
+#else
+#endif
+
+----------------------------------------------------
+
+[
+	["preprocessor", "#if foo"],
+	["preprocessor", "#else"],
+	["preprocessor", "#endif"]
+]
+
+----------------------------------------------------
+
+Checks for preprocessor directives.
\ No newline at end of file
diff --git a/tests/languages/fsharp/string_feature.test b/tests/languages/fsharp/string_feature.test
new file mode 100644
index 0000000000..89412ac072
--- /dev/null
+++ b/tests/languages/fsharp/string_feature.test
@@ -0,0 +1,45 @@
+""
+"fo\"o"
+"foo\
+bar"
+"foo"B
+
+@""
+@"foo"
+@"fo""o"
+@"foo"B
+
+""""""
+"""fo""o"
+bar"""
+"""foo"""B
+
+'a'
+'\''
+'\\'
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"o\""],
+	["string", "\"foo\\\r\nbar\""],
+	["string", "\"foo\"B"],
+
+	["string", "@\"\""],
+	["string", "@\"foo\""],
+	["string", "@\"fo\"\"o\""],
+	["string", "@\"foo\"B"],
+
+	["string", "\"\"\"\"\"\""],
+	["string", "\"\"\"fo\"\"o\"\r\nbar\"\"\""],
+	["string", "\"\"\"foo\"\"\"B"],
+
+	["string", "'a'"],
+	["string", "'\\''"],
+	["string", "'\\\\'"]
+]
+
+----------------------------------------------------
+
+Checks for normal strings, verbatim strings, triple-quoted strings and character literals.
\ No newline at end of file

From 48ff8b78ecddd688f499c23e320a5ceedc87e163 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 09:00:20 +0200
Subject: [PATCH 184/310] Gherkin: don't allow spaces in tags

---
 components/prism-gherkin.js     | 2 +-
 components/prism-gherkin.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-gherkin.js b/components/prism-gherkin.js
index f0793eed3f..333911040c 100644
--- a/components/prism-gherkin.js
+++ b/components/prism-gherkin.js
@@ -8,7 +8,7 @@ Prism.languages.gherkin = {
 		lookbehind: true
 	},
 	'tag': {
-		pattern: /((^|\n)[ \t]*)@.*/,
+		pattern: /((^|\n)[ \t]*)@\S*/,
 		lookbehind: true
 	},
 	'feature': {
diff --git a/components/prism-gherkin.min.js b/components/prism-gherkin.min.js
index 6e278d69b2..72186249ce 100644
--- a/components/prism-gherkin.min.js
+++ b/components/prism-gherkin.min.js
@@ -1 +1 @@
-Prism.languages.gherkin={pystring:{pattern:/("""|''')[\s\S]+?\1/,alias:"string"},comment:{pattern:/((^|\n)[ \t]*)#.*/,lookbehind:!0},tag:{pattern:/((^|\n)[ \t]*)@.*/,lookbehind:!0},feature:{pattern:/((^|\n)[ \t]*)(Ability|Ahoy matey!|Arwedd|Aspekt|Besigheid Behoefte|Business Need|Caracteristica|Característica|Egenskab|Egenskap|Eiginleiki|Feature|Fīča|Fitur|Fonctionnalité|Fonksyonalite|Funcionalidade|Funcionalitat|Functionalitate|Funcţionalitate|Funcționalitate|Functionaliteit|Fungsi|Funkcia|Funkcija|Funkcionalitāte|Funkcionalnost|Funkcja|Funksie|Funktionalität|Funktionalitéit|Funzionalità|Hwaet|Hwæt|Jellemző|Karakteristik|laH|Lastnost|Mak|Mogucnost|Mogućnost|Moznosti|Možnosti|OH HAI|Omadus|Ominaisuus|Osobina|Özellik|perbogh|poQbogh malja'|Potrzeba biznesowa|Požadavek|Požiadavka|Pretty much|Qap|Qu'meH 'ut|Savybė|Tính năng|Trajto|Vermoë|Vlastnosť|Właściwość|Značilnost|Δυνατότητα|Λειτουργία|Могућност|Мөмкинлек|Особина|Свойство|Үзенчәлеклелек|Функционал|Функционалност|Функция|Функціонал|תכונה|خاصية|خصوصیت|صلاحیت|کاروبار کی ضرورت|وِیژگی|रूप लेख|ਖਾਸੀਅਤ|ਨਕਸ਼ ਨੁਹਾਰ|ਮੁਹਾਂਦਰਾ|గుణము|ಹೆಚ್ಚಳ|ความต้องการทางธุรกิจ|ความสามารถ|โครงหลัก|기능|フィーチャ|功能|機能):([^:]+\n)*/,lookbehind:!0,inside:{important:{pattern:/(:)[^\n]+/,lookbehind:!0},keyword:/[^:\n]+:/}},scenario:{pattern:/((^|\n)[ \t]*)(Abstract Scenario|Abstrakt Scenario|Achtergrond|Aer|Ær|Agtergrond|All y'all|Antecedentes|Antecedents|Atburðarás|Atburðarásir|Awww, look mate|B4|Background|Baggrund|Bakgrund|Bakgrunn|Bakgrunnur|Beispiele|Beispiller|Bối cảnh|Cefndir|Cenario|Cenário|Cenario de Fundo|Cenário de Fundo|Cenarios|Cenários|Contesto|Context|Contexte|Contexto|Conto|Contoh|Contone|Dæmi|Dasar|Dead men tell no tales|Delineacao do Cenario|Delineação do Cenário|Dis is what went down|Dữ liệu|Dyagram senaryo|Dyagram Senaryo|Egzanp|Ejemplos|Eksempler|Ekzemploj|Enghreifftiau|Esbozo do escenario|Escenari|Escenario|Esempi|Esquema de l'escenari|Esquema del escenario|Esquema do Cenario|Esquema do Cenário|Examples|EXAMPLZ|Exempel|Exemple|Exemples|Exemplos|First off|Fono|Forgatókönyv|Forgatókönyv vázlat|Fundo|Geçmiş|ghantoH|Grundlage|Hannergrond|Háttér|Heave to|Istorik|Juhtumid|Keadaan|Khung kịch bản|Khung tình huống|Kịch bản|Koncept|Konsep skenario|Kontèks|Kontekst|Kontekstas|Konteksts|Kontext|Konturo de la scenaro|Latar Belakang|lut|lut chovnatlh|lutmey|Lýsing Atburðarásar|Lýsing Dæma|Menggariskan Senario|MISHUN|MISHUN SRSLY|mo'|Náčrt Scenára|Náčrt Scénáře|Náčrt Scenáru|Oris scenarija|Örnekler|Osnova|Osnova Scenára|Osnova scénáře|Osnutek|Ozadje|Paraugs|Pavyzdžiai|Példák|Piemēri|Plan du scénario|Plan du Scénario|Plan senaryo|Plan Senaryo|Plang vum Szenario|Pozadí|Pozadie|Pozadina|Príklady|Příklady|Primer|Primeri|Primjeri|Przykłady|Raamstsenaarium|Reckon it's like|Rerefons|Scenár|Scénář|Scenarie|Scenarij|Scenarijai|Scenarijaus šablonas|Scenariji|Scenārijs|Scenārijs pēc parauga|Scenarijus|Scenario|Scénario|Scenario Amlinellol|Scenario Outline|Scenario Template|Scenariomal|Scenariomall|Scenarios|Scenariu|Scenariusz|Scenaro|Schema dello scenario|Se ðe|Se the|Se þe|Senario|Senaryo|Senaryo deskripsyon|Senaryo Deskripsyon|Senaryo taslağı|Shiver me timbers|Situācija|Situai|Situasie|Situasie Uiteensetting|Skenario|Skenario konsep|Skica|Structura scenariu|Structură scenariu|Struktura scenarija|Stsenaarium|Swa|Swa hwaer swa|Swa hwær swa|Szablon scenariusza|Szenario|Szenariogrundriss|Tapaukset|Tapaus|Tapausaihio|Taust|Tausta|Template Keadaan|Template Senario|Template Situai|The thing of it is|Tình huống|Variantai|Voorbeelde|Voorbeelden|Wharrimean is|Yo\-ho\-ho|You'll wanna|Założenia|Παραδείγματα|Περιγραφή Σεναρίου|Σενάρια|Σενάριο|Υπόβαθρο|Кереш|Контекст|Концепт|Мисаллар|Мисоллар|Основа|Передумова|Позадина|Предистория|Предыстория|Приклади|Пример|Примери|Примеры|Рамка на сценарий|Скица|Структура сценарија|Структура сценария|Структура сценарію|Сценарий|Сценарий структураси|Сценарийның төзелеше|Сценарији|Сценарио|Сценарій|Тарих|Үрнәкләр|דוגמאות|רקע|תבנית תרחיש|תרחיש|الخلفية|الگوی سناریو|امثلة|پس منظر|زمینه|سناریو|سيناريو|سيناريو مخطط|مثالیں|منظر نامے کا خاکہ|منظرنامہ|نمونه ها|उदाहरण|परिदृश्य|परिदृश्य रूपरेखा|पृष्ठभूमि|ਉਦਾਹਰਨਾਂ|ਪਟਕਥਾ|ਪਟਕਥਾ ਢਾਂਚਾ|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਿਛੋਕੜ|ఉదాహరణలు|కథనం|నేపథ్యం|సన్నివేశం|ಉದಾಹರಣೆಗಳು|ಕಥಾಸಾರಾಂಶ|ವಿವರಣೆ|ಹಿನ್ನೆಲೆ|โครงสร้างของเหตุการณ์|ชุดของตัวอย่าง|ชุดของเหตุการณ์|แนวคิด|สรุปเหตุการณ์|เหตุการณ์|배경|시나리오|시나리오 개요|예|サンプル|シナリオ|シナリオアウトライン|シナリオテンプレ|シナリオテンプレート|テンプレ|例|例子|剧本|剧本大纲|劇本|劇本大綱|场景|场景大纲|場景|場景大綱|背景):[^:\n]*/,lookbehind:!0,inside:{important:{pattern:/(:)[^\n]*/,lookbehind:!0},keyword:/[^:\n]+:/}},"table-body":{pattern:/(\n[ \t]*\|.+\|[^\n]*)+/,lookbehind:!0,inside:{outline:{pattern:/<[^>]+?>/,alias:"variable"},td:{pattern:/[^|]+/,alias:"string"},punctuation:/\|/}},"table-head":{pattern:/(\n[ \t]*\|.+\|[^\n]*)/,inside:{th:{pattern:/[^|]+/,alias:"variable"},punctuation:/\|/}},atrule:{pattern:/(\n[ \t]+)('ach|'a|'ej|7|a|A také|A taktiež|A tiež|A zároveň|Aber|Ac|Adott|Akkor|Ak|Aleshores|Ale|Ali|Allora|Alors|Als|Ama|Amennyiben|Amikor|Ampak|an|AN|Ananging|And y'all|And|Angenommen|Anrhegedig a|An|Apabila|Atès|Atesa|Atunci|Avast!|Aye|A|awer|Bagi|Banjur|Bet|Biết|Blimey!|Buh|But at the end of the day I reckon|But y'all|But|BUT|Cal|Când|Cando|Cand|Ce|Cuando|Če|Ða ðe|Ða|Dadas|Dada|Dados|Dado|DaH ghu' bejlu'|dann|Dann|Dano|Dan|Dar|Dat fiind|Data|Date fiind|Date|Dati fiind|Dati|Daţi fiind|Dați fiind|Dato|DEN|Den youse gotta|Dengan|De|Diberi|Diyelim ki|Donada|Donat|Donitaĵo|Do|Dun|Duota|Ðurh|Eeldades|Ef|Eğer ki|Entao|Então|Entón|Entonces|En|Epi|E|És|Etant donnée|Etant donné|Et|Étant données|Étant donnée|Étant donné|Etant données|Etant donnés|Étant donnés|Fakat|Gangway!|Gdy|Gegeben seien|Gegeben sei|Gegeven|Gegewe|ghu' noblu'|Gitt|Given y'all|Given|Givet|Givun|Ha|Cho|I CAN HAZ|In|Ir|It's just unbelievable|I|Ja|Jeśli|Jeżeli|Kadar|Kada|Kad|Kai|Kaj|Když|Keď|Kemudian|Ketika|Khi|Kiedy|Ko|Kuid|Kui|Kun|Lan|latlh|Le sa a|Let go and haul|Le|Lè sa a|Lè|Logo|Lorsqu'<|Lorsque|mä|Maar|Mais|Mając|Majd|Maka|Manawa|Mas|Ma|Menawa|Men|Mutta|Nalikaning|Nalika|Nanging|Når|När|Nato|Nhưng|Niin|Njuk|O zaman|Og|Och|Oletetaan|Onda|Ond|Oraz|Pak|Pero|Però|Podano|Pokiaľ|Pokud|Potem|Potom|Privzeto|Pryd|qaSDI'|Quando|Quand|Quan|Så|Sed|Se|Siis|Sipoze ke|Sipoze Ke|Sipoze|Si|Şi|Și|Soit|Stel|Tada|Tad|Takrat|Tak|Tapi|Ter|Tetapi|Tha the|Tha|Then y'all|Then|Thì|Thurh|Toda|Too right|ugeholl|Und|Un|Và|vaj|Vendar|Ve|wann|Wanneer|WEN|Wenn|When y'all|When|Wtedy|Wun|Y'know|Yeah nah|Yna|Youse know like when|Youse know when youse got|Y|Za predpokladu|Za předpokladu|Zadani|Zadano|Zadan|Zadate|Zadato|Zakładając|Zaradi|Zatati|Þa|Þá|Þa þe|Þegar|Þurh|Αλλά|Δεδομένου|Και|Όταν|Τότε|А також|Агар|Але|Али|Аммо|А|Әгәр|Әйтик|Әмма|Бирок|Ва|Вә|Дадено|Дано|Допустим|Если|Задате|Задати|Задато|И|І|К тому же|Када|Кад|Когато|Когда|Коли|Ләкин|Лекин|Нәтиҗәдә|Нехай|Но|Онда|Припустимо, що|Припустимо|Пусть|Также|Та|Тогда|Тоді|То|Унда|Һәм|Якщо|אבל|אזי|אז|בהינתן|וגם|כאשר|آنگاه|اذاً|اگر|اما|اور|با فرض|بالفرض|بفرض|پھر|تب|ثم|جب|عندما|فرض کیا|لكن|لیکن|متى|هنگامی|و|अगर|और|कदा|किन्तु|चूंकि|जब|तथा|तदा|तब|परन्तु|पर|यदि|ਅਤੇ|ਜਦੋਂ|ਜਿਵੇਂ ਕਿ|ਜੇਕਰ|ਤਦ|ਪਰ|అప్పుడు|ఈ పరిస్థితిలో|కాని|చెప్పబడినది|మరియు|ಆದರೆ|ನಂತರ|ನೀಡಿದ|ಮತ್ತು|ಸ್ಥಿತಿಯನ್ನು|กำหนดให้|ดังนั้น|แต่|เมื่อ|และ|그러면<|그리고<|단<|만약<|만일<|먼저<|조건<|하지만<|かつ<|しかし<|ただし<|ならば<|もし<|並且<|但し<|但是<|假如<|假定<|假設<|假设<|前提<|同时<|同時<|并且<|当<|當<|而且<|那么<|那麼<)(?=[ \t]+)/,lookbehind:!0},string:{pattern:/("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*')/,inside:{outline:{pattern:/<[^>]+?>/,alias:"variable"}}},outline:{pattern:/<[^>]+?>/,alias:"variable"}};
\ No newline at end of file
+Prism.languages.gherkin={pystring:{pattern:/("""|''')[\s\S]+?\1/,alias:"string"},comment:{pattern:/((^|\n)[ \t]*)#.*/,lookbehind:!0},tag:{pattern:/((^|\n)[ \t]*)@\S*/,lookbehind:!0},feature:{pattern:/((^|\n)[ \t]*)(Ability|Ahoy matey!|Arwedd|Aspekt|Besigheid Behoefte|Business Need|Caracteristica|Característica|Egenskab|Egenskap|Eiginleiki|Feature|Fīča|Fitur|Fonctionnalité|Fonksyonalite|Funcionalidade|Funcionalitat|Functionalitate|Funcţionalitate|Funcționalitate|Functionaliteit|Fungsi|Funkcia|Funkcija|Funkcionalitāte|Funkcionalnost|Funkcja|Funksie|Funktionalität|Funktionalitéit|Funzionalità|Hwaet|Hwæt|Jellemző|Karakteristik|laH|Lastnost|Mak|Mogucnost|Mogućnost|Moznosti|Možnosti|OH HAI|Omadus|Ominaisuus|Osobina|Özellik|perbogh|poQbogh malja'|Potrzeba biznesowa|Požadavek|Požiadavka|Pretty much|Qap|Qu'meH 'ut|Savybė|Tính năng|Trajto|Vermoë|Vlastnosť|Właściwość|Značilnost|Δυνατότητα|Λειτουργία|Могућност|Мөмкинлек|Особина|Свойство|Үзенчәлеклелек|Функционал|Функционалност|Функция|Функціонал|תכונה|خاصية|خصوصیت|صلاحیت|کاروبار کی ضرورت|وِیژگی|रूप लेख|ਖਾਸੀਅਤ|ਨਕਸ਼ ਨੁਹਾਰ|ਮੁਹਾਂਦਰਾ|గుణము|ಹೆಚ್ಚಳ|ความต้องการทางธุรกิจ|ความสามารถ|โครงหลัก|기능|フィーチャ|功能|機能):([^:]+\n)*/,lookbehind:!0,inside:{important:{pattern:/(:)[^\n]+/,lookbehind:!0},keyword:/[^:\n]+:/}},scenario:{pattern:/((^|\n)[ \t]*)(Abstract Scenario|Abstrakt Scenario|Achtergrond|Aer|Ær|Agtergrond|All y'all|Antecedentes|Antecedents|Atburðarás|Atburðarásir|Awww, look mate|B4|Background|Baggrund|Bakgrund|Bakgrunn|Bakgrunnur|Beispiele|Beispiller|Bối cảnh|Cefndir|Cenario|Cenário|Cenario de Fundo|Cenário de Fundo|Cenarios|Cenários|Contesto|Context|Contexte|Contexto|Conto|Contoh|Contone|Dæmi|Dasar|Dead men tell no tales|Delineacao do Cenario|Delineação do Cenário|Dis is what went down|Dữ liệu|Dyagram senaryo|Dyagram Senaryo|Egzanp|Ejemplos|Eksempler|Ekzemploj|Enghreifftiau|Esbozo do escenario|Escenari|Escenario|Esempi|Esquema de l'escenari|Esquema del escenario|Esquema do Cenario|Esquema do Cenário|Examples|EXAMPLZ|Exempel|Exemple|Exemples|Exemplos|First off|Fono|Forgatókönyv|Forgatókönyv vázlat|Fundo|Geçmiş|ghantoH|Grundlage|Hannergrond|Háttér|Heave to|Istorik|Juhtumid|Keadaan|Khung kịch bản|Khung tình huống|Kịch bản|Koncept|Konsep skenario|Kontèks|Kontekst|Kontekstas|Konteksts|Kontext|Konturo de la scenaro|Latar Belakang|lut|lut chovnatlh|lutmey|Lýsing Atburðarásar|Lýsing Dæma|Menggariskan Senario|MISHUN|MISHUN SRSLY|mo'|Náčrt Scenára|Náčrt Scénáře|Náčrt Scenáru|Oris scenarija|Örnekler|Osnova|Osnova Scenára|Osnova scénáře|Osnutek|Ozadje|Paraugs|Pavyzdžiai|Példák|Piemēri|Plan du scénario|Plan du Scénario|Plan senaryo|Plan Senaryo|Plang vum Szenario|Pozadí|Pozadie|Pozadina|Príklady|Příklady|Primer|Primeri|Primjeri|Przykłady|Raamstsenaarium|Reckon it's like|Rerefons|Scenár|Scénář|Scenarie|Scenarij|Scenarijai|Scenarijaus šablonas|Scenariji|Scenārijs|Scenārijs pēc parauga|Scenarijus|Scenario|Scénario|Scenario Amlinellol|Scenario Outline|Scenario Template|Scenariomal|Scenariomall|Scenarios|Scenariu|Scenariusz|Scenaro|Schema dello scenario|Se ðe|Se the|Se þe|Senario|Senaryo|Senaryo deskripsyon|Senaryo Deskripsyon|Senaryo taslağı|Shiver me timbers|Situācija|Situai|Situasie|Situasie Uiteensetting|Skenario|Skenario konsep|Skica|Structura scenariu|Structură scenariu|Struktura scenarija|Stsenaarium|Swa|Swa hwaer swa|Swa hwær swa|Szablon scenariusza|Szenario|Szenariogrundriss|Tapaukset|Tapaus|Tapausaihio|Taust|Tausta|Template Keadaan|Template Senario|Template Situai|The thing of it is|Tình huống|Variantai|Voorbeelde|Voorbeelden|Wharrimean is|Yo\-ho\-ho|You'll wanna|Założenia|Παραδείγματα|Περιγραφή Σεναρίου|Σενάρια|Σενάριο|Υπόβαθρο|Кереш|Контекст|Концепт|Мисаллар|Мисоллар|Основа|Передумова|Позадина|Предистория|Предыстория|Приклади|Пример|Примери|Примеры|Рамка на сценарий|Скица|Структура сценарија|Структура сценария|Структура сценарію|Сценарий|Сценарий структураси|Сценарийның төзелеше|Сценарији|Сценарио|Сценарій|Тарих|Үрнәкләр|דוגמאות|רקע|תבנית תרחיש|תרחיש|الخلفية|الگوی سناریو|امثلة|پس منظر|زمینه|سناریو|سيناريو|سيناريو مخطط|مثالیں|منظر نامے کا خاکہ|منظرنامہ|نمونه ها|उदाहरण|परिदृश्य|परिदृश्य रूपरेखा|पृष्ठभूमि|ਉਦਾਹਰਨਾਂ|ਪਟਕਥਾ|ਪਟਕਥਾ ਢਾਂਚਾ|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਿਛੋਕੜ|ఉదాహరణలు|కథనం|నేపథ్యం|సన్నివేశం|ಉದಾಹರಣೆಗಳು|ಕಥಾಸಾರಾಂಶ|ವಿವರಣೆ|ಹಿನ್ನೆಲೆ|โครงสร้างของเหตุการณ์|ชุดของตัวอย่าง|ชุดของเหตุการณ์|แนวคิด|สรุปเหตุการณ์|เหตุการณ์|배경|시나리오|시나리오 개요|예|サンプル|シナリオ|シナリオアウトライン|シナリオテンプレ|シナリオテンプレート|テンプレ|例|例子|剧本|剧本大纲|劇本|劇本大綱|场景|场景大纲|場景|場景大綱|背景):[^:\n]*/,lookbehind:!0,inside:{important:{pattern:/(:)[^\n]*/,lookbehind:!0},keyword:/[^:\n]+:/}},"table-body":{pattern:/(\n[ \t]*\|.+\|[^\n]*)+/,lookbehind:!0,inside:{outline:{pattern:/<[^>]+?>/,alias:"variable"},td:{pattern:/[^|]+/,alias:"string"},punctuation:/\|/}},"table-head":{pattern:/(\n[ \t]*\|.+\|[^\n]*)/,inside:{th:{pattern:/[^|]+/,alias:"variable"},punctuation:/\|/}},atrule:{pattern:/(\n[ \t]+)('ach|'a|'ej|7|a|A také|A taktiež|A tiež|A zároveň|Aber|Ac|Adott|Akkor|Ak|Aleshores|Ale|Ali|Allora|Alors|Als|Ama|Amennyiben|Amikor|Ampak|an|AN|Ananging|And y'all|And|Angenommen|Anrhegedig a|An|Apabila|Atès|Atesa|Atunci|Avast!|Aye|A|awer|Bagi|Banjur|Bet|Biết|Blimey!|Buh|But at the end of the day I reckon|But y'all|But|BUT|Cal|Când|Cando|Cand|Ce|Cuando|Če|Ða ðe|Ða|Dadas|Dada|Dados|Dado|DaH ghu' bejlu'|dann|Dann|Dano|Dan|Dar|Dat fiind|Data|Date fiind|Date|Dati fiind|Dati|Daţi fiind|Dați fiind|Dato|DEN|Den youse gotta|Dengan|De|Diberi|Diyelim ki|Donada|Donat|Donitaĵo|Do|Dun|Duota|Ðurh|Eeldades|Ef|Eğer ki|Entao|Então|Entón|Entonces|En|Epi|E|És|Etant donnée|Etant donné|Et|Étant données|Étant donnée|Étant donné|Etant données|Etant donnés|Étant donnés|Fakat|Gangway!|Gdy|Gegeben seien|Gegeben sei|Gegeven|Gegewe|ghu' noblu'|Gitt|Given y'all|Given|Givet|Givun|Ha|Cho|I CAN HAZ|In|Ir|It's just unbelievable|I|Ja|Jeśli|Jeżeli|Kadar|Kada|Kad|Kai|Kaj|Když|Keď|Kemudian|Ketika|Khi|Kiedy|Ko|Kuid|Kui|Kun|Lan|latlh|Le sa a|Let go and haul|Le|Lè sa a|Lè|Logo|Lorsqu'<|Lorsque|mä|Maar|Mais|Mając|Majd|Maka|Manawa|Mas|Ma|Menawa|Men|Mutta|Nalikaning|Nalika|Nanging|Når|När|Nato|Nhưng|Niin|Njuk|O zaman|Og|Och|Oletetaan|Onda|Ond|Oraz|Pak|Pero|Però|Podano|Pokiaľ|Pokud|Potem|Potom|Privzeto|Pryd|qaSDI'|Quando|Quand|Quan|Så|Sed|Se|Siis|Sipoze ke|Sipoze Ke|Sipoze|Si|Şi|Și|Soit|Stel|Tada|Tad|Takrat|Tak|Tapi|Ter|Tetapi|Tha the|Tha|Then y'all|Then|Thì|Thurh|Toda|Too right|ugeholl|Und|Un|Và|vaj|Vendar|Ve|wann|Wanneer|WEN|Wenn|When y'all|When|Wtedy|Wun|Y'know|Yeah nah|Yna|Youse know like when|Youse know when youse got|Y|Za predpokladu|Za předpokladu|Zadani|Zadano|Zadan|Zadate|Zadato|Zakładając|Zaradi|Zatati|Þa|Þá|Þa þe|Þegar|Þurh|Αλλά|Δεδομένου|Και|Όταν|Τότε|А також|Агар|Але|Али|Аммо|А|Әгәр|Әйтик|Әмма|Бирок|Ва|Вә|Дадено|Дано|Допустим|Если|Задате|Задати|Задато|И|І|К тому же|Када|Кад|Когато|Когда|Коли|Ләкин|Лекин|Нәтиҗәдә|Нехай|Но|Онда|Припустимо, що|Припустимо|Пусть|Также|Та|Тогда|Тоді|То|Унда|Һәм|Якщо|אבל|אזי|אז|בהינתן|וגם|כאשר|آنگاه|اذاً|اگر|اما|اور|با فرض|بالفرض|بفرض|پھر|تب|ثم|جب|عندما|فرض کیا|لكن|لیکن|متى|هنگامی|و|अगर|और|कदा|किन्तु|चूंकि|जब|तथा|तदा|तब|परन्तु|पर|यदि|ਅਤੇ|ਜਦੋਂ|ਜਿਵੇਂ ਕਿ|ਜੇਕਰ|ਤਦ|ਪਰ|అప్పుడు|ఈ పరిస్థితిలో|కాని|చెప్పబడినది|మరియు|ಆದರೆ|ನಂತರ|ನೀಡಿದ|ಮತ್ತು|ಸ್ಥಿತಿಯನ್ನು|กำหนดให้|ดังนั้น|แต่|เมื่อ|และ|그러면<|그리고<|단<|만약<|만일<|먼저<|조건<|하지만<|かつ<|しかし<|ただし<|ならば<|もし<|並且<|但し<|但是<|假如<|假定<|假設<|假设<|前提<|同时<|同時<|并且<|当<|當<|而且<|那么<|那麼<)(?=[ \t]+)/,lookbehind:!0},string:{pattern:/("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*')/,inside:{outline:{pattern:/<[^>]+?>/,alias:"variable"}}},outline:{pattern:/<[^>]+?>/,alias:"variable"}};
\ No newline at end of file

From a288368eb51bd9692ae8e49071c88fe9c46863cc Mon Sep 17 00:00:00 2001
From: Joe Gibson <gibsjose@mail.gvsu.edu>
Date: Wed, 19 Aug 2015 13:58:35 -0400
Subject: [PATCH 185/310] Just adding 'class-name' to list, not using insert
 method

---
 components/prism-python.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/prism-python.js b/components/prism-python.js
index a3171d7cb6..187a60c7fc 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -8,16 +8,13 @@ Prism.languages.python= {
 		pattern: /((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,
 		lookbehind: true
 	},
+	'class-name': {
+		pattern: /(class\s+)[a-z0-9_]+/i,
+		lookbehind: true
+	},
 	'keyword' : /\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
 	'boolean' : /\b(True|False)\b/,
 	'number' : /\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
 	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,
 	'punctuation' : /[{}[\];(),.:]/
 };
-
-Prism.languages.insertBefore('python', 'keyword', {
-	'class-name': {
-		pattern: /(class\s+)[a-z0-9_]+/i,
-		lookbehind: true
-	}
-});

From ce1ec3b5cdc9d080b6c1784e9da8bc1c15ba5403 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 20:26:44 +0200
Subject: [PATCH 186/310] Gherkin: Handle \r\n and \r + allow feature alone +
 don't match blank td and th.

---
 components/prism-gherkin.js     | 26 +++++++++++++-------------
 components/prism-gherkin.min.js |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/prism-gherkin.js b/components/prism-gherkin.js
index 333911040c..66e25b3adf 100644
--- a/components/prism-gherkin.js
+++ b/components/prism-gherkin.js
@@ -4,37 +4,37 @@ Prism.languages.gherkin = {
 		alias: 'string'
 	},
 	'comment': {
-		pattern: /((^|\n)[ \t]*)#.*/,
+		pattern: /((^|\r?\n|\r)[ \t]*)#.*/,
 		lookbehind: true
 	},
 	'tag': {
-		pattern: /((^|\n)[ \t]*)@\S*/,
+		pattern: /((^|\r?\n|\r)[ \t]*)@\S*/,
 		lookbehind: true
 	},
 	'feature': {
-		pattern: /((^|\n)[ \t]*)(Ability|Ahoy matey!|Arwedd|Aspekt|Besigheid Behoefte|Business Need|Caracteristica|Característica|Egenskab|Egenskap|Eiginleiki|Feature|Fīča|Fitur|Fonctionnalité|Fonksyonalite|Funcionalidade|Funcionalitat|Functionalitate|Funcţionalitate|Funcționalitate|Functionaliteit|Fungsi|Funkcia|Funkcija|Funkcionalitāte|Funkcionalnost|Funkcja|Funksie|Funktionalität|Funktionalitéit|Funzionalità|Hwaet|Hwæt|Jellemző|Karakteristik|laH|Lastnost|Mak|Mogucnost|Mogućnost|Moznosti|Možnosti|OH HAI|Omadus|Ominaisuus|Osobina|Özellik|perbogh|poQbogh malja'|Potrzeba biznesowa|Požadavek|Požiadavka|Pretty much|Qap|Qu'meH 'ut|Savybė|Tính năng|Trajto|Vermoë|Vlastnosť|Właściwość|Značilnost|Δυνατότητα|Λειτουργία|Могућност|Мөмкинлек|Особина|Свойство|Үзенчәлеклелек|Функционал|Функционалност|Функция|Функціонал|תכונה|خاصية|خصوصیت|صلاحیت|کاروبار کی ضرورت|وِیژگی|रूप लेख|ਖਾਸੀਅਤ|ਨਕਸ਼ ਨੁਹਾਰ|ਮੁਹਾਂਦਰਾ|గుణము|ಹೆಚ್ಚಳ|ความต้องการทางธุรกิจ|ความสามารถ|โครงหลัก|기능|フィーチャ|功能|機能):([^:]+\n)*/,
+		pattern: /((^|\r?\n|\r)[ \t]*)(Ability|Ahoy matey!|Arwedd|Aspekt|Besigheid Behoefte|Business Need|Caracteristica|Característica|Egenskab|Egenskap|Eiginleiki|Feature|Fīča|Fitur|Fonctionnalité|Fonksyonalite|Funcionalidade|Funcionalitat|Functionalitate|Funcţionalitate|Funcționalitate|Functionaliteit|Fungsi|Funkcia|Funkcija|Funkcionalitāte|Funkcionalnost|Funkcja|Funksie|Funktionalität|Funktionalitéit|Funzionalità|Hwaet|Hwæt|Jellemző|Karakteristik|laH|Lastnost|Mak|Mogucnost|Mogućnost|Moznosti|Možnosti|OH HAI|Omadus|Ominaisuus|Osobina|Özellik|perbogh|poQbogh malja'|Potrzeba biznesowa|Požadavek|Požiadavka|Pretty much|Qap|Qu'meH 'ut|Savybė|Tính năng|Trajto|Vermoë|Vlastnosť|Właściwość|Značilnost|Δυνατότητα|Λειτουργία|Могућност|Мөмкинлек|Особина|Свойство|Үзенчәлеклелек|Функционал|Функционалност|Функция|Функціонал|תכונה|خاصية|خصوصیت|صلاحیت|کاروبار کی ضرورت|وِیژگی|रूप लेख|ਖਾਸੀਅਤ|ਨਕਸ਼ ਨੁਹਾਰ|ਮੁਹਾਂਦਰਾ|గుణము|ಹೆಚ್ಚಳ|ความต้องการทางธุรกิจ|ความสามารถ|โครงหลัก|기능|フィーチャ|功能|機能):([^:]+(?:\r?\n|\r|$))*/,
 		lookbehind: true,
 		inside: {
 			'important': {
-				pattern: /(:)[^\n]+/,
+				pattern: /(:)[^\r\n]+/,
 				lookbehind: true
 			},
-			keyword: /[^:\n]+:/
+			keyword: /[^:\r\n]+:/
 		}
 	},
 	'scenario': {
-		pattern: /((^|\n)[ \t]*)(Abstract Scenario|Abstrakt Scenario|Achtergrond|Aer|Ær|Agtergrond|All y'all|Antecedentes|Antecedents|Atburðarás|Atburðarásir|Awww, look mate|B4|Background|Baggrund|Bakgrund|Bakgrunn|Bakgrunnur|Beispiele|Beispiller|Bối cảnh|Cefndir|Cenario|Cenário|Cenario de Fundo|Cenário de Fundo|Cenarios|Cenários|Contesto|Context|Contexte|Contexto|Conto|Contoh|Contone|Dæmi|Dasar|Dead men tell no tales|Delineacao do Cenario|Delineação do Cenário|Dis is what went down|Dữ liệu|Dyagram senaryo|Dyagram Senaryo|Egzanp|Ejemplos|Eksempler|Ekzemploj|Enghreifftiau|Esbozo do escenario|Escenari|Escenario|Esempi|Esquema de l'escenari|Esquema del escenario|Esquema do Cenario|Esquema do Cenário|Examples|EXAMPLZ|Exempel|Exemple|Exemples|Exemplos|First off|Fono|Forgatókönyv|Forgatókönyv vázlat|Fundo|Geçmiş|ghantoH|Grundlage|Hannergrond|Háttér|Heave to|Istorik|Juhtumid|Keadaan|Khung kịch bản|Khung tình huống|Kịch bản|Koncept|Konsep skenario|Kontèks|Kontekst|Kontekstas|Konteksts|Kontext|Konturo de la scenaro|Latar Belakang|lut|lut chovnatlh|lutmey|Lýsing Atburðarásar|Lýsing Dæma|Menggariskan Senario|MISHUN|MISHUN SRSLY|mo'|Náčrt Scenára|Náčrt Scénáře|Náčrt Scenáru|Oris scenarija|Örnekler|Osnova|Osnova Scenára|Osnova scénáře|Osnutek|Ozadje|Paraugs|Pavyzdžiai|Példák|Piemēri|Plan du scénario|Plan du Scénario|Plan senaryo|Plan Senaryo|Plang vum Szenario|Pozadí|Pozadie|Pozadina|Príklady|Příklady|Primer|Primeri|Primjeri|Przykłady|Raamstsenaarium|Reckon it's like|Rerefons|Scenár|Scénář|Scenarie|Scenarij|Scenarijai|Scenarijaus šablonas|Scenariji|Scenārijs|Scenārijs pēc parauga|Scenarijus|Scenario|Scénario|Scenario Amlinellol|Scenario Outline|Scenario Template|Scenariomal|Scenariomall|Scenarios|Scenariu|Scenariusz|Scenaro|Schema dello scenario|Se ðe|Se the|Se þe|Senario|Senaryo|Senaryo deskripsyon|Senaryo Deskripsyon|Senaryo taslağı|Shiver me timbers|Situācija|Situai|Situasie|Situasie Uiteensetting|Skenario|Skenario konsep|Skica|Structura scenariu|Structură scenariu|Struktura scenarija|Stsenaarium|Swa|Swa hwaer swa|Swa hwær swa|Szablon scenariusza|Szenario|Szenariogrundriss|Tapaukset|Tapaus|Tapausaihio|Taust|Tausta|Template Keadaan|Template Senario|Template Situai|The thing of it is|Tình huống|Variantai|Voorbeelde|Voorbeelden|Wharrimean is|Yo\-ho\-ho|You'll wanna|Założenia|Παραδείγματα|Περιγραφή Σεναρίου|Σενάρια|Σενάριο|Υπόβαθρο|Кереш|Контекст|Концепт|Мисаллар|Мисоллар|Основа|Передумова|Позадина|Предистория|Предыстория|Приклади|Пример|Примери|Примеры|Рамка на сценарий|Скица|Структура сценарија|Структура сценария|Структура сценарію|Сценарий|Сценарий структураси|Сценарийның төзелеше|Сценарији|Сценарио|Сценарій|Тарих|Үрнәкләр|דוגמאות|רקע|תבנית תרחיש|תרחיש|الخلفية|الگوی سناریو|امثلة|پس منظر|زمینه|سناریو|سيناريو|سيناريو مخطط|مثالیں|منظر نامے کا خاکہ|منظرنامہ|نمونه ها|उदाहरण|परिदृश्य|परिदृश्य रूपरेखा|पृष्ठभूमि|ਉਦਾਹਰਨਾਂ|ਪਟਕਥਾ|ਪਟਕਥਾ ਢਾਂਚਾ|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਿਛੋਕੜ|ఉదాహరణలు|కథనం|నేపథ్యం|సన్నివేశం|ಉದಾಹರಣೆಗಳು|ಕಥಾಸಾರಾಂಶ|ವಿವರಣೆ|ಹಿನ್ನೆಲೆ|โครงสร้างของเหตุการณ์|ชุดของตัวอย่าง|ชุดของเหตุการณ์|แนวคิด|สรุปเหตุการณ์|เหตุการณ์|배경|시나리오|시나리오 개요|예|サンプル|シナリオ|シナリオアウトライン|シナリオテンプレ|シナリオテンプレート|テンプレ|例|例子|剧本|剧本大纲|劇本|劇本大綱|场景|场景大纲|場景|場景大綱|背景):[^:\n]*/,
+		pattern: /((^|\r?\n|\r)[ \t]*)(Abstract Scenario|Abstrakt Scenario|Achtergrond|Aer|Ær|Agtergrond|All y'all|Antecedentes|Antecedents|Atburðarás|Atburðarásir|Awww, look mate|B4|Background|Baggrund|Bakgrund|Bakgrunn|Bakgrunnur|Beispiele|Beispiller|Bối cảnh|Cefndir|Cenario|Cenário|Cenario de Fundo|Cenário de Fundo|Cenarios|Cenários|Contesto|Context|Contexte|Contexto|Conto|Contoh|Contone|Dæmi|Dasar|Dead men tell no tales|Delineacao do Cenario|Delineação do Cenário|Dis is what went down|Dữ liệu|Dyagram senaryo|Dyagram Senaryo|Egzanp|Ejemplos|Eksempler|Ekzemploj|Enghreifftiau|Esbozo do escenario|Escenari|Escenario|Esempi|Esquema de l'escenari|Esquema del escenario|Esquema do Cenario|Esquema do Cenário|Examples|EXAMPLZ|Exempel|Exemple|Exemples|Exemplos|First off|Fono|Forgatókönyv|Forgatókönyv vázlat|Fundo|Geçmiş|ghantoH|Grundlage|Hannergrond|Háttér|Heave to|Istorik|Juhtumid|Keadaan|Khung kịch bản|Khung tình huống|Kịch bản|Koncept|Konsep skenario|Kontèks|Kontekst|Kontekstas|Konteksts|Kontext|Konturo de la scenaro|Latar Belakang|lut|lut chovnatlh|lutmey|Lýsing Atburðarásar|Lýsing Dæma|Menggariskan Senario|MISHUN|MISHUN SRSLY|mo'|Náčrt Scenára|Náčrt Scénáře|Náčrt Scenáru|Oris scenarija|Örnekler|Osnova|Osnova Scenára|Osnova scénáře|Osnutek|Ozadje|Paraugs|Pavyzdžiai|Példák|Piemēri|Plan du scénario|Plan du Scénario|Plan senaryo|Plan Senaryo|Plang vum Szenario|Pozadí|Pozadie|Pozadina|Príklady|Příklady|Primer|Primeri|Primjeri|Przykłady|Raamstsenaarium|Reckon it's like|Rerefons|Scenár|Scénář|Scenarie|Scenarij|Scenarijai|Scenarijaus šablonas|Scenariji|Scenārijs|Scenārijs pēc parauga|Scenarijus|Scenario|Scénario|Scenario Amlinellol|Scenario Outline|Scenario Template|Scenariomal|Scenariomall|Scenarios|Scenariu|Scenariusz|Scenaro|Schema dello scenario|Se ðe|Se the|Se þe|Senario|Senaryo|Senaryo deskripsyon|Senaryo Deskripsyon|Senaryo taslağı|Shiver me timbers|Situācija|Situai|Situasie|Situasie Uiteensetting|Skenario|Skenario konsep|Skica|Structura scenariu|Structură scenariu|Struktura scenarija|Stsenaarium|Swa|Swa hwaer swa|Swa hwær swa|Szablon scenariusza|Szenario|Szenariogrundriss|Tapaukset|Tapaus|Tapausaihio|Taust|Tausta|Template Keadaan|Template Senario|Template Situai|The thing of it is|Tình huống|Variantai|Voorbeelde|Voorbeelden|Wharrimean is|Yo\-ho\-ho|You'll wanna|Założenia|Παραδείγματα|Περιγραφή Σεναρίου|Σενάρια|Σενάριο|Υπόβαθρο|Кереш|Контекст|Концепт|Мисаллар|Мисоллар|Основа|Передумова|Позадина|Предистория|Предыстория|Приклади|Пример|Примери|Примеры|Рамка на сценарий|Скица|Структура сценарија|Структура сценария|Структура сценарію|Сценарий|Сценарий структураси|Сценарийның төзелеше|Сценарији|Сценарио|Сценарій|Тарих|Үрнәкләр|דוגמאות|רקע|תבנית תרחיש|תרחיש|الخلفية|الگوی سناریو|امثلة|پس منظر|زمینه|سناریو|سيناريو|سيناريو مخطط|مثالیں|منظر نامے کا خاکہ|منظرنامہ|نمونه ها|उदाहरण|परिदृश्य|परिदृश्य रूपरेखा|पृष्ठभूमि|ਉਦਾਹਰਨਾਂ|ਪਟਕਥਾ|ਪਟਕਥਾ ਢਾਂਚਾ|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਿਛੋਕੜ|ఉదాహరణలు|కథనం|నేపథ్యం|సన్నివేశం|ಉದಾಹರಣೆಗಳು|ಕಥಾಸಾರಾಂಶ|ವಿವರಣೆ|ಹಿನ್ನೆಲೆ|โครงสร้างของเหตุการณ์|ชุดของตัวอย่าง|ชุดของเหตุการณ์|แนวคิด|สรุปเหตุการณ์|เหตุการณ์|배경|시나리오|시나리오 개요|예|サンプル|シナリオ|シナリオアウトライン|シナリオテンプレ|シナリオテンプレート|テンプレ|例|例子|剧本|剧本大纲|劇本|劇本大綱|场景|场景大纲|場景|場景大綱|背景):[^:\r\n]*/,
 		lookbehind: true,
 		inside: {
 			'important': {
-				pattern: /(:)[^\n]*/,
+				pattern: /(:)[^\r\n]*/,
 				lookbehind: true
 			},
-			keyword: /[^:\n]+:/
+			keyword: /[^:\r\n]+:/
 		}
 	},
 	'table-body': {
-		pattern: /(\n[ \t]*\|.+\|[^\n]*)+/,
+		pattern: /((?:\r?\n|\r)[ \t]*\|.+\|[^\r\n]*)+/,
 		lookbehind: true,
 		inside: {
 			'outline': {
@@ -42,24 +42,24 @@ Prism.languages.gherkin = {
 				alias: 'variable'
 			},
 			'td': {
-				pattern: /[^|]+/,
+				pattern: /\s*[^\s|][^|]*/,
 				alias: 'string'
 			},
 			'punctuation': /\|/
 		}
 	},
 	'table-head': {
-		pattern: /(\n[ \t]*\|.+\|[^\n]*)/,
+		pattern: /((?:\r?\n|\r)[ \t]*\|.+\|[^\r\n]*)/,
 		inside: {
 			'th': {
-				pattern: /[^|]+/,
+				pattern: /\s*[^\s|][^|]*/,
 				alias: 'variable'
 			},
 			'punctuation': /\|/
 		}
 	},
 	'atrule': {
-		pattern: /(\n[ \t]+)('ach|'a|'ej|7|a|A také|A taktiež|A tiež|A zároveň|Aber|Ac|Adott|Akkor|Ak|Aleshores|Ale|Ali|Allora|Alors|Als|Ama|Amennyiben|Amikor|Ampak|an|AN|Ananging|And y'all|And|Angenommen|Anrhegedig a|An|Apabila|Atès|Atesa|Atunci|Avast!|Aye|A|awer|Bagi|Banjur|Bet|Biết|Blimey!|Buh|But at the end of the day I reckon|But y'all|But|BUT|Cal|Când|Cando|Cand|Ce|Cuando|Če|Ða ðe|Ða|Dadas|Dada|Dados|Dado|DaH ghu' bejlu'|dann|Dann|Dano|Dan|Dar|Dat fiind|Data|Date fiind|Date|Dati fiind|Dati|Daţi fiind|Dați fiind|Dato|DEN|Den youse gotta|Dengan|De|Diberi|Diyelim ki|Donada|Donat|Donitaĵo|Do|Dun|Duota|Ðurh|Eeldades|Ef|Eğer ki|Entao|Então|Entón|Entonces|En|Epi|E|És|Etant donnée|Etant donné|Et|Étant données|Étant donnée|Étant donné|Etant données|Etant donnés|Étant donnés|Fakat|Gangway!|Gdy|Gegeben seien|Gegeben sei|Gegeven|Gegewe|ghu' noblu'|Gitt|Given y'all|Given|Givet|Givun|Ha|Cho|I CAN HAZ|In|Ir|It's just unbelievable|I|Ja|Jeśli|Jeżeli|Kadar|Kada|Kad|Kai|Kaj|Když|Keď|Kemudian|Ketika|Khi|Kiedy|Ko|Kuid|Kui|Kun|Lan|latlh|Le sa a|Let go and haul|Le|Lè sa a|Lè|Logo|Lorsqu'<|Lorsque|mä|Maar|Mais|Mając|Majd|Maka|Manawa|Mas|Ma|Menawa|Men|Mutta|Nalikaning|Nalika|Nanging|Når|När|Nato|Nhưng|Niin|Njuk|O zaman|Og|Och|Oletetaan|Onda|Ond|Oraz|Pak|Pero|Però|Podano|Pokiaľ|Pokud|Potem|Potom|Privzeto|Pryd|qaSDI'|Quando|Quand|Quan|Så|Sed|Se|Siis|Sipoze ke|Sipoze Ke|Sipoze|Si|Şi|Și|Soit|Stel|Tada|Tad|Takrat|Tak|Tapi|Ter|Tetapi|Tha the|Tha|Then y'all|Then|Thì|Thurh|Toda|Too right|ugeholl|Und|Un|Và|vaj|Vendar|Ve|wann|Wanneer|WEN|Wenn|When y'all|When|Wtedy|Wun|Y'know|Yeah nah|Yna|Youse know like when|Youse know when youse got|Y|Za predpokladu|Za předpokladu|Zadani|Zadano|Zadan|Zadate|Zadato|Zakładając|Zaradi|Zatati|Þa|Þá|Þa þe|Þegar|Þurh|Αλλά|Δεδομένου|Και|Όταν|Τότε|А також|Агар|Але|Али|Аммо|А|Әгәр|Әйтик|Әмма|Бирок|Ва|Вә|Дадено|Дано|Допустим|Если|Задате|Задати|Задато|И|І|К тому же|Када|Кад|Когато|Когда|Коли|Ләкин|Лекин|Нәтиҗәдә|Нехай|Но|Онда|Припустимо, що|Припустимо|Пусть|Также|Та|Тогда|Тоді|То|Унда|Һәм|Якщо|אבל|אזי|אז|בהינתן|וגם|כאשר|آنگاه|اذاً|اگر|اما|اور|با فرض|بالفرض|بفرض|پھر|تب|ثم|جب|عندما|فرض کیا|لكن|لیکن|متى|هنگامی|و|अगर|और|कदा|किन्तु|चूंकि|जब|तथा|तदा|तब|परन्तु|पर|यदि|ਅਤੇ|ਜਦੋਂ|ਜਿਵੇਂ ਕਿ|ਜੇਕਰ|ਤਦ|ਪਰ|అప్పుడు|ఈ పరిస్థితిలో|కాని|చెప్పబడినది|మరియు|ಆದರೆ|ನಂತರ|ನೀಡಿದ|ಮತ್ತು|ಸ್ಥಿತಿಯನ್ನು|กำหนดให้|ดังนั้น|แต่|เมื่อ|และ|그러면<|그리고<|단<|만약<|만일<|먼저<|조건<|하지만<|かつ<|しかし<|ただし<|ならば<|もし<|並且<|但し<|但是<|假如<|假定<|假設<|假设<|前提<|同时<|同時<|并且<|当<|當<|而且<|那么<|那麼<)(?=[ \t]+)/,
+		pattern: /((?:\r?\n|\r)[ \t]+)('ach|'a|'ej|7|a|A také|A taktiež|A tiež|A zároveň|Aber|Ac|Adott|Akkor|Ak|Aleshores|Ale|Ali|Allora|Alors|Als|Ama|Amennyiben|Amikor|Ampak|an|AN|Ananging|And y'all|And|Angenommen|Anrhegedig a|An|Apabila|Atès|Atesa|Atunci|Avast!|Aye|A|awer|Bagi|Banjur|Bet|Biết|Blimey!|Buh|But at the end of the day I reckon|But y'all|But|BUT|Cal|Când|Cando|Cand|Ce|Cuando|Če|Ða ðe|Ða|Dadas|Dada|Dados|Dado|DaH ghu' bejlu'|dann|Dann|Dano|Dan|Dar|Dat fiind|Data|Date fiind|Date|Dati fiind|Dati|Daţi fiind|Dați fiind|Dato|DEN|Den youse gotta|Dengan|De|Diberi|Diyelim ki|Donada|Donat|Donitaĵo|Do|Dun|Duota|Ðurh|Eeldades|Ef|Eğer ki|Entao|Então|Entón|Entonces|En|Epi|E|És|Etant donnée|Etant donné|Et|Étant données|Étant donnée|Étant donné|Etant données|Etant donnés|Étant donnés|Fakat|Gangway!|Gdy|Gegeben seien|Gegeben sei|Gegeven|Gegewe|ghu' noblu'|Gitt|Given y'all|Given|Givet|Givun|Ha|Cho|I CAN HAZ|In|Ir|It's just unbelievable|I|Ja|Jeśli|Jeżeli|Kadar|Kada|Kad|Kai|Kaj|Když|Keď|Kemudian|Ketika|Khi|Kiedy|Ko|Kuid|Kui|Kun|Lan|latlh|Le sa a|Let go and haul|Le|Lè sa a|Lè|Logo|Lorsqu'<|Lorsque|mä|Maar|Mais|Mając|Majd|Maka|Manawa|Mas|Ma|Menawa|Men|Mutta|Nalikaning|Nalika|Nanging|Når|När|Nato|Nhưng|Niin|Njuk|O zaman|Og|Och|Oletetaan|Onda|Ond|Oraz|Pak|Pero|Però|Podano|Pokiaľ|Pokud|Potem|Potom|Privzeto|Pryd|qaSDI'|Quando|Quand|Quan|Så|Sed|Se|Siis|Sipoze ke|Sipoze Ke|Sipoze|Si|Şi|Și|Soit|Stel|Tada|Tad|Takrat|Tak|Tapi|Ter|Tetapi|Tha the|Tha|Then y'all|Then|Thì|Thurh|Toda|Too right|ugeholl|Und|Un|Và|vaj|Vendar|Ve|wann|Wanneer|WEN|Wenn|When y'all|When|Wtedy|Wun|Y'know|Yeah nah|Yna|Youse know like when|Youse know when youse got|Y|Za predpokladu|Za předpokladu|Zadani|Zadano|Zadan|Zadate|Zadato|Zakładając|Zaradi|Zatati|Þa þe|Þa|Þá|Þegar|Þurh|Αλλά|Δεδομένου|Και|Όταν|Τότε|А також|Агар|Але|Али|Аммо|А|Әгәр|Әйтик|Әмма|Бирок|Ва|Вә|Дадено|Дано|Допустим|Если|Задате|Задати|Задато|И|І|К тому же|Када|Кад|Когато|Когда|Коли|Ләкин|Лекин|Нәтиҗәдә|Нехай|Но|Онда|Припустимо, що|Припустимо|Пусть|Также|Та|Тогда|Тоді|То|Унда|Һәм|Якщо|אבל|אזי|אז|בהינתן|וגם|כאשר|آنگاه|اذاً|اگر|اما|اور|با فرض|بالفرض|بفرض|پھر|تب|ثم|جب|عندما|فرض کیا|لكن|لیکن|متى|هنگامی|و|अगर|और|कदा|किन्तु|चूंकि|जब|तथा|तदा|तब|परन्तु|पर|यदि|ਅਤੇ|ਜਦੋਂ|ਜਿਵੇਂ ਕਿ|ਜੇਕਰ|ਤਦ|ਪਰ|అప్పుడు|ఈ పరిస్థితిలో|కాని|చెప్పబడినది|మరియు|ಆದರೆ|ನಂತರ|ನೀಡಿದ|ಮತ್ತು|ಸ್ಥಿತಿಯನ್ನು|กำหนดให้|ดังนั้น|แต่|เมื่อ|และ|그러면<|그리고<|단<|만약<|만일<|먼저<|조건<|하지만<|かつ<|しかし<|ただし<|ならば<|もし<|並且<|但し<|但是<|假如<|假定<|假設<|假设<|前提<|同时<|同時<|并且<|当<|當<|而且<|那么<|那麼<)(?=[ \t]+)/,
 		lookbehind: true
 	},
 	'string': {
diff --git a/components/prism-gherkin.min.js b/components/prism-gherkin.min.js
index 72186249ce..cece556dc1 100644
--- a/components/prism-gherkin.min.js
+++ b/components/prism-gherkin.min.js
@@ -1 +1 @@
-Prism.languages.gherkin={pystring:{pattern:/("""|''')[\s\S]+?\1/,alias:"string"},comment:{pattern:/((^|\n)[ \t]*)#.*/,lookbehind:!0},tag:{pattern:/((^|\n)[ \t]*)@\S*/,lookbehind:!0},feature:{pattern:/((^|\n)[ \t]*)(Ability|Ahoy matey!|Arwedd|Aspekt|Besigheid Behoefte|Business Need|Caracteristica|Característica|Egenskab|Egenskap|Eiginleiki|Feature|Fīča|Fitur|Fonctionnalité|Fonksyonalite|Funcionalidade|Funcionalitat|Functionalitate|Funcţionalitate|Funcționalitate|Functionaliteit|Fungsi|Funkcia|Funkcija|Funkcionalitāte|Funkcionalnost|Funkcja|Funksie|Funktionalität|Funktionalitéit|Funzionalità|Hwaet|Hwæt|Jellemző|Karakteristik|laH|Lastnost|Mak|Mogucnost|Mogućnost|Moznosti|Možnosti|OH HAI|Omadus|Ominaisuus|Osobina|Özellik|perbogh|poQbogh malja'|Potrzeba biznesowa|Požadavek|Požiadavka|Pretty much|Qap|Qu'meH 'ut|Savybė|Tính năng|Trajto|Vermoë|Vlastnosť|Właściwość|Značilnost|Δυνατότητα|Λειτουργία|Могућност|Мөмкинлек|Особина|Свойство|Үзенчәлеклелек|Функционал|Функционалност|Функция|Функціонал|תכונה|خاصية|خصوصیت|صلاحیت|کاروبار کی ضرورت|وِیژگی|रूप लेख|ਖਾਸੀਅਤ|ਨਕਸ਼ ਨੁਹਾਰ|ਮੁਹਾਂਦਰਾ|గుణము|ಹೆಚ್ಚಳ|ความต้องการทางธุรกิจ|ความสามารถ|โครงหลัก|기능|フィーチャ|功能|機能):([^:]+\n)*/,lookbehind:!0,inside:{important:{pattern:/(:)[^\n]+/,lookbehind:!0},keyword:/[^:\n]+:/}},scenario:{pattern:/((^|\n)[ \t]*)(Abstract Scenario|Abstrakt Scenario|Achtergrond|Aer|Ær|Agtergrond|All y'all|Antecedentes|Antecedents|Atburðarás|Atburðarásir|Awww, look mate|B4|Background|Baggrund|Bakgrund|Bakgrunn|Bakgrunnur|Beispiele|Beispiller|Bối cảnh|Cefndir|Cenario|Cenário|Cenario de Fundo|Cenário de Fundo|Cenarios|Cenários|Contesto|Context|Contexte|Contexto|Conto|Contoh|Contone|Dæmi|Dasar|Dead men tell no tales|Delineacao do Cenario|Delineação do Cenário|Dis is what went down|Dữ liệu|Dyagram senaryo|Dyagram Senaryo|Egzanp|Ejemplos|Eksempler|Ekzemploj|Enghreifftiau|Esbozo do escenario|Escenari|Escenario|Esempi|Esquema de l'escenari|Esquema del escenario|Esquema do Cenario|Esquema do Cenário|Examples|EXAMPLZ|Exempel|Exemple|Exemples|Exemplos|First off|Fono|Forgatókönyv|Forgatókönyv vázlat|Fundo|Geçmiş|ghantoH|Grundlage|Hannergrond|Háttér|Heave to|Istorik|Juhtumid|Keadaan|Khung kịch bản|Khung tình huống|Kịch bản|Koncept|Konsep skenario|Kontèks|Kontekst|Kontekstas|Konteksts|Kontext|Konturo de la scenaro|Latar Belakang|lut|lut chovnatlh|lutmey|Lýsing Atburðarásar|Lýsing Dæma|Menggariskan Senario|MISHUN|MISHUN SRSLY|mo'|Náčrt Scenára|Náčrt Scénáře|Náčrt Scenáru|Oris scenarija|Örnekler|Osnova|Osnova Scenára|Osnova scénáře|Osnutek|Ozadje|Paraugs|Pavyzdžiai|Példák|Piemēri|Plan du scénario|Plan du Scénario|Plan senaryo|Plan Senaryo|Plang vum Szenario|Pozadí|Pozadie|Pozadina|Príklady|Příklady|Primer|Primeri|Primjeri|Przykłady|Raamstsenaarium|Reckon it's like|Rerefons|Scenár|Scénář|Scenarie|Scenarij|Scenarijai|Scenarijaus šablonas|Scenariji|Scenārijs|Scenārijs pēc parauga|Scenarijus|Scenario|Scénario|Scenario Amlinellol|Scenario Outline|Scenario Template|Scenariomal|Scenariomall|Scenarios|Scenariu|Scenariusz|Scenaro|Schema dello scenario|Se ðe|Se the|Se þe|Senario|Senaryo|Senaryo deskripsyon|Senaryo Deskripsyon|Senaryo taslağı|Shiver me timbers|Situācija|Situai|Situasie|Situasie Uiteensetting|Skenario|Skenario konsep|Skica|Structura scenariu|Structură scenariu|Struktura scenarija|Stsenaarium|Swa|Swa hwaer swa|Swa hwær swa|Szablon scenariusza|Szenario|Szenariogrundriss|Tapaukset|Tapaus|Tapausaihio|Taust|Tausta|Template Keadaan|Template Senario|Template Situai|The thing of it is|Tình huống|Variantai|Voorbeelde|Voorbeelden|Wharrimean is|Yo\-ho\-ho|You'll wanna|Założenia|Παραδείγματα|Περιγραφή Σεναρίου|Σενάρια|Σενάριο|Υπόβαθρο|Кереш|Контекст|Концепт|Мисаллар|Мисоллар|Основа|Передумова|Позадина|Предистория|Предыстория|Приклади|Пример|Примери|Примеры|Рамка на сценарий|Скица|Структура сценарија|Структура сценария|Структура сценарію|Сценарий|Сценарий структураси|Сценарийның төзелеше|Сценарији|Сценарио|Сценарій|Тарих|Үрнәкләр|דוגמאות|רקע|תבנית תרחיש|תרחיש|الخلفية|الگوی سناریو|امثلة|پس منظر|زمینه|سناریو|سيناريو|سيناريو مخطط|مثالیں|منظر نامے کا خاکہ|منظرنامہ|نمونه ها|उदाहरण|परिदृश्य|परिदृश्य रूपरेखा|पृष्ठभूमि|ਉਦਾਹਰਨਾਂ|ਪਟਕਥਾ|ਪਟਕਥਾ ਢਾਂਚਾ|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਿਛੋਕੜ|ఉదాహరణలు|కథనం|నేపథ్యం|సన్నివేశం|ಉದಾಹರಣೆಗಳು|ಕಥಾಸಾರಾಂಶ|ವಿವರಣೆ|ಹಿನ್ನೆಲೆ|โครงสร้างของเหตุการณ์|ชุดของตัวอย่าง|ชุดของเหตุการณ์|แนวคิด|สรุปเหตุการณ์|เหตุการณ์|배경|시나리오|시나리오 개요|예|サンプル|シナリオ|シナリオアウトライン|シナリオテンプレ|シナリオテンプレート|テンプレ|例|例子|剧本|剧本大纲|劇本|劇本大綱|场景|场景大纲|場景|場景大綱|背景):[^:\n]*/,lookbehind:!0,inside:{important:{pattern:/(:)[^\n]*/,lookbehind:!0},keyword:/[^:\n]+:/}},"table-body":{pattern:/(\n[ \t]*\|.+\|[^\n]*)+/,lookbehind:!0,inside:{outline:{pattern:/<[^>]+?>/,alias:"variable"},td:{pattern:/[^|]+/,alias:"string"},punctuation:/\|/}},"table-head":{pattern:/(\n[ \t]*\|.+\|[^\n]*)/,inside:{th:{pattern:/[^|]+/,alias:"variable"},punctuation:/\|/}},atrule:{pattern:/(\n[ \t]+)('ach|'a|'ej|7|a|A také|A taktiež|A tiež|A zároveň|Aber|Ac|Adott|Akkor|Ak|Aleshores|Ale|Ali|Allora|Alors|Als|Ama|Amennyiben|Amikor|Ampak|an|AN|Ananging|And y'all|And|Angenommen|Anrhegedig a|An|Apabila|Atès|Atesa|Atunci|Avast!|Aye|A|awer|Bagi|Banjur|Bet|Biết|Blimey!|Buh|But at the end of the day I reckon|But y'all|But|BUT|Cal|Când|Cando|Cand|Ce|Cuando|Če|Ða ðe|Ða|Dadas|Dada|Dados|Dado|DaH ghu' bejlu'|dann|Dann|Dano|Dan|Dar|Dat fiind|Data|Date fiind|Date|Dati fiind|Dati|Daţi fiind|Dați fiind|Dato|DEN|Den youse gotta|Dengan|De|Diberi|Diyelim ki|Donada|Donat|Donitaĵo|Do|Dun|Duota|Ðurh|Eeldades|Ef|Eğer ki|Entao|Então|Entón|Entonces|En|Epi|E|És|Etant donnée|Etant donné|Et|Étant données|Étant donnée|Étant donné|Etant données|Etant donnés|Étant donnés|Fakat|Gangway!|Gdy|Gegeben seien|Gegeben sei|Gegeven|Gegewe|ghu' noblu'|Gitt|Given y'all|Given|Givet|Givun|Ha|Cho|I CAN HAZ|In|Ir|It's just unbelievable|I|Ja|Jeśli|Jeżeli|Kadar|Kada|Kad|Kai|Kaj|Když|Keď|Kemudian|Ketika|Khi|Kiedy|Ko|Kuid|Kui|Kun|Lan|latlh|Le sa a|Let go and haul|Le|Lè sa a|Lè|Logo|Lorsqu'<|Lorsque|mä|Maar|Mais|Mając|Majd|Maka|Manawa|Mas|Ma|Menawa|Men|Mutta|Nalikaning|Nalika|Nanging|Når|När|Nato|Nhưng|Niin|Njuk|O zaman|Og|Och|Oletetaan|Onda|Ond|Oraz|Pak|Pero|Però|Podano|Pokiaľ|Pokud|Potem|Potom|Privzeto|Pryd|qaSDI'|Quando|Quand|Quan|Så|Sed|Se|Siis|Sipoze ke|Sipoze Ke|Sipoze|Si|Şi|Și|Soit|Stel|Tada|Tad|Takrat|Tak|Tapi|Ter|Tetapi|Tha the|Tha|Then y'all|Then|Thì|Thurh|Toda|Too right|ugeholl|Und|Un|Và|vaj|Vendar|Ve|wann|Wanneer|WEN|Wenn|When y'all|When|Wtedy|Wun|Y'know|Yeah nah|Yna|Youse know like when|Youse know when youse got|Y|Za predpokladu|Za předpokladu|Zadani|Zadano|Zadan|Zadate|Zadato|Zakładając|Zaradi|Zatati|Þa|Þá|Þa þe|Þegar|Þurh|Αλλά|Δεδομένου|Και|Όταν|Τότε|А також|Агар|Але|Али|Аммо|А|Әгәр|Әйтик|Әмма|Бирок|Ва|Вә|Дадено|Дано|Допустим|Если|Задате|Задати|Задато|И|І|К тому же|Када|Кад|Когато|Когда|Коли|Ләкин|Лекин|Нәтиҗәдә|Нехай|Но|Онда|Припустимо, що|Припустимо|Пусть|Также|Та|Тогда|Тоді|То|Унда|Һәм|Якщо|אבל|אזי|אז|בהינתן|וגם|כאשר|آنگاه|اذاً|اگر|اما|اور|با فرض|بالفرض|بفرض|پھر|تب|ثم|جب|عندما|فرض کیا|لكن|لیکن|متى|هنگامی|و|अगर|और|कदा|किन्तु|चूंकि|जब|तथा|तदा|तब|परन्तु|पर|यदि|ਅਤੇ|ਜਦੋਂ|ਜਿਵੇਂ ਕਿ|ਜੇਕਰ|ਤਦ|ਪਰ|అప్పుడు|ఈ పరిస్థితిలో|కాని|చెప్పబడినది|మరియు|ಆದರೆ|ನಂತರ|ನೀಡಿದ|ಮತ್ತು|ಸ್ಥಿತಿಯನ್ನು|กำหนดให้|ดังนั้น|แต่|เมื่อ|และ|그러면<|그리고<|단<|만약<|만일<|먼저<|조건<|하지만<|かつ<|しかし<|ただし<|ならば<|もし<|並且<|但し<|但是<|假如<|假定<|假設<|假设<|前提<|同时<|同時<|并且<|当<|當<|而且<|那么<|那麼<)(?=[ \t]+)/,lookbehind:!0},string:{pattern:/("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*')/,inside:{outline:{pattern:/<[^>]+?>/,alias:"variable"}}},outline:{pattern:/<[^>]+?>/,alias:"variable"}};
\ No newline at end of file
+Prism.languages.gherkin={pystring:{pattern:/("""|''')[\s\S]+?\1/,alias:"string"},comment:{pattern:/((^|\r?\n|\r)[ \t]*)#.*/,lookbehind:!0},tag:{pattern:/((^|\r?\n|\r)[ \t]*)@\S*/,lookbehind:!0},feature:{pattern:/((^|\r?\n|\r)[ \t]*)(Ability|Ahoy matey!|Arwedd|Aspekt|Besigheid Behoefte|Business Need|Caracteristica|Característica|Egenskab|Egenskap|Eiginleiki|Feature|Fīča|Fitur|Fonctionnalité|Fonksyonalite|Funcionalidade|Funcionalitat|Functionalitate|Funcţionalitate|Funcționalitate|Functionaliteit|Fungsi|Funkcia|Funkcija|Funkcionalitāte|Funkcionalnost|Funkcja|Funksie|Funktionalität|Funktionalitéit|Funzionalità|Hwaet|Hwæt|Jellemző|Karakteristik|laH|Lastnost|Mak|Mogucnost|Mogućnost|Moznosti|Možnosti|OH HAI|Omadus|Ominaisuus|Osobina|Özellik|perbogh|poQbogh malja'|Potrzeba biznesowa|Požadavek|Požiadavka|Pretty much|Qap|Qu'meH 'ut|Savybė|Tính năng|Trajto|Vermoë|Vlastnosť|Właściwość|Značilnost|Δυνατότητα|Λειτουργία|Могућност|Мөмкинлек|Особина|Свойство|Үзенчәлеклелек|Функционал|Функционалност|Функция|Функціонал|תכונה|خاصية|خصوصیت|صلاحیت|کاروبار کی ضرورت|وِیژگی|रूप लेख|ਖਾਸੀਅਤ|ਨਕਸ਼ ਨੁਹਾਰ|ਮੁਹਾਂਦਰਾ|గుణము|ಹೆಚ್ಚಳ|ความต้องการทางธุรกิจ|ความสามารถ|โครงหลัก|기능|フィーチャ|功能|機能):([^:]+(?:\r?\n|\r|$))*/,lookbehind:!0,inside:{important:{pattern:/(:)[^\r\n]+/,lookbehind:!0},keyword:/[^:\r\n]+:/}},scenario:{pattern:/((^|\r?\n|\r)[ \t]*)(Abstract Scenario|Abstrakt Scenario|Achtergrond|Aer|Ær|Agtergrond|All y'all|Antecedentes|Antecedents|Atburðarás|Atburðarásir|Awww, look mate|B4|Background|Baggrund|Bakgrund|Bakgrunn|Bakgrunnur|Beispiele|Beispiller|Bối cảnh|Cefndir|Cenario|Cenário|Cenario de Fundo|Cenário de Fundo|Cenarios|Cenários|Contesto|Context|Contexte|Contexto|Conto|Contoh|Contone|Dæmi|Dasar|Dead men tell no tales|Delineacao do Cenario|Delineação do Cenário|Dis is what went down|Dữ liệu|Dyagram senaryo|Dyagram Senaryo|Egzanp|Ejemplos|Eksempler|Ekzemploj|Enghreifftiau|Esbozo do escenario|Escenari|Escenario|Esempi|Esquema de l'escenari|Esquema del escenario|Esquema do Cenario|Esquema do Cenário|Examples|EXAMPLZ|Exempel|Exemple|Exemples|Exemplos|First off|Fono|Forgatókönyv|Forgatókönyv vázlat|Fundo|Geçmiş|ghantoH|Grundlage|Hannergrond|Háttér|Heave to|Istorik|Juhtumid|Keadaan|Khung kịch bản|Khung tình huống|Kịch bản|Koncept|Konsep skenario|Kontèks|Kontekst|Kontekstas|Konteksts|Kontext|Konturo de la scenaro|Latar Belakang|lut|lut chovnatlh|lutmey|Lýsing Atburðarásar|Lýsing Dæma|Menggariskan Senario|MISHUN|MISHUN SRSLY|mo'|Náčrt Scenára|Náčrt Scénáře|Náčrt Scenáru|Oris scenarija|Örnekler|Osnova|Osnova Scenára|Osnova scénáře|Osnutek|Ozadje|Paraugs|Pavyzdžiai|Példák|Piemēri|Plan du scénario|Plan du Scénario|Plan senaryo|Plan Senaryo|Plang vum Szenario|Pozadí|Pozadie|Pozadina|Príklady|Příklady|Primer|Primeri|Primjeri|Przykłady|Raamstsenaarium|Reckon it's like|Rerefons|Scenár|Scénář|Scenarie|Scenarij|Scenarijai|Scenarijaus šablonas|Scenariji|Scenārijs|Scenārijs pēc parauga|Scenarijus|Scenario|Scénario|Scenario Amlinellol|Scenario Outline|Scenario Template|Scenariomal|Scenariomall|Scenarios|Scenariu|Scenariusz|Scenaro|Schema dello scenario|Se ðe|Se the|Se þe|Senario|Senaryo|Senaryo deskripsyon|Senaryo Deskripsyon|Senaryo taslağı|Shiver me timbers|Situācija|Situai|Situasie|Situasie Uiteensetting|Skenario|Skenario konsep|Skica|Structura scenariu|Structură scenariu|Struktura scenarija|Stsenaarium|Swa|Swa hwaer swa|Swa hwær swa|Szablon scenariusza|Szenario|Szenariogrundriss|Tapaukset|Tapaus|Tapausaihio|Taust|Tausta|Template Keadaan|Template Senario|Template Situai|The thing of it is|Tình huống|Variantai|Voorbeelde|Voorbeelden|Wharrimean is|Yo\-ho\-ho|You'll wanna|Założenia|Παραδείγματα|Περιγραφή Σεναρίου|Σενάρια|Σενάριο|Υπόβαθρο|Кереш|Контекст|Концепт|Мисаллар|Мисоллар|Основа|Передумова|Позадина|Предистория|Предыстория|Приклади|Пример|Примери|Примеры|Рамка на сценарий|Скица|Структура сценарија|Структура сценария|Структура сценарію|Сценарий|Сценарий структураси|Сценарийның төзелеше|Сценарији|Сценарио|Сценарій|Тарих|Үрнәкләр|דוגמאות|רקע|תבנית תרחיש|תרחיש|الخلفية|الگوی سناریو|امثلة|پس منظر|زمینه|سناریو|سيناريو|سيناريو مخطط|مثالیں|منظر نامے کا خاکہ|منظرنامہ|نمونه ها|उदाहरण|परिदृश्य|परिदृश्य रूपरेखा|पृष्ठभूमि|ਉਦਾਹਰਨਾਂ|ਪਟਕਥਾ|ਪਟਕਥਾ ਢਾਂਚਾ|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਿਛੋਕੜ|ఉదాహరణలు|కథనం|నేపథ్యం|సన్నివేశం|ಉದಾಹರಣೆಗಳು|ಕಥಾಸಾರಾಂಶ|ವಿವರಣೆ|ಹಿನ್ನೆಲೆ|โครงสร้างของเหตุการณ์|ชุดของตัวอย่าง|ชุดของเหตุการณ์|แนวคิด|สรุปเหตุการณ์|เหตุการณ์|배경|시나리오|시나리오 개요|예|サンプル|シナリオ|シナリオアウトライン|シナリオテンプレ|シナリオテンプレート|テンプレ|例|例子|剧本|剧本大纲|劇本|劇本大綱|场景|场景大纲|場景|場景大綱|背景):[^:\r\n]*/,lookbehind:!0,inside:{important:{pattern:/(:)[^\r\n]*/,lookbehind:!0},keyword:/[^:\r\n]+:/}},"table-body":{pattern:/((?:\r?\n|\r)[ \t]*\|.+\|[^\r\n]*)+/,lookbehind:!0,inside:{outline:{pattern:/<[^>]+?>/,alias:"variable"},td:{pattern:/\s*[^\s|][^|]*/,alias:"string"},punctuation:/\|/}},"table-head":{pattern:/((?:\r?\n|\r)[ \t]*\|.+\|[^\r\n]*)/,inside:{th:{pattern:/\s*[^\s|][^|]*/,alias:"variable"},punctuation:/\|/}},atrule:{pattern:/((?:\r?\n|\r)[ \t]+)('ach|'a|'ej|7|a|A také|A taktiež|A tiež|A zároveň|Aber|Ac|Adott|Akkor|Ak|Aleshores|Ale|Ali|Allora|Alors|Als|Ama|Amennyiben|Amikor|Ampak|an|AN|Ananging|And y'all|And|Angenommen|Anrhegedig a|An|Apabila|Atès|Atesa|Atunci|Avast!|Aye|A|awer|Bagi|Banjur|Bet|Biết|Blimey!|Buh|But at the end of the day I reckon|But y'all|But|BUT|Cal|Când|Cando|Cand|Ce|Cuando|Če|Ða ðe|Ða|Dadas|Dada|Dados|Dado|DaH ghu' bejlu'|dann|Dann|Dano|Dan|Dar|Dat fiind|Data|Date fiind|Date|Dati fiind|Dati|Daţi fiind|Dați fiind|Dato|DEN|Den youse gotta|Dengan|De|Diberi|Diyelim ki|Donada|Donat|Donitaĵo|Do|Dun|Duota|Ðurh|Eeldades|Ef|Eğer ki|Entao|Então|Entón|Entonces|En|Epi|E|És|Etant donnée|Etant donné|Et|Étant données|Étant donnée|Étant donné|Etant données|Etant donnés|Étant donnés|Fakat|Gangway!|Gdy|Gegeben seien|Gegeben sei|Gegeven|Gegewe|ghu' noblu'|Gitt|Given y'all|Given|Givet|Givun|Ha|Cho|I CAN HAZ|In|Ir|It's just unbelievable|I|Ja|Jeśli|Jeżeli|Kadar|Kada|Kad|Kai|Kaj|Když|Keď|Kemudian|Ketika|Khi|Kiedy|Ko|Kuid|Kui|Kun|Lan|latlh|Le sa a|Let go and haul|Le|Lè sa a|Lè|Logo|Lorsqu'<|Lorsque|mä|Maar|Mais|Mając|Majd|Maka|Manawa|Mas|Ma|Menawa|Men|Mutta|Nalikaning|Nalika|Nanging|Når|När|Nato|Nhưng|Niin|Njuk|O zaman|Og|Och|Oletetaan|Onda|Ond|Oraz|Pak|Pero|Però|Podano|Pokiaľ|Pokud|Potem|Potom|Privzeto|Pryd|qaSDI'|Quando|Quand|Quan|Så|Sed|Se|Siis|Sipoze ke|Sipoze Ke|Sipoze|Si|Şi|Și|Soit|Stel|Tada|Tad|Takrat|Tak|Tapi|Ter|Tetapi|Tha the|Tha|Then y'all|Then|Thì|Thurh|Toda|Too right|ugeholl|Und|Un|Và|vaj|Vendar|Ve|wann|Wanneer|WEN|Wenn|When y'all|When|Wtedy|Wun|Y'know|Yeah nah|Yna|Youse know like when|Youse know when youse got|Y|Za predpokladu|Za předpokladu|Zadani|Zadano|Zadan|Zadate|Zadato|Zakładając|Zaradi|Zatati|Þa þe|Þa|Þá|Þegar|Þurh|Αλλά|Δεδομένου|Και|Όταν|Τότε|А також|Агар|Але|Али|Аммо|А|Әгәр|Әйтик|Әмма|Бирок|Ва|Вә|Дадено|Дано|Допустим|Если|Задате|Задати|Задато|И|І|К тому же|Када|Кад|Когато|Когда|Коли|Ләкин|Лекин|Нәтиҗәдә|Нехай|Но|Онда|Припустимо, що|Припустимо|Пусть|Также|Та|Тогда|Тоді|То|Унда|Һәм|Якщо|אבל|אזי|אז|בהינתן|וגם|כאשר|آنگاه|اذاً|اگر|اما|اور|با فرض|بالفرض|بفرض|پھر|تب|ثم|جب|عندما|فرض کیا|لكن|لیکن|متى|هنگامی|و|अगर|और|कदा|किन्तु|चूंकि|जब|तथा|तदा|तब|परन्तु|पर|यदि|ਅਤੇ|ਜਦੋਂ|ਜਿਵੇਂ ਕਿ|ਜੇਕਰ|ਤਦ|ਪਰ|అప్పుడు|ఈ పరిస్థితిలో|కాని|చెప్పబడినది|మరియు|ಆದರೆ|ನಂತರ|ನೀಡಿದ|ಮತ್ತು|ಸ್ಥಿತಿಯನ್ನು|กำหนดให้|ดังนั้น|แต่|เมื่อ|และ|그러면<|그리고<|단<|만약<|만일<|먼저<|조건<|하지만<|かつ<|しかし<|ただし<|ならば<|もし<|並且<|但し<|但是<|假如<|假定<|假設<|假设<|前提<|同时<|同時<|并且<|当<|當<|而且<|那么<|那麼<)(?=[ \t]+)/,lookbehind:!0},string:{pattern:/("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*')/,inside:{outline:{pattern:/<[^>]+?>/,alias:"variable"}}},outline:{pattern:/<[^>]+?>/,alias:"variable"}};
\ No newline at end of file

From af75a3ba80436e03fec74139dd2ab3161d237efd Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 20:27:31 +0200
Subject: [PATCH 187/310] Add tests for Gherkin

---
 tests/languages/gherkin/atrule_feature.test   | 1211 +++++++++++++++++
 tests/languages/gherkin/comment_feature.test  |   15 +
 tests/languages/gherkin/feature_feature.test  |  196 +++
 tests/languages/gherkin/outline_feature.test  |   11 +
 tests/languages/gherkin/pystring_feature.test |   20 +
 tests/languages/gherkin/scenario_feature.test |  581 ++++++++
 tests/languages/gherkin/string_feature.test   |   29 +
 tests/languages/gherkin/table_feature.test    |   40 +
 tests/languages/gherkin/tag_feature.test      |   17 +
 9 files changed, 2120 insertions(+)
 create mode 100644 tests/languages/gherkin/atrule_feature.test
 create mode 100644 tests/languages/gherkin/comment_feature.test
 create mode 100644 tests/languages/gherkin/feature_feature.test
 create mode 100644 tests/languages/gherkin/outline_feature.test
 create mode 100644 tests/languages/gherkin/pystring_feature.test
 create mode 100644 tests/languages/gherkin/scenario_feature.test
 create mode 100644 tests/languages/gherkin/string_feature.test
 create mode 100644 tests/languages/gherkin/table_feature.test
 create mode 100644 tests/languages/gherkin/tag_feature.test

diff --git a/tests/languages/gherkin/atrule_feature.test b/tests/languages/gherkin/atrule_feature.test
new file mode 100644
index 0000000000..23bc5408c5
--- /dev/null
+++ b/tests/languages/gherkin/atrule_feature.test
@@ -0,0 +1,1211 @@
+Scenario: foo
+	'ach foobar
+	'a foobar
+	'ej foobar
+	7 foobar
+	a foobar
+	A také foobar
+	A taktiež foobar
+	A tiež foobar
+	A zároveň foobar
+	Aber foobar
+	Ac foobar
+	Adott foobar
+	Akkor foobar
+	Ak foobar
+	Aleshores foobar
+	Ale foobar
+	Ali foobar
+	Allora foobar
+	Alors foobar
+	Als foobar
+	Ama foobar
+	Amennyiben foobar
+	Amikor foobar
+	Ampak foobar
+	an foobar
+	AN foobar
+	Ananging foobar
+	And y'all foobar
+	And foobar
+	Angenommen foobar
+	Anrhegedig a foobar
+	An foobar
+	Apabila foobar
+	Atès foobar
+	Atesa foobar
+	Atunci foobar
+	Avast! foobar
+	Aye foobar
+	A foobar
+	awer foobar
+	Bagi foobar
+	Banjur foobar
+	Bet foobar
+	Biết foobar
+	Blimey! foobar
+	Buh foobar
+	But at the end of the day I reckon foobar
+	But y'all foobar
+	But foobar
+	BUT foobar
+	Cal foobar
+	Când foobar
+	Cando foobar
+	Cand foobar
+	Ce foobar
+	Cuando foobar
+	Če foobar
+	Ða ðe foobar
+	Ða foobar
+	Dadas foobar
+	Dada foobar
+	Dados foobar
+	Dado foobar
+	DaH ghu' bejlu' foobar
+	dann foobar
+	Dann foobar
+	Dano foobar
+	Dan foobar
+	Dar foobar
+	Dat fiind foobar
+	Data foobar
+	Date fiind foobar
+	Date foobar
+	Dati fiind foobar
+	Dati foobar
+	Daţi fiind foobar
+	Dați fiind foobar
+	Dato foobar
+	DEN foobar
+	Den youse gotta foobar
+	Dengan foobar
+	De foobar
+	Diberi foobar
+	Diyelim ki foobar
+	Donada foobar
+	Donat foobar
+	Donitaĵo foobar
+	Do foobar
+	Dun foobar
+	Duota foobar
+	Ðurh foobar
+	Eeldades foobar
+	Ef foobar
+	Eğer ki foobar
+	Entao foobar
+	Então foobar
+	Entón foobar
+	Entonces foobar
+	En foobar
+	Epi foobar
+	E foobar
+	És foobar
+	Etant donnée foobar
+	Etant donné foobar
+	Et foobar
+	Étant données foobar
+	Étant donnée foobar
+	Étant donné foobar
+	Etant données foobar
+	Etant donnés foobar
+	Étant donnés foobar
+	Fakat foobar
+	Gangway! foobar
+	Gdy foobar
+	Gegeben seien foobar
+	Gegeben sei foobar
+	Gegeven foobar
+	Gegewe foobar
+	ghu' noblu' foobar
+	Gitt foobar
+	Given y'all foobar
+	Given foobar
+	Givet foobar
+	Givun foobar
+	Ha foobar
+	Cho foobar
+	I CAN HAZ foobar
+	In foobar
+	Ir foobar
+	It's just unbelievable foobar
+	I foobar
+	Ja foobar
+	Jeśli foobar
+	Jeżeli foobar
+	Kadar foobar
+	Kada foobar
+	Kad foobar
+	Kai foobar
+	Kaj foobar
+	Když foobar
+	Keď foobar
+	Kemudian foobar
+	Ketika foobar
+	Khi foobar
+	Kiedy foobar
+	Ko foobar
+	Kuid foobar
+	Kui foobar
+	Kun foobar
+	Lan foobar
+	latlh foobar
+	Le sa a foobar
+	Let go and haul foobar
+	Le foobar
+	Lè sa a foobar
+	Lè foobar
+	Logo foobar
+	Lorsqu'< foobar
+	Lorsque foobar
+	mä foobar
+	Maar foobar
+	Mais foobar
+	Mając foobar
+	Majd foobar
+	Maka foobar
+	Manawa foobar
+	Mas foobar
+	Ma foobar
+	Menawa foobar
+	Men foobar
+	Mutta foobar
+	Nalikaning foobar
+	Nalika foobar
+	Nanging foobar
+	Når foobar
+	När foobar
+	Nato foobar
+	Nhưng foobar
+	Niin foobar
+	Njuk foobar
+	O zaman foobar
+	Og foobar
+	Och foobar
+	Oletetaan foobar
+	Onda foobar
+	Ond foobar
+	Oraz foobar
+	Pak foobar
+	Pero foobar
+	Però foobar
+	Podano foobar
+	Pokiaľ foobar
+	Pokud foobar
+	Potem foobar
+	Potom foobar
+	Privzeto foobar
+	Pryd foobar
+	qaSDI' foobar
+	Quando foobar
+	Quand foobar
+	Quan foobar
+	Så foobar
+	Sed foobar
+	Se foobar
+	Siis foobar
+	Sipoze ke foobar
+	Sipoze Ke foobar
+	Sipoze foobar
+	Si foobar
+	Şi foobar
+	Și foobar
+	Soit foobar
+	Stel foobar
+	Tada foobar
+	Tad foobar
+	Takrat foobar
+	Tak foobar
+	Tapi foobar
+	Ter foobar
+	Tetapi foobar
+	Tha the foobar
+	Tha foobar
+	Then y'all foobar
+	Then foobar
+	Thì foobar
+	Thurh foobar
+	Toda foobar
+	Too right foobar
+	ugeholl foobar
+	Und foobar
+	Un foobar
+	Và foobar
+	vaj foobar
+	Vendar foobar
+	Ve foobar
+	wann foobar
+	Wanneer foobar
+	WEN foobar
+	Wenn foobar
+	When y'all foobar
+	When foobar
+	Wtedy foobar
+	Wun foobar
+	Y'know foobar
+	Yeah nah foobar
+	Yna foobar
+	Youse know like when foobar
+	Youse know when youse got foobar
+	Y foobar
+	Za predpokladu foobar
+	Za předpokladu foobar
+	Zadani foobar
+	Zadano foobar
+	Zadan foobar
+	Zadate foobar
+	Zadato foobar
+	Zakładając foobar
+	Zaradi foobar
+	Zatati foobar
+	Þa foobar
+	Þá foobar
+	Þa þe foobar
+	Þegar foobar
+	Þurh foobar
+	Αλλά foobar
+	Δεδομένου foobar
+	Και foobar
+	Όταν foobar
+	Τότε foobar
+	А також foobar
+	Агар foobar
+	Але foobar
+	Али foobar
+	Аммо foobar
+	А foobar
+	Әгәр foobar
+	Әйтик foobar
+	Әмма foobar
+	Бирок foobar
+	Ва foobar
+	Вә foobar
+	Дадено foobar
+	Дано foobar
+	Допустим foobar
+	Если foobar
+	Задате foobar
+	Задати foobar
+	Задато foobar
+	И foobar
+	І foobar
+	К тому же foobar
+	Када foobar
+	Кад foobar
+	Когато foobar
+	Когда foobar
+	Коли foobar
+	Ләкин foobar
+	Лекин foobar
+	Нәтиҗәдә foobar
+	Нехай foobar
+	Но foobar
+	Онда foobar
+	Припустимо, що foobar
+	Припустимо foobar
+	Пусть foobar
+	Также foobar
+	Та foobar
+	Тогда foobar
+	Тоді foobar
+	То foobar
+	Унда foobar
+	Һәм foobar
+	Якщо foobar
+	אבל foobar
+	אזי foobar
+	אז foobar
+	בהינתן foobar
+	וגם foobar
+	כאשר foobar
+	آنگاه foobar
+	اذاً foobar
+	اگر foobar
+	اما foobar
+	اور foobar
+	با فرض foobar
+	بالفرض foobar
+	بفرض foobar
+	پھر foobar
+	تب foobar
+	ثم foobar
+	جب foobar
+	عندما foobar
+	فرض کیا foobar
+	لكن foobar
+	لیکن foobar
+	متى foobar
+	هنگامی foobar
+	و foobar
+	अगर foobar
+	और foobar
+	कदा foobar
+	किन्तु foobar
+	चूंकि foobar
+	जब foobar
+	तथा foobar
+	तदा foobar
+	तब foobar
+	परन्तु foobar
+	पर foobar
+	यदि foobar
+	ਅਤੇ foobar
+	ਜਦੋਂ foobar
+	ਜਿਵੇਂ ਕਿ foobar
+	ਜੇਕਰ foobar
+	ਤਦ foobar
+	ਪਰ foobar
+	అప్పుడు foobar
+	ఈ పరిస్థితిలో foobar
+	కాని foobar
+	చెప్పబడినది foobar
+	మరియు foobar
+	ಆದರೆ foobar
+	ನಂತರ foobar
+	ನೀಡಿದ foobar
+	ಮತ್ತು foobar
+	ಸ್ಥಿತಿಯನ್ನು foobar
+	กำหนดให้ foobar
+	ดังนั้น foobar
+	แต่ foobar
+	เมื่อ foobar
+	และ foobar
+	그러면< foobar
+	그리고< foobar
+	단< foobar
+	만약< foobar
+	만일< foobar
+	먼저< foobar
+	조건< foobar
+	하지만< foobar
+	かつ< foobar
+	しかし< foobar
+	ただし< foobar
+	ならば< foobar
+	もし< foobar
+	並且< foobar
+	但し< foobar
+	但是< foobar
+	假如< foobar
+	假定< foobar
+	假設< foobar
+	假设< foobar
+	前提< foobar
+	同时< foobar
+	同時< foobar
+	并且< foobar
+	当< foobar
+	當< foobar
+	而且< foobar
+	那么< foobar
+	那麼< foobar
+
+----------------------------------------------------
+
+[
+	["scenario", [["keyword", "Scenario:"], ["important", " foo"]]],
+	["atrule", "'ach"],
+	" foobar\r\n\t",
+	["atrule", "'a"],
+	" foobar\r\n\t",
+	["atrule", "'ej"],
+	" foobar\r\n\t",
+	["atrule", "7"],
+	" foobar\r\n\t",
+	["atrule", "a"],
+	" foobar\r\n\t",
+	["atrule", "A také"],
+	" foobar\r\n\t",
+	["atrule", "A taktiež"],
+	" foobar\r\n\t",
+	["atrule", "A tiež"],
+	" foobar\r\n\t",
+	["atrule", "A zároveň"],
+	" foobar\r\n\t",
+	["atrule", "Aber"],
+	" foobar\r\n\t",
+	["atrule", "Ac"],
+	" foobar\r\n\t",
+	["atrule", "Adott"],
+	" foobar\r\n\t",
+	["atrule", "Akkor"],
+	" foobar\r\n\t",
+	["atrule", "Ak"],
+	" foobar\r\n\t",
+	["atrule", "Aleshores"],
+	" foobar\r\n\t",
+	["atrule", "Ale"],
+	" foobar\r\n\t",
+	["atrule", "Ali"],
+	" foobar\r\n\t",
+	["atrule", "Allora"],
+	" foobar\r\n\t",
+	["atrule", "Alors"],
+	" foobar\r\n\t",
+	["atrule", "Als"],
+	" foobar\r\n\t",
+	["atrule", "Ama"],
+	" foobar\r\n\t",
+	["atrule", "Amennyiben"],
+	" foobar\r\n\t",
+	["atrule", "Amikor"],
+	" foobar\r\n\t",
+	["atrule", "Ampak"],
+	" foobar\r\n\t",
+	["atrule", "an"],
+	" foobar\r\n\t",
+	["atrule", "AN"],
+	" foobar\r\n\t",
+	["atrule", "Ananging"],
+	" foobar\r\n\t",
+	["atrule", "And y'all"],
+	" foobar\r\n\t",
+	["atrule", "And"],
+	" foobar\r\n\t",
+	["atrule", "Angenommen"],
+	" foobar\r\n\t",
+	["atrule", "Anrhegedig a"],
+	" foobar\r\n\t",
+	["atrule", "An"],
+	" foobar\r\n\t",
+	["atrule", "Apabila"],
+	" foobar\r\n\t",
+	["atrule", "Atès"],
+	" foobar\r\n\t",
+	["atrule", "Atesa"],
+	" foobar\r\n\t",
+	["atrule", "Atunci"],
+	" foobar\r\n\t",
+	["atrule", "Avast!"],
+	" foobar\r\n\t",
+	["atrule", "Aye"],
+	" foobar\r\n\t",
+	["atrule", "A"],
+	" foobar\r\n\t",
+	["atrule", "awer"],
+	" foobar\r\n\t",
+	["atrule", "Bagi"],
+	" foobar\r\n\t",
+	["atrule", "Banjur"],
+	" foobar\r\n\t",
+	["atrule", "Bet"],
+	" foobar\r\n\t",
+	["atrule", "Biết"],
+	" foobar\r\n\t",
+	["atrule", "Blimey!"],
+	" foobar\r\n\t",
+	["atrule", "Buh"],
+	" foobar\r\n\t",
+	["atrule", "But at the end of the day I reckon"],
+	" foobar\r\n\t",
+	["atrule", "But y'all"],
+	" foobar\r\n\t",
+	["atrule", "But"],
+	" foobar\r\n\t",
+	["atrule", "BUT"],
+	" foobar\r\n\t",
+	["atrule", "Cal"],
+	" foobar\r\n\t",
+	["atrule", "Când"],
+	" foobar\r\n\t",
+	["atrule", "Cando"],
+	" foobar\r\n\t",
+	["atrule", "Cand"],
+	" foobar\r\n\t",
+	["atrule", "Ce"],
+	" foobar\r\n\t",
+	["atrule", "Cuando"],
+	" foobar\r\n\t",
+	["atrule", "Če"],
+	" foobar\r\n\t",
+	["atrule", "Ða ðe"],
+	" foobar\r\n\t",
+	["atrule", "Ða"],
+	" foobar\r\n\t",
+	["atrule", "Dadas"],
+	" foobar\r\n\t",
+	["atrule", "Dada"],
+	" foobar\r\n\t",
+	["atrule", "Dados"],
+	" foobar\r\n\t",
+	["atrule", "Dado"],
+	" foobar\r\n\t",
+	["atrule", "DaH ghu' bejlu'"],
+	" foobar\r\n\t",
+	["atrule", "dann"],
+	" foobar\r\n\t",
+	["atrule", "Dann"],
+	" foobar\r\n\t",
+	["atrule", "Dano"],
+	" foobar\r\n\t",
+	["atrule", "Dan"],
+	" foobar\r\n\t",
+	["atrule", "Dar"],
+	" foobar\r\n\t",
+	["atrule", "Dat fiind"],
+	" foobar\r\n\t",
+	["atrule", "Data"],
+	" foobar\r\n\t",
+	["atrule", "Date fiind"],
+	" foobar\r\n\t",
+	["atrule", "Date"],
+	" foobar\r\n\t",
+	["atrule", "Dati fiind"],
+	" foobar\r\n\t",
+	["atrule", "Dati"],
+	" foobar\r\n\t",
+	["atrule", "Daţi fiind"],
+	" foobar\r\n\t",
+	["atrule", "Dați fiind"],
+	" foobar\r\n\t",
+	["atrule", "Dato"],
+	" foobar\r\n\t",
+	["atrule", "DEN"],
+	" foobar\r\n\t",
+	["atrule", "Den youse gotta"],
+	" foobar\r\n\t",
+	["atrule", "Dengan"],
+	" foobar\r\n\t",
+	["atrule", "De"],
+	" foobar\r\n\t",
+	["atrule", "Diberi"],
+	" foobar\r\n\t",
+	["atrule", "Diyelim ki"],
+	" foobar\r\n\t",
+	["atrule", "Donada"],
+	" foobar\r\n\t",
+	["atrule", "Donat"],
+	" foobar\r\n\t",
+	["atrule", "Donitaĵo"],
+	" foobar\r\n\t",
+	["atrule", "Do"],
+	" foobar\r\n\t",
+	["atrule", "Dun"],
+	" foobar\r\n\t",
+	["atrule", "Duota"],
+	" foobar\r\n\t",
+	["atrule", "Ðurh"],
+	" foobar\r\n\t",
+	["atrule", "Eeldades"],
+	" foobar\r\n\t",
+	["atrule", "Ef"],
+	" foobar\r\n\t",
+	["atrule", "Eğer ki"],
+	" foobar\r\n\t",
+	["atrule", "Entao"],
+	" foobar\r\n\t",
+	["atrule", "Então"],
+	" foobar\r\n\t",
+	["atrule", "Entón"],
+	" foobar\r\n\t",
+	["atrule", "Entonces"],
+	" foobar\r\n\t",
+	["atrule", "En"],
+	" foobar\r\n\t",
+	["atrule", "Epi"],
+	" foobar\r\n\t",
+	["atrule", "E"],
+	" foobar\r\n\t",
+	["atrule", "És"],
+	" foobar\r\n\t",
+	["atrule", "Etant donnée"],
+	" foobar\r\n\t",
+	["atrule", "Etant donné"],
+	" foobar\r\n\t",
+	["atrule", "Et"],
+	" foobar\r\n\t",
+	["atrule", "Étant données"],
+	" foobar\r\n\t",
+	["atrule", "Étant donnée"],
+	" foobar\r\n\t",
+	["atrule", "Étant donné"],
+	" foobar\r\n\t",
+	["atrule", "Etant données"],
+	" foobar\r\n\t",
+	["atrule", "Etant donnés"],
+	" foobar\r\n\t",
+	["atrule", "Étant donnés"],
+	" foobar\r\n\t",
+	["atrule", "Fakat"],
+	" foobar\r\n\t",
+	["atrule", "Gangway!"],
+	" foobar\r\n\t",
+	["atrule", "Gdy"],
+	" foobar\r\n\t",
+	["atrule", "Gegeben seien"],
+	" foobar\r\n\t",
+	["atrule", "Gegeben sei"],
+	" foobar\r\n\t",
+	["atrule", "Gegeven"],
+	" foobar\r\n\t",
+	["atrule", "Gegewe"],
+	" foobar\r\n\t",
+	["atrule", "ghu' noblu'"],
+	" foobar\r\n\t",
+	["atrule", "Gitt"],
+	" foobar\r\n\t",
+	["atrule", "Given y'all"],
+	" foobar\r\n\t",
+	["atrule", "Given"],
+	" foobar\r\n\t",
+	["atrule", "Givet"],
+	" foobar\r\n\t",
+	["atrule", "Givun"],
+	" foobar\r\n\t",
+	["atrule", "Ha"],
+	" foobar\r\n\t",
+	["atrule", "Cho"],
+	" foobar\r\n\t",
+	["atrule", "I CAN HAZ"],
+	" foobar\r\n\t",
+	["atrule", "In"],
+	" foobar\r\n\t",
+	["atrule", "Ir"],
+	" foobar\r\n\t",
+	["atrule", "It's just unbelievable"],
+	" foobar\r\n\t",
+	["atrule", "I"],
+	" foobar\r\n\t",
+	["atrule", "Ja"],
+	" foobar\r\n\t",
+	["atrule", "Jeśli"],
+	" foobar\r\n\t",
+	["atrule", "Jeżeli"],
+	" foobar\r\n\t",
+	["atrule", "Kadar"],
+	" foobar\r\n\t",
+	["atrule", "Kada"],
+	" foobar\r\n\t",
+	["atrule", "Kad"],
+	" foobar\r\n\t",
+	["atrule", "Kai"],
+	" foobar\r\n\t",
+	["atrule", "Kaj"],
+	" foobar\r\n\t",
+	["atrule", "Když"],
+	" foobar\r\n\t",
+	["atrule", "Keď"],
+	" foobar\r\n\t",
+	["atrule", "Kemudian"],
+	" foobar\r\n\t",
+	["atrule", "Ketika"],
+	" foobar\r\n\t",
+	["atrule", "Khi"],
+	" foobar\r\n\t",
+	["atrule", "Kiedy"],
+	" foobar\r\n\t",
+	["atrule", "Ko"],
+	" foobar\r\n\t",
+	["atrule", "Kuid"],
+	" foobar\r\n\t",
+	["atrule", "Kui"],
+	" foobar\r\n\t",
+	["atrule", "Kun"],
+	" foobar\r\n\t",
+	["atrule", "Lan"],
+	" foobar\r\n\t",
+	["atrule", "latlh"],
+	" foobar\r\n\t",
+	["atrule", "Le sa a"],
+	" foobar\r\n\t",
+	["atrule", "Let go and haul"],
+	" foobar\r\n\t",
+	["atrule", "Le"],
+	" foobar\r\n\t",
+	["atrule", "Lè sa a"],
+	" foobar\r\n\t",
+	["atrule", "Lè"],
+	" foobar\r\n\t",
+	["atrule", "Logo"],
+	" foobar\r\n\t",
+	["atrule", "Lorsqu'<"],
+	" foobar\r\n\t",
+	["atrule", "Lorsque"],
+	" foobar\r\n\t",
+	["atrule", "mä"],
+	" foobar\r\n\t",
+	["atrule", "Maar"],
+	" foobar\r\n\t",
+	["atrule", "Mais"],
+	" foobar\r\n\t",
+	["atrule", "Mając"],
+	" foobar\r\n\t",
+	["atrule", "Majd"],
+	" foobar\r\n\t",
+	["atrule", "Maka"],
+	" foobar\r\n\t",
+	["atrule", "Manawa"],
+	" foobar\r\n\t",
+	["atrule", "Mas"],
+	" foobar\r\n\t",
+	["atrule", "Ma"],
+	" foobar\r\n\t",
+	["atrule", "Menawa"],
+	" foobar\r\n\t",
+	["atrule", "Men"],
+	" foobar\r\n\t",
+	["atrule", "Mutta"],
+	" foobar\r\n\t",
+	["atrule", "Nalikaning"],
+	" foobar\r\n\t",
+	["atrule", "Nalika"],
+	" foobar\r\n\t",
+	["atrule", "Nanging"],
+	" foobar\r\n\t",
+	["atrule", "Når"],
+	" foobar\r\n\t",
+	["atrule", "När"],
+	" foobar\r\n\t",
+	["atrule", "Nato"],
+	" foobar\r\n\t",
+	["atrule", "Nhưng"],
+	" foobar\r\n\t",
+	["atrule", "Niin"],
+	" foobar\r\n\t",
+	["atrule", "Njuk"],
+	" foobar\r\n\t",
+	["atrule", "O zaman"],
+	" foobar\r\n\t",
+	["atrule", "Og"],
+	" foobar\r\n\t",
+	["atrule", "Och"],
+	" foobar\r\n\t",
+	["atrule", "Oletetaan"],
+	" foobar\r\n\t",
+	["atrule", "Onda"],
+	" foobar\r\n\t",
+	["atrule", "Ond"],
+	" foobar\r\n\t",
+	["atrule", "Oraz"],
+	" foobar\r\n\t",
+	["atrule", "Pak"],
+	" foobar\r\n\t",
+	["atrule", "Pero"],
+	" foobar\r\n\t",
+	["atrule", "Però"],
+	" foobar\r\n\t",
+	["atrule", "Podano"],
+	" foobar\r\n\t",
+	["atrule", "Pokiaľ"],
+	" foobar\r\n\t",
+	["atrule", "Pokud"],
+	" foobar\r\n\t",
+	["atrule", "Potem"],
+	" foobar\r\n\t",
+	["atrule", "Potom"],
+	" foobar\r\n\t",
+	["atrule", "Privzeto"],
+	" foobar\r\n\t",
+	["atrule", "Pryd"],
+	" foobar\r\n\t",
+	["atrule", "qaSDI'"],
+	" foobar\r\n\t",
+	["atrule", "Quando"],
+	" foobar\r\n\t",
+	["atrule", "Quand"],
+	" foobar\r\n\t",
+	["atrule", "Quan"],
+	" foobar\r\n\t",
+	["atrule", "Så"],
+	" foobar\r\n\t",
+	["atrule", "Sed"],
+	" foobar\r\n\t",
+	["atrule", "Se"],
+	" foobar\r\n\t",
+	["atrule", "Siis"],
+	" foobar\r\n\t",
+	["atrule", "Sipoze ke"],
+	" foobar\r\n\t",
+	["atrule", "Sipoze Ke"],
+	" foobar\r\n\t",
+	["atrule", "Sipoze"],
+	" foobar\r\n\t",
+	["atrule", "Si"],
+	" foobar\r\n\t",
+	["atrule", "Şi"],
+	" foobar\r\n\t",
+	["atrule", "Și"],
+	" foobar\r\n\t",
+	["atrule", "Soit"],
+	" foobar\r\n\t",
+	["atrule", "Stel"],
+	" foobar\r\n\t",
+	["atrule", "Tada"],
+	" foobar\r\n\t",
+	["atrule", "Tad"],
+	" foobar\r\n\t",
+	["atrule", "Takrat"],
+	" foobar\r\n\t",
+	["atrule", "Tak"],
+	" foobar\r\n\t",
+	["atrule", "Tapi"],
+	" foobar\r\n\t",
+	["atrule", "Ter"],
+	" foobar\r\n\t",
+	["atrule", "Tetapi"],
+	" foobar\r\n\t",
+	["atrule", "Tha the"],
+	" foobar\r\n\t",
+	["atrule", "Tha"],
+	" foobar\r\n\t",
+	["atrule", "Then y'all"],
+	" foobar\r\n\t",
+	["atrule", "Then"],
+	" foobar\r\n\t",
+	["atrule", "Thì"],
+	" foobar\r\n\t",
+	["atrule", "Thurh"],
+	" foobar\r\n\t",
+	["atrule", "Toda"],
+	" foobar\r\n\t",
+	["atrule", "Too right"],
+	" foobar\r\n\t",
+	["atrule", "ugeholl"],
+	" foobar\r\n\t",
+	["atrule", "Und"],
+	" foobar\r\n\t",
+	["atrule", "Un"],
+	" foobar\r\n\t",
+	["atrule", "Và"],
+	" foobar\r\n\t",
+	["atrule", "vaj"],
+	" foobar\r\n\t",
+	["atrule", "Vendar"],
+	" foobar\r\n\t",
+	["atrule", "Ve"],
+	" foobar\r\n\t",
+	["atrule", "wann"],
+	" foobar\r\n\t",
+	["atrule", "Wanneer"],
+	" foobar\r\n\t",
+	["atrule", "WEN"],
+	" foobar\r\n\t",
+	["atrule", "Wenn"],
+	" foobar\r\n\t",
+	["atrule", "When y'all"],
+	" foobar\r\n\t",
+	["atrule", "When"],
+	" foobar\r\n\t",
+	["atrule", "Wtedy"],
+	" foobar\r\n\t",
+	["atrule", "Wun"],
+	" foobar\r\n\t",
+	["atrule", "Y'know"],
+	" foobar\r\n\t",
+	["atrule", "Yeah nah"],
+	" foobar\r\n\t",
+	["atrule", "Yna"],
+	" foobar\r\n\t",
+	["atrule", "Youse know like when"],
+	" foobar\r\n\t",
+	["atrule", "Youse know when youse got"],
+	" foobar\r\n\t",
+	["atrule", "Y"],
+	" foobar\r\n\t",
+	["atrule", "Za predpokladu"],
+	" foobar\r\n\t",
+	["atrule", "Za předpokladu"],
+	" foobar\r\n\t",
+	["atrule", "Zadani"],
+	" foobar\r\n\t",
+	["atrule", "Zadano"],
+	" foobar\r\n\t",
+	["atrule", "Zadan"],
+	" foobar\r\n\t",
+	["atrule", "Zadate"],
+	" foobar\r\n\t",
+	["atrule", "Zadato"],
+	" foobar\r\n\t",
+	["atrule", "Zakładając"],
+	" foobar\r\n\t",
+	["atrule", "Zaradi"],
+	" foobar\r\n\t",
+	["atrule", "Zatati"],
+	" foobar\r\n\t",
+	["atrule", "Þa"],
+	" foobar\r\n\t",
+	["atrule", "Þá"],
+	" foobar\r\n\t",
+	["atrule", "Þa þe"],
+	" foobar\r\n\t",
+	["atrule", "Þegar"],
+	" foobar\r\n\t",
+	["atrule", "Þurh"],
+	" foobar\r\n\t",
+	["atrule", "Αλλά"],
+	" foobar\r\n\t",
+	["atrule", "Δεδομένου"],
+	" foobar\r\n\t",
+	["atrule", "Και"],
+	" foobar\r\n\t",
+	["atrule", "Όταν"],
+	" foobar\r\n\t",
+	["atrule", "Τότε"],
+	" foobar\r\n\t",
+	["atrule", "А також"],
+	" foobar\r\n\t",
+	["atrule", "Агар"],
+	" foobar\r\n\t",
+	["atrule", "Але"],
+	" foobar\r\n\t",
+	["atrule", "Али"],
+	" foobar\r\n\t",
+	["atrule", "Аммо"],
+	" foobar\r\n\t",
+	["atrule", "А"],
+	" foobar\r\n\t",
+	["atrule", "Әгәр"],
+	" foobar\r\n\t",
+	["atrule", "Әйтик"],
+	" foobar\r\n\t",
+	["atrule", "Әмма"],
+	" foobar\r\n\t",
+	["atrule", "Бирок"],
+	" foobar\r\n\t",
+	["atrule", "Ва"],
+	" foobar\r\n\t",
+	["atrule", "Вә"],
+	" foobar\r\n\t",
+	["atrule", "Дадено"],
+	" foobar\r\n\t",
+	["atrule", "Дано"],
+	" foobar\r\n\t",
+	["atrule", "Допустим"],
+	" foobar\r\n\t",
+	["atrule", "Если"],
+	" foobar\r\n\t",
+	["atrule", "Задате"],
+	" foobar\r\n\t",
+	["atrule", "Задати"],
+	" foobar\r\n\t",
+	["atrule", "Задато"],
+	" foobar\r\n\t",
+	["atrule", "И"],
+	" foobar\r\n\t",
+	["atrule", "І"],
+	" foobar\r\n\t",
+	["atrule", "К тому же"],
+	" foobar\r\n\t",
+	["atrule", "Када"],
+	" foobar\r\n\t",
+	["atrule", "Кад"],
+	" foobar\r\n\t",
+	["atrule", "Когато"],
+	" foobar\r\n\t",
+	["atrule", "Когда"],
+	" foobar\r\n\t",
+	["atrule", "Коли"],
+	" foobar\r\n\t",
+	["atrule", "Ләкин"],
+	" foobar\r\n\t",
+	["atrule", "Лекин"],
+	" foobar\r\n\t",
+	["atrule", "Нәтиҗәдә"],
+	" foobar\r\n\t",
+	["atrule", "Нехай"],
+	" foobar\r\n\t",
+	["atrule", "Но"],
+	" foobar\r\n\t",
+	["atrule", "Онда"],
+	" foobar\r\n\t",
+	["atrule", "Припустимо, що"],
+	" foobar\r\n\t",
+	["atrule", "Припустимо"],
+	" foobar\r\n\t",
+	["atrule", "Пусть"],
+	" foobar\r\n\t",
+	["atrule", "Также"],
+	" foobar\r\n\t",
+	["atrule", "Та"],
+	" foobar\r\n\t",
+	["atrule", "Тогда"],
+	" foobar\r\n\t",
+	["atrule", "Тоді"],
+	" foobar\r\n\t",
+	["atrule", "То"],
+	" foobar\r\n\t",
+	["atrule", "Унда"],
+	" foobar\r\n\t",
+	["atrule", "Һәм"],
+	" foobar\r\n\t",
+	["atrule", "Якщо"],
+	" foobar\r\n\t",
+	["atrule", "אבל"],
+	" foobar\r\n\t",
+	["atrule", "אזי"],
+	" foobar\r\n\t",
+	["atrule", "אז"],
+	" foobar\r\n\t",
+	["atrule", "בהינתן"],
+	" foobar\r\n\t",
+	["atrule", "וגם"],
+	" foobar\r\n\t",
+	["atrule", "כאשר"],
+	" foobar\r\n\t",
+	["atrule", "آنگاه"],
+	" foobar\r\n\t",
+	["atrule", "اذاً"],
+	" foobar\r\n\t",
+	["atrule", "اگر"],
+	" foobar\r\n\t",
+	["atrule", "اما"],
+	" foobar\r\n\t",
+	["atrule", "اور"],
+	" foobar\r\n\t",
+	["atrule", "با فرض"],
+	" foobar\r\n\t",
+	["atrule", "بالفرض"],
+	" foobar\r\n\t",
+	["atrule", "بفرض"],
+	" foobar\r\n\t",
+	["atrule", "پھر"],
+	" foobar\r\n\t",
+	["atrule", "تب"],
+	" foobar\r\n\t",
+	["atrule", "ثم"],
+	" foobar\r\n\t",
+	["atrule", "جب"],
+	" foobar\r\n\t",
+	["atrule", "عندما"],
+	" foobar\r\n\t",
+	["atrule", "فرض کیا"],
+	" foobar\r\n\t",
+	["atrule", "لكن"],
+	" foobar\r\n\t",
+	["atrule", "لیکن"],
+	" foobar\r\n\t",
+	["atrule", "متى"],
+	" foobar\r\n\t",
+	["atrule", "هنگامی"],
+	" foobar\r\n\t",
+	["atrule", "و"],
+	" foobar\r\n\t",
+	["atrule", "अगर"],
+	" foobar\r\n\t",
+	["atrule", "और"],
+	" foobar\r\n\t",
+	["atrule", "कदा"],
+	" foobar\r\n\t",
+	["atrule", "किन्तु"],
+	" foobar\r\n\t",
+	["atrule", "चूंकि"],
+	" foobar\r\n\t",
+	["atrule", "जब"],
+	" foobar\r\n\t",
+	["atrule", "तथा"],
+	" foobar\r\n\t",
+	["atrule", "तदा"],
+	" foobar\r\n\t",
+	["atrule", "तब"],
+	" foobar\r\n\t",
+	["atrule", "परन्तु"],
+	" foobar\r\n\t",
+	["atrule", "पर"],
+	" foobar\r\n\t",
+	["atrule", "यदि"],
+	" foobar\r\n\t",
+	["atrule", "ਅਤੇ"],
+	" foobar\r\n\t",
+	["atrule", "ਜਦੋਂ"],
+	" foobar\r\n\t",
+	["atrule", "ਜਿਵੇਂ ਕਿ"],
+	" foobar\r\n\t",
+	["atrule", "ਜੇਕਰ"],
+	" foobar\r\n\t",
+	["atrule", "ਤਦ"],
+	" foobar\r\n\t",
+	["atrule", "ਪਰ"],
+	" foobar\r\n\t",
+	["atrule", "అప్పుడు"],
+	" foobar\r\n\t",
+	["atrule", "ఈ పరిస్థితిలో"],
+	" foobar\r\n\t",
+	["atrule", "కాని"],
+	" foobar\r\n\t",
+	["atrule", "చెప్పబడినది"],
+	" foobar\r\n\t",
+	["atrule", "మరియు"],
+	" foobar\r\n\t",
+	["atrule", "ಆದರೆ"],
+	" foobar\r\n\t",
+	["atrule", "ನಂತರ"],
+	" foobar\r\n\t",
+	["atrule", "ನೀಡಿದ"],
+	" foobar\r\n\t",
+	["atrule", "ಮತ್ತು"],
+	" foobar\r\n\t",
+	["atrule", "ಸ್ಥಿತಿಯನ್ನು"],
+	" foobar\r\n\t",
+	["atrule", "กำหนดให้"],
+	" foobar\r\n\t",
+	["atrule", "ดังนั้น"],
+	" foobar\r\n\t",
+	["atrule", "แต่"],
+	" foobar\r\n\t",
+	["atrule", "เมื่อ"],
+	" foobar\r\n\t",
+	["atrule", "และ"],
+	" foobar\r\n\t",
+	["atrule", "그러면<"],
+	" foobar\r\n\t",
+	["atrule", "그리고<"],
+	" foobar\r\n\t",
+	["atrule", "단<"],
+	" foobar\r\n\t",
+	["atrule", "만약<"],
+	" foobar\r\n\t",
+	["atrule", "만일<"],
+	" foobar\r\n\t",
+	["atrule", "먼저<"],
+	" foobar\r\n\t",
+	["atrule", "조건<"],
+	" foobar\r\n\t",
+	["atrule", "하지만<"],
+	" foobar\r\n\t",
+	["atrule", "かつ<"],
+	" foobar\r\n\t",
+	["atrule", "しかし<"],
+	" foobar\r\n\t",
+	["atrule", "ただし<"],
+	" foobar\r\n\t",
+	["atrule", "ならば<"],
+	" foobar\r\n\t",
+	["atrule", "もし<"],
+	" foobar\r\n\t",
+	["atrule", "並且<"],
+	" foobar\r\n\t",
+	["atrule", "但し<"],
+	" foobar\r\n\t",
+	["atrule", "但是<"],
+	" foobar\r\n\t",
+	["atrule", "假如<"],
+	" foobar\r\n\t",
+	["atrule", "假定<"],
+	" foobar\r\n\t",
+	["atrule", "假設<"],
+	" foobar\r\n\t",
+	["atrule", "假设<"],
+	" foobar\r\n\t",
+	["atrule", "前提<"],
+	" foobar\r\n\t",
+	["atrule", "同时<"],
+	" foobar\r\n\t",
+	["atrule", "同時<"],
+	" foobar\r\n\t",
+	["atrule", "并且<"],
+	" foobar\r\n\t",
+	["atrule", "当<"],
+	" foobar\r\n\t",
+	["atrule", "當<"],
+	" foobar\r\n\t",
+	["atrule", "而且<"],
+	" foobar\r\n\t",
+	["atrule", "那么<"],
+	" foobar\r\n\t",
+	["atrule", "那麼<"],
+	" foobar"
+]
+
+----------------------------------------------------
+
+Checks for at-rules in all languages.
\ No newline at end of file
diff --git a/tests/languages/gherkin/comment_feature.test b/tests/languages/gherkin/comment_feature.test
new file mode 100644
index 0000000000..ce88cc95a1
--- /dev/null
+++ b/tests/languages/gherkin/comment_feature.test
@@ -0,0 +1,15 @@
+#
+# foo bar
+	# foobar
+
+----------------------------------------------------
+
+[
+	["comment", "#"],
+	["comment", "# foo bar"],
+	["comment", "# foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/gherkin/feature_feature.test b/tests/languages/gherkin/feature_feature.test
new file mode 100644
index 0000000000..774dd363c8
--- /dev/null
+++ b/tests/languages/gherkin/feature_feature.test
@@ -0,0 +1,196 @@
+Ability: foobar
+baz
+Ahoy matey!:
+Arwedd: foobar
+Aspekt: foobar
+Besigheid Behoefte: foobar
+Business Need: foobar
+Caracteristica: foobar
+Característica: foobar
+Egenskab: foobar
+Egenskap: foobar
+Eiginleiki: foobar
+Feature: foobar
+Fīča: foobar
+Fitur: foobar
+Fonctionnalité: foobar
+Fonksyonalite: foobar
+Funcionalidade: foobar
+Funcionalitat: foobar
+Functionalitate: foobar
+Funcţionalitate: foobar
+Funcționalitate: foobar
+Functionaliteit: foobar
+Fungsi: foobar
+Funkcia: foobar
+Funkcija: foobar
+Funkcionalitāte: foobar
+Funkcionalnost: foobar
+Funkcja: foobar
+Funksie: foobar
+Funktionalität: foobar
+Funktionalitéit: foobar
+Funzionalità: foobar
+Hwaet: foobar
+Hwæt: foobar
+Jellemző: foobar
+Karakteristik: foobar
+laH: foobar
+Lastnost: foobar
+Mak: foobar
+Mogucnost: foobar
+Mogućnost: foobar
+Moznosti: foobar
+Možnosti: foobar
+OH HAI: foobar
+Omadus: foobar
+Ominaisuus: foobar
+Osobina: foobar
+Özellik: foobar
+perbogh: foobar
+poQbogh malja': foobar
+Potrzeba biznesowa: foobar
+Požadavek: foobar
+Požiadavka: foobar
+Pretty much: foobar
+Qap: foobar
+Qu'meH 'ut: foobar
+Savybė: foobar
+Tính năng: foobar
+Trajto: foobar
+Vermoë: foobar
+Vlastnosť: foobar
+Właściwość: foobar
+Značilnost: foobar
+Δυνατότητα: foobar
+Λειτουργία: foobar
+Могућност: foobar
+Мөмкинлек: foobar
+Особина: foobar
+Свойство: foobar
+Үзенчәлеклелек: foobar
+Функционал: foobar
+Функционалност: foobar
+Функция: foobar
+Функціонал: foobar
+תכונה: foobar
+خاصية: foobar
+خصوصیت: foobar
+صلاحیت: foobar
+کاروبار کی ضرورت: foobar
+وِیژگی: foobar
+रूप लेख: foobar
+ਖਾਸੀਅਤ: foobar
+ਨਕਸ਼ ਨੁਹਾਰ: foobar
+ਮੁਹਾਂਦਰਾ: foobar
+గుణము: foobar
+ಹೆಚ್ಚಳ: foobar
+ความต้องการทางธุรกิจ: foobar
+ความสามารถ: foobar
+โครงหลัก: foobar
+기능: foobar
+フィーチャ: foobar
+功能: foobar
+機能: foobar
+
+----------------------------------------------------
+
+[
+	["feature", [["keyword", "Ability:"], ["important", " foobar"], "\r\nbaz\r\n"]],
+	["feature", [["keyword", "Ahoy matey!:"]]],
+	["feature", [["keyword", "Arwedd:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Aspekt:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Besigheid Behoefte:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Business Need:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Caracteristica:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Característica:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Egenskab:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Egenskap:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Eiginleiki:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Feature:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Fīča:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Fitur:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Fonctionnalité:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Fonksyonalite:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funcionalidade:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funcionalitat:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Functionalitate:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funcţionalitate:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funcționalitate:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Functionaliteit:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Fungsi:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funkcia:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funkcija:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funkcionalitāte:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funkcionalnost:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funkcja:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funksie:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funktionalität:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funktionalitéit:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Funzionalità:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Hwaet:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Hwæt:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Jellemző:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Karakteristik:"], ["important", " foobar"]]],
+	["feature", [["keyword", "laH:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Lastnost:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Mak:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Mogucnost:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Mogućnost:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Moznosti:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Možnosti:"], ["important", " foobar"]]],
+	["feature", [["keyword", "OH HAI:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Omadus:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Ominaisuus:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Osobina:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Özellik:"], ["important", " foobar"]]],
+	["feature", [["keyword", "perbogh:"], ["important", " foobar"]]],
+	["feature", [["keyword", "poQbogh malja':"], ["important", " foobar"]]],
+	["feature", [["keyword", "Potrzeba biznesowa:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Požadavek:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Požiadavka:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Pretty much:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Qap:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Qu'meH 'ut:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Savybė:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Tính năng:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Trajto:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Vermoë:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Vlastnosť:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Właściwość:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Značilnost:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Δυνατότητα:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Λειτουργία:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Могућност:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Мөмкинлек:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Особина:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Свойство:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Үзенчәлеклелек:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Функционал:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Функционалност:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Функция:"], ["important", " foobar"]]],
+	["feature", [["keyword", "Функціонал:"], ["important", " foobar"]]],
+	["feature", [["keyword", "תכונה:"], ["important", " foobar"]]],
+	["feature", [["keyword", "خاصية:"], ["important", " foobar"]]],
+	["feature", [["keyword", "خصوصیت:"], ["important", " foobar"]]],
+	["feature", [["keyword", "صلاحیت:"], ["important", " foobar"]]],
+	["feature", [["keyword", "کاروبار کی ضرورت:"], ["important", " foobar"]]],
+	["feature", [["keyword", "وِیژگی:"], ["important", " foobar"]]],
+	["feature", [["keyword", "रूप लेख:"], ["important", " foobar"]]],
+	["feature", [["keyword", "ਖਾਸੀਅਤ:"], ["important", " foobar"]]],
+	["feature", [["keyword", "ਨਕਸ਼ ਨੁਹਾਰ:"], ["important", " foobar"]]],
+	["feature", [["keyword", "ਮੁਹਾਂਦਰਾ:"], ["important", " foobar"]]],
+	["feature", [["keyword", "గుణము:"], ["important", " foobar"]]],
+	["feature", [["keyword", "ಹೆಚ್ಚಳ:"], ["important", " foobar"]]],
+	["feature", [["keyword", "ความต้องการทางธุรกิจ:"], ["important", " foobar"]]],
+	["feature", [["keyword", "ความสามารถ:"], ["important", " foobar"]]],
+	["feature", [["keyword", "โครงหลัก:"], ["important", " foobar"]]],
+	["feature", [["keyword", "기능:"], ["important", " foobar"]]],
+	["feature", [["keyword", "フィーチャ:"], ["important", " foobar"]]],
+	["feature", [["keyword", "功能:"], ["important", " foobar"]]],
+	["feature", [["keyword", "機能:"], ["important", " foobar"]]]
+]
+
+----------------------------------------------------
+
+Checks for features in all languages.
\ No newline at end of file
diff --git a/tests/languages/gherkin/outline_feature.test b/tests/languages/gherkin/outline_feature.test
new file mode 100644
index 0000000000..19fc54f940
--- /dev/null
+++ b/tests/languages/gherkin/outline_feature.test
@@ -0,0 +1,11 @@
+<foobar>
+
+----------------------------------------------------
+
+[
+	["outline", "<foobar>"]
+]
+
+----------------------------------------------------
+
+Checks for single outlines.
\ No newline at end of file
diff --git a/tests/languages/gherkin/pystring_feature.test b/tests/languages/gherkin/pystring_feature.test
new file mode 100644
index 0000000000..17fd2b4d46
--- /dev/null
+++ b/tests/languages/gherkin/pystring_feature.test
@@ -0,0 +1,20 @@
+"""
+foo
+bar
+"""
+
+'''
+foo
+bar
+'''
+
+----------------------------------------------------
+
+[
+	["pystring", "\"\"\"\r\nfoo\r\nbar\r\n\"\"\""],
+	["pystring", "'''\r\nfoo\r\nbar\r\n'''"]
+]
+
+----------------------------------------------------
+
+Checks for pystrings.
\ No newline at end of file
diff --git a/tests/languages/gherkin/scenario_feature.test b/tests/languages/gherkin/scenario_feature.test
new file mode 100644
index 0000000000..0979c698c5
--- /dev/null
+++ b/tests/languages/gherkin/scenario_feature.test
@@ -0,0 +1,581 @@
+Abstract Scenario: foobar
+Abstrakt Scenario: foobar
+Achtergrond: foobar
+Aer: foobar
+Ær: foobar
+Agtergrond: foobar
+All y'all: foobar
+Antecedentes: foobar
+Antecedents: foobar
+Atburðarás: foobar
+Atburðarásir: foobar
+Awww, look mate: foobar
+B4: foobar
+Background: foobar
+Baggrund: foobar
+Bakgrund: foobar
+Bakgrunn: foobar
+Bakgrunnur: foobar
+Beispiele: foobar
+Beispiller: foobar
+Bối cảnh: foobar
+Cefndir: foobar
+Cenario: foobar
+Cenário: foobar
+Cenario de Fundo: foobar
+Cenário de Fundo: foobar
+Cenarios: foobar
+Cenários: foobar
+Contesto: foobar
+Context: foobar
+Contexte: foobar
+Contexto: foobar
+Conto: foobar
+Contoh: foobar
+Contone: foobar
+Dæmi: foobar
+Dasar: foobar
+Dead men tell no tales: foobar
+Delineacao do Cenario: foobar
+Delineação do Cenário: foobar
+Dis is what went down: foobar
+Dữ liệu: foobar
+Dyagram senaryo: foobar
+Dyagram Senaryo: foobar
+Egzanp: foobar
+Ejemplos: foobar
+Eksempler: foobar
+Ekzemploj: foobar
+Enghreifftiau: foobar
+Esbozo do escenario: foobar
+Escenari: foobar
+Escenario: foobar
+Esempi: foobar
+Esquema de l'escenari: foobar
+Esquema del escenario: foobar
+Esquema do Cenario: foobar
+Esquema do Cenário: foobar
+Examples: foobar
+EXAMPLZ: foobar
+Exempel: foobar
+Exemple: foobar
+Exemples: foobar
+Exemplos: foobar
+First off: foobar
+Fono: foobar
+Forgatókönyv: foobar
+Forgatókönyv vázlat: foobar
+Fundo: foobar
+Geçmiş: foobar
+ghantoH: foobar
+Grundlage: foobar
+Hannergrond: foobar
+Háttér: foobar
+Heave to: foobar
+Istorik: foobar
+Juhtumid: foobar
+Keadaan: foobar
+Khung kịch bản: foobar
+Khung tình huống: foobar
+Kịch bản: foobar
+Koncept: foobar
+Konsep skenario: foobar
+Kontèks: foobar
+Kontekst: foobar
+Kontekstas: foobar
+Konteksts: foobar
+Kontext: foobar
+Konturo de la scenaro: foobar
+Latar Belakang: foobar
+lut: foobar
+lut chovnatlh: foobar
+lutmey: foobar
+Lýsing Atburðarásar: foobar
+Lýsing Dæma: foobar
+Menggariskan Senario: foobar
+MISHUN: foobar
+MISHUN SRSLY: foobar
+mo': foobar
+Náčrt Scenára: foobar
+Náčrt Scénáře: foobar
+Náčrt Scenáru: foobar
+Oris scenarija: foobar
+Örnekler: foobar
+Osnova: foobar
+Osnova Scenára: foobar
+Osnova scénáře: foobar
+Osnutek: foobar
+Ozadje: foobar
+Paraugs: foobar
+Pavyzdžiai: foobar
+Példák: foobar
+Piemēri: foobar
+Plan du scénario: foobar
+Plan du Scénario: foobar
+Plan senaryo: foobar
+Plan Senaryo: foobar
+Plang vum Szenario: foobar
+Pozadí: foobar
+Pozadie: foobar
+Pozadina: foobar
+Príklady: foobar
+Příklady: foobar
+Primer: foobar
+Primeri: foobar
+Primjeri: foobar
+Przykłady: foobar
+Raamstsenaarium: foobar
+Reckon it's like: foobar
+Rerefons: foobar
+Scenár: foobar
+Scénář: foobar
+Scenarie: foobar
+Scenarij: foobar
+Scenarijai: foobar
+Scenarijaus šablonas: foobar
+Scenariji: foobar
+Scenārijs: foobar
+Scenārijs pēc parauga: foobar
+Scenarijus: foobar
+Scenario: foobar
+Scénario: foobar
+Scenario Amlinellol: foobar
+Scenario Outline: foobar
+Scenario Template: foobar
+Scenariomal: foobar
+Scenariomall: foobar
+Scenarios: foobar
+Scenariu: foobar
+Scenariusz: foobar
+Scenaro: foobar
+Schema dello scenario: foobar
+Se ðe: foobar
+Se the: foobar
+Se þe: foobar
+Senario: foobar
+Senaryo: foobar
+Senaryo deskripsyon: foobar
+Senaryo Deskripsyon: foobar
+Senaryo taslağı: foobar
+Shiver me timbers: foobar
+Situācija: foobar
+Situai: foobar
+Situasie: foobar
+Situasie Uiteensetting: foobar
+Skenario: foobar
+Skenario konsep: foobar
+Skica: foobar
+Structura scenariu: foobar
+Structură scenariu: foobar
+Struktura scenarija: foobar
+Stsenaarium: foobar
+Swa: foobar
+Swa hwaer swa: foobar
+Swa hwær swa: foobar
+Szablon scenariusza: foobar
+Szenario: foobar
+Szenariogrundriss: foobar
+Tapaukset: foobar
+Tapaus: foobar
+Tapausaihio: foobar
+Taust: foobar
+Tausta: foobar
+Template Keadaan: foobar
+Template Senario: foobar
+Template Situai: foobar
+The thing of it is: foobar
+Tình huống: foobar
+Variantai: foobar
+Voorbeelde: foobar
+Voorbeelden: foobar
+Wharrimean is: foobar
+Yo-ho-ho: foobar
+You'll wanna: foobar
+Założenia: foobar
+Παραδείγματα: foobar
+Περιγραφή Σεναρίου: foobar
+Σενάρια: foobar
+Σενάριο: foobar
+Υπόβαθρο: foobar
+Кереш: foobar
+Контекст: foobar
+Концепт: foobar
+Мисаллар: foobar
+Мисоллар: foobar
+Основа: foobar
+Передумова: foobar
+Позадина: foobar
+Предистория: foobar
+Предыстория: foobar
+Приклади: foobar
+Пример: foobar
+Примери: foobar
+Примеры: foobar
+Рамка на сценарий: foobar
+Скица: foobar
+Структура сценарија: foobar
+Структура сценария: foobar
+Структура сценарію: foobar
+Сценарий: foobar
+Сценарий структураси: foobar
+Сценарийның төзелеше: foobar
+Сценарији: foobar
+Сценарио: foobar
+Сценарій: foobar
+Тарих: foobar
+Үрнәкләр: foobar
+דוגמאות: foobar
+רקע: foobar
+תבנית תרחיש: foobar
+תרחיש: foobar
+الخلفية: foobar
+الگوی سناریو: foobar
+امثلة: foobar
+پس منظر: foobar
+زمینه: foobar
+سناریو: foobar
+سيناريو: foobar
+سيناريو مخطط: foobar
+مثالیں: foobar
+منظر نامے کا خاکہ: foobar
+منظرنامہ: foobar
+نمونه ها: foobar
+उदाहरण: foobar
+परिदृश्य: foobar
+परिदृश्य रूपरेखा: foobar
+पृष्ठभूमि: foobar
+ਉਦਾਹਰਨਾਂ: foobar
+ਪਟਕਥਾ: foobar
+ਪਟਕਥਾ ਢਾਂਚਾ: foobar
+ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ: foobar
+ਪਿਛੋਕੜ: foobar
+ఉదాహరణలు: foobar
+కథనం: foobar
+నేపథ్యం: foobar
+సన్నివేశం: foobar
+ಉದಾಹರಣೆಗಳು: foobar
+ಕಥಾಸಾರಾಂಶ: foobar
+ವಿವರಣೆ: foobar
+ಹಿನ್ನೆಲೆ: foobar
+โครงสร้างของเหตุการณ์: foobar
+ชุดของตัวอย่าง: foobar
+ชุดของเหตุการณ์: foobar
+แนวคิด: foobar
+สรุปเหตุการณ์: foobar
+เหตุการณ์: foobar
+배경: foobar
+시나리오: foobar
+시나리오 개요: foobar
+예: foobar
+サンプル: foobar
+シナリオ: foobar
+シナリオアウトライン: foobar
+シナリオテンプレ: foobar
+シナリオテンプレート: foobar
+テンプレ: foobar
+例: foobar
+例子: foobar
+剧本: foobar
+剧本大纲: foobar
+劇本: foobar
+劇本大綱: foobar
+场景: foobar
+场景大纲: foobar
+場景: foobar
+場景大綱: foobar
+背景: foobar
+
+----------------------------------------------------
+
+[
+	["scenario", [["keyword", "Abstract Scenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Abstrakt Scenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Achtergrond:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Aer:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Ær:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Agtergrond:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "All y'all:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Antecedentes:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Antecedents:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Atburðarás:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Atburðarásir:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Awww, look mate:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "B4:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Background:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Baggrund:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Bakgrund:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Bakgrunn:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Bakgrunnur:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Beispiele:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Beispiller:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Bối cảnh:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Cefndir:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Cenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Cenário:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Cenario de Fundo:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Cenário de Fundo:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Cenarios:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Cenários:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Contesto:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Context:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Contexte:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Contexto:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Conto:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Contoh:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Contone:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Dæmi:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Dasar:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Dead men tell no tales:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Delineacao do Cenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Delineação do Cenário:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Dis is what went down:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Dữ liệu:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Dyagram senaryo:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Dyagram Senaryo:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Egzanp:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Ejemplos:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Eksempler:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Ekzemploj:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Enghreifftiau:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Esbozo do escenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Escenari:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Escenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Esempi:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Esquema de l'escenari:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Esquema del escenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Esquema do Cenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Esquema do Cenário:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Examples:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "EXAMPLZ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Exempel:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Exemple:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Exemples:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Exemplos:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "First off:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Fono:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Forgatókönyv:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Forgatókönyv vázlat:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Fundo:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Geçmiş:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ghantoH:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Grundlage:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Hannergrond:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Háttér:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Heave to:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Istorik:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Juhtumid:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Keadaan:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Khung kịch bản:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Khung tình huống:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Kịch bản:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Koncept:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Konsep skenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Kontèks:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Kontekst:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Kontekstas:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Konteksts:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Kontext:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Konturo de la scenaro:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Latar Belakang:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "lut:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "lut chovnatlh:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "lutmey:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Lýsing Atburðarásar:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Lýsing Dæma:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Menggariskan Senario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "MISHUN:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "MISHUN SRSLY:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "mo':"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Náčrt Scenára:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Náčrt Scénáře:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Náčrt Scenáru:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Oris scenarija:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Örnekler:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Osnova:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Osnova Scenára:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Osnova scénáře:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Osnutek:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Ozadje:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Paraugs:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Pavyzdžiai:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Példák:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Piemēri:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Plan du scénario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Plan du Scénario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Plan senaryo:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Plan Senaryo:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Plang vum Szenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Pozadí:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Pozadie:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Pozadina:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Príklady:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Příklady:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Primer:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Primeri:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Primjeri:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Przykłady:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Raamstsenaarium:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Reckon it's like:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Rerefons:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenár:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scénář:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenarie:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenarij:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenarijai:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenarijaus šablonas:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenariji:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenārijs:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenārijs pēc parauga:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenarijus:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scénario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenario Amlinellol:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenario Outline:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenario Template:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenariomal:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenariomall:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenarios:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenariu:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenariusz:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Scenaro:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Schema dello scenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Se ðe:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Se the:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Se þe:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Senario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Senaryo:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Senaryo deskripsyon:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Senaryo Deskripsyon:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Senaryo taslağı:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Shiver me timbers:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Situācija:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Situai:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Situasie:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Situasie Uiteensetting:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Skenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Skenario konsep:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Skica:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Structura scenariu:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Structură scenariu:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Struktura scenarija:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Stsenaarium:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Swa:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Swa hwaer swa:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Swa hwær swa:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Szablon scenariusza:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Szenario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Szenariogrundriss:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Tapaukset:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Tapaus:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Tapausaihio:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Taust:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Tausta:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Template Keadaan:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Template Senario:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Template Situai:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "The thing of it is:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Tình huống:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Variantai:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Voorbeelde:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Voorbeelden:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Wharrimean is:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Yo-ho-ho:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "You'll wanna:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Założenia:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Παραδείγματα:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Περιγραφή Σεναρίου:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Σενάρια:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Σενάριο:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Υπόβαθρο:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Кереш:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Контекст:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Концепт:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Мисаллар:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Мисоллар:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Основа:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Передумова:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Позадина:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Предистория:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Предыстория:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Приклади:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Пример:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Примери:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Примеры:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Рамка на сценарий:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Скица:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Структура сценарија:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Структура сценария:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Структура сценарію:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Сценарий:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Сценарий структураси:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Сценарийның төзелеше:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Сценарији:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Сценарио:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Сценарій:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Тарих:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "Үрнәкләр:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "דוגמאות:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "רקע:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "תבנית תרחיש:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "תרחיש:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "الخلفية:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "الگوی سناریو:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "امثلة:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "پس منظر:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "زمینه:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "سناریو:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "سيناريو:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "سيناريو مخطط:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "مثالیں:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "منظر نامے کا خاکہ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "منظرنامہ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "نمونه ها:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "उदाहरण:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "परिदृश्य:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "परिदृश्य रूपरेखा:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "पृष्ठभूमि:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ਉਦਾਹਰਨਾਂ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ਪਟਕਥਾ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ਪਟਕਥਾ ਢਾਂਚਾ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ਪਿਛੋਕੜ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ఉదాహరణలు:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "కథనం:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "నేపథ్యం:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "సన్నివేశం:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ಉದಾಹರಣೆಗಳು:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ಕಥಾಸಾರಾಂಶ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ವಿವರಣೆ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ಹಿನ್ನೆಲೆ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "โครงสร้างของเหตุการณ์:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ชุดของตัวอย่าง:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "ชุดของเหตุการณ์:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "แนวคิด:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "สรุปเหตุการณ์:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "เหตุการณ์:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "배경:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "시나리오:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "시나리오 개요:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "예:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "サンプル:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "シナリオ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "シナリオアウトライン:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "シナリオテンプレ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "シナリオテンプレート:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "テンプレ:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "例:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "例子:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "剧本:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "剧本大纲:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "劇本:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "劇本大綱:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "场景:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "场景大纲:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "場景:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "場景大綱:"], ["important", " foobar"]]],
+	["scenario", [["keyword", "背景:"], ["important", " foobar"]]]
+]
+
+----------------------------------------------------
+
+Checks for scenarios in all languages.
\ No newline at end of file
diff --git a/tests/languages/gherkin/string_feature.test b/tests/languages/gherkin/string_feature.test
new file mode 100644
index 0000000000..bcb152f788
--- /dev/null
+++ b/tests/languages/gherkin/string_feature.test
@@ -0,0 +1,29 @@
+""
+"foobar"
+"foo<bar>baz"
+''
+'foobar'
+'foo<bar>baz'
+
+----------------------------------------------------
+
+[
+	["string", ["\"\""]],
+	["string", ["\"foobar\""]],
+	["string", [
+		"\"foo",
+		["outline", "<bar>"],
+		"baz\""
+	]],
+	["string", ["''"]],
+	["string", ["'foobar'"]],
+	["string", [
+        "'foo",
+        ["outline", "<bar>"],
+        "baz'"
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for double-quoted and single-quoted strings.
\ No newline at end of file
diff --git a/tests/languages/gherkin/table_feature.test b/tests/languages/gherkin/table_feature.test
new file mode 100644
index 0000000000..00eaef858c
--- /dev/null
+++ b/tests/languages/gherkin/table_feature.test
@@ -0,0 +1,40 @@
+Examples: foo
+| start  | eat | left |
+|  <foo> |  5  |  7   |
+	|  20    |  5  |  15  |
+
+----------------------------------------------------
+
+[
+	["scenario", [["keyword", "Examples:"], ["important", " foo"]]],
+	["table-head", [
+		["punctuation", "|"],
+		["th", " start  "],
+		["punctuation", "|"],
+        ["th", " eat "],
+        ["punctuation", "|"],
+        ["th", " left "],
+        ["punctuation", "|"]
+    ]],
+    ["table-body", [
+		["punctuation", "|"],
+		["outline", "<foo>"],
+		["punctuation", "|"],
+		["td", "  5  "],
+		["punctuation", "|"],
+        ["td", "  7   "],
+        ["punctuation", "|"],
+
+        ["punctuation", "|"],
+        ["td", "  20    "],
+        ["punctuation", "|"],
+        ["td", "  5  "],
+        ["punctuation", "|"],
+        ["td", "  15  "],
+        ["punctuation", "|"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for table heads and table bodies.
\ No newline at end of file
diff --git a/tests/languages/gherkin/tag_feature.test b/tests/languages/gherkin/tag_feature.test
new file mode 100644
index 0000000000..51026ea1b1
--- /dev/null
+++ b/tests/languages/gherkin/tag_feature.test
@@ -0,0 +1,17 @@
+@important
+@billing @bicker @annoy
+	@foo
+
+----------------------------------------------------
+
+[
+	["tag", "@important"],
+	["tag", "@billing"],
+	["tag", "@bicker"],
+	["tag", "@annoy"],
+	["tag", "@foo"]
+]
+
+----------------------------------------------------
+
+Checks for tags.
\ No newline at end of file

From f618948cecc5a310919674c917c957d35a4b5bbe Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 19 Aug 2015 20:30:40 +0200
Subject: [PATCH 188/310] Run gulp task

---
 components/prism-python.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/prism-python.min.js b/components/prism-python.min.js
index 19ca5c55b5..28bfc499af 100644
--- a/components/prism-python.min.js
+++ b/components/prism-python.min.js
@@ -1 +1 @@
-Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,"function":{pattern:/((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,lookbehind:!0},keyword:/\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};Prism.languages.insertBefore("python","keyword",{"class-name":{pattern:/(class\s+)[a-z0-9_]+/i,lookbehind:!0}});
+Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,"function":{pattern:/((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,lookbehind:!0},"class-name":{pattern:/(class\s+)[a-z0-9_]+/i,lookbehind:!0},keyword:/\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file

From 466a0a9bef87a3537f9d916b11f943e583461bdd Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 20 Aug 2015 08:11:16 +0200
Subject: [PATCH 189/310] Add tests for git

---
 tests/languages/git/command_feature.test     | 15 +++++++++++++++
 tests/languages/git/comment_feature.test     | 17 +++++++++++++++++
 tests/languages/git/commit_sha1_feature.test | 15 +++++++++++++++
 tests/languages/git/coord_feature.test       | 13 +++++++++++++
 tests/languages/git/diff_feature.test        | 15 +++++++++++++++
 tests/languages/git/string_feature.test      | 17 +++++++++++++++++
 6 files changed, 92 insertions(+)
 create mode 100644 tests/languages/git/command_feature.test
 create mode 100644 tests/languages/git/comment_feature.test
 create mode 100644 tests/languages/git/commit_sha1_feature.test
 create mode 100644 tests/languages/git/coord_feature.test
 create mode 100644 tests/languages/git/diff_feature.test
 create mode 100644 tests/languages/git/string_feature.test

diff --git a/tests/languages/git/command_feature.test b/tests/languages/git/command_feature.test
new file mode 100644
index 0000000000..488f0be392
--- /dev/null
+++ b/tests/languages/git/command_feature.test
@@ -0,0 +1,15 @@
+$ git add file.txt
+foo@foobar ~ $ git diff --cached
+$ git log -p -i
+
+----------------------------------------------------
+
+[
+	["command", ["$ git add file.txt"]],
+	["command", ["foo@foobar ~ $ git diff", ["parameter", " --cached"]]],
+	["command", ["$ git log", ["parameter", " -p"], ["parameter", " -i"]]]
+]
+
+----------------------------------------------------
+
+Checks for git commands, with and without parameters.
\ No newline at end of file
diff --git a/tests/languages/git/comment_feature.test b/tests/languages/git/comment_feature.test
new file mode 100644
index 0000000000..c3d0358e78
--- /dev/null
+++ b/tests/languages/git/comment_feature.test
@@ -0,0 +1,17 @@
+# On branch gh-pages
+# Changes to be committed:
+#   (use "git reset HEAD <file>..." to unstage)
+#
+
+----------------------------------------------------
+
+[
+	["comment", "# On branch gh-pages"],
+	["comment", "# Changes to be committed:"],
+	["comment", "#   (use \"git reset HEAD <file>...\" to unstage)"],
+	["comment", "#"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/git/commit_sha1_feature.test b/tests/languages/git/commit_sha1_feature.test
new file mode 100644
index 0000000000..fbc58ed2bd
--- /dev/null
+++ b/tests/languages/git/commit_sha1_feature.test
@@ -0,0 +1,15 @@
+commit a11a14ef7e26f2ca62d4b35eac455ce636d0dc09
+commit 87edc4ad8c71b95f6e46f736eb98b742859abd95
+commit 3102416a90c431400d2e2a14e707fb7fd6d9e06d
+
+----------------------------------------------------
+
+[
+	["commit_sha1", "commit a11a14ef7e26f2ca62d4b35eac455ce636d0dc09"],
+	["commit_sha1", "commit 87edc4ad8c71b95f6e46f736eb98b742859abd95"],
+	["commit_sha1", "commit 3102416a90c431400d2e2a14e707fb7fd6d9e06d"]
+]
+
+----------------------------------------------------
+
+Checks for commit SHA1.
\ No newline at end of file
diff --git a/tests/languages/git/coord_feature.test b/tests/languages/git/coord_feature.test
new file mode 100644
index 0000000000..8d8c5e2b48
--- /dev/null
+++ b/tests/languages/git/coord_feature.test
@@ -0,0 +1,13 @@
+@@ -1 +1,2 @@
+@@@ -98,20 -98,12 +98,20 @@@
+
+----------------------------------------------------
+
+[
+	["coord", "@@ -1 +1,2 @@"],
+	["coord", "@@@ -98,20 -98,12 +98,20 @@@"]
+]
+
+----------------------------------------------------
+
+Checks for coords.
\ No newline at end of file
diff --git a/tests/languages/git/diff_feature.test b/tests/languages/git/diff_feature.test
new file mode 100644
index 0000000000..3c75cca195
--- /dev/null
+++ b/tests/languages/git/diff_feature.test
@@ -0,0 +1,15 @@
+-Here's my tetx file
++Here's my text file
++And this is the second line
+
+----------------------------------------------------
+
+[
+	["deleted", "-Here's my tetx file"],
+	["inserted", "+Here's my text file"],
+	["inserted", "+And this is the second line"]
+]
+
+----------------------------------------------------
+
+Checks for inserted and deleted lines in git diff output.
\ No newline at end of file
diff --git a/tests/languages/git/string_feature.test b/tests/languages/git/string_feature.test
new file mode 100644
index 0000000000..ebff3bf525
--- /dev/null
+++ b/tests/languages/git/string_feature.test
@@ -0,0 +1,17 @@
+""
+"foo"
+''
+'bar'
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"foo\""],
+	["string", "''"],
+	["string", "'bar'"]
+]
+
+----------------------------------------------------
+
+Checks for double-quoted and single-quoted strings.
\ No newline at end of file

From 776ab9019c6c02656db0491ba3821fdc12c83aac Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 20 Aug 2015 08:39:30 +0200
Subject: [PATCH 190/310] Go: improved operator regexp + removed punctuation
 from it

---
 components/prism-go.js     | 2 +-
 components/prism-go.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-go.js b/components/prism-go.js
index 089560a4bc..3f7d7c56a5 100644
--- a/components/prism-go.js
+++ b/components/prism-go.js
@@ -2,7 +2,7 @@ Prism.languages.go = Prism.languages.extend('clike', {
 	'keyword': /\b(break|case|chan|const|continue|default|defer|else|fallthrough|for|func|go(to)?|if|import|interface|map|package|range|return|select|struct|switch|type|var)\b/,
 	'builtin': /\b(bool|byte|complex(64|128)|error|float(32|64)|rune|string|u?int(8|16|32|64|)|uintptr|append|cap|close|complex|copy|delete|imag|len|make|new|panic|print(ln)?|real|recover)\b/,
 	'boolean': /\b(_|iota|nil|true|false)\b/,
-	'operator': /([(){}\[\]]|[*\/%^!]=?|\+[=+]?|-[>=-]?|\|[=|]?|>[=>]?|<(<|[=-])?|==?|&(&|=|^=?)?|\.(\.\.)?|[,;]|:=?)/,
+	'operator': /[*\/%^!=]=?|\+[=+]?|-[=-]?|\|[=|]?|&(?:=|&|\^=?)?|>(?:>=?|=)?|<(?:<=?|=|-)?|:=|\.\.\./,
 	'number': /\b(-?(0x[a-f\d]+|(\d+\.?\d*|\.\d+)(e[-+]?\d+)?)i?)\b/i,
 	'string': /("|'|`)(\\?.|\r|\n)*?\1/
 });
diff --git a/components/prism-go.min.js b/components/prism-go.min.js
index 530a2b70a9..d616836b36 100644
--- a/components/prism-go.min.js
+++ b/components/prism-go.min.js
@@ -1 +1 @@
-Prism.languages.go=Prism.languages.extend("clike",{keyword:/\b(break|case|chan|const|continue|default|defer|else|fallthrough|for|func|go(to)?|if|import|interface|map|package|range|return|select|struct|switch|type|var)\b/,builtin:/\b(bool|byte|complex(64|128)|error|float(32|64)|rune|string|u?int(8|16|32|64|)|uintptr|append|cap|close|complex|copy|delete|imag|len|make|new|panic|print(ln)?|real|recover)\b/,"boolean":/\b(_|iota|nil|true|false)\b/,operator:/([(){}\[\]]|[*\/%^!]=?|\+[=+]?|-[>=-]?|\|[=|]?|>[=>]?|<(<|[=-])?|==?|&(&|=|^=?)?|\.(\.\.)?|[,;]|:=?)/,number:/\b(-?(0x[a-f\d]+|(\d+\.?\d*|\.\d+)(e[-+]?\d+)?)i?)\b/i,string:/("|'|`)(\\?.|\r|\n)*?\1/}),delete Prism.languages.go["class-name"];
\ No newline at end of file
+Prism.languages.go=Prism.languages.extend("clike",{keyword:/\b(break|case|chan|const|continue|default|defer|else|fallthrough|for|func|go(to)?|if|import|interface|map|package|range|return|select|struct|switch|type|var)\b/,builtin:/\b(bool|byte|complex(64|128)|error|float(32|64)|rune|string|u?int(8|16|32|64|)|uintptr|append|cap|close|complex|copy|delete|imag|len|make|new|panic|print(ln)?|real|recover)\b/,"boolean":/\b(_|iota|nil|true|false)\b/,operator:/[*\/%^!=]=?|\+[=+]?|-[=-]?|\|[=|]?|&(?:=|&|\^=?)?|>(?:>=?|=)?|<(?:<=?|=|-)?|:=|\.\.\./,number:/\b(-?(0x[a-f\d]+|(\d+\.?\d*|\.\d+)(e[-+]?\d+)?)i?)\b/i,string:/("|'|`)(\\?.|\r|\n)*?\1/}),delete Prism.languages.go["class-name"];
\ No newline at end of file

From 29bb9aa76a9f07ab3000ecd3ceaf117f53ee40dc Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 20 Aug 2015 08:48:50 +0200
Subject: [PATCH 191/310] Add tests for Go

---
 tests/languages/go/boolean_feature.test  | 19 ++++++
 tests/languages/go/builtin_feature.test  | 79 ++++++++++++++++++++++++
 tests/languages/go/keyword_feature.test  | 59 ++++++++++++++++++
 tests/languages/go/number_feature.test   | 43 +++++++++++++
 tests/languages/go/operator_feature.test | 27 ++++++++
 tests/languages/go/string_feature.test   | 37 +++++++++++
 6 files changed, 264 insertions(+)
 create mode 100644 tests/languages/go/boolean_feature.test
 create mode 100644 tests/languages/go/builtin_feature.test
 create mode 100644 tests/languages/go/keyword_feature.test
 create mode 100644 tests/languages/go/number_feature.test
 create mode 100644 tests/languages/go/operator_feature.test
 create mode 100644 tests/languages/go/string_feature.test

diff --git a/tests/languages/go/boolean_feature.test b/tests/languages/go/boolean_feature.test
new file mode 100644
index 0000000000..1ee1192625
--- /dev/null
+++ b/tests/languages/go/boolean_feature.test
@@ -0,0 +1,19 @@
+_
+iota
+nil
+true
+false
+
+----------------------------------------------------
+
+[
+	["boolean", "_"],
+	["boolean", "iota"],
+	["boolean", "nil"],
+	["boolean", "true"],
+	["boolean", "false"]
+]
+
+----------------------------------------------------
+
+Checks for all boolean values.
\ No newline at end of file
diff --git a/tests/languages/go/builtin_feature.test b/tests/languages/go/builtin_feature.test
new file mode 100644
index 0000000000..414018fe02
--- /dev/null
+++ b/tests/languages/go/builtin_feature.test
@@ -0,0 +1,79 @@
+bool
+byte
+complex64
+complex128
+error
+float32
+float64
+rune
+string
+int
+int8
+int16
+int32
+int64
+uint
+uint8
+uint16
+uint32
+uint64
+uintptr
+append
+cap
+close
+complex
+copy
+delete
+imag
+len
+make
+new
+panic
+print
+println
+real
+recover
+
+----------------------------------------------------
+
+[
+	["builtin", "bool"],
+	["builtin", "byte"],
+	["builtin", "complex64"],
+	["builtin", "complex128"],
+	["builtin", "error"],
+	["builtin", "float32"],
+	["builtin", "float64"],
+	["builtin", "rune"],
+	["builtin", "string"],
+	["builtin", "int"],
+	["builtin", "int8"],
+	["builtin", "int16"],
+	["builtin", "int32"],
+	["builtin", "int64"],
+	["builtin", "uint"],
+	["builtin", "uint8"],
+	["builtin", "uint16"],
+	["builtin", "uint32"],
+	["builtin", "uint64"],
+	["builtin", "uintptr"],
+	["builtin", "append"],
+	["builtin", "cap"],
+	["builtin", "close"],
+	["builtin", "complex"],
+	["builtin", "copy"],
+	["builtin", "delete"],
+	["builtin", "imag"],
+	["builtin", "len"],
+	["builtin", "make"],
+	["builtin", "new"],
+	["builtin", "panic"],
+	["builtin", "print"],
+	["builtin", "println"],
+	["builtin", "real"],
+	["builtin", "recover"]
+]
+
+----------------------------------------------------
+
+Checks for all builtins.
\ No newline at end of file
diff --git a/tests/languages/go/keyword_feature.test b/tests/languages/go/keyword_feature.test
new file mode 100644
index 0000000000..a2799f73f1
--- /dev/null
+++ b/tests/languages/go/keyword_feature.test
@@ -0,0 +1,59 @@
+break
+case
+chan
+const
+continue
+default
+defer
+else
+fallthrough
+for
+func
+go
+goto
+if
+import
+interface
+map
+package
+range
+return
+select
+struct
+switch
+type
+var
+
+----------------------------------------------------
+
+[
+	["keyword", "break"],
+	["keyword", "case"],
+	["keyword", "chan"],
+	["keyword", "const"],
+	["keyword", "continue"],
+	["keyword", "default"],
+	["keyword", "defer"],
+	["keyword", "else"],
+	["keyword", "fallthrough"],
+	["keyword", "for"],
+	["keyword", "func"],
+	["keyword", "go"],
+	["keyword", "goto"],
+	["keyword", "if"],
+	["keyword", "import"],
+	["keyword", "interface"],
+	["keyword", "map"],
+	["keyword", "package"],
+	["keyword", "range"],
+	["keyword", "return"],
+	["keyword", "select"],
+	["keyword", "struct"],
+	["keyword", "switch"],
+	["keyword", "type"],
+	["keyword", "var"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords
\ No newline at end of file
diff --git a/tests/languages/go/number_feature.test b/tests/languages/go/number_feature.test
new file mode 100644
index 0000000000..f21b3e8750
--- /dev/null
+++ b/tests/languages/go/number_feature.test
@@ -0,0 +1,43 @@
+42
+0600
+0xBadFace
+170141183460469231731687303715884105727
+72.40
+072.40
+2.71828
+1.e+0
+6.67428e-11
+1E6
+0i
+011i
+0.i
+2.71828i
+1.e+0i
+6.67428e-11i
+1E6i
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "0600"],
+	["number", "0xBadFace"],
+	["number", "170141183460469231731687303715884105727"],
+	["number", "72.40"],
+	["number", "072.40"],
+	["number", "2.71828"],
+	["number", "1.e+0"],
+	["number", "6.67428e-11"],
+	["number", "1E6"],
+	["number", "0i"],
+	["number", "011i"],
+	["number", "0.i"],
+	["number", "2.71828i"],
+	["number", "1.e+0i"],
+	["number", "6.67428e-11i"],
+	["number", "1E6i"]
+]
+
+----------------------------------------------------
+
+Checks for integers, floats and imaginary numbers.
\ No newline at end of file
diff --git a/tests/languages/go/operator_feature.test b/tests/languages/go/operator_feature.test
new file mode 100644
index 0000000000..cda538614a
--- /dev/null
+++ b/tests/languages/go/operator_feature.test
@@ -0,0 +1,27 @@
+* / % ^ ! =
+*= /= %= ^= != ==
++ += ++
+- -= --
+| |= ||
+& &= && &^ &^=
+> >> >>= >=
+< << <<= <= <-
+:= ...
+
+----------------------------------------------------
+
+[
+	["operator", "*"], ["operator", "/"], ["operator", "%"], ["operator", "^"], ["operator", "!"], ["operator", "="],
+	["operator", "*="], ["operator", "/="], ["operator", "%="], ["operator", "^="], ["operator", "!="], ["operator", "=="],
+	["operator", "+"], ["operator", "+="], ["operator", "++"],
+	["operator", "-"], ["operator", "-="], ["operator", "--"],
+	["operator", "|"], ["operator", "|="], ["operator", "||"],
+	["operator", "&"], ["operator", "&="], ["operator", "&&"], ["operator", "&^"], ["operator", "&^="],
+	["operator", ">"], ["operator", ">>"], ["operator", ">>="], ["operator", ">="],
+	["operator", "<"], ["operator", "<<"], ["operator", "<<="], ["operator", "<="], ["operator", "<-"],
+	["operator", ":="], ["operator", "..."]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/go/string_feature.test b/tests/languages/go/string_feature.test
new file mode 100644
index 0000000000..97e3960b72
--- /dev/null
+++ b/tests/languages/go/string_feature.test
@@ -0,0 +1,37 @@
+'a'
+'ä'
+'本'
+'\t'
+'\xff'
+'\u12e4'
+
+`abc`
+`\n
+\n`
+"\n"
+"\""
+"Hello, world!\n"
+"日本語"
+"\xff\u00FF"
+
+----------------------------------------------------
+
+[
+	["string", "'a'"],
+	["string", "'ä'"],
+	["string", "'本'"],
+	["string", "'\\t'"],
+	["string", "'\\xff'"],
+	["string", "'\\u12e4'"],
+	["string", "`abc`"],
+	["string", "`\\n\r\n\\n`"],
+	["string", "\"\\n\""],
+	["string", "\"\\\"\""],
+	["string", "\"Hello, world!\\n\""],
+	["string", "\"日本語\""],
+	["string", "\"\\xff\\u00FF\""]
+]
+
+----------------------------------------------------
+
+Checks for runes and strings.
\ No newline at end of file

From 7f21d439afac3678d2f219c2321e25d8f868aacb Mon Sep 17 00:00:00 2001
From: Adam Moore <amooreinteractive@gmail.com>
Date: Thu, 20 Aug 2015 09:52:27 -0700
Subject: [PATCH 192/310] add reset styles to show-language plugin due to style
 overwriting form the themes, bug pertained to Coy styles

---
 plugins/show-language/prism-show-language.css | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/show-language/prism-show-language.css b/plugins/show-language/prism-show-language.css
index 4a3c2f29f6..1e539db5fc 100644
--- a/plugins/show-language/prism-show-language.css
+++ b/plugins/show-language/prism-show-language.css
@@ -7,10 +7,23 @@ pre[class*='language-'][data-language]::before {
 	background-color: #CFCFCF;
 	display: inline-block;
 	position: absolute;
+	bottom: auto;
+	left: auto;
 	top: 0;
 	right: 0;
+	width: auto;
+	height: auto;
 	font-size: 0.9em;
 	border-radius: 0 0 0 5px;
 	padding: 0 0.5em;
 	text-shadow: none;
+	z-index: 1;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+	-webkit-transform: none;
+	-moz-transform: none;
+	-ms-transform: none;
+	-o-transform: none;
+	transform: none;
 }
\ No newline at end of file

From 3120ff73ab57b356785e6e9b67ade55039e926f5 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 21 Aug 2015 07:47:59 +0200
Subject: [PATCH 193/310] Scheme: Add missing lookbehind on number pattern. Fix
 #702

---
 components/prism-scheme.js     | 33 ++++++++++++++++-----------------
 components/prism-scheme.min.js |  2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/components/prism-scheme.js b/components/prism-scheme.js
index c3b592fba2..7966e543b4 100644
--- a/components/prism-scheme.js
+++ b/components/prism-scheme.js
@@ -1,24 +1,23 @@
 Prism.languages.scheme = {
-    'boolean' : /#(t|f){1}/,
-    'comment' : /;.*/,
-    'keyword' : {
+	'boolean' : /#(t|f){1}/,
+	'comment' : /;.*/,
+	'keyword' : {
 		pattern : /([(])(define(-syntax|-library|-values)?|(case-)?lambda|let(-values|(rec)?(\*)?)?|else|if|cond|begin|delay|delay-force|parameterize|guard|set!|(quasi-)?quote|syntax-rules)/,
 		lookbehind : true
-    },
-    'builtin' : {
+	},
+	'builtin' : {
 		pattern :  /([(])(cons|car|cdr|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b/,
 		lookbehind : true
-    },
-    'string' :  /(["])(?:(?=(\\?))\2.)*?\1|'[^('|\s)]+/, //thanks http://stackoverflow.com/questions/171480/regex-grabbing-values-between-quotation-marks
-    'number' : /(\s|\))[-+]?[0-9]*\.?[0-9]+((\s*)[-+]{1}(\s*)[0-9]*\.?[0-9]+i)?/,
-    'operator': /(\*|\+|\-|%|\/|<=|=>|>=|<|=|>)/,
-    'function' : {
+	},
+	'string' :  /(["])(?:(?=(\\?))\2.)*?\1|'[^('|\s)]+/, //thanks http://stackoverflow.com/questions/171480/regex-grabbing-values-between-quotation-marks
+	'number' : {
+		pattern: /(\s|\))[-+]?[0-9]*\.?[0-9]+((\s*)[-+]{1}(\s*)[0-9]*\.?[0-9]+i)?/,
+		lookbehind: true
+	},
+	'operator': /(\*|\+|\-|%|\/|<=|=>|>=|<|=|>)/,
+	'function' : {
 		pattern : /([(])[^(\s|\))]*\s/,
 		lookbehind : true
-    },
-    'punctuation' : /[()]/
-};
-
-    
-
-    
+	},
+	'punctuation' : /[()]/
+};
\ No newline at end of file
diff --git a/components/prism-scheme.min.js b/components/prism-scheme.min.js
index 7000c58156..131ec36e2b 100644
--- a/components/prism-scheme.min.js
+++ b/components/prism-scheme.min.js
@@ -1 +1 @@
-Prism.languages.scheme={"boolean":/#(t|f){1}/,comment:/;.*/,keyword:{pattern:/([(])(define(-syntax|-library|-values)?|(case-)?lambda|let(-values|(rec)?(\*)?)?|else|if|cond|begin|delay|delay-force|parameterize|guard|set!|(quasi-)?quote|syntax-rules)/,lookbehind:!0},builtin:{pattern:/([(])(cons|car|cdr|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b/,lookbehind:!0},string:/(["])(?:(?=(\\?))\2.)*?\1|'[^('|\s)]+/,number:/(\s|\))[-+]?[0-9]*\.?[0-9]+((\s*)[-+]{1}(\s*)[0-9]*\.?[0-9]+i)?/,operator:/(\*|\+|\-|%|\/|<=|=>|>=|<|=|>)/,"function":{pattern:/([(])[^(\s|\))]*\s/,lookbehind:!0},punctuation:/[()]/};
\ No newline at end of file
+Prism.languages.scheme={"boolean":/#(t|f){1}/,comment:/;.*/,keyword:{pattern:/([(])(define(-syntax|-library|-values)?|(case-)?lambda|let(-values|(rec)?(\*)?)?|else|if|cond|begin|delay|delay-force|parameterize|guard|set!|(quasi-)?quote|syntax-rules)/,lookbehind:!0},builtin:{pattern:/([(])(cons|car|cdr|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b/,lookbehind:!0},string:/(["])(?:(?=(\\?))\2.)*?\1|'[^('|\s)]+/,number:{pattern:/(\s|\))[-+]?[0-9]*\.?[0-9]+((\s*)[-+]{1}(\s*)[0-9]*\.?[0-9]+i)?/,lookbehind:!0},operator:/(\*|\+|\-|%|\/|<=|=>|>=|<|=|>)/,"function":{pattern:/([(])[^(\s|\))]*\s/,lookbehind:!0},punctuation:/[()]/};
\ No newline at end of file

From 722bfe28651c29acbce479b3f159c3d46d9026c3 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 21 Aug 2015 08:14:20 +0200
Subject: [PATCH 194/310] Groovy: Allow for multi-line slashy strings

---
 components/prism-groovy.js     | 3 ++-
 components/prism-groovy.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/prism-groovy.js b/components/prism-groovy.js
index 3d5890f650..0992d77e04 100644
--- a/components/prism-groovy.js
+++ b/components/prism-groovy.js
@@ -1,6 +1,6 @@
 Prism.languages.groovy = Prism.languages.extend('clike', {
 	'keyword': /\b(as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,
-	'string': /("""|''')[\W\w]*?\1|("|'|\/)(?:\\?.)*?\2|(\$\/)(\$\/\$|[\W\w])*?\/\$/,
+	'string': /("""|''')[\W\w]*?\1|("|')(?:\\?.)*?\2|\/(?:\\\/|\\?[^\/])+\/|\$\/(\$\/\$|[\W\w])*?\/\$/,
 	'number': /\b0b[01_]+\b|\b0x[\da-f_]+(\.[\da-f_p\-]+)?\b|\b[\d_]+(\.[\d_]+[e]?[\d]*)?[glidf]\b|[\d_]+(\.[\d_]+)?\b/i,
 	'operator': {
 		pattern: /(^|[^.])(={0,2}~|\?\.|\*?\.@|\.&|\.{1,2}(?!\.)|\.{2}<?(?=\w)|->|\?:|[-+]{1,2}|!|<=>|>{1,3}|<{1,2}|={1,2}|&{1,2}|\|{1,2}|\?|\*{1,2}|\/|\^|%)/,
@@ -27,6 +27,7 @@ Prism.languages.insertBefore('groovy', 'function', {
 	}
 });
 
+// Handle string interpolation
 Prism.hooks.add('wrap', function(env) {
 	if (env.language === 'groovy' && env.type === 'string') {
 		var delimiter = env.content[0];
diff --git a/components/prism-groovy.min.js b/components/prism-groovy.min.js
index 63ed1996e7..46fc9c3668 100644
--- a/components/prism-groovy.min.js
+++ b/components/prism-groovy.min.js
@@ -1 +1 @@
-Prism.languages.groovy=Prism.languages.extend("clike",{keyword:/\b(as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,string:/("""|''')[\W\w]*?\1|("|'|\/)(?:\\?.)*?\2|(\$\/)(\$\/\$|[\W\w])*?\/\$/,number:/\b0b[01_]+\b|\b0x[\da-f_]+(\.[\da-f_p\-]+)?\b|\b[\d_]+(\.[\d_]+[e]?[\d]*)?[glidf]\b|[\d_]+(\.[\d_]+)?\b/i,operator:{pattern:/(^|[^.])(={0,2}~|\?\.|\*?\.@|\.&|\.{1,2}(?!\.)|\.{2}<?(?=\w)|->|\?:|[-+]{1,2}|!|<=>|>{1,3}|<{1,2}|={1,2}|&{1,2}|\|{1,2}|\?|\*{1,2}|\/|\^|%)/,lookbehind:!0},punctuation:/\.+|[{}[\];(),:$]/}),Prism.languages.insertBefore("groovy","string",{shebang:{pattern:/#!.+/,alias:"comment"}}),Prism.languages.insertBefore("groovy","punctuation",{"spock-block":/\b(setup|given|when|then|and|cleanup|expect|where):/}),Prism.languages.insertBefore("groovy","function",{annotation:{pattern:/(^|[^.])@\w+/,lookbehind:!0}}),Prism.hooks.add("wrap",function(e){if("groovy"===e.language&&"string"===e.type){var t=e.content[0];if("'"!=t){var n=/([^\\])(\$(\{.*?\}|[\w\.]+))/;"$"===t&&(n=/([^\$])(\$(\{.*?\}|[\w\.]+))/),e.content=Prism.highlight(e.content,{expression:{pattern:n,lookbehind:!0,inside:Prism.languages.groovy}}),e.classes.push("/"===t?"regex":"gstring")}}});
\ No newline at end of file
+Prism.languages.groovy=Prism.languages.extend("clike",{keyword:/\b(as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,string:/("""|''')[\W\w]*?\1|("|')(?:\\?.)*?\2|\/(?:\\\/|\\?[^\/])+\/|\$\/(\$\/\$|[\W\w])*?\/\$/,number:/\b0b[01_]+\b|\b0x[\da-f_]+(\.[\da-f_p\-]+)?\b|\b[\d_]+(\.[\d_]+[e]?[\d]*)?[glidf]\b|[\d_]+(\.[\d_]+)?\b/i,operator:{pattern:/(^|[^.])(={0,2}~|\?\.|\*?\.@|\.&|\.{1,2}(?!\.)|\.{2}<?(?=\w)|->|\?:|[-+]{1,2}|!|<=>|>{1,3}|<{1,2}|={1,2}|&{1,2}|\|{1,2}|\?|\*{1,2}|\/|\^|%)/,lookbehind:!0},punctuation:/\.+|[{}[\];(),:$]/}),Prism.languages.insertBefore("groovy","string",{shebang:{pattern:/#!.+/,alias:"comment"}}),Prism.languages.insertBefore("groovy","punctuation",{"spock-block":/\b(setup|given|when|then|and|cleanup|expect|where):/}),Prism.languages.insertBefore("groovy","function",{annotation:{pattern:/(^|[^.])@\w+/,lookbehind:!0}}),Prism.hooks.add("wrap",function(e){if("groovy"===e.language&&"string"===e.type){var t=e.content[0];if("'"!=t){var n=/([^\\])(\$(\{.*?\}|[\w\.]+))/;"$"===t&&(n=/([^\$])(\$(\{.*?\}|[\w\.]+))/),e.content=Prism.highlight(e.content,{expression:{pattern:n,lookbehind:!0,inside:Prism.languages.groovy}}),e.classes.push("/"===t?"regex":"gstring")}}});
\ No newline at end of file

From 55fcc58e0c248f2ae95f21402e5cb50010c3d80d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 21 Aug 2015 09:14:52 +0200
Subject: [PATCH 195/310] Groovy: Revert last change: don't allow for
 multi-line slashy strings, because it will mess up with division operator +
 Improved operators regex

---
 components/prism-groovy.js     | 6 +++---
 components/prism-groovy.min.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/prism-groovy.js b/components/prism-groovy.js
index 0992d77e04..dfb3657390 100644
--- a/components/prism-groovy.js
+++ b/components/prism-groovy.js
@@ -1,9 +1,9 @@
 Prism.languages.groovy = Prism.languages.extend('clike', {
 	'keyword': /\b(as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,
-	'string': /("""|''')[\W\w]*?\1|("|')(?:\\?.)*?\2|\/(?:\\\/|\\?[^\/])+\/|\$\/(\$\/\$|[\W\w])*?\/\$/,
-	'number': /\b0b[01_]+\b|\b0x[\da-f_]+(\.[\da-f_p\-]+)?\b|\b[\d_]+(\.[\d_]+[e]?[\d]*)?[glidf]\b|[\d_]+(\.[\d_]+)?\b/i,
+	'string': /("""|''')[\W\w]*?\1|("|'|\/)(?:\\?.)*?\2|(\$\/)(\$\/\$|[\W\w])*?\/\$/,
+	'number': /\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?[\d]+)?)[glidf]?\b/i,
 	'operator': {
-		pattern: /(^|[^.])(={0,2}~|\?\.|\*?\.@|\.&|\.{1,2}(?!\.)|\.{2}<?(?=\w)|->|\?:|[-+]{1,2}|!|<=>|>{1,3}|<{1,2}|={1,2}|&{1,2}|\|{1,2}|\?|\*{1,2}|\/|\^|%)/,
+		pattern: /(^|[^.])(~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.{1,2}(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,
 		lookbehind: true
 	},
 	'punctuation': /\.+|[{}[\];(),:$]/
diff --git a/components/prism-groovy.min.js b/components/prism-groovy.min.js
index 46fc9c3668..6069cf5c71 100644
--- a/components/prism-groovy.min.js
+++ b/components/prism-groovy.min.js
@@ -1 +1 @@
-Prism.languages.groovy=Prism.languages.extend("clike",{keyword:/\b(as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,string:/("""|''')[\W\w]*?\1|("|')(?:\\?.)*?\2|\/(?:\\\/|\\?[^\/])+\/|\$\/(\$\/\$|[\W\w])*?\/\$/,number:/\b0b[01_]+\b|\b0x[\da-f_]+(\.[\da-f_p\-]+)?\b|\b[\d_]+(\.[\d_]+[e]?[\d]*)?[glidf]\b|[\d_]+(\.[\d_]+)?\b/i,operator:{pattern:/(^|[^.])(={0,2}~|\?\.|\*?\.@|\.&|\.{1,2}(?!\.)|\.{2}<?(?=\w)|->|\?:|[-+]{1,2}|!|<=>|>{1,3}|<{1,2}|={1,2}|&{1,2}|\|{1,2}|\?|\*{1,2}|\/|\^|%)/,lookbehind:!0},punctuation:/\.+|[{}[\];(),:$]/}),Prism.languages.insertBefore("groovy","string",{shebang:{pattern:/#!.+/,alias:"comment"}}),Prism.languages.insertBefore("groovy","punctuation",{"spock-block":/\b(setup|given|when|then|and|cleanup|expect|where):/}),Prism.languages.insertBefore("groovy","function",{annotation:{pattern:/(^|[^.])@\w+/,lookbehind:!0}}),Prism.hooks.add("wrap",function(e){if("groovy"===e.language&&"string"===e.type){var t=e.content[0];if("'"!=t){var n=/([^\\])(\$(\{.*?\}|[\w\.]+))/;"$"===t&&(n=/([^\$])(\$(\{.*?\}|[\w\.]+))/),e.content=Prism.highlight(e.content,{expression:{pattern:n,lookbehind:!0,inside:Prism.languages.groovy}}),e.classes.push("/"===t?"regex":"gstring")}}});
\ No newline at end of file
+Prism.languages.groovy=Prism.languages.extend("clike",{keyword:/\b(as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/,string:/("""|''')[\W\w]*?\1|("|'|\/)(?:\\?.)*?\2|(\$\/)(\$\/\$|[\W\w])*?\/\$/,number:/\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?[\d]+)?)[glidf]?\b/i,operator:{pattern:/(^|[^.])(~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.{1,2}(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,lookbehind:!0},punctuation:/\.+|[{}[\];(),:$]/}),Prism.languages.insertBefore("groovy","string",{shebang:{pattern:/#!.+/,alias:"comment"}}),Prism.languages.insertBefore("groovy","punctuation",{"spock-block":/\b(setup|given|when|then|and|cleanup|expect|where):/}),Prism.languages.insertBefore("groovy","function",{annotation:{pattern:/(^|[^.])@\w+/,lookbehind:!0}}),Prism.hooks.add("wrap",function(e){if("groovy"===e.language&&"string"===e.type){var t=e.content[0];if("'"!=t){var n=/([^\\])(\$(\{.*?\}|[\w\.]+))/;"$"===t&&(n=/([^\$])(\$(\{.*?\}|[\w\.]+))/),e.content=Prism.highlight(e.content,{expression:{pattern:n,lookbehind:!0,inside:Prism.languages.groovy}}),e.classes.push("/"===t?"regex":"gstring")}}});
\ No newline at end of file

From aa757f6c5f4d1a9a170928ece8f1c162c9a289e8 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 21 Aug 2015 19:05:38 +0200
Subject: [PATCH 196/310] C-like: add word boundary before class-name prefixes

---
 components/prism-clike.js     | 2 +-
 components/prism-clike.min.js | 2 +-
 prism.js                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index c497995abc..3f4bb63524 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -11,7 +11,7 @@ Prism.languages.clike = {
 	],
 	'string': /("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 	'class-name': {
-		pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
+		pattern: /((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,
 		inside: {
 			punctuation: /(\.|\\)/
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index f79d3a4aea..29cd28125a 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index fd979fbf77..bf5f6f83a2 100644
--- a/prism.js
+++ b/prism.js
@@ -551,7 +551,7 @@ Prism.languages.clike = {
 	],
 	'string': /("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 	'class-name': {
-		pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
+		pattern: /((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,
 		lookbehind: true,
 		inside: {
 			punctuation: /(\.|\\)/

From 07ade2c36d77a9fcd50d675a0066344d907b01e9 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 21 Aug 2015 19:07:41 +0200
Subject: [PATCH 197/310] Add tests for Groovy

---
 .../languages/groovy/annotation_feature.test  | 17 ++++++
 tests/languages/groovy/keyword_feature.test   | 61 +++++++++++++++++++
 tests/languages/groovy/number_feature.test    | 43 +++++++++++++
 tests/languages/groovy/operator_feature.test  | 45 ++++++++++++++
 tests/languages/groovy/shebang_feature.test   | 13 ++++
 .../languages/groovy/spock-block_feature.test | 25 ++++++++
 tests/languages/groovy/string_feature.test    | 48 +++++++++++++++
 7 files changed, 252 insertions(+)
 create mode 100644 tests/languages/groovy/annotation_feature.test
 create mode 100644 tests/languages/groovy/keyword_feature.test
 create mode 100644 tests/languages/groovy/number_feature.test
 create mode 100644 tests/languages/groovy/operator_feature.test
 create mode 100644 tests/languages/groovy/shebang_feature.test
 create mode 100644 tests/languages/groovy/spock-block_feature.test
 create mode 100644 tests/languages/groovy/string_feature.test

diff --git a/tests/languages/groovy/annotation_feature.test b/tests/languages/groovy/annotation_feature.test
new file mode 100644
index 0000000000..f956c52798
--- /dev/null
+++ b/tests/languages/groovy/annotation_feature.test
@@ -0,0 +1,17 @@
+@BaseScript MyBaseClass baseScript
+@DelegatesTo(EmailSpec)
+
+----------------------------------------------------
+
+[
+	["annotation", "@BaseScript"],
+	" MyBaseClass baseScript\r\n",
+	["annotation", "@DelegatesTo"],
+	["punctuation", "("],
+	"EmailSpec",
+	["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for annotations.
\ No newline at end of file
diff --git a/tests/languages/groovy/keyword_feature.test b/tests/languages/groovy/keyword_feature.test
new file mode 100644
index 0000000000..57b7e16419
--- /dev/null
+++ b/tests/languages/groovy/keyword_feature.test
@@ -0,0 +1,61 @@
+as def in abstract
+assert boolean break
+byte case catch char
+class;
+const continue
+default do double else
+enum
+extends;
+final
+finally float for goto
+if
+implements;
+import
+instanceof;
+int
+interface;
+long native
+new;
+package private protected
+public return short
+static strictfp super
+switch synchronized this
+throw throws
+trait;
+transient
+try void volatile while
+
+----------------------------------------------------
+
+[
+	["keyword", "as"], ["keyword", "def"], ["keyword", "in"], ["keyword", "abstract"],
+	["keyword", "assert"], ["keyword", "boolean"], ["keyword", "break"],
+	["keyword", "byte"], ["keyword", "case"], ["keyword", "catch"], ["keyword", "char"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "const"], ["keyword", "continue"],
+	["keyword", "default"], ["keyword", "do"], ["keyword", "double"], ["keyword", "else"],
+	["keyword", "enum"],
+	["keyword", "extends"], ["punctuation", ";"],
+	["keyword", "final"],
+	["keyword", "finally"], ["keyword", "float"], ["keyword", "for"], ["keyword", "goto"],
+	["keyword", "if"],
+	["keyword", "implements"], ["punctuation", ";"],
+	["keyword", "import"],
+	["keyword", "instanceof"], ["punctuation", ";"],
+	["keyword", "int"],
+	["keyword", "interface"], ["punctuation", ";"],
+	["keyword", "long"], ["keyword", "native"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "package"], ["keyword", "private"], ["keyword", "protected"],
+	["keyword", "public"], ["keyword", "return"], ["keyword", "short"],
+	["keyword", "static"], ["keyword", "strictfp"], ["keyword", "super"],
+	["keyword", "switch"], ["keyword", "synchronized"], ["keyword", "this"],
+	["keyword", "throw"], ["keyword", "throws"],
+	["keyword", "trait"], ["punctuation", ";"],
+	["keyword", "transient"],
+	["keyword", "try"], ["keyword", "void"], ["keyword", "volatile"], ["keyword", "while"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/groovy/number_feature.test b/tests/languages/groovy/number_feature.test
new file mode 100644
index 0000000000..bd12ff9df0
--- /dev/null
+++ b/tests/languages/groovy/number_feature.test
@@ -0,0 +1,43 @@
+0b0110
+0b0110_1111_0000
+0b01G 0b01L 0b01I
+0b01D 0b01F
+
+0xBABE
+0xBad_Face
+0x1.8p1
+0xa.fp-2
+
+42_000
+3.14_15_9
+1.2e3
+3E+1
+4E-2
+42g 42l 42i
+42d 42f
+
+----------------------------------------------------
+
+[
+	["number", "0b0110"],
+	["number", "0b0110_1111_0000"],
+	["number", "0b01G"], ["number", "0b01L"], ["number", "0b01I"],
+	["number", "0b01D"], ["number", "0b01F"],
+
+	["number", "0xBABE"],
+	["number", "0xBad_Face"],
+	["number", "0x1.8p1"],
+	["number", "0xa.fp-2"],
+
+	["number", "42_000"],
+	["number", "3.14_15_9"],
+	["number", "1.2e3"],
+	["number", "3E+1"],
+	["number", "4E-2"],
+	["number", "42g"], ["number", "42l"], ["number", "42i"],
+	["number", "42d"], ["number", "42f"]
+]
+
+----------------------------------------------------
+
+Checks for binary, hexadecimal and decimal numbers.
\ No newline at end of file
diff --git a/tests/languages/groovy/operator_feature.test b/tests/languages/groovy/operator_feature.test
new file mode 100644
index 0000000000..cce07a9912
--- /dev/null
+++ b/tests/languages/groovy/operator_feature.test
@@ -0,0 +1,45 @@
+~
+= == =~ ==~
+? ?. ?:
+* ** *. *= **=
+. .@ .&
+5..8
+5..<8
+- -- -= ->
++ ++ +=
+! !=
+< << <<= <= <=>
+> >> >>> >>= >>>= >=
+& && &=
+| || |=
+/
+/=
+^ ^=
+% %=
+
+----------------------------------------------------
+
+[
+	["operator", "~"],
+	["operator", "="], ["operator", "=="], ["operator", "=~"], ["operator", "==~"],
+	["operator", "?"], ["operator", "?."], ["operator", "?:"],
+	["operator", "*"], ["operator", "**"], ["operator", "*."], ["operator", "*="], ["operator", "**="],
+	["operator", "."], ["operator", ".@"], ["operator", ".&"],
+	["number", "5"], ["operator", ".."], ["number", "8"],
+	["number", "5"], ["operator", "..<"], ["number", "8"],
+	["operator", "-"], ["operator", "--"], ["operator", "-="], ["operator", "->"],
+	["operator", "+"], ["operator", "++"], ["operator", "+="],
+	["operator", "!"], ["operator", "!="],
+	["operator", "<"], ["operator", "<<"], ["operator", "<<="], ["operator", "<="], ["operator", "<=>"],
+	["operator", ">"], ["operator", ">>"], ["operator", ">>>"], ["operator", ">>="], ["operator", ">>>="], ["operator", ">="],
+	["operator", "&"], ["operator", "&&"], ["operator", "&="],
+	["operator", "|"], ["operator", "||"], ["operator", "|="],
+	["operator", "/"],
+	["operator", "/="],
+	["operator", "^"], ["operator", "^="],
+	["operator", "%"], ["operator", "%="]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/groovy/shebang_feature.test b/tests/languages/groovy/shebang_feature.test
new file mode 100644
index 0000000000..c5806ebbb3
--- /dev/null
+++ b/tests/languages/groovy/shebang_feature.test
@@ -0,0 +1,13 @@
+#!foobar
+#!/usr/bin/env groovy
+
+----------------------------------------------------
+
+[
+	["shebang", "#!foobar"],
+	["shebang", "#!/usr/bin/env groovy"]
+]
+
+----------------------------------------------------
+
+Check for shebang comments.
\ No newline at end of file
diff --git a/tests/languages/groovy/spock-block_feature.test b/tests/languages/groovy/spock-block_feature.test
new file mode 100644
index 0000000000..5cc72fe830
--- /dev/null
+++ b/tests/languages/groovy/spock-block_feature.test
@@ -0,0 +1,25 @@
+setup:
+given:
+when:
+then:
+and:
+cleanup:
+expect:
+where:
+
+----------------------------------------------------
+
+[
+	["spock-block", "setup:"],
+	["spock-block", "given:"],
+	["spock-block", "when:"],
+	["spock-block", "then:"],
+	["spock-block", "and:"],
+	["spock-block", "cleanup:"],
+	["spock-block", "expect:"],
+	["spock-block", "where:"]
+]
+
+----------------------------------------------------
+
+Checks for all spock blocks.
\ No newline at end of file
diff --git a/tests/languages/groovy/string_feature.test b/tests/languages/groovy/string_feature.test
new file mode 100644
index 0000000000..e8dbb046dc
--- /dev/null
+++ b/tests/languages/groovy/string_feature.test
@@ -0,0 +1,48 @@
+""""""
+"""foo"""
+"""foo
+bar"""
+
+''''''
+'''foo'''
+'''foo
+bar'''
+
+""
+"fo\"o"
+''
+'fo\'o'
+
+/foo/
+/fo\/o/
+
+$/fo$/$o/$
+$/foo
+bar/$
+
+----------------------------------------------------
+
+[
+	["string", "\"\"\"\"\"\""],
+	["string", "\"\"\"foo\"\"\""],
+	["string", "\"\"\"foo\r\nbar\"\"\""],
+	["string", "''''''"],
+	["string", "'''foo'''"],
+	["string", "'''foo\r\nbar'''"],
+
+	["string", "\"\""],
+	["string", "\"fo\\\"o\""],
+	["string", "''"],
+	["string", "'fo\\'o'"],
+
+	["string", "/foo/"],
+	["string", "/fo\\/o/"],
+
+	["string", "$/fo$/$o/$"],
+	["string", "$/foo\r\nbar/$"]
+]
+
+----------------------------------------------------
+
+Checks for single quoted, triple single quoted, double quoted,
+triple double quoted, slashy and dollar slashy strings.
\ No newline at end of file

From f77b40b7e83839a17f1dac1933580285ce0c1411 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 22 Aug 2015 22:41:31 +0200
Subject: [PATCH 198/310] Haml: Combine both multiline-comment regexps + handle
 \r\n and \r

---
 components/prism-haml.js     | 35 ++++++++++++++---------------------
 components/prism-haml.min.js |  2 +-
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/components/prism-haml.js b/components/prism-haml.js
index eb0b9a9138..8c28c8ae7b 100644
--- a/components/prism-haml.js
+++ b/components/prism-haml.js
@@ -10,29 +10,22 @@
 	Prism.languages.haml = {
 		// Multiline stuff should appear before the rest
 
-		'multiline-comment': [
-			{
-				pattern: /((?:^|\n)([\t ]*))\/.*(\n\2[\t ]+.+)*/,
-				lookbehind: true,
-				alias: 'comment'
-			},
-			{
-				pattern: /((?:^|\n)([\t ]*))-#.*(\n\2[\t ]+.+)*/,
-				lookbehind: true,
-				alias: 'comment'
-			}
-		],
+		'multiline-comment': {
+			pattern: /((?:^|\r?\n|\r)([\t ]*))(?:\/|-#).*((?:\r?\n|\r)\2[\t ]+.+)*/,
+			lookbehind: true,
+			alias: 'comment'
+		},
 
 		'multiline-code': [
 			{
-				pattern: /((?:^|\n)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*(\n\2[\t ]+.*,[\t ]*)*(\n\2[\t ]+.+)/,
+				pattern: /((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*((?:\r?\n|\r)\2[\t ]+.*,[\t ]*)*((?:\r?\n|\r)\2[\t ]+.+)/,
 				lookbehind: true,
 				inside: {
 					rest: Prism.languages.ruby
 				}
 			},
 			{
-				pattern: /((?:^|\n)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*(\n\2[\t ]+.*\|[\t ]*)*/,
+				pattern: /((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*((?:\r?\n|\r)\2[\t ]+.*\|[\t ]*)*/,
 				lookbehind: true,
 				inside: {
 					rest: Prism.languages.ruby
@@ -42,7 +35,7 @@
 
 		// See at the end of the file for known filters
 		'filter': {
-			pattern: /((?:^|\n)([\t ]*)):[\w-]+(\n(?:\2[\t ]+.+|\s*?(?=\n)))+/,
+			pattern: /((?:^|\r?\n|\r)([\t ]*)):[\w-]+((?:\r?\n|\r)(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/,
 			lookbehind: true,
 			inside: {
 				'filter-name': {
@@ -53,19 +46,19 @@
 		},
 
 		'markup': {
-			pattern: /((?:^|\n)[\t ]*)<.+/,
+			pattern: /((?:^|\r?\n|\r)[\t ]*)<.+/,
 			lookbehind: true,
 			inside: {
 				rest: Prism.languages.markup
 			}
 		},
 		'doctype': {
-			pattern: /((?:^|\n)[\t ]*)!!!(?: .+)?/,
+			pattern: /((?:^|\r?\n|\r)[\t ]*)!!!(?: .+)?/,
 			lookbehind: true
 		},
 		'tag': {
 			// Allows for one nested group of braces
-			pattern: /((?:^|\n)[\t ]*)[%.#][\w\-#.]*[\w\-](?:\([^)]+\)|\{(?:\{[^}]+\}|[^}])+\}|\[[^\]]+\])*[\/<>]*/,
+			pattern: /((?:^|\r?\n|\r)[\t ]*)[%.#][\w\-#.]*[\w\-](?:\([^)]+\)|\{(?:\{[^}]+\}|[^}])+\}|\[[^\]]+\])*[\/<>]*/,
 			lookbehind: true,
 			inside: {
 				'attributes': [
@@ -100,7 +93,7 @@
 			}
 		},
 		'code': {
-			pattern: /((?:^|\n)[\t ]*(?:[~-]|[&!]?=)).+/,
+			pattern: /((?:^|\r?\n|\r)[\t ]*(?:[~-]|[&!]?=)).+/,
 			lookbehind: true,
 			inside: {
 				rest: Prism.languages.ruby
@@ -118,12 +111,12 @@
 			}
 		},
 		'punctuation': {
-			pattern: /((?:^|\n)[\t ]*)[~=\-&!]/,
+			pattern: /((?:^|\r?\n|\r)[\t ]*)[~=\-&!]/,
 			lookbehind: true
 		}
 	};
 
-	var filter_pattern = '((?:^|\\n)([\\t ]*)):{{filter_name}}(\\n(?:\\2[\\t ]+.+|\\s*?(?=\\n)))+';
+	var filter_pattern = '((?:^|\\r?\\n|\\r)([\\t ]*)):{{filter_name}}(\\n(?:\\2[\\t ]+.+|\\s*?(?=\\n)))+';
 
 	// Non exhaustive list of available filters and associated languages
 	var filters = [
diff --git a/components/prism-haml.min.js b/components/prism-haml.min.js
index 9af046e489..cf97e7c38b 100644
--- a/components/prism-haml.min.js
+++ b/components/prism-haml.min.js
@@ -1 +1 @@
-!function(e){e.languages.haml={"multiline-comment":[{pattern:/((?:^|\n)([\t ]*))\/.*(\n\2[\t ]+.+)*/,lookbehind:!0,alias:"comment"},{pattern:/((?:^|\n)([\t ]*))-#.*(\n\2[\t ]+.+)*/,lookbehind:!0,alias:"comment"}],"multiline-code":[{pattern:/((?:^|\n)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*(\n\2[\t ]+.*,[\t ]*)*(\n\2[\t ]+.+)/,lookbehind:!0,inside:{rest:e.languages.ruby}},{pattern:/((?:^|\n)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*(\n\2[\t ]+.*\|[\t ]*)*/,lookbehind:!0,inside:{rest:e.languages.ruby}}],filter:{pattern:/((?:^|\n)([\t ]*)):[\w-]+(\n(?:\2[\t ]+.+|\s*?(?=\n)))+/,lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"}}},markup:{pattern:/((?:^|\n)[\t ]*)<.+/,lookbehind:!0,inside:{rest:e.languages.markup}},doctype:{pattern:/((?:^|\n)[\t ]*)!!!(?: .+)?/,lookbehind:!0},tag:{pattern:/((?:^|\n)[\t ]*)[%.#][\w\-#.]*[\w\-](?:\([^)]+\)|\{(?:\{[^}]+\}|[^}])+\}|\[[^\]]+\])*[\/<>]*/,lookbehind:!0,inside:{attributes:[{pattern:/(^|[^#])\{(?:\{[^}]+\}|[^}])+\}/,lookbehind:!0,inside:{rest:e.languages.ruby}},{pattern:/\([^)]+\)/,inside:{"attr-value":{pattern:/(=\s*)(?:"(?:\\?.)*?"|[^)\s]+)/,lookbehind:!0},"attr-name":/[\w:-]+(?=\s*!?=|\s*[,)])/,punctuation:/[=(),]/}},{pattern:/\[[^\]]+\]/,inside:{rest:e.languages.ruby}}],punctuation:/[<>]/}},code:{pattern:/((?:^|\n)[\t ]*(?:[~-]|[&!]?=)).+/,lookbehind:!0,inside:{rest:e.languages.ruby}},interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"},rest:e.languages.ruby}},punctuation:{pattern:/((?:^|\n)[\t ]*)[~=\-&!]/,lookbehind:!0}};for(var t="((?:^|\\n)([\\t ]*)):{{filter_name}}(\\n(?:\\2[\\t ]+.+|\\s*?(?=\\n)))+",n=["css",{filter:"coffee",language:"coffeescript"},"erb","javascript","less","markdown","ruby","scss","textile"],a={},i=0,r=n.length;r>i;i++){var l=n[i];l="string"==typeof l?{filter:l,language:l}:l,e.languages[l.language]&&(a["filter-"+l.filter]={pattern:RegExp(t.replace("{{filter_name}}",l.filter)),lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},rest:e.languages[l.language]}})}e.languages.insertBefore("haml","filter",a)}(Prism);
\ No newline at end of file
+!function(e){e.languages.haml={"multiline-comment":{pattern:/((?:^|\r?\n|\r)([\t ]*))(?:\/|-#).*((?:\r?\n|\r)\2[\t ]+.+)*/,lookbehind:!0,alias:"comment"},"multiline-code":[{pattern:/((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*((?:\r?\n|\r)\2[\t ]+.*,[\t ]*)*((?:\r?\n|\r)\2[\t ]+.+)/,lookbehind:!0,inside:{rest:e.languages.ruby}},{pattern:/((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*((?:\r?\n|\r)\2[\t ]+.*\|[\t ]*)*/,lookbehind:!0,inside:{rest:e.languages.ruby}}],filter:{pattern:/((?:^|\r?\n|\r)([\t ]*)):[\w-]+((?:\r?\n|\r)(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/,lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"}}},markup:{pattern:/((?:^|\r?\n|\r)[\t ]*)<.+/,lookbehind:!0,inside:{rest:e.languages.markup}},doctype:{pattern:/((?:^|\r?\n|\r)[\t ]*)!!!(?: .+)?/,lookbehind:!0},tag:{pattern:/((?:^|\r?\n|\r)[\t ]*)[%.#][\w\-#.]*[\w\-](?:\([^)]+\)|\{(?:\{[^}]+\}|[^}])+\}|\[[^\]]+\])*[\/<>]*/,lookbehind:!0,inside:{attributes:[{pattern:/(^|[^#])\{(?:\{[^}]+\}|[^}])+\}/,lookbehind:!0,inside:{rest:e.languages.ruby}},{pattern:/\([^)]+\)/,inside:{"attr-value":{pattern:/(=\s*)(?:"(?:\\?.)*?"|[^)\s]+)/,lookbehind:!0},"attr-name":/[\w:-]+(?=\s*!?=|\s*[,)])/,punctuation:/[=(),]/}},{pattern:/\[[^\]]+\]/,inside:{rest:e.languages.ruby}}],punctuation:/[<>]/}},code:{pattern:/((?:^|\r?\n|\r)[\t ]*(?:[~-]|[&!]?=)).+/,lookbehind:!0,inside:{rest:e.languages.ruby}},interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"},rest:e.languages.ruby}},punctuation:{pattern:/((?:^|\r?\n|\r)[\t ]*)[~=\-&!]/,lookbehind:!0}};for(var t="((?:^|\\r?\\n|\\r)([\\t ]*)):{{filter_name}}(\\n(?:\\2[\\t ]+.+|\\s*?(?=\\n)))+",n=["css",{filter:"coffee",language:"coffeescript"},"erb","javascript","less","markdown","ruby","scss","textile"],r={},a=0,i=n.length;i>a;a++){var l=n[a];l="string"==typeof l?{filter:l,language:l}:l,e.languages[l.language]&&(r["filter-"+l.filter]={pattern:RegExp(t.replace("{{filter_name}}",l.filter)),lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},rest:e.languages[l.language]}})}e.languages.insertBefore("haml","filter",r)}(Prism);
\ No newline at end of file

From 135ee9d1ee4195c6c0b9f23dfe218f043990a68d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 22 Aug 2015 23:39:15 +0200
Subject: [PATCH 199/310] C-like: Improved operator regex + add != and !==

---
 components/prism-clike.js     | 2 +-
 components/prism-clike.min.js | 2 +-
 prism.js                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-clike.js b/components/prism-clike.js
index 3f4bb63524..f0a526a128 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -21,6 +21,6 @@ Prism.languages.clike = {
 	'boolean': /\b(true|false)\b/,
 	'function': /[a-z0-9_]+(?=\()/i,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
-	'operator': /[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,
+	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
 	'punctuation': /[{}[\];(),.:]/
 };
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index 29cd28125a..8cb049bf22 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index bf5f6f83a2..fe17031325 100644
--- a/prism.js
+++ b/prism.js
@@ -561,7 +561,7 @@ Prism.languages.clike = {
 	'boolean': /\b(true|false)\b/,
 	'function': /[a-z0-9_]+(?=\()/i,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
-	'operator': /[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,
+	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
 	'punctuation': /[{}[\];(),.:]/
 };
 

From 62bdd9af78ae6542252c9d3813db58b5cf4ce9ce Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 22 Aug 2015 23:41:40 +0200
Subject: [PATCH 200/310] Fix C-like test for operators

---
 tests/languages/clike/operator_feature.test | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/languages/clike/operator_feature.test b/tests/languages/clike/operator_feature.test
index ec68a4af2c..1a4c6495da 100644
--- a/tests/languages/clike/operator_feature.test
+++ b/tests/languages/clike/operator_feature.test
@@ -1,6 +1,7 @@
 - + -- ++
-! < <= > >=
+< <= > >=
 = == ===
+! != !==
 & && | ||
 ? * / ~ ^ %
 
@@ -8,8 +9,9 @@
 
 [
 	["operator", "-"], ["operator", "+"], ["operator", "--"], ["operator", "++"],
-	["operator", "!"], ["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
+	["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
 	["operator", "="], ["operator", "=="], ["operator", "==="],
+	["operator", "!"], ["operator", "!="], ["operator", "!=="],
 	["operator", "&"], ["operator", "&&"], ["operator", "|"], ["operator", "||"],
 	["operator", "?"], ["operator", "*"], ["operator", "/"], ["operator", "~"], ["operator", "^"], ["operator", "%"]
 ]

From dd4989f5f8c90babee1087dbd52953f9d732eb6b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 22 Aug 2015 23:47:59 +0200
Subject: [PATCH 201/310] Ruby: Code cleaning, handle \r\n and \r, fix some
 regexps

---
 components/prism-ruby.js     | 17 ++++++++++-------
 components/prism-ruby.min.js |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/components/prism-ruby.js b/components/prism-ruby.js
index 030eefe9f7..e8e220b504 100644
--- a/components/prism-ruby.js
+++ b/components/prism-ruby.js
@@ -5,10 +5,8 @@
  * 		constant, builtin, variable, symbol, regex
  */
 Prism.languages.ruby = Prism.languages.extend('clike', {
-	'comment': /#(?!\{[^\r\n]*?\})[^\r\n]*(\r?\n|$)/,
-	'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/,
-	'builtin': /\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
-	'constant': /\b[A-Z][a-zA-Z_0-9]*[?!]?\b/
+	'comment': /#(?!\{[^\r\n]*?\}).*/,
+	'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/
 });
 
 Prism.languages.insertBefore('ruby', 'keyword', {
@@ -16,12 +14,17 @@ Prism.languages.insertBefore('ruby', 'keyword', {
 		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true
 	},
-	'variable': /[@$]+\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/,
-	'symbol': /:\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/
+	'variable': /[@$]+[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/,
+	'symbol': /:[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/
+});
+
+Prism.languages.insertBefore('ruby', 'number', {
+	'builtin': /\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
+	'constant': /\b[A-Z][a-zA-Z_0-9]*(?:[?!]|\b)/
 });
 
 Prism.languages.ruby.string = {
-	pattern: /("|')(#\{[^}]+\}|\\\n|\\?.)*?\1/,
+	pattern: /("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,
 	inside: {
 		'interpolation': {
 			pattern: /#\{[^}]+\}/,
diff --git a/components/prism-ruby.min.js b/components/prism-ruby.min.js
index f8f899dcd3..675a76c3d6 100644
--- a/components/prism-ruby.min.js
+++ b/components/prism-ruby.min.js
@@ -1 +1 @@
-Prism.languages.ruby=Prism.languages.extend("clike",{comment:/#(?!\{[^\r\n]*?\})[^\r\n]*(\r?\n|$)/,keyword:/\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/,builtin:/\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,constant:/\b[A-Z][a-zA-Z_0-9]*[?!]?\b/}),Prism.languages.insertBefore("ruby","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0},variable:/[@$]+\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/,symbol:/:\b[a-zA-Z_][a-zA-Z_0-9]*[?!]?\b/}),Prism.languages.ruby.string={pattern:/("|')(#\{[^}]+\}|\\\n|\\?.)*?\1/,inside:{interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"tag"},rest:Prism.util.clone(Prism.languages.ruby)}}}};
\ No newline at end of file
+Prism.languages.ruby=Prism.languages.extend("clike",{comment:/#(?!\{[^\r\n]*?\}).*/,keyword:/\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/}),Prism.languages.insertBefore("ruby","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0},variable:/[@$]+[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/,symbol:/:[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/}),Prism.languages.insertBefore("ruby","number",{builtin:/\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,constant:/\b[A-Z][a-zA-Z_0-9]*(?:[?!]|\b)/}),Prism.languages.ruby.string={pattern:/("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,inside:{interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"tag"},rest:Prism.util.clone(Prism.languages.ruby)}}}};
\ No newline at end of file

From 5bb0b15aeee093801d92cb80a64881429c87c213 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 22 Aug 2015 23:50:05 +0200
Subject: [PATCH 202/310] Add tests for Ruby

---
 tests/languages/ruby/builtin_feature.test  | 29 ++++++++++++++
 tests/languages/ruby/comment_feature.test  | 13 +++++++
 tests/languages/ruby/constant_feature.test | 21 +++++++++++
 tests/languages/ruby/keyword_feature.test  | 39 +++++++++++++++++++
 tests/languages/ruby/regex_feature.test    | 15 ++++++++
 tests/languages/ruby/string_feature.test   | 44 ++++++++++++++++++++++
 tests/languages/ruby/symbol_feature.test   | 17 +++++++++
 tests/languages/ruby/variable_feature.test | 27 +++++++++++++
 8 files changed, 205 insertions(+)
 create mode 100644 tests/languages/ruby/builtin_feature.test
 create mode 100644 tests/languages/ruby/comment_feature.test
 create mode 100644 tests/languages/ruby/constant_feature.test
 create mode 100644 tests/languages/ruby/keyword_feature.test
 create mode 100644 tests/languages/ruby/regex_feature.test
 create mode 100644 tests/languages/ruby/string_feature.test
 create mode 100644 tests/languages/ruby/symbol_feature.test
 create mode 100644 tests/languages/ruby/variable_feature.test

diff --git a/tests/languages/ruby/builtin_feature.test b/tests/languages/ruby/builtin_feature.test
new file mode 100644
index 0000000000..e1bb32e934
--- /dev/null
+++ b/tests/languages/ruby/builtin_feature.test
@@ -0,0 +1,29 @@
+Array Bignum Binding
+Class;
+Continuation Dir Exception
+FalseClass File Stat File
+Fixnum Fload Hash Integer
+IO MatchData Method Module
+NilClass Numeric Object
+Proc Range Regexp String
+Struct TMS Symbol ThreadGroup
+Thread Time TrueClass
+
+----------------------------------------------------
+
+[
+	["builtin", "Array"], ["builtin", "Bignum"], ["builtin", "Binding"],
+	["builtin", "Class"], ["punctuation", ";"],
+	["builtin", "Continuation"], ["builtin", "Dir"], ["builtin", "Exception"],
+	["builtin", "FalseClass"], ["builtin", "File"], ["builtin", "Stat"], ["builtin", "File"],
+	["builtin", "Fixnum"], ["builtin", "Fload"], ["builtin", "Hash"], ["builtin", "Integer"],
+	["builtin", "IO"], ["builtin", "MatchData"], ["builtin", "Method"], ["builtin", "Module"],
+	["builtin", "NilClass"], ["builtin", "Numeric"], ["builtin", "Object"],
+	["builtin", "Proc"], ["builtin", "Range"], ["builtin", "Regexp"], ["builtin", "String"],
+	["builtin", "Struct"], ["builtin", "TMS"], ["builtin", "Symbol"], ["builtin", "ThreadGroup"],
+	["builtin", "Thread"], ["builtin", "Time"], ["builtin", "TrueClass"]
+]
+
+----------------------------------------------------
+
+Checks for all builtins.
\ No newline at end of file
diff --git a/tests/languages/ruby/comment_feature.test b/tests/languages/ruby/comment_feature.test
new file mode 100644
index 0000000000..054d6023d1
--- /dev/null
+++ b/tests/languages/ruby/comment_feature.test
@@ -0,0 +1,13 @@
+#
+# foobar
+
+----------------------------------------------------
+
+[
+	["comment", "#"],
+	["comment", "# foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/ruby/constant_feature.test b/tests/languages/ruby/constant_feature.test
new file mode 100644
index 0000000000..220cf7463c
--- /dev/null
+++ b/tests/languages/ruby/constant_feature.test
@@ -0,0 +1,21 @@
+Foobar
+FOO_BAR_42
+F
+FOO
+BAR?
+BAZ!
+
+----------------------------------------------------
+
+[
+	["constant", "Foobar"],
+	["constant", "FOO_BAR_42"],
+	["constant", "F"],
+	["constant", "FOO"],
+	["constant", "BAR?"],
+	["constant", "BAZ!"]
+]
+
+----------------------------------------------------
+
+Checks for constants.
\ No newline at end of file
diff --git a/tests/languages/ruby/keyword_feature.test b/tests/languages/ruby/keyword_feature.test
new file mode 100644
index 0000000000..2292cd0d9c
--- /dev/null
+++ b/tests/languages/ruby/keyword_feature.test
@@ -0,0 +1,39 @@
+alias and BEGIN begin
+break case
+class;
+def
+define_method defined
+do each else elsif
+END end ensure false
+for if in module
+new;
+next nil not
+or raise redo require
+rescue retry return
+self super then throw
+true undef unless until
+when while yield
+
+----------------------------------------------------
+
+[
+	["keyword", "alias"], ["keyword", "and"], ["keyword", "BEGIN"], ["keyword", "begin"],
+	["keyword", "break"], ["keyword", "case"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "def"],
+	["keyword", "define_method"], ["keyword", "defined"],
+	["keyword", "do"], ["keyword", "each"], ["keyword", "else"], ["keyword", "elsif"],
+	["keyword", "END"], ["keyword", "end"], ["keyword", "ensure"], ["keyword", "false"],
+	["keyword", "for"], ["keyword", "if"], ["keyword", "in"], ["keyword", "module"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "next"], ["keyword", "nil"], ["keyword", "not"],
+	["keyword", "or"], ["keyword", "raise"], ["keyword", "redo"], ["keyword", "require"],
+	["keyword", "rescue"], ["keyword", "retry"], ["keyword", "return"],
+	["keyword", "self"], ["keyword", "super"], ["keyword", "then"], ["keyword", "throw"],
+	["keyword", "true"], ["keyword", "undef"], ["keyword", "unless"], ["keyword", "until"],
+	["keyword", "when"], ["keyword", "while"], ["keyword", "yield"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/ruby/regex_feature.test b/tests/languages/ruby/regex_feature.test
new file mode 100644
index 0000000000..da20fe2930
--- /dev/null
+++ b/tests/languages/ruby/regex_feature.test
@@ -0,0 +1,15 @@
+/[foo]\/bar/gim
+/[bar]/,
+/./i;
+
+----------------------------------------------------
+
+[
+	["regex", "/[foo]\\/bar/gim"],
+	["regex", "/[bar]/"], ["punctuation", ","],
+	["regex", "/./i"], ["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for regex.
\ No newline at end of file
diff --git a/tests/languages/ruby/string_feature.test b/tests/languages/ruby/string_feature.test
new file mode 100644
index 0000000000..889ab14e91
--- /dev/null
+++ b/tests/languages/ruby/string_feature.test
@@ -0,0 +1,44 @@
+''
+""
+'foo'
+"foo"
+'foo\
+bar'
+"foo\
+bar"
+
+'foo #{42} bar'
+"foo #{ 42 } bar"
+
+----------------------------------------------------
+
+[
+	["string", ["''"]],
+	["string", ["\"\""]],
+	["string", ["'foo'"]],
+	["string", ["\"foo\""]],
+	["string", ["'foo\\\r\nbar'"]],
+	["string", ["\"foo\\\r\nbar\""]],
+	["string", [
+		"'foo ",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "42"],
+			["delimiter", "}"]
+		]],
+		" bar'"
+	]],
+	["string", [
+        "\"foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        " bar\""
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for strings and string interpolation.
\ No newline at end of file
diff --git a/tests/languages/ruby/symbol_feature.test b/tests/languages/ruby/symbol_feature.test
new file mode 100644
index 0000000000..6a51758056
--- /dev/null
+++ b/tests/languages/ruby/symbol_feature.test
@@ -0,0 +1,17 @@
+:_
+:foo
+:BAR?
+:Baz_42!
+
+----------------------------------------------------
+
+[
+	["symbol", ":_"],
+	["symbol", ":foo"],
+	["symbol", ":BAR?"],
+	["symbol", ":Baz_42!"]
+]
+
+----------------------------------------------------
+
+Checks for symbols.
\ No newline at end of file
diff --git a/tests/languages/ruby/variable_feature.test b/tests/languages/ruby/variable_feature.test
new file mode 100644
index 0000000000..3b7b7c7486
--- /dev/null
+++ b/tests/languages/ruby/variable_feature.test
@@ -0,0 +1,27 @@
+$_
+$foo
+$BAR?
+$Baz_42!
+
+@_
+@foo
+@BAR?
+@Baz_42!
+
+----------------------------------------------------
+
+[
+	["variable", "$_"],
+	["variable", "$foo"],
+	["variable", "$BAR?"],
+	["variable", "$Baz_42!"],
+
+	["variable", "@_"],
+	["variable", "@foo"],
+	["variable", "@BAR?"],
+	["variable", "@Baz_42!"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From bbe68aca0930b1c01d1ccf87961897f8f9df40e1 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 23 Aug 2015 01:20:57 +0200
Subject: [PATCH 203/310] Haml: Handle \r\n and \r in filter regex

---
 components/prism-haml.js     | 4 ++--
 components/prism-haml.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-haml.js b/components/prism-haml.js
index 8c28c8ae7b..e14539f994 100644
--- a/components/prism-haml.js
+++ b/components/prism-haml.js
@@ -111,12 +111,12 @@
 			}
 		},
 		'punctuation': {
-			pattern: /((?:^|\r?\n|\r)[\t ]*)[~=\-&!]/,
+			pattern: /((?:^|\r?\n|\r)[\t ]*)[~=\-&!]+/,
 			lookbehind: true
 		}
 	};
 
-	var filter_pattern = '((?:^|\\r?\\n|\\r)([\\t ]*)):{{filter_name}}(\\n(?:\\2[\\t ]+.+|\\s*?(?=\\n)))+';
+	var filter_pattern = '((?:^|\\r?\\n|\\r)([\\t ]*)):{{filter_name}}((?:\\r?\\n|\\r)(?:\\2[\\t ]+.+|\\s*?(?=\\r?\\n|\\r)))+';
 
 	// Non exhaustive list of available filters and associated languages
 	var filters = [
diff --git a/components/prism-haml.min.js b/components/prism-haml.min.js
index cf97e7c38b..0a717544c3 100644
--- a/components/prism-haml.min.js
+++ b/components/prism-haml.min.js
@@ -1 +1 @@
-!function(e){e.languages.haml={"multiline-comment":{pattern:/((?:^|\r?\n|\r)([\t ]*))(?:\/|-#).*((?:\r?\n|\r)\2[\t ]+.+)*/,lookbehind:!0,alias:"comment"},"multiline-code":[{pattern:/((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*((?:\r?\n|\r)\2[\t ]+.*,[\t ]*)*((?:\r?\n|\r)\2[\t ]+.+)/,lookbehind:!0,inside:{rest:e.languages.ruby}},{pattern:/((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*((?:\r?\n|\r)\2[\t ]+.*\|[\t ]*)*/,lookbehind:!0,inside:{rest:e.languages.ruby}}],filter:{pattern:/((?:^|\r?\n|\r)([\t ]*)):[\w-]+((?:\r?\n|\r)(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/,lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"}}},markup:{pattern:/((?:^|\r?\n|\r)[\t ]*)<.+/,lookbehind:!0,inside:{rest:e.languages.markup}},doctype:{pattern:/((?:^|\r?\n|\r)[\t ]*)!!!(?: .+)?/,lookbehind:!0},tag:{pattern:/((?:^|\r?\n|\r)[\t ]*)[%.#][\w\-#.]*[\w\-](?:\([^)]+\)|\{(?:\{[^}]+\}|[^}])+\}|\[[^\]]+\])*[\/<>]*/,lookbehind:!0,inside:{attributes:[{pattern:/(^|[^#])\{(?:\{[^}]+\}|[^}])+\}/,lookbehind:!0,inside:{rest:e.languages.ruby}},{pattern:/\([^)]+\)/,inside:{"attr-value":{pattern:/(=\s*)(?:"(?:\\?.)*?"|[^)\s]+)/,lookbehind:!0},"attr-name":/[\w:-]+(?=\s*!?=|\s*[,)])/,punctuation:/[=(),]/}},{pattern:/\[[^\]]+\]/,inside:{rest:e.languages.ruby}}],punctuation:/[<>]/}},code:{pattern:/((?:^|\r?\n|\r)[\t ]*(?:[~-]|[&!]?=)).+/,lookbehind:!0,inside:{rest:e.languages.ruby}},interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"},rest:e.languages.ruby}},punctuation:{pattern:/((?:^|\r?\n|\r)[\t ]*)[~=\-&!]/,lookbehind:!0}};for(var t="((?:^|\\r?\\n|\\r)([\\t ]*)):{{filter_name}}(\\n(?:\\2[\\t ]+.+|\\s*?(?=\\n)))+",n=["css",{filter:"coffee",language:"coffeescript"},"erb","javascript","less","markdown","ruby","scss","textile"],r={},a=0,i=n.length;i>a;a++){var l=n[a];l="string"==typeof l?{filter:l,language:l}:l,e.languages[l.language]&&(r["filter-"+l.filter]={pattern:RegExp(t.replace("{{filter_name}}",l.filter)),lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},rest:e.languages[l.language]}})}e.languages.insertBefore("haml","filter",r)}(Prism);
\ No newline at end of file
+!function(e){e.languages.haml={"multiline-comment":{pattern:/((?:^|\r?\n|\r)([\t ]*))(?:\/|-#).*((?:\r?\n|\r)\2[\t ]+.+)*/,lookbehind:!0,alias:"comment"},"multiline-code":[{pattern:/((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*((?:\r?\n|\r)\2[\t ]+.*,[\t ]*)*((?:\r?\n|\r)\2[\t ]+.+)/,lookbehind:!0,inside:{rest:e.languages.ruby}},{pattern:/((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*((?:\r?\n|\r)\2[\t ]+.*\|[\t ]*)*/,lookbehind:!0,inside:{rest:e.languages.ruby}}],filter:{pattern:/((?:^|\r?\n|\r)([\t ]*)):[\w-]+((?:\r?\n|\r)(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/,lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"}}},markup:{pattern:/((?:^|\r?\n|\r)[\t ]*)<.+/,lookbehind:!0,inside:{rest:e.languages.markup}},doctype:{pattern:/((?:^|\r?\n|\r)[\t ]*)!!!(?: .+)?/,lookbehind:!0},tag:{pattern:/((?:^|\r?\n|\r)[\t ]*)[%.#][\w\-#.]*[\w\-](?:\([^)]+\)|\{(?:\{[^}]+\}|[^}])+\}|\[[^\]]+\])*[\/<>]*/,lookbehind:!0,inside:{attributes:[{pattern:/(^|[^#])\{(?:\{[^}]+\}|[^}])+\}/,lookbehind:!0,inside:{rest:e.languages.ruby}},{pattern:/\([^)]+\)/,inside:{"attr-value":{pattern:/(=\s*)(?:"(?:\\?.)*?"|[^)\s]+)/,lookbehind:!0},"attr-name":/[\w:-]+(?=\s*!?=|\s*[,)])/,punctuation:/[=(),]/}},{pattern:/\[[^\]]+\]/,inside:{rest:e.languages.ruby}}],punctuation:/[<>]/}},code:{pattern:/((?:^|\r?\n|\r)[\t ]*(?:[~-]|[&!]?=)).+/,lookbehind:!0,inside:{rest:e.languages.ruby}},interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"},rest:e.languages.ruby}},punctuation:{pattern:/((?:^|\r?\n|\r)[\t ]*)[~=\-&!]+/,lookbehind:!0}};for(var t="((?:^|\\r?\\n|\\r)([\\t ]*)):{{filter_name}}((?:\\r?\\n|\\r)(?:\\2[\\t ]+.+|\\s*?(?=\\r?\\n|\\r)))+",r=["css",{filter:"coffee",language:"coffeescript"},"erb","javascript","less","markdown","ruby","scss","textile"],n={},a=0,i=r.length;i>a;a++){var l=r[a];l="string"==typeof l?{filter:l,language:l}:l,e.languages[l.language]&&(n["filter-"+l.filter]={pattern:RegExp(t.replace("{{filter_name}}",l.filter)),lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},rest:e.languages[l.language]}})}e.languages.insertBefore("haml","filter",n)}(Prism);
\ No newline at end of file

From 8aa2b0802a01e2f6779fc00c9284024449a05669 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 23 Aug 2015 01:21:44 +0200
Subject: [PATCH 204/310] Add tests for Haml

---
 .../coffeescript+haml_usage.test              |  24 +++
 tests/languages/css+haml/css+haml_usage.test  |  28 +++
 tests/languages/haml/code_feature.test        |  19 +++
 tests/languages/haml/doctype_feature.test     |  15 ++
 .../languages/haml/interpolation_feature.test |  21 +++
 .../haml/multiline-code_feature.test          |  58 +++++++
 .../haml/multiline-comment_feature.test       |  46 +++++
 tests/languages/haml/tag_feature.test         | 161 ++++++++++++++++++
 .../javascript+haml_usage.test                |  24 +++
 .../languages/less+haml/less+haml_usage.test  |  32 ++++
 .../markdown+haml/markdown+haml_usage.test    |  32 ++++
 .../languages/markup+haml/markup_feature.test |  11 ++
 .../languages/scss+haml/scss+haml_usage.test  |  40 +++++
 13 files changed, 511 insertions(+)
 create mode 100644 tests/languages/coffeescript+haml/coffeescript+haml_usage.test
 create mode 100644 tests/languages/css+haml/css+haml_usage.test
 create mode 100644 tests/languages/haml/code_feature.test
 create mode 100644 tests/languages/haml/doctype_feature.test
 create mode 100644 tests/languages/haml/interpolation_feature.test
 create mode 100644 tests/languages/haml/multiline-code_feature.test
 create mode 100644 tests/languages/haml/multiline-comment_feature.test
 create mode 100644 tests/languages/haml/tag_feature.test
 create mode 100644 tests/languages/javascript+haml/javascript+haml_usage.test
 create mode 100644 tests/languages/less+haml/less+haml_usage.test
 create mode 100644 tests/languages/markdown+haml/markdown+haml_usage.test
 create mode 100644 tests/languages/markup+haml/markup_feature.test
 create mode 100644 tests/languages/scss+haml/scss+haml_usage.test

diff --git a/tests/languages/coffeescript+haml/coffeescript+haml_usage.test b/tests/languages/coffeescript+haml/coffeescript+haml_usage.test
new file mode 100644
index 0000000000..7a7751692d
--- /dev/null
+++ b/tests/languages/coffeescript+haml/coffeescript+haml_usage.test
@@ -0,0 +1,24 @@
+:coffee
+	'This is coffee script'
+
+~
+	:coffee
+	  'This is coffee script'
+
+----------------------------------------------------
+
+[
+	["filter-coffee", [
+		["filter-name", ":coffee"],
+		["string", "'This is coffee script'"]
+	]],
+	["punctuation", "~"],
+	["filter-coffee", [
+        ["filter-name", ":coffee"],
+        ["string", "'This is coffee script'"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for CoffeeScript filter in Haml. The tilde serves only as a separator.
\ No newline at end of file
diff --git a/tests/languages/css+haml/css+haml_usage.test b/tests/languages/css+haml/css+haml_usage.test
new file mode 100644
index 0000000000..c90047f28f
--- /dev/null
+++ b/tests/languages/css+haml/css+haml_usage.test
@@ -0,0 +1,28 @@
+:css
+	.test {}
+
+~
+	:css
+	  .test {}
+
+----------------------------------------------------
+
+[
+	["filter-css", [
+		["filter-name", ":css"],
+		["selector", ".test"],
+		["punctuation", "{"],
+		["punctuation", "}"]
+	]],
+	["punctuation", "~"],
+	["filter-css", [
+        ["filter-name", ":css"],
+        ["selector", ".test"],
+        ["punctuation", "{"],
+        ["punctuation", "}"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for CSS filter in Haml. The tilde serves only as a separator.
\ No newline at end of file
diff --git a/tests/languages/haml/code_feature.test b/tests/languages/haml/code_feature.test
new file mode 100644
index 0000000000..51315e62c1
--- /dev/null
+++ b/tests/languages/haml/code_feature.test
@@ -0,0 +1,19 @@
+~ 42
+- 42
+= 42
+&= 42
+!= 42
+
+----------------------------------------------------
+
+[
+	["punctuation", "~"], ["code", [["number", "42"]]],
+	["punctuation", "-"], ["code", [["number", "42"]]],
+	["punctuation", "="], ["code", [["number", "42"]]],
+	["punctuation", "&="], ["code", [["number", "42"]]],
+	["punctuation", "!="], ["code", [["number", "42"]]]
+]
+
+----------------------------------------------------
+
+Checks for single-line code.
\ No newline at end of file
diff --git a/tests/languages/haml/doctype_feature.test b/tests/languages/haml/doctype_feature.test
new file mode 100644
index 0000000000..5f5a731bcd
--- /dev/null
+++ b/tests/languages/haml/doctype_feature.test
@@ -0,0 +1,15 @@
+!!!
+!!! 5
+!!! Strict
+
+----------------------------------------------------
+
+[
+	["doctype", "!!!"],
+	["doctype", "!!! 5"],
+	["doctype", "!!! Strict"]
+]
+
+----------------------------------------------------
+
+Checks for doctypes.
diff --git a/tests/languages/haml/interpolation_feature.test b/tests/languages/haml/interpolation_feature.test
new file mode 100644
index 0000000000..ed13c87a81
--- /dev/null
+++ b/tests/languages/haml/interpolation_feature.test
@@ -0,0 +1,21 @@
+#{ 42 }
+#{ "foobar" }
+
+----------------------------------------------------
+
+[
+	["interpolation", [
+		["delimiter", "#{"],
+		["number", "42"],
+		["delimiter", "}"]
+	]],
+	["interpolation", [
+		["delimiter", "#{"],
+		["string", ["\"foobar\""]],
+		["delimiter", "}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for interpolation in plain text.
\ No newline at end of file
diff --git a/tests/languages/haml/multiline-code_feature.test b/tests/languages/haml/multiline-code_feature.test
new file mode 100644
index 0000000000..06cb2b439d
--- /dev/null
+++ b/tests/languages/haml/multiline-code_feature.test
@@ -0,0 +1,58 @@
+	~ 1,
+	  1,
+	  1
+~ 2 |
+  2 |
+  2 |
+
+- 3,
+  3,
+  3
+	- 4 |
+	  4 |
+	  4 |
+
+  = 5,
+    5,
+    5
+= 6 |
+  6 |
+  6 |
+
+&= 7,
+   7,
+   7
+  &= 8 |
+     8 |
+     8 |
+
+!= 9,
+   9,
+   9
+!= 10 |
+   10 |
+   10 |
+
+----------------------------------------------------
+
+[
+	["punctuation", "~"], ["multiline-code", [["number", "1"], ["punctuation", ","], ["number", "1"], ["punctuation", ","], ["number", "1"]]],
+	["punctuation", "~"], ["multiline-code", [["number", "2"], ["operator", "|"], ["number", "2"], ["operator", "|"], ["number", "2"], ["operator", "|"]]],
+    
+	["punctuation", "-"], ["multiline-code", [["number", "3"], ["punctuation", ","], ["number", "3"], ["punctuation", ","], ["number", "3"]]],
+    ["punctuation", "-"], ["multiline-code", [["number", "4"], ["operator", "|"], ["number", "4"], ["operator", "|"], ["number", "4"], ["operator", "|"]]],
+    
+    ["punctuation", "="], ["multiline-code", [["number", "5"], ["punctuation", ","], ["number", "5"], ["punctuation", ","], ["number", "5"]]],
+	["punctuation", "="], ["multiline-code", [["number", "6"], ["operator", "|"], ["number", "6"], ["operator", "|"], ["number", "6"], ["operator", "|"]]],
+	
+	["punctuation", "&="], ["multiline-code", [["number", "7"], ["punctuation", ","], ["number", "7"], ["punctuation", ","], ["number", "7"]]],
+	["punctuation", "&="], ["multiline-code", [["number", "8"], ["operator", "|"], ["number", "8"], ["operator", "|"], ["number", "8"], ["operator", "|"]]],
+	
+	["punctuation", "!="], ["multiline-code", [["number", "9"], ["punctuation", ","], ["number", "9"], ["punctuation", ","], ["number", "9"]]],
+	["punctuation", "!="], ["multiline-code", [["number", "10"], ["operator", "|"], ["number", "10"], ["operator", "|"], ["number", "10"], ["operator", "|"]]]
+]
+
+----------------------------------------------------
+
+Checks for inline code, with all possible prefixes, some not indented, some
+indented with two spaces, some indented with one tab.
\ No newline at end of file
diff --git a/tests/languages/haml/multiline-comment_feature.test b/tests/languages/haml/multiline-comment_feature.test
new file mode 100644
index 0000000000..809aaffa3b
--- /dev/null
+++ b/tests/languages/haml/multiline-comment_feature.test
@@ -0,0 +1,46 @@
+/
+
+/ foo
+
+/foo
+ bar
+
+  /foo
+   bar
+
+	/foo
+	 bar
+
+-#
+
+-# foo
+
+-#foo
+ bar
+
+  -#foo
+   bar
+
+	-#foo
+	 bar
+
+----------------------------------------------------
+
+[
+	["multiline-comment", "/"],
+	["multiline-comment", "/ foo"],
+	["multiline-comment", "/foo\r\n bar"],
+	["multiline-comment", "/foo\r\n   bar"],
+	["multiline-comment", "/foo\r\n\t bar"],
+
+	["multiline-comment", "-#"],
+    ["multiline-comment", "-# foo"],
+    ["multiline-comment", "-#foo\r\n bar"],
+    ["multiline-comment", "-#foo\r\n   bar"],
+    ["multiline-comment", "-#foo\r\n\t bar"]
+]
+
+----------------------------------------------------
+
+Checks for multi-line comments, not indented, indented with two spaces and
+indented with one tab.
\ No newline at end of file
diff --git a/tests/languages/haml/tag_feature.test b/tests/languages/haml/tag_feature.test
new file mode 100644
index 0000000000..e5927d04a9
--- /dev/null
+++ b/tests/languages/haml/tag_feature.test
@@ -0,0 +1,161 @@
+%one
+	%two
+
+%div#things
+%div.articles
+%div.article.title
+
+%script{:type => "text/javascript",
+        :src  => "javascripts/script_#{42}"}
+
+%div{:id => [@item.type, @item.number]}
+
+%a(title=@title href=href)
+%input(selected)
+
+%html{html_attrs('fr-fr')}
+
+%div[@user, :greeting]
+	%bar[290]/
+
+%div#Article.article.entry{:id => @article.number}
+
+#collection
+	.item
+
+%br/
+%blockquote<
+%img>
+
+----------------------------------------------------
+
+[
+	["tag", ["%one"]],
+	["tag", ["%two"]],
+
+	["tag", ["%div#things"]],
+	["tag", ["%div.articles"]],
+	["tag", ["%div.article.title"]],
+
+	["tag", [
+		"%script",
+		["attributes", [
+			["punctuation", "{"],
+			["symbol", ":type"],
+			["operator", "="], ["operator", ">"],
+			["string", ["\"text/javascript\""]],
+			["punctuation", ","],
+			["symbol", ":src"],
+			["operator", "="], ["operator", ">"],
+			["string", [
+				"\"javascripts/script_",
+				["interpolation", [
+					["delimiter", "#{"],
+					["number", "42"],
+					["delimiter", "}"]
+				]],
+				"\""
+			]],
+			["punctuation", "}"]
+		]]
+	]],
+
+	["tag", [
+		"%div",
+		["attributes", [
+			["punctuation", "{"],
+			["symbol", ":id"],
+			["operator", "="], ["operator", ">"],
+			["punctuation", "["],
+			["variable", "@item"],
+			["punctuation", "."],
+			"type",
+			["punctuation", ","],
+			["variable", "@item"],
+			["punctuation", "."],
+			"number",
+			["punctuation", "]"],
+			["punctuation", "}"]
+		]]
+	]],
+
+	["tag", [
+		"%a",
+		["attributes", [
+			["punctuation", "("],
+			["attr-name", "title"],
+			["punctuation", "="],
+			["attr-value", "@title"],
+			["attr-name", "href"],
+			["punctuation", "="],
+            ["attr-value", "href"],
+            ["punctuation", ")"]
+		]]
+	]],
+	["tag", [
+		"%input",
+		["attributes", [
+			["punctuation", "("],
+			["attr-name", "selected"],
+			["punctuation", ")"]
+		]]
+	]],
+
+	["tag", [
+		"%html",
+		["attributes", [
+			["punctuation", "{"],
+			["function", "html_attrs"],
+			["punctuation", "("],
+			["string", ["'fr-fr'"]],
+			["punctuation", ")"],
+			["punctuation", "}"]
+		]]
+	]],
+
+	["tag", [
+		"%div",
+		["attributes", [
+			["punctuation", "["],
+			["variable", "@user"],
+			["punctuation", ","],
+			["symbol", ":greeting"],
+			["punctuation", "]"]
+		]]
+	]],
+	["tag", [
+		"%bar",
+		["attributes", [
+			["punctuation", "["],
+			["number", "290"],
+			["punctuation", "]"]
+		]],
+		"/"
+	]],
+
+	["tag", [
+		"%div#Article.article.entry",
+		["attributes", [
+			["punctuation", "{"],
+			["symbol", ":id"],
+			["operator", "="], ["operator", ">"],
+			["variable", "@article"],
+			["punctuation", "."],
+			"number",
+			["punctuation", "}"]
+		]]
+	]],
+
+	["tag", ["#collection"]],
+	["tag", [".item"]],
+
+	["tag", ["%br/"]],
+	["tag", ["%blockquote", ["punctuation", "<"]]],
+	["tag", ["%img", ["punctuation", ">"]]]
+]
+
+----------------------------------------------------
+
+Checks for tags: basic element names, attributes, html-style attributes,
+attribute methods, boolean attributes, class and id shortcuts,
+implicit div elements, empty tags and whitespace removal.
\ No newline at end of file
diff --git a/tests/languages/javascript+haml/javascript+haml_usage.test b/tests/languages/javascript+haml/javascript+haml_usage.test
new file mode 100644
index 0000000000..2420e60f12
--- /dev/null
+++ b/tests/languages/javascript+haml/javascript+haml_usage.test
@@ -0,0 +1,24 @@
+:javascript
+	0xBadFace
+
+~
+	:javascript
+	  0xBadFace
+
+----------------------------------------------------
+
+[
+	["filter-javascript", [
+		["filter-name", ":javascript"],
+		["number", "0xBadFace"]
+	]],
+	["punctuation", "~"],
+	["filter-javascript", [
+		["filter-name", ":javascript"],
+		["number", "0xBadFace"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for JavaScript filter in Haml. The tilde serves only as a separator.
\ No newline at end of file
diff --git a/tests/languages/less+haml/less+haml_usage.test b/tests/languages/less+haml/less+haml_usage.test
new file mode 100644
index 0000000000..fffe2ca74e
--- /dev/null
+++ b/tests/languages/less+haml/less+haml_usage.test
@@ -0,0 +1,32 @@
+:less
+	.foo { .bar; }
+
+~
+	:less
+	  .foo { .bar; }
+
+----------------------------------------------------
+
+[
+	["filter-less", [
+		["filter-name", ":less"],
+		["selector", [".foo"]],
+		["punctuation", "{"],
+		["mixin-usage", ".bar"],
+		["punctuation", ";"],
+		["punctuation", "}"]
+	]],
+	["punctuation", "~"],
+	["filter-less", [
+		["filter-name", ":less"],
+		["selector", [".foo"]],
+		["punctuation", "{"],
+		["mixin-usage", ".bar"],
+		["punctuation", ";"],
+		["punctuation", "}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for Less filter in Haml. The tilde serves only as a separator.
\ No newline at end of file
diff --git a/tests/languages/markdown+haml/markdown+haml_usage.test b/tests/languages/markdown+haml/markdown+haml_usage.test
new file mode 100644
index 0000000000..4a75fa9cc2
--- /dev/null
+++ b/tests/languages/markdown+haml/markdown+haml_usage.test
@@ -0,0 +1,32 @@
+:markdown
+ # Title 1
+
+~
+  :markdown
+   # Title 1
+
+----------------------------------------------------
+
+[
+	["filter-markdown", [
+		["filter-name", ":markdown"],
+		["title", [
+			["punctuation", "#"],
+			" Title 1"
+		]]
+	]],
+	["punctuation", "~"],
+	["filter-markdown", [
+		["filter-name", ":markdown"],
+		["title", [
+            ["punctuation", "#"],
+            " Title 1"
+        ]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for Markdown filter in Haml. The tilde serves only as a separator.
+Indentation is intentionally less than 1 tab, otherwise markdown is
+interpreted as code.
\ No newline at end of file
diff --git a/tests/languages/markup+haml/markup_feature.test b/tests/languages/markup+haml/markup_feature.test
new file mode 100644
index 0000000000..ab5bbbeb9c
--- /dev/null
+++ b/tests/languages/markup+haml/markup_feature.test
@@ -0,0 +1,11 @@
+<div>
+
+----------------------------------------------------
+
+[
+	["markup", [["tag", [["tag", [["punctuation", "<"], "div"]], ["punctuation", ">"]]]]]
+]
+
+----------------------------------------------------
+
+Checks for embedded markup.
\ No newline at end of file
diff --git a/tests/languages/scss+haml/scss+haml_usage.test b/tests/languages/scss+haml/scss+haml_usage.test
new file mode 100644
index 0000000000..0fe4f2582a
--- /dev/null
+++ b/tests/languages/scss+haml/scss+haml_usage.test
@@ -0,0 +1,40 @@
+:scss
+	#main {
+		width: $width;
+	}
+
+~
+	:scss
+	  #main {
+	    width: $width;
+	  }
+
+----------------------------------------------------
+
+[
+	["filter-scss", [
+		["filter-name", ":scss"],
+		["selector", ["\r\n\t#main "]],
+		["punctuation", "{"],
+		["property", "width"],
+		["punctuation", ":"],
+		["variable", "$width"],
+		["punctuation", ";"],
+		["punctuation", "}"]
+	]],
+	["punctuation", "~"],
+	["filter-scss", [
+		["filter-name", ":scss"],
+		["selector", ["\r\n\t  #main "]],
+		["punctuation", "{"],
+		["property", "width"],
+		["punctuation", ":"],
+		["variable", "$width"],
+		["punctuation", ";"],
+		["punctuation", "}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for CSS filter in Haml. The tilde serves only as a separator.
\ No newline at end of file

From c477f9ab6414760b09e67fd43c357860dc86c55f Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 23 Aug 2015 13:52:11 +0200
Subject: [PATCH 205/310] Handlebars: Fix empty strings, add plus sign in
 exponential notation, improve block pattern and variable pattern.

---
 components/prism-handlebars.js     | 8 ++++----
 components/prism-handlebars.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-handlebars.js b/components/prism-handlebars.js
index 00fe7714d6..bc8714f0e4 100644
--- a/components/prism-handlebars.js
+++ b/components/prism-handlebars.js
@@ -10,11 +10,11 @@
 					pattern: /^\{\{\{?|\}\}\}?$/i,
 					alias: 'punctuation'
 				},
-				'string': /(["'])(\\?.)+?\1/,
-				'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
+				'string': /(["'])(\\?.)*?\1/,
+				'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)\b/,
 				'boolean': /\b(true|false)\b/,
 				'block': {
-					pattern: /^(\s*~?\s*)[#\/]\S+/i,
+					pattern: /^(\s*~?\s*)[#\/]\S+?(?=\s*~?\s*$|\s)/i,
 					lookbehind: true,
 					alias: 'keyword'
 				},
@@ -26,7 +26,7 @@
 					}
 				},
 				'punctuation': /[!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]/,
-				'variable': /[^!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/
+				'variable': /[^!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~\s]+/
 			}
 		}
 	});
diff --git a/components/prism-handlebars.min.js b/components/prism-handlebars.min.js
index acafd0c263..b970bfbcfb 100644
--- a/components/prism-handlebars.min.js
+++ b/components/prism-handlebars.min.js
@@ -1 +1 @@
-!function(e){var a=/\{\{\{[\w\W]+?\}\}\}|\{\{[\w\W]+?\}\}/g;e.languages.handlebars=e.languages.extend("markup",{handlebars:{pattern:a,inside:{delimiter:{pattern:/^\{\{\{?|\}\}\}?$/i,alias:"punctuation"},string:/(["'])(\\?.)+?\1/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,"boolean":/\b(true|false)\b/,block:{pattern:/^(\s*~?\s*)[#\/]\S+/i,lookbehind:!0,alias:"keyword"},brackets:{pattern:/\[[^\]]+\]/,inside:{punctuation:/\[|\]/,variable:/[\w\W]+/}},punctuation:/[!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]/,variable:/[^!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/}}}),e.languages.insertBefore("handlebars","tag",{"handlebars-comment":{pattern:/\{\{![\w\W]*?\}\}/,alias:["handlebars","comment"]}}),e.hooks.add("before-highlight",function(e){"handlebars"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(a,function(a){return e.tokenStack.push(a),"___HANDLEBARS"+e.tokenStack.length+"___"}))}),e.hooks.add("before-insert",function(e){"handlebars"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),e.hooks.add("after-highlight",function(a){if("handlebars"===a.language){for(var n,t=0;n=a.tokenStack[t];t++)a.highlightedCode=a.highlightedCode.replace("___HANDLEBARS"+(t+1)+"___",e.highlight(n,a.grammar,"handlebars"));a.element.innerHTML=a.highlightedCode}})}(Prism);
\ No newline at end of file
+!function(e){var a=/\{\{\{[\w\W]+?\}\}\}|\{\{[\w\W]+?\}\}/g;e.languages.handlebars=e.languages.extend("markup",{handlebars:{pattern:a,inside:{delimiter:{pattern:/^\{\{\{?|\}\}\}?$/i,alias:"punctuation"},string:/(["'])(\\?.)*?\1/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)\b/,"boolean":/\b(true|false)\b/,block:{pattern:/^(\s*~?\s*)[#\/]\S+?(?=\s*~?\s*$|\s)/i,lookbehind:!0,alias:"keyword"},brackets:{pattern:/\[[^\]]+\]/,inside:{punctuation:/\[|\]/,variable:/[\w\W]+/}},punctuation:/[!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]/,variable:/[^!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~\s]+/}}}),e.languages.insertBefore("handlebars","tag",{"handlebars-comment":{pattern:/\{\{![\w\W]*?\}\}/,alias:["handlebars","comment"]}}),e.hooks.add("before-highlight",function(e){"handlebars"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(a,function(a){return e.tokenStack.push(a),"___HANDLEBARS"+e.tokenStack.length+"___"}))}),e.hooks.add("before-insert",function(e){"handlebars"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),e.hooks.add("after-highlight",function(a){if("handlebars"===a.language){for(var n,t=0;n=a.tokenStack[t];t++)a.highlightedCode=a.highlightedCode.replace("___HANDLEBARS"+(t+1)+"___",e.highlight(n,a.grammar,"handlebars"));a.element.innerHTML=a.highlightedCode}})}(Prism);
\ No newline at end of file

From 49d6cb9fd76889e95cfee6044bf03f7c82a71e9b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 23 Aug 2015 13:53:02 +0200
Subject: [PATCH 206/310] Add tests for Handlebars

---
 tests/languages/handlebars/block_feature.test | 23 +++++++++++++++
 .../languages/handlebars/boolean_feature.test | 17 +++++++++++
 .../languages/handlebars/comment_feature.test | 19 ++++++++++++
 .../languages/handlebars/number_feature.test  | 29 +++++++++++++++++++
 .../languages/handlebars/string_feature.test  | 25 ++++++++++++++++
 5 files changed, 113 insertions(+)
 create mode 100644 tests/languages/handlebars/block_feature.test
 create mode 100644 tests/languages/handlebars/boolean_feature.test
 create mode 100644 tests/languages/handlebars/comment_feature.test
 create mode 100644 tests/languages/handlebars/number_feature.test
 create mode 100644 tests/languages/handlebars/string_feature.test

diff --git a/tests/languages/handlebars/block_feature.test b/tests/languages/handlebars/block_feature.test
new file mode 100644
index 0000000000..dd2c74e9c7
--- /dev/null
+++ b/tests/languages/handlebars/block_feature.test
@@ -0,0 +1,23 @@
+{{#each comments}}{{/each}}
+{{~#if isActive~}}{{~/if~}}
+
+----------------------------------------------------
+
+[
+	["handlebars", [
+		["delimiter", "{{"], ["block", "#each"], ["variable", "comments"], ["delimiter", "}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{"], ["block", "/each"], ["delimiter", "}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{"], ["punctuation", "~"], ["block", "#if"], ["variable", "isActive"], ["punctuation", "~"], ["delimiter", "}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{"], ["punctuation", "~"], ["block", "/if"], ["punctuation", "~"], ["delimiter", "}}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for block helpers.
\ No newline at end of file
diff --git a/tests/languages/handlebars/boolean_feature.test b/tests/languages/handlebars/boolean_feature.test
new file mode 100644
index 0000000000..1f252a1450
--- /dev/null
+++ b/tests/languages/handlebars/boolean_feature.test
@@ -0,0 +1,17 @@
+{{ true }}
+{{{ false }}}
+
+----------------------------------------------------
+
+[
+	["handlebars", [
+		["delimiter", "{{"], ["boolean", "true"], ["delimiter", "}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{{"], ["boolean", "false"], ["delimiter", "}}}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for all booleans.
\ No newline at end of file
diff --git a/tests/languages/handlebars/comment_feature.test b/tests/languages/handlebars/comment_feature.test
new file mode 100644
index 0000000000..813f978d6e
--- /dev/null
+++ b/tests/languages/handlebars/comment_feature.test
@@ -0,0 +1,19 @@
+{{! foobar}}
+{{!-- foo bar baz --}}
+{{! foo
+bar }}
+{{!-- foo
+bar --}}
+
+----------------------------------------------------
+
+[
+	["handlebars-comment", "{{! foobar}}"],
+	["handlebars-comment", "{{!-- foo bar baz --}}"],
+	["handlebars-comment", "{{! foo\r\nbar }}"],
+	["handlebars-comment", "{{!-- foo\r\nbar --}}"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/handlebars/number_feature.test b/tests/languages/handlebars/number_feature.test
new file mode 100644
index 0000000000..aa894ec501
--- /dev/null
+++ b/tests/languages/handlebars/number_feature.test
@@ -0,0 +1,29 @@
+{{ 0xBadFace }}
+{{{ 42 }}}
+{{{ 4e2 }}}
+{{ 3.5e+1 }}
+{{ 0.15e-9 }}
+
+----------------------------------------------------
+
+[
+	["handlebars", [
+		["delimiter", "{{"], ["number", "0xBadFace"], ["delimiter", "}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{{"], ["number", "42"], ["delimiter", "}}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{{"], ["number", "4e2"], ["delimiter", "}}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{"], ["number", "3.5e+1"], ["delimiter", "}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{"], ["number", "0.15e-9"], ["delimiter", "}}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for decimal and hexadecimal numbers.
\ No newline at end of file
diff --git a/tests/languages/handlebars/string_feature.test b/tests/languages/handlebars/string_feature.test
new file mode 100644
index 0000000000..f9f9d707a6
--- /dev/null
+++ b/tests/languages/handlebars/string_feature.test
@@ -0,0 +1,25 @@
+{{ "" }}
+{{{''}}}
+{{{"foobar"}}}
+{{ 'foobar' }}
+
+----------------------------------------------------
+
+[
+	["handlebars", [
+		["delimiter", "{{"], ["string", "\"\""], ["delimiter", "}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{{"], ["string", "''"], ["delimiter", "}}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{{"], ["string", "\"foobar\""], ["delimiter", "}}}"]
+	]],
+	["handlebars", [
+		["delimiter", "{{"], ["string", "'foobar'"], ["delimiter", "}}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for strings
\ No newline at end of file

From 1cc8d8e5a05999b1a65a97da10c0c956093b5094 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 23 Aug 2015 14:46:31 +0200
Subject: [PATCH 207/310] Haskell: Removed useless backslashes and parentheses
 + handle \r\n and \r + simplify number regexp + fix operator regexp

---
 components/prism-haskell.js     | 10 +++++-----
 components/prism-haskell.min.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/prism-haskell.js b/components/prism-haskell.js
index cc2452a74a..a2f43be2ff 100644
--- a/components/prism-haskell.js
+++ b/components/prism-haskell.js
@@ -1,16 +1,16 @@
 Prism.languages.haskell= {
 	'comment': {
-		pattern: /(^|[^-!#$%*+=\?&@|~.:<>^\\])(--[^-!#$%*+=\?&@|~.:<>^\\].*(\r?\n|$)|{-[\w\W]*?-})/m,
+		pattern: /(^|[^-!#$%*+=?&@|~.:<>^\\\/])(--[^-!#$%*+=?&@|~.:<>^\\\/].*|{-[\w\W]*?-})/m,
 		lookbehind: true
 	},
-	'char': /'([^\\"]|\\([abfnrtv\\"'&]|\^[A-Z@[\]\^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+))'/,
+	'char': /'([^\\']|\\([abfnrtv\\"'&]|\^[A-Z@[\]\^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+))'/,
 	'string': /"([^\\"]|\\([abfnrtv\\"'&]|\^[A-Z@[\]\^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+)|\\\s+\\)*"/,
 	'keyword' : /\b(case|class|data|deriving|do|else|if|in|infixl|infixr|instance|let|module|newtype|of|primitive|then|type|where)\b/,
 	'import_statement' : {
 		// The imported or hidden names are not included in this import
 		// statement. This is because we want to highlight those exactly like
 		// we do for the names in the program.
-		pattern: /(\n|^)\s*(import)\s+(qualified\s+)?(([A-Z][_a-zA-Z0-9']*)(\.[A-Z][_a-zA-Z0-9']*)*)(\s+(as)\s+(([A-Z][_a-zA-Z0-9']*)(\.[A-Z][_a-zA-Z0-9']*)*))?(\s+hiding\b)?/m,
+		pattern: /(\r?\n|\r|^)\s*import\s+(qualified\s+)?([A-Z][_a-zA-Z0-9']*)(\.[A-Z][_a-zA-Z0-9']*)*(\s+as\s+([A-Z][_a-zA-Z0-9']*)(\.[A-Z][_a-zA-Z0-9']*)*)?(\s+hiding\b)?/m,
 		inside: {
 			'keyword': /\b(import|qualified|as|hiding)\b/
 		}
@@ -18,13 +18,13 @@ Prism.languages.haskell= {
 	// These are builtin variables only. Constructors are highlighted later as a constant.
 	'builtin': /\b(abs|acos|acosh|all|and|any|appendFile|approxRational|asTypeOf|asin|asinh|atan|atan2|atanh|basicIORun|break|catch|ceiling|chr|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|denominator|digitToInt|div|divMod|drop|dropWhile|either|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldl|foldl1|foldr|foldr1|fromDouble|fromEnum|fromInt|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|group|head|id|inRange|index|init|intToDigit|interact|ioError|isAlpha|isAlphaNum|isAscii|isControl|isDenormalized|isDigit|isHexDigit|isIEEE|isInfinite|isLower|isNaN|isNegativeZero|isOctDigit|isPrint|isSpace|isUpper|iterate|last|lcm|length|lex|lexDigits|lexLitChar|lines|log|logBase|lookup|map|mapM|mapM_|max|maxBound|maximum|maybe|min|minBound|minimum|mod|negate|not|notElem|null|numerator|odd|or|ord|otherwise|pack|pi|pred|primExitWith|print|product|properFraction|putChar|putStr|putStrLn|quot|quotRem|range|rangeSize|read|readDec|readFile|readFloat|readHex|readIO|readInt|readList|readLitChar|readLn|readOct|readParen|readSigned|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequence_|show|showChar|showInt|showList|showLitChar|showParen|showSigned|showString|shows|showsPrec|significand|signum|sin|sinh|snd|sort|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|threadToIOResult|toEnum|toInt|toInteger|toLower|toRational|toUpper|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)\b/,
 	// decimal integers and floating point numbers | octal integers | hexadecimal integers
-	'number' : /\b(\d+(\.\d+)?([eE][+-]?\d+)?|0[Oo][0-7]+|0[Xx][0-9a-fA-F]+)\b/,
+	'number' : /\b(\d+(\.\d+)?(e[+-]?\d+)?|0o[0-7]+|0x[0-9a-f]+)\b/i,
 	// Most of this is needed because of the meaning of a single '.'.
 	// If it stands alone freely, it is the function composition.
 	// It may also be a separator between a module name and an identifier => no
 	// operator. If it comes together with other special characters it is an
 	// operator too.
-	'operator' : /\s\.\s|([-!#$%*+=\?&@|~:<>^\\]*\.[-!#$%*+=\?&@|~:<>^\\]+)|([-!#$%*+=\?&@|~:<>^\\]+\.[-!#$%*+=\?&@|~:<>^\\]*)|[-!#$%*+=\?&@|~:<>^\\]+|(`([A-Z][_a-zA-Z0-9']*\.)*[_a-z][_a-zA-Z0-9']*`)/,
+	'operator' : /\s\.\s|[-!#$%*+=?&@|~.:<>^\\\/]*\.[-!#$%*+=?&@|~.:<>^\\\/]+|[-!#$%*+=?&@|~.:<>^\\\/]+\.[-!#$%*+=?&@|~.:<>^\\\/]*|[-!#$%*+=?&@|~:<>^\\\/]+|`([A-Z][_a-zA-Z0-9']*\.)*[_a-z][_a-zA-Z0-9']*`/,
 	// In Haskell, nearly everything is a variable, do not highlight these.
 	'hvariable': /\b([A-Z][_a-zA-Z0-9']*\.)*[_a-z][_a-zA-Z0-9']*\b/,
 	'constant': /\b([A-Z][_a-zA-Z0-9']*\.)*[A-Z][_a-zA-Z0-9']*\b/,
diff --git a/components/prism-haskell.min.js b/components/prism-haskell.min.js
index 5661b7e797..115927a8b2 100644
--- a/components/prism-haskell.min.js
+++ b/components/prism-haskell.min.js
@@ -1 +1 @@
-Prism.languages.haskell={comment:{pattern:/(^|[^-!#$%*+=\?&@|~.:<>^\\])(--[^-!#$%*+=\?&@|~.:<>^\\].*(\r?\n|$)|{-[\w\W]*?-})/m,lookbehind:!0},"char":/'([^\\"]|\\([abfnrtv\\"'&]|\^[A-Z@[\]\^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+))'/,string:/"([^\\"]|\\([abfnrtv\\"'&]|\^[A-Z@[\]\^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+)|\\\s+\\)*"/,keyword:/\b(case|class|data|deriving|do|else|if|in|infixl|infixr|instance|let|module|newtype|of|primitive|then|type|where)\b/,import_statement:{pattern:/(\n|^)\s*(import)\s+(qualified\s+)?(([A-Z][_a-zA-Z0-9']*)(\.[A-Z][_a-zA-Z0-9']*)*)(\s+(as)\s+(([A-Z][_a-zA-Z0-9']*)(\.[A-Z][_a-zA-Z0-9']*)*))?(\s+hiding\b)?/m,inside:{keyword:/\b(import|qualified|as|hiding)\b/}},builtin:/\b(abs|acos|acosh|all|and|any|appendFile|approxRational|asTypeOf|asin|asinh|atan|atan2|atanh|basicIORun|break|catch|ceiling|chr|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|denominator|digitToInt|div|divMod|drop|dropWhile|either|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldl|foldl1|foldr|foldr1|fromDouble|fromEnum|fromInt|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|group|head|id|inRange|index|init|intToDigit|interact|ioError|isAlpha|isAlphaNum|isAscii|isControl|isDenormalized|isDigit|isHexDigit|isIEEE|isInfinite|isLower|isNaN|isNegativeZero|isOctDigit|isPrint|isSpace|isUpper|iterate|last|lcm|length|lex|lexDigits|lexLitChar|lines|log|logBase|lookup|map|mapM|mapM_|max|maxBound|maximum|maybe|min|minBound|minimum|mod|negate|not|notElem|null|numerator|odd|or|ord|otherwise|pack|pi|pred|primExitWith|print|product|properFraction|putChar|putStr|putStrLn|quot|quotRem|range|rangeSize|read|readDec|readFile|readFloat|readHex|readIO|readInt|readList|readLitChar|readLn|readOct|readParen|readSigned|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequence_|show|showChar|showInt|showList|showLitChar|showParen|showSigned|showString|shows|showsPrec|significand|signum|sin|sinh|snd|sort|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|threadToIOResult|toEnum|toInt|toInteger|toLower|toRational|toUpper|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)\b/,number:/\b(\d+(\.\d+)?([eE][+-]?\d+)?|0[Oo][0-7]+|0[Xx][0-9a-fA-F]+)\b/,operator:/\s\.\s|([-!#$%*+=\?&@|~:<>^\\]*\.[-!#$%*+=\?&@|~:<>^\\]+)|([-!#$%*+=\?&@|~:<>^\\]+\.[-!#$%*+=\?&@|~:<>^\\]*)|[-!#$%*+=\?&@|~:<>^\\]+|(`([A-Z][_a-zA-Z0-9']*\.)*[_a-z][_a-zA-Z0-9']*`)/,hvariable:/\b([A-Z][_a-zA-Z0-9']*\.)*[_a-z][_a-zA-Z0-9']*\b/,constant:/\b([A-Z][_a-zA-Z0-9']*\.)*[A-Z][_a-zA-Z0-9']*\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.haskell={comment:{pattern:/(^|[^-!#$%*+=?&@|~.:<>^\\\/])(--[^-!#$%*+=?&@|~.:<>^\\\/].*|{-[\w\W]*?-})/m,lookbehind:!0},"char":/'([^\\']|\\([abfnrtv\\"'&]|\^[A-Z@[\]\^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+))'/,string:/"([^\\"]|\\([abfnrtv\\"'&]|\^[A-Z@[\]\^_]|NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|\d+|o[0-7]+|x[0-9a-fA-F]+)|\\\s+\\)*"/,keyword:/\b(case|class|data|deriving|do|else|if|in|infixl|infixr|instance|let|module|newtype|of|primitive|then|type|where)\b/,import_statement:{pattern:/(\r?\n|\r|^)\s*import\s+(qualified\s+)?([A-Z][_a-zA-Z0-9']*)(\.[A-Z][_a-zA-Z0-9']*)*(\s+as\s+([A-Z][_a-zA-Z0-9']*)(\.[A-Z][_a-zA-Z0-9']*)*)?(\s+hiding\b)?/m,inside:{keyword:/\b(import|qualified|as|hiding)\b/}},builtin:/\b(abs|acos|acosh|all|and|any|appendFile|approxRational|asTypeOf|asin|asinh|atan|atan2|atanh|basicIORun|break|catch|ceiling|chr|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|denominator|digitToInt|div|divMod|drop|dropWhile|either|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldl|foldl1|foldr|foldr1|fromDouble|fromEnum|fromInt|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|group|head|id|inRange|index|init|intToDigit|interact|ioError|isAlpha|isAlphaNum|isAscii|isControl|isDenormalized|isDigit|isHexDigit|isIEEE|isInfinite|isLower|isNaN|isNegativeZero|isOctDigit|isPrint|isSpace|isUpper|iterate|last|lcm|length|lex|lexDigits|lexLitChar|lines|log|logBase|lookup|map|mapM|mapM_|max|maxBound|maximum|maybe|min|minBound|minimum|mod|negate|not|notElem|null|numerator|odd|or|ord|otherwise|pack|pi|pred|primExitWith|print|product|properFraction|putChar|putStr|putStrLn|quot|quotRem|range|rangeSize|read|readDec|readFile|readFloat|readHex|readIO|readInt|readList|readLitChar|readLn|readOct|readParen|readSigned|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequence_|show|showChar|showInt|showList|showLitChar|showParen|showSigned|showString|shows|showsPrec|significand|signum|sin|sinh|snd|sort|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|threadToIOResult|toEnum|toInt|toInteger|toLower|toRational|toUpper|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)\b/,number:/\b(\d+(\.\d+)?(e[+-]?\d+)?|0o[0-7]+|0x[0-9a-f]+)\b/i,operator:/\s\.\s|[-!#$%*+=?&@|~.:<>^\\\/]*\.[-!#$%*+=?&@|~.:<>^\\\/]+|[-!#$%*+=?&@|~.:<>^\\\/]+\.[-!#$%*+=?&@|~.:<>^\\\/]*|[-!#$%*+=?&@|~:<>^\\\/]+|`([A-Z][_a-zA-Z0-9']*\.)*[_a-z][_a-zA-Z0-9']*`/,hvariable:/\b([A-Z][_a-zA-Z0-9']*\.)*[_a-z][_a-zA-Z0-9']*\b/,constant:/\b([A-Z][_a-zA-Z0-9']*\.)*[A-Z][_a-zA-Z0-9']*\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file

From 95b0e9bec0b51325a225185626ef5105aa0a7f59 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 23 Aug 2015 14:47:14 +0200
Subject: [PATCH 208/310] Add tests for Haskell

---
 tests/languages/haskell/builtin_feature.test  | 137 ++++++++++++++++++
 tests/languages/haskell/char_feature.test     |  17 +++
 tests/languages/haskell/comment_feature.test  |  14 ++
 tests/languages/haskell/constant_feature.test |  15 ++
 .../languages/haskell/hvariable_feature.test  |  15 ++
 .../haskell/import_statement_feature.test     |  35 +++++
 tests/languages/haskell/keyword_feature.test  |  19 +++
 tests/languages/haskell/number_feature.test   |  23 +++
 tests/languages/haskell/operator_feature.test |  37 +++++
 tests/languages/haskell/string_feature.test   |  16 ++
 10 files changed, 328 insertions(+)
 create mode 100644 tests/languages/haskell/builtin_feature.test
 create mode 100644 tests/languages/haskell/char_feature.test
 create mode 100644 tests/languages/haskell/comment_feature.test
 create mode 100644 tests/languages/haskell/constant_feature.test
 create mode 100644 tests/languages/haskell/hvariable_feature.test
 create mode 100644 tests/languages/haskell/import_statement_feature.test
 create mode 100644 tests/languages/haskell/keyword_feature.test
 create mode 100644 tests/languages/haskell/number_feature.test
 create mode 100644 tests/languages/haskell/operator_feature.test
 create mode 100644 tests/languages/haskell/string_feature.test

diff --git a/tests/languages/haskell/builtin_feature.test b/tests/languages/haskell/builtin_feature.test
new file mode 100644
index 0000000000..c50ca40bb2
--- /dev/null
+++ b/tests/languages/haskell/builtin_feature.test
@@ -0,0 +1,137 @@
+abs acos acosh all and
+any appendFile approxRational
+asTypeOf asin asinh atan
+atan2 atanh basicIORun break
+catch ceiling chr compare
+concat concatMap const
+cos cosh curry cycle
+decodeFloat denominator
+digitToInt div divMod
+drop dropWhile either
+elem encodeFloat enumFrom
+enumFromThen enumFromThenTo
+enumFromTo error even exp
+exponent fail filter flip
+floatDigits floatRadix
+floatRange floor fmap
+foldl foldl1 foldr foldr1
+fromDouble fromEnum fromInt
+fromInteger fromIntegral
+fromRational fst gcd
+getChar getContents getLine
+group head id inRange index
+init intToDigit interact
+ioError isAlpha isAlphaNum
+isAscii isControl isDenormalized
+isDigit isHexDigit isIEEE
+isInfinite isLower isNaN
+isNegativeZero isOctDigit
+isPrint isSpace isUpper iterate
+last lcm length lex
+lexDigits lexLitChar lines
+log logBase lookup map
+mapM mapM_ max maxBound
+maximum maybe min minBound
+minimum mod negate not
+notElem null numerator odd
+or ord otherwise pack pi
+pred primExitWith print
+product properFraction
+putChar putStr putStrLn quot
+quotRem range rangeSize read
+readDec readFile readFloat readHex
+readIO readInt readList
+readLitChar readLn readOct
+readParen readSigned reads
+readsPrec realToFrac recip
+rem repeat replicate return
+reverse round scaleFloat
+scanl scanl1 scanr scanr1
+seq sequence sequence_ show
+showChar showInt showList
+showLitChar showParen showSigned
+showString shows showsPrec
+significand signum sin sinh
+snd sort span splitAt sqrt
+subtract succ sum tail take
+takeWhile tan tanh threadToIOResult
+toEnum toInt toInteger
+toLower toRational toUpper
+truncate uncurry undefined
+unlines until unwords
+unzip unzip3 userError words
+writeFile zip zip3 zipWith
+zipWith3
+
+----------------------------------------------------
+
+[
+	["builtin", "abs"], ["builtin", "acos"], ["builtin", "acosh"], ["builtin", "all"], ["builtin", "and"],
+	["builtin", "any"], ["builtin", "appendFile"], ["builtin", "approxRational"],
+	["builtin", "asTypeOf"], ["builtin", "asin"], ["builtin", "asinh"], ["builtin", "atan"],
+	["builtin", "atan2"], ["builtin", "atanh"], ["builtin", "basicIORun"], ["builtin", "break"],
+	["builtin", "catch"], ["builtin", "ceiling"], ["builtin", "chr"], ["builtin", "compare"],
+	["builtin", "concat"], ["builtin", "concatMap"], ["builtin", "const"],
+	["builtin", "cos"], ["builtin", "cosh"], ["builtin", "curry"], ["builtin", "cycle"],
+	["builtin", "decodeFloat"], ["builtin", "denominator"],
+	["builtin", "digitToInt"], ["builtin", "div"], ["builtin", "divMod"],
+	["builtin", "drop"], ["builtin", "dropWhile"], ["builtin", "either"],
+	["builtin", "elem"], ["builtin", "encodeFloat"], ["builtin", "enumFrom"],
+	["builtin", "enumFromThen"], ["builtin", "enumFromThenTo"],
+	["builtin", "enumFromTo"], ["builtin", "error"], ["builtin", "even"], ["builtin", "exp"],
+	["builtin", "exponent"], ["builtin", "fail"], ["builtin", "filter"], ["builtin", "flip"],
+	["builtin", "floatDigits"], ["builtin", "floatRadix"],
+	["builtin", "floatRange"], ["builtin", "floor"], ["builtin", "fmap"],
+	["builtin", "foldl"], ["builtin", "foldl1"], ["builtin", "foldr"], ["builtin", "foldr1"],
+	["builtin", "fromDouble"], ["builtin", "fromEnum"], ["builtin", "fromInt"],
+	["builtin", "fromInteger"], ["builtin", "fromIntegral"],
+	["builtin", "fromRational"], ["builtin", "fst"], ["builtin", "gcd"],
+	["builtin", "getChar"], ["builtin", "getContents"], ["builtin", "getLine"],
+	["builtin", "group"], ["builtin", "head"], ["builtin", "id"], ["builtin", "inRange"], ["builtin", "index"],
+	["builtin", "init"], ["builtin", "intToDigit"], ["builtin", "interact"],
+	["builtin", "ioError"], ["builtin", "isAlpha"], ["builtin", "isAlphaNum"],
+	["builtin", "isAscii"], ["builtin", "isControl"], ["builtin", "isDenormalized"],
+	["builtin", "isDigit"], ["builtin", "isHexDigit"], ["builtin", "isIEEE"],
+	["builtin", "isInfinite"], ["builtin", "isLower"], ["builtin", "isNaN"],
+	["builtin", "isNegativeZero"], ["builtin", "isOctDigit"],
+	["builtin", "isPrint"], ["builtin", "isSpace"], ["builtin", "isUpper"], ["builtin", "iterate"],
+	["builtin", "last"], ["builtin", "lcm"], ["builtin", "length"], ["builtin", "lex"],
+	["builtin", "lexDigits"], ["builtin", "lexLitChar"], ["builtin", "lines"],
+	["builtin", "log"], ["builtin", "logBase"], ["builtin", "lookup"], ["builtin", "map"],
+	["builtin", "mapM"], ["builtin", "mapM_"], ["builtin", "max"], ["builtin", "maxBound"],
+	["builtin", "maximum"], ["builtin", "maybe"], ["builtin", "min"], ["builtin", "minBound"],
+	["builtin", "minimum"], ["builtin", "mod"], ["builtin", "negate"], ["builtin", "not"],
+	["builtin", "notElem"], ["builtin", "null"], ["builtin", "numerator"], ["builtin", "odd"],
+	["builtin", "or"], ["builtin", "ord"], ["builtin", "otherwise"], ["builtin", "pack"], ["builtin", "pi"],
+	["builtin", "pred"], ["builtin", "primExitWith"], ["builtin", "print"],
+	["builtin", "product"], ["builtin", "properFraction"],
+	["builtin", "putChar"], ["builtin", "putStr"], ["builtin", "putStrLn"], ["builtin", "quot"],
+	["builtin", "quotRem"], ["builtin", "range"], ["builtin", "rangeSize"], ["builtin", "read"],
+	["builtin", "readDec"], ["builtin", "readFile"], ["builtin", "readFloat"], ["builtin", "readHex"],
+	["builtin", "readIO"], ["builtin", "readInt"], ["builtin", "readList"],
+	["builtin", "readLitChar"], ["builtin", "readLn"], ["builtin", "readOct"],
+	["builtin", "readParen"], ["builtin", "readSigned"], ["builtin", "reads"],
+	["builtin", "readsPrec"], ["builtin", "realToFrac"], ["builtin", "recip"],
+	["builtin", "rem"], ["builtin", "repeat"], ["builtin", "replicate"], ["builtin", "return"],
+	["builtin", "reverse"], ["builtin", "round"], ["builtin", "scaleFloat"],
+	["builtin", "scanl"], ["builtin", "scanl1"], ["builtin", "scanr"], ["builtin", "scanr1"],
+	["builtin", "seq"], ["builtin", "sequence"], ["builtin", "sequence_"], ["builtin", "show"],
+	["builtin", "showChar"], ["builtin", "showInt"], ["builtin", "showList"],
+	["builtin", "showLitChar"], ["builtin", "showParen"], ["builtin", "showSigned"],
+	["builtin", "showString"], ["builtin", "shows"], ["builtin", "showsPrec"],
+	["builtin", "significand"], ["builtin", "signum"], ["builtin", "sin"], ["builtin", "sinh"],
+	["builtin", "snd"], ["builtin", "sort"], ["builtin", "span"], ["builtin", "splitAt"], ["builtin", "sqrt"],
+	["builtin", "subtract"], ["builtin", "succ"], ["builtin", "sum"], ["builtin", "tail"], ["builtin", "take"],
+	["builtin", "takeWhile"], ["builtin", "tan"], ["builtin", "tanh"], ["builtin", "threadToIOResult"],
+	["builtin", "toEnum"], ["builtin", "toInt"], ["builtin", "toInteger"],
+	["builtin", "toLower"], ["builtin", "toRational"], ["builtin", "toUpper"],
+	["builtin", "truncate"], ["builtin", "uncurry"], ["builtin", "undefined"],
+	["builtin", "unlines"], ["builtin", "until"], ["builtin", "unwords"],
+	["builtin", "unzip"], ["builtin", "unzip3"], ["builtin", "userError"], ["builtin", "words"],
+	["builtin", "writeFile"], ["builtin", "zip"], ["builtin", "zip3"], ["builtin", "zipWith"],
+	["builtin", "zipWith3"]
+]
+
+----------------------------------------------------
+
+Checks for all builtin.
\ No newline at end of file
diff --git a/tests/languages/haskell/char_feature.test b/tests/languages/haskell/char_feature.test
new file mode 100644
index 0000000000..e4dedc444a
--- /dev/null
+++ b/tests/languages/haskell/char_feature.test
@@ -0,0 +1,17 @@
+'a'
+'\n'
+'\23'
+'\xFE'
+
+----------------------------------------------------
+
+[
+	["char", "'a'"],
+	["char", "'\\n'"],
+	["char", "'\\23'"],
+	["char", "'\\xFE'"]
+]
+
+----------------------------------------------------
+
+Checks for chars.
\ No newline at end of file
diff --git a/tests/languages/haskell/comment_feature.test b/tests/languages/haskell/comment_feature.test
new file mode 100644
index 0000000000..d8c8cdda20
--- /dev/null
+++ b/tests/languages/haskell/comment_feature.test
@@ -0,0 +1,14 @@
+-- foo
+{- foo
+bar -}
+
+----------------------------------------------------
+
+[
+	["comment", "-- foo"],
+	["comment", "{- foo\r\nbar -}"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
\ No newline at end of file
diff --git a/tests/languages/haskell/constant_feature.test b/tests/languages/haskell/constant_feature.test
new file mode 100644
index 0000000000..06f25f10e5
--- /dev/null
+++ b/tests/languages/haskell/constant_feature.test
@@ -0,0 +1,15 @@
+Foo
+Foo.Bar
+Baz.Foobar_42
+
+----------------------------------------------------
+
+[
+	["constant", "Foo"],
+	["constant", "Foo.Bar"],
+	["constant", "Baz.Foobar_42"]
+]
+
+----------------------------------------------------
+
+Checks for constants.
\ No newline at end of file
diff --git a/tests/languages/haskell/hvariable_feature.test b/tests/languages/haskell/hvariable_feature.test
new file mode 100644
index 0000000000..defa3ba74d
--- /dev/null
+++ b/tests/languages/haskell/hvariable_feature.test
@@ -0,0 +1,15 @@
+foo
+Foo.bar
+Baz.foobar_42
+
+----------------------------------------------------
+
+[
+	["hvariable", "foo"],
+	["hvariable", "Foo.bar"],
+	["hvariable", "Baz.foobar_42"]
+]
+
+----------------------------------------------------
+
+Checks for hvariables.
\ No newline at end of file
diff --git a/tests/languages/haskell/import_statement_feature.test b/tests/languages/haskell/import_statement_feature.test
new file mode 100644
index 0000000000..120fbe7511
--- /dev/null
+++ b/tests/languages/haskell/import_statement_feature.test
@@ -0,0 +1,35 @@
+import Foo
+import qualified Foobar
+import Foo_42.Bar as Foobar
+import Foo.Bar as Foo.Baz hiding
+
+----------------------------------------------------
+
+[
+	["import_statement", [
+		["keyword", "import"],
+		" Foo"
+	]],
+	["import_statement", [
+		["keyword", "import"],
+		["keyword", "qualified"],
+		" Foobar"
+	]],
+	["import_statement", [
+		["keyword", "import"],
+		" Foo_42.Bar ",
+		["keyword", "as"],
+		" Foobar"
+	]],
+	["import_statement", [
+		["keyword", "import"],
+		" Foo.Bar ",
+		["keyword", "as"],
+		" Foo.Baz ",
+		["keyword", "hiding"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for import statement.
\ No newline at end of file
diff --git a/tests/languages/haskell/keyword_feature.test b/tests/languages/haskell/keyword_feature.test
new file mode 100644
index 0000000000..0fb3657923
--- /dev/null
+++ b/tests/languages/haskell/keyword_feature.test
@@ -0,0 +1,19 @@
+case class data deriving
+do else if in infixl
+infixr instance let
+module newtype of
+primitive then type where
+
+----------------------------------------------------
+
+[
+	["keyword", "case"], ["keyword", "class"], ["keyword", "data"], ["keyword", "deriving"],
+	["keyword", "do"], ["keyword", "else"], ["keyword", "if"], ["keyword", "in"], ["keyword", "infixl"],
+	["keyword", "infixr"], ["keyword", "instance"], ["keyword", "let"],
+	["keyword", "module"], ["keyword", "newtype"], ["keyword", "of"],
+	["keyword", "primitive"], ["keyword", "then"], ["keyword", "type"], ["keyword", "where"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/haskell/number_feature.test b/tests/languages/haskell/number_feature.test
new file mode 100644
index 0000000000..f45a0f2869
--- /dev/null
+++ b/tests/languages/haskell/number_feature.test
@@ -0,0 +1,23 @@
+42
+3.14159
+2E3
+1.2e-4
+0.9e+1
+0o47
+0xBadFace
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "2E3"],
+	["number", "1.2e-4"],
+	["number", "0.9e+1"],
+	["number", "0o47"],
+	["number", "0xBadFace"]
+]
+
+----------------------------------------------------
+
+Checks for decimal, octal and hexadecimal numbers.
\ No newline at end of file
diff --git a/tests/languages/haskell/operator_feature.test b/tests/languages/haskell/operator_feature.test
new file mode 100644
index 0000000000..9cd8339fbf
--- /dev/null
+++ b/tests/languages/haskell/operator_feature.test
@@ -0,0 +1,37 @@
+..
+reverse . sort
+`foo`
+`Foo.bar`
++ - * /
+^ ^^ **
+&& ||
+< <= == /=
+>= > \ |
+++ : !!
+\\ <- ->
+= :: =>
+>> >>= >@>
+~ ! @
+
+----------------------------------------------------
+
+[
+	["operator", ".."],
+	["builtin", "reverse"], ["operator", " . "], ["builtin", "sort"],
+	["operator", "`foo`"],
+	["operator", "`Foo.bar`"],
+	["operator", "+"], ["operator", "-"], ["operator", "*"], ["operator", "/"],
+	["operator", "^"], ["operator", "^^"], ["operator", "**"],
+	["operator", "&&"], ["operator", "||"],
+	["operator", "<"], ["operator", "<="], ["operator", "=="], ["operator", "/="],
+	["operator", ">="], ["operator", ">"], ["operator", "\\"], ["operator", "|"],
+	["operator", "++"], ["operator", ":"], ["operator", "!!"],
+	["operator", "\\\\"], ["operator", "<-"], ["operator", "->"],
+	["operator", "="], ["operator", "::"], ["operator", "=>"],
+	["operator", ">>"], ["operator", ">>="], ["operator", ">@>"],
+	["operator", "~"], ["operator", "!"], ["operator", "@"]
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/haskell/string_feature.test b/tests/languages/haskell/string_feature.test
new file mode 100644
index 0000000000..c45407975e
--- /dev/null
+++ b/tests/languages/haskell/string_feature.test
@@ -0,0 +1,16 @@
+""
+"fo\"o"
+"foo \
+  \ bar"
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"o\""],
+	["string", "\"foo \\\r\n  \\ bar\""]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From aaa90f1005e527765e6b4b4ae590faf4fb75dd83 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 23 Aug 2015 17:25:40 +0200
Subject: [PATCH 209/310] HTTP: Fix indentation + Add multiline flag for more
 flexibility + Fix response status + Handle \r\n and \r

---
 components/prism-http.js     | 72 +++++++++++++++++++-----------------
 components/prism-http.min.js |  2 +-
 2 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/components/prism-http.js b/components/prism-http.js
index f94f6de926..edddb406bf 100644
--- a/components/prism-http.js
+++ b/components/prism-http.js
@@ -1,44 +1,50 @@
 Prism.languages.http = {
-    'request-line': {
-        pattern: /^(POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b\shttps?:\/\/\S+\sHTTP\/[0-9.]+/,
-        inside: {
-            // HTTP Verb
-            property: /^\b(POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b/,
-            // Path or query argument
-            'attr-name': /:\w+/
-        }
-    },
-    'response-status': {
-        pattern: /^HTTP\/1.[01] [0-9]+.*/,
-        inside: {
-            // Status, e.g. 200 OK
-            property: /[0-9]+[A-Z\s-]+$/i
-        }
-    },
-    // HTTP header name
-    keyword: /^[\w-]+:(?=.+)/m
+	'request-line': {
+		pattern: /^(POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b\shttps?:\/\/\S+\sHTTP\/[0-9.]+/m,
+		inside: {
+			// HTTP Verb
+			property: /^(POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b/,
+			// Path or query argument
+			'attr-name': /:\w+/
+		}
+	},
+	'response-status': {
+		pattern: /^HTTP\/1.[01] [0-9]+.*/m,
+		inside: {
+			// Status, e.g. 200 OK
+			property: {
+                pattern: /(^HTTP\/1.[01] )[0-9]+.*/i,
+                lookbehind: true
+            }
+		}
+	},
+	// HTTP header name
+	'header-name': {
+        pattern: /^[\w-]+:(?=.)/m,
+        alias: 'keyword'
+    }
 };
 
 // Create a mapping of Content-Type headers to language definitions
 var httpLanguages = {
-    'application/json': Prism.languages.javascript,
-    'application/xml': Prism.languages.markup,
-    'text/xml': Prism.languages.markup,
-    'text/html': Prism.languages.markup
+	'application/json': Prism.languages.javascript,
+	'application/xml': Prism.languages.markup,
+	'text/xml': Prism.languages.markup,
+	'text/html': Prism.languages.markup
 };
 
 // Insert each content type parser that has its associated language
 // currently loaded.
 for (var contentType in httpLanguages) {
-    if (httpLanguages[contentType]) {
-        var options = {};
-        options[contentType] = {
-            pattern: new RegExp('(content-type:\\s*' + contentType + '[\\w\\W]*?)\\n\\n[\\w\\W]*', 'i'),
-            lookbehind: true,
-            inside: {
-                rest: httpLanguages[contentType]
-            }
-        };
-        Prism.languages.insertBefore('http', 'keyword', options);
-    }
+	if (httpLanguages[contentType]) {
+		var options = {};
+		options[contentType] = {
+			pattern: new RegExp('(content-type:\\s*' + contentType + '[\\w\\W]*?)(?:\\r?\\n|\\r){2}[\\w\\W]*', 'i'),
+			lookbehind: true,
+			inside: {
+				rest: httpLanguages[contentType]
+			}
+		};
+		Prism.languages.insertBefore('http', 'header-name', options);
+	}
 }
diff --git a/components/prism-http.min.js b/components/prism-http.min.js
index 05a0d74c2e..bd3b7287a3 100644
--- a/components/prism-http.min.js
+++ b/components/prism-http.min.js
@@ -1 +1 @@
-Prism.languages.http={"request-line":{pattern:/^(POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b\shttps?:\/\/\S+\sHTTP\/[0-9.]+/,inside:{property:/^\b(POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b/,"attr-name":/:\w+/}},"response-status":{pattern:/^HTTP\/1.[01] [0-9]+.*/,inside:{property:/[0-9]+[A-Z\s-]+$/i}},keyword:/^[\w-]+:(?=.+)/m};var httpLanguages={"application/json":Prism.languages.javascript,"application/xml":Prism.languages.markup,"text/xml":Prism.languages.markup,"text/html":Prism.languages.markup};for(var contentType in httpLanguages)if(httpLanguages[contentType]){var options={};options[contentType]={pattern:new RegExp("(content-type:\\s*"+contentType+"[\\w\\W]*?)\\n\\n[\\w\\W]*","i"),lookbehind:!0,inside:{rest:httpLanguages[contentType]}},Prism.languages.insertBefore("http","keyword",options)}
\ No newline at end of file
+Prism.languages.http={"request-line":{pattern:/^(POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b\shttps?:\/\/\S+\sHTTP\/[0-9.]+/m,inside:{property:/^(POST|GET|PUT|DELETE|OPTIONS|PATCH|TRACE|CONNECT)\b/,"attr-name":/:\w+/}},"response-status":{pattern:/^HTTP\/1.[01] [0-9]+.*/m,inside:{property:{pattern:/(^HTTP\/1.[01] )[0-9]+.*/i,lookbehind:!0}}},"header-name":{pattern:/^[\w-]+:(?=.)/m,alias:"keyword"}};var httpLanguages={"application/json":Prism.languages.javascript,"application/xml":Prism.languages.markup,"text/xml":Prism.languages.markup,"text/html":Prism.languages.markup};for(var contentType in httpLanguages)if(httpLanguages[contentType]){var options={};options[contentType]={pattern:new RegExp("(content-type:\\s*"+contentType+"[\\w\\W]*?)(?:\\r?\\n|\\r){2}[\\w\\W]*","i"),lookbehind:!0,inside:{rest:httpLanguages[contentType]}},Prism.languages.insertBefore("http","header-name",options)}
\ No newline at end of file

From 4ba4c48ebc7335cb9b646cc5949ced2113ed7b4c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 23 Aug 2015 17:26:38 +0200
Subject: [PATCH 210/310] Add tests for HTTP

---
 tests/languages/http/header-name_feature.test | 24 +++++++++
 .../languages/http/request-line_feature.test  | 51 +++++++++++++++++++
 .../http/response-status_feature.test         | 29 +++++++++++
 .../javascript+http_usage.test                | 21 ++++++++
 .../markup+http/markup+http_usage.test        | 30 +++++++++++
 5 files changed, 155 insertions(+)
 create mode 100644 tests/languages/http/header-name_feature.test
 create mode 100644 tests/languages/http/request-line_feature.test
 create mode 100644 tests/languages/http/response-status_feature.test
 create mode 100644 tests/languages/javascript+http/javascript+http_usage.test
 create mode 100644 tests/languages/markup+http/markup+http_usage.test

diff --git a/tests/languages/http/header-name_feature.test b/tests/languages/http/header-name_feature.test
new file mode 100644
index 0000000000..cd2612fa66
--- /dev/null
+++ b/tests/languages/http/header-name_feature.test
@@ -0,0 +1,24 @@
+Accept-Language: fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3
+Accept-Encoding: gzip, deflate
+Server: GitHub.com
+Date: Mon, 22 Dec 2014 18:25:30 GMT
+Content-Type: text/html; charset=utf-8
+
+----------------------------------------------------
+
+[
+	["header-name", "Accept-Language:"],
+	" fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3\r\n",
+	["header-name", "Accept-Encoding:"],
+	" gzip, deflate\r\n",
+	["header-name", "Server:"],
+	" GitHub.com\r\n",
+	["header-name", "Date:"],
+	" Mon, 22 Dec 2014 18:25:30 GMT\r\n",
+	["header-name", "Content-Type:"],
+	" text/html; charset=utf-8"
+]
+
+----------------------------------------------------
+
+Checks for header names.
\ No newline at end of file
diff --git a/tests/languages/http/request-line_feature.test b/tests/languages/http/request-line_feature.test
new file mode 100644
index 0000000000..e2343748dc
--- /dev/null
+++ b/tests/languages/http/request-line_feature.test
@@ -0,0 +1,51 @@
+POST http://example.com HTTP/1.0
+GET http://localhost:9999/foo.html HTTP/1.1
+PUT http://www.example.com HTTP/2.0
+DELETE https://example.com HTTP/1.1
+OPTIONS https://www.example.com HTTP/1.1
+PATCH http://example.com HTTP/1.0
+TRACE http://example.com HTTP/1.0
+CONNECT http://example.com HTTP/1.0
+
+----------------------------------------------------
+
+[
+	["request-line", [
+		["property", "POST"],
+		" http://example.com HTTP/1.0"
+	]],
+	["request-line", [
+		["property", "GET"],
+		" http://localhost",
+		["attr-name", ":9999"],
+		"/foo.html HTTP/1.1"
+	]],
+	["request-line", [
+		["property", "PUT"],
+		" http://www.example.com HTTP/2.0"
+	]],
+	["request-line", [
+		["property", "DELETE"],
+		" https://example.com HTTP/1.1"
+	]],
+	["request-line", [
+		["property", "OPTIONS"],
+		" https://www.example.com HTTP/1.1"
+	]],
+	["request-line", [
+		["property", "PATCH"],
+		" http://example.com HTTP/1.0"
+	]],
+	["request-line", [
+		["property", "TRACE"],
+		" http://example.com HTTP/1.0"
+	]],
+	["request-line", [
+		["property", "CONNECT"],
+		" http://example.com HTTP/1.0"
+	]]
+]
+
+----------------------------------------------------
+
+Checks for request lines.
\ No newline at end of file
diff --git a/tests/languages/http/response-status_feature.test b/tests/languages/http/response-status_feature.test
new file mode 100644
index 0000000000..7384ff2a89
--- /dev/null
+++ b/tests/languages/http/response-status_feature.test
@@ -0,0 +1,29 @@
+HTTP/1.0 200 OK
+HTTP/1.1 403 Forbidden
+HTTP/1.1 404 Not Found
+HTTP/1.0 418 I'm a teapot
+
+----------------------------------------------------
+
+[
+	["response-status", [
+		"HTTP/1.0 ",
+		["property", "200 OK"]
+	]],
+	["response-status", [
+		"HTTP/1.1 ",
+		["property", "403 Forbidden"]
+	]],
+	["response-status", [
+		"HTTP/1.1 ",
+		["property", "404 Not Found"]
+	]],
+	["response-status", [
+		"HTTP/1.0 ",
+		["property", "418 I'm a teapot"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for response statuses.
\ No newline at end of file
diff --git a/tests/languages/javascript+http/javascript+http_usage.test b/tests/languages/javascript+http/javascript+http_usage.test
new file mode 100644
index 0000000000..825fea49d5
--- /dev/null
+++ b/tests/languages/javascript+http/javascript+http_usage.test
@@ -0,0 +1,21 @@
+Content-type: application/json
+
+{"foo":"bar"}
+
+----------------------------------------------------
+
+[
+	["header-name", "Content-type:"],
+	" application/json",
+	["application/json", [
+		["punctuation", "{"],
+		["string", "\"foo\""],
+		["punctuation", ":"],
+		["string", "\"bar\""],
+		["punctuation", "}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for JSON content in HTTP.
\ No newline at end of file
diff --git a/tests/languages/markup+http/markup+http_usage.test b/tests/languages/markup+http/markup+http_usage.test
new file mode 100644
index 0000000000..77457709bc
--- /dev/null
+++ b/tests/languages/markup+http/markup+http_usage.test
@@ -0,0 +1,30 @@
+Content-type: application/xml
+
+<foo></foo>
+
+----------------------------------------------------
+
+[
+	["header-name", "Content-type:"],
+	" application/xml",
+	["application/xml", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"foo"
+			]],
+			["punctuation", ">"]
+		]],
+		["tag", [
+            ["tag", [
+                ["punctuation", "</"],
+                "foo"
+            ]],
+            ["punctuation", ">"]
+        ]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for XML content in HTTP.
\ No newline at end of file

From 53d58390296fece4b06b9de56259cc0190b3e719 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 24 Aug 2015 07:59:39 +0200
Subject: [PATCH 211/310] Ini: Fix some regexps + remove unused flags

---
 components/prism-ini.js     | 20 ++++++++++----------
 components/prism-ini.min.js |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/prism-ini.js b/components/prism-ini.js
index 1f6cb1251b..e6a3852203 100644
--- a/components/prism-ini.js
+++ b/components/prism-ini.js
@@ -1,11 +1,11 @@
-Prism.languages.ini= {
-	'comment': /^\s*;.*$/m,
-	'important': /\[.*?\]/m,
-	'constant': /^\s*[^\s=]+?(?=[ \t]*=)/m,
-	'attr-value': {
-		pattern: /=.*/m,
-		inside: {
-			'punctuation': /^[=]/
-		}
-	}
+Prism.languages.ini= {
+	'comment': /^[ \t]*;.*$/m,
+	'important': /\[.*?\]/,
+	'constant': /^[ \t]*[^\s=]+?(?=[ \t]*=)/m,
+	'attr-value': {
+		pattern: /=.*/,
+		inside: {
+			'punctuation': /^[=]/
+		}
+	}
 };
\ No newline at end of file
diff --git a/components/prism-ini.min.js b/components/prism-ini.min.js
index 9f0fb2fa94..b78bc95188 100644
--- a/components/prism-ini.min.js
+++ b/components/prism-ini.min.js
@@ -1 +1 @@
-Prism.languages.ini={comment:/^\s*;.*$/m,important:/\[.*?\]/m,constant:/^\s*[^\s=]+?(?=[ \t]*=)/m,"attr-value":{pattern:/=.*/m,inside:{punctuation:/^[=]/}}};
\ No newline at end of file
+Prism.languages.ini={comment:/^[ \t]*;.*$/m,important:/\[.*?\]/,constant:/^[ \t]*[^\s=]+?(?=[ \t]*=)/m,"attr-value":{pattern:/=.*/,inside:{punctuation:/^[=]/}}};
\ No newline at end of file

From 36b5b56eca314e032ccf4d7f1d381f650b2a5fc6 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 24 Aug 2015 08:00:41 +0200
Subject: [PATCH 212/310] Add tests for Ini

---
 tests/languages/ini/comment_feature.test   | 13 +++++++++++++
 tests/languages/ini/important_feature.test | 13 +++++++++++++
 tests/languages/ini/key_value_feature.test | 21 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 tests/languages/ini/comment_feature.test
 create mode 100644 tests/languages/ini/important_feature.test
 create mode 100644 tests/languages/ini/key_value_feature.test

diff --git a/tests/languages/ini/comment_feature.test b/tests/languages/ini/comment_feature.test
new file mode 100644
index 0000000000..85faefe78b
--- /dev/null
+++ b/tests/languages/ini/comment_feature.test
@@ -0,0 +1,13 @@
+;
+; foobar
+
+----------------------------------------------------
+
+[
+	["comment", ";"],
+	["comment", "; foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/ini/important_feature.test b/tests/languages/ini/important_feature.test
new file mode 100644
index 0000000000..b30ffc3e39
--- /dev/null
+++ b/tests/languages/ini/important_feature.test
@@ -0,0 +1,13 @@
+[owner]
+[foobar]
+
+----------------------------------------------------
+
+[
+	["important", "[owner]"],
+	["important", "[foobar]"]
+]
+
+----------------------------------------------------
+
+Checks for section titles.
\ No newline at end of file
diff --git a/tests/languages/ini/key_value_feature.test b/tests/languages/ini/key_value_feature.test
new file mode 100644
index 0000000000..5d25d9d3cf
--- /dev/null
+++ b/tests/languages/ini/key_value_feature.test
@@ -0,0 +1,21 @@
+foo=Bar Baz
+foobar=42
+
+----------------------------------------------------
+
+[
+	["constant", "foo"],
+	["attr-value", [
+		["punctuation", "="],
+		"Bar Baz"
+	]],
+	["constant", "foobar"],
+	["attr-value", [
+		["punctuation", "="],
+		"42"
+	]]
+]
+
+----------------------------------------------------
+
+Checks for key/value pairs.
\ No newline at end of file

From cae2cefb138862537f29cf7293d996f2b0c9bb27 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 24 Aug 2015 20:08:54 +0200
Subject: [PATCH 213/310] Twig: Prevent "other" pattern from matching blank
 strings

---
 components/prism-twig.js     | 3 ++-
 components/prism-twig.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/prism-twig.js b/components/prism-twig.js
index b2fc48fb58..7a8baccaa2 100644
--- a/components/prism-twig.js
+++ b/components/prism-twig.js
@@ -40,7 +40,8 @@ Prism.languages.twig = {
 
 	// The rest can be parsed as HTML
 	'other': {
-		pattern: /[\s\S]*/,
+		// We want non-blank matches
+		pattern: /\S(?:[\s\S]*\S)?/,
 		inside: Prism.languages.markup
 	}
 };
diff --git a/components/prism-twig.min.js b/components/prism-twig.min.js
index db8f500693..0cea17fa93 100644
--- a/components/prism-twig.min.js
+++ b/components/prism-twig.min.js
@@ -1 +1 @@
-Prism.languages.twig={comment:/\{#[\s\S]*?#\}/,tag:{pattern:/(\{\{[\s\S]*?\}\}|\{%[\s\S]*?%\})/,inside:{ld:{pattern:/^(\{\{\-?|\{%\-?\s*\w+)/,inside:{punctuation:/^(\{\{|\{%)\-?/,keyword:/\w+/}},rd:{pattern:/\-?(%\}|\}\})$/,inside:{punctuation:/.*/}},string:{pattern:/("|')(\\?.)*?\1/,inside:{punctuation:/^('|")|('|")$/}},keyword:/\b(if)\b/,"boolean":/\b(true|false|null)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/==|=|!=|<|>|>=|<=|\+|\-|~|\*|\/|\/\/|%|\*\*|\|/,"space-operator":{pattern:/(\s)(\b(not|b\-and|b\-xor|b\-or|and|or|in|matches|starts with|ends with|is)\b|\?|:|\?:)(?=\s)/,lookbehind:!0,inside:{operator:/.*/}},property:/\b[a-zA-Z_][a-zA-Z0-9_]*\b/,punctuation:/\(|\)|\[\]|\[|\]|\{|\}|:|\.|,/}},other:{pattern:/[\s\S]*/,inside:Prism.languages.markup}};
\ No newline at end of file
+Prism.languages.twig={comment:/\{#[\s\S]*?#\}/,tag:{pattern:/(\{\{[\s\S]*?\}\}|\{%[\s\S]*?%\})/,inside:{ld:{pattern:/^(\{\{\-?|\{%\-?\s*\w+)/,inside:{punctuation:/^(\{\{|\{%)\-?/,keyword:/\w+/}},rd:{pattern:/\-?(%\}|\}\})$/,inside:{punctuation:/.*/}},string:{pattern:/("|')(\\?.)*?\1/,inside:{punctuation:/^('|")|('|")$/}},keyword:/\b(if)\b/,"boolean":/\b(true|false|null)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/==|=|!=|<|>|>=|<=|\+|\-|~|\*|\/|\/\/|%|\*\*|\|/,"space-operator":{pattern:/(\s)(\b(not|b\-and|b\-xor|b\-or|and|or|in|matches|starts with|ends with|is)\b|\?|:|\?:)(?=\s)/,lookbehind:!0,inside:{operator:/.*/}},property:/\b[a-zA-Z_][a-zA-Z0-9_]*\b/,punctuation:/\(|\)|\[\]|\[|\]|\{|\}|:|\.|,/}},other:{pattern:/\S(?:[\s\S]*\S)?/,inside:Prism.languages.markup}};
\ No newline at end of file

From a79e838eefbce7892bdfc4fea8c7a3131c107b52 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 24 Aug 2015 20:10:36 +0200
Subject: [PATCH 214/310] Jade: Add todo list + remove single-line comment
 pattern + simplified most patterns with m flag + handle \r\n and \r

---
 components/prism-jade.js     | 64 +++++++++++++++++++-----------------
 components/prism-jade.min.js |  2 +-
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/components/prism-jade.js b/components/prism-jade.js
index e734706696..2b1010567b 100644
--- a/components/prism-jade.js
+++ b/components/prism-jade.js
@@ -1,18 +1,26 @@
 (function(Prism) {
+	// TODO:
+	// - Add CSS highlighting inside <style> tags
+	// - Add support for multi-line code blocks
+	// - Add support for interpolation #{} and !{}
+	// - Add support for tag interpolation #[]
+	// - Add explicit support for plain text using |
+	// - Add support for markup embedded in plain text
+
 	Prism.languages.jade = {
 
 		// Multiline stuff should appear before the rest
 
-		'multiline-comment': {
-			pattern: /((?:^|\n)([\t ]*))\/\/.*(\n\2[\t ]+.+)*/,
-			lookbehind: true,
-			alias: 'comment'
+		// This handles both single-line and multi-line comments
+		'comment': {
+			pattern: /(^([\t ]*))\/\/.*((?:\r?\n|\r)\2[\t ]+.+)*/m,
+			lookbehind: true
 		},
 
 		// All the tag-related part is in lookbehind
 		// so that it can be highlighted by the "tag" pattern
 		'multiline-script': {
-			pattern: /((?:^|\n)([\t ]*)script\b.*\.[\t ]*)(\n(?:\2[\t ]+.+|\s*?(?=\n)))+/,
+			pattern: /(^([\t ]*)script\b.*\.[\t ]*)((?:\r?\n|\r(?!\n))(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/m,
 			lookbehind: true,
 			inside: {
 				rest: Prism.languages.javascript
@@ -21,7 +29,7 @@
 
 		// See at the end of the file for known filters
 		'filter': {
-			pattern: /((?:^|\n)([\t ]*)):.+(\n(?:\2[\t ]+.+|\s*?(?=\n)))+/,
+			pattern: /(^([\t ]*)):.+((?:\r?\n|\r(?!\n))(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/m,
 			lookbehind: true,
 			inside: {
 				'filter-name': {
@@ -32,20 +40,16 @@
 		},
 
 		'multiline-plain-text': {
-			pattern: /((?:^|\n)([\t ]*)[\w\-#.]+\.[\t ]*)(\n(?:\2[\t ]+.+|\s*?(?=\n)))+/,
+			pattern: /(^([\t ]*)[\w\-#.]+\.[\t ]*)((?:\r?\n|\r(?!\n))(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/m,
 			lookbehind: true
 		},
 		'markup': {
-			pattern: /((?:^|\n)[\t ]*)<.+/,
+			pattern: /(^[\t ]*)<.+/m,
 			lookbehind: true,
 			inside: {
 				rest: Prism.languages.markup
 			}
 		},
-		'comment': {
-			pattern: /((?:^|\n)[\t ]*)\/\/.+/,
-			lookbehind: true
-		},
 		'doctype': {
 			pattern: /((?:^|\n)[\t ]*)doctype(?: .+)?/,
 			lookbehind: true
@@ -53,33 +57,31 @@
 
 		// This handle all conditional and loop keywords
 		'flow-control': {
-			pattern: /((?:^|\n)[\t ]*)(?:if|unless|else|case|when|default|each|while)(?: .+)?/,
+			pattern: /(^[\t ]*)(?:if|unless|else|case|when|default|each|while)\b(?: .+)?/m,
 			lookbehind: true,
 			inside: {
 				'each': {
-					pattern: /((?:^|\n)[\t ]*)each .+? in\b/,
-					lookbehind: true,
+					pattern: /^each .+? in\b/,
 					inside: {
 						'keyword': /\b(?:each|in)\b/,
 						'punctuation': /,/
 					}
 				},
 				'branch': {
-					pattern: /((?:^|\n)[\t ]*)(?:if|unless|else|case|when|default|while)/,
-					lookbehind: true,
+					pattern: /^(?:if|unless|else|case|when|default|while)\b/,
 					alias: 'keyword'
 				},
 				rest: Prism.languages.javascript
 			}
 		},
 		'keyword': {
-			pattern: /((?:^|\n)[\t ]*)(?:block|extends|include|append|prepend)\b.+/,
+			pattern: /(^[\t ]*)(?:block|extends|include|append|prepend)\b.+/m,
 			lookbehind: true
 		},
 		'mixin': [
 			// Declaration
 			{
-				pattern: /((?:^|\n)[\t ]*)mixin .+/,
+				pattern: /(^[\t ]*)mixin .+/m,
 				lookbehind: true,
 				inside: {
 					'keyword': /^mixin/,
@@ -89,7 +91,7 @@
 			},
 			// Usage
 			{
-				pattern: /((?:^|\n)[\t ]*)\+.+/,
+				pattern: /(^[\t ]*)\+.+/m,
 				lookbehind: true,
 				inside: {
 					'name': {
@@ -101,7 +103,7 @@
 			}
 		],
 		'script': {
-			pattern: /((?:^|\n)[\t ]*script(?:(?:&[^(]+)?\([^)]+\))*) .+/,
+			pattern: /(^[\t ]*script(?:(?:&[^(]+)?\([^)]+\))*[\t ]+).+/m,
 			lookbehind: true,
 			inside: {
 				rest: Prism.languages.javascript
@@ -109,11 +111,11 @@
 		},
 
 		'plain-text': {
-				pattern: /((?:^|\n)[\t ]*(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?[\t ]+).+/,
-				lookbehind: true
+			pattern: /(^[\t ]*(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?[\t ]+).+/m,
+			lookbehind: true
 		},
 		'tag': {
-			pattern: /((?:^|\n)[\t ]*)(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?:?/,
+			pattern: /(^[\t ]*)(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?:?/m,
 			lookbehind: true,
 			inside: {
 				'attributes': [
@@ -127,33 +129,33 @@
 						pattern: /\([^)]+\)/,
 						inside: {
 							'attr-value': {
-								pattern: /(=\s*)(?:\{[^}]*\}|[^,)\n]+)/,
+								pattern: /(=\s*)(?:\{[^}]*\}|[^,)\r\n]+)/,
 								lookbehind: true,
 								inside: {
 									rest: Prism.languages.javascript
 								}
 							},
 							'attr-name': /[\w-]+(?=\s*!?=|\s*[,)])/,
-							'punctuation': /[!=(),]/
+							'punctuation': /[!=(),]+/
 						}
 					}
 				],
-				'punctuation': /[:]/
+				'punctuation': /:/
 			}
 		},
 		'code': [
 			{
-				pattern: /((?:^|\n)[\t ]*(?:-|!?=)).+/,
+				pattern: /(^[\t ]*(?:-|!?=)).+/m,
 				lookbehind: true,
 				inside: {
 					rest: Prism.languages.javascript
 				}
 			}
 		],
-		'punctuation': /[.\-!=|]/
+		'punctuation': /[.\-!=|]+/
 	};
 
-	var filter_pattern = '((?:^|\\n)([\\t ]*)):{{filter_name}}(\\n(?:\\2[\\t ]+.+|\\s*?(?=\\n)))+';
+	var filter_pattern = '(^([\\t ]*)):{{filter_name}}((?:\\r?\\n|\\r(?!\\n))(?:\\2[\\t ]+.+|\\s*?(?=\\r?\\n|\\r)))+';
 
 	// Non exhaustive list of available filters and associated languages
 	var filters = [
@@ -178,7 +180,7 @@
 		filter = typeof filter === 'string' ? {filter: filter, language: filter} : filter;
 		if (Prism.languages[filter.language]) {
 			all_filters['filter-' + filter.filter] = {
-				pattern: RegExp(filter_pattern.replace('{{filter_name}}', filter.filter)),
+				pattern: RegExp(filter_pattern.replace('{{filter_name}}', filter.filter), 'm'),
 				lookbehind: true,
 				inside: {
 					'filter-name': {
diff --git a/components/prism-jade.min.js b/components/prism-jade.min.js
index a2bbbfa3f6..50d981ad7b 100644
--- a/components/prism-jade.min.js
+++ b/components/prism-jade.min.js
@@ -1 +1 @@
-!function(e){e.languages.jade={"multiline-comment":{pattern:/((?:^|\n)([\t ]*))\/\/.*(\n\2[\t ]+.+)*/,lookbehind:!0,alias:"comment"},"multiline-script":{pattern:/((?:^|\n)([\t ]*)script\b.*\.[\t ]*)(\n(?:\2[\t ]+.+|\s*?(?=\n)))+/,lookbehind:!0,inside:{rest:e.languages.javascript}},filter:{pattern:/((?:^|\n)([\t ]*)):.+(\n(?:\2[\t ]+.+|\s*?(?=\n)))+/,lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"}}},"multiline-plain-text":{pattern:/((?:^|\n)([\t ]*)[\w\-#.]+\.[\t ]*)(\n(?:\2[\t ]+.+|\s*?(?=\n)))+/,lookbehind:!0},markup:{pattern:/((?:^|\n)[\t ]*)<.+/,lookbehind:!0,inside:{rest:e.languages.markup}},comment:{pattern:/((?:^|\n)[\t ]*)\/\/.+/,lookbehind:!0},doctype:{pattern:/((?:^|\n)[\t ]*)doctype(?: .+)?/,lookbehind:!0},"flow-control":{pattern:/((?:^|\n)[\t ]*)(?:if|unless|else|case|when|default|each|while)(?: .+)?/,lookbehind:!0,inside:{each:{pattern:/((?:^|\n)[\t ]*)each .+? in\b/,lookbehind:!0,inside:{keyword:/\b(?:each|in)\b/,punctuation:/,/}},branch:{pattern:/((?:^|\n)[\t ]*)(?:if|unless|else|case|when|default|while)/,lookbehind:!0,alias:"keyword"},rest:e.languages.javascript}},keyword:{pattern:/((?:^|\n)[\t ]*)(?:block|extends|include|append|prepend)\b.+/,lookbehind:!0},mixin:[{pattern:/((?:^|\n)[\t ]*)mixin .+/,lookbehind:!0,inside:{keyword:/^mixin/,"function":/\w+(?=\s*\(|\s*$)/,punctuation:/[(),.]/}},{pattern:/((?:^|\n)[\t ]*)\+.+/,lookbehind:!0,inside:{name:{pattern:/^\+\w+/,alias:"function"},rest:e.languages.javascript}}],script:{pattern:/((?:^|\n)[\t ]*script(?:(?:&[^(]+)?\([^)]+\))*) .+/,lookbehind:!0,inside:{rest:e.languages.javascript}},"plain-text":{pattern:/((?:^|\n)[\t ]*(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?[\t ]+).+/,lookbehind:!0},tag:{pattern:/((?:^|\n)[\t ]*)(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?:?/,lookbehind:!0,inside:{attributes:[{pattern:/&[^(]+\([^)]+\)/,inside:{rest:e.languages.javascript}},{pattern:/\([^)]+\)/,inside:{"attr-value":{pattern:/(=\s*)(?:\{[^}]*\}|[^,)\n]+)/,lookbehind:!0,inside:{rest:e.languages.javascript}},"attr-name":/[\w-]+(?=\s*!?=|\s*[,)])/,punctuation:/[!=(),]/}}],punctuation:/[:]/}},code:[{pattern:/((?:^|\n)[\t ]*(?:-|!?=)).+/,lookbehind:!0,inside:{rest:e.languages.javascript}}],punctuation:/[.\-!=|]/};for(var t="((?:^|\\n)([\\t ]*)):{{filter_name}}(\\n(?:\\2[\\t ]+.+|\\s*?(?=\\n)))+",n=[{filter:"atpl",language:"twig"},{filter:"coffee",language:"coffeescript"},"ejs","handlebars","hogan","less","livescript","markdown","mustache","plates",{filter:"sass",language:"scss"},"stylus","swig"],a={},i=0,s=n.length;s>i;i++){var l=n[i];l="string"==typeof l?{filter:l,language:l}:l,e.languages[l.language]&&(a["filter-"+l.filter]={pattern:RegExp(t.replace("{{filter_name}}",l.filter)),lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},rest:e.languages[l.language]}})}e.languages.insertBefore("jade","filter",a)}(Prism);
\ No newline at end of file
+!function(e){e.languages.jade={comment:{pattern:/(^([\t ]*))\/\/.*((?:\r?\n|\r)\2[\t ]+.+)*/m,lookbehind:!0},"multiline-script":{pattern:/(^([\t ]*)script\b.*\.[\t ]*)((?:\r?\n|\r(?!\n))(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0,inside:{rest:e.languages.javascript}},filter:{pattern:/(^([\t ]*)):.+((?:\r?\n|\r(?!\n))(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"}}},"multiline-plain-text":{pattern:/(^([\t ]*)[\w\-#.]+\.[\t ]*)((?:\r?\n|\r(?!\n))(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0},markup:{pattern:/(^[\t ]*)<.+/m,lookbehind:!0,inside:{rest:e.languages.markup}},doctype:{pattern:/((?:^|\n)[\t ]*)doctype(?: .+)?/,lookbehind:!0},"flow-control":{pattern:/(^[\t ]*)(?:if|unless|else|case|when|default|each|while)\b(?: .+)?/m,lookbehind:!0,inside:{each:{pattern:/^each .+? in\b/,inside:{keyword:/\b(?:each|in)\b/,punctuation:/,/}},branch:{pattern:/^(?:if|unless|else|case|when|default|while)\b/,alias:"keyword"},rest:e.languages.javascript}},keyword:{pattern:/(^[\t ]*)(?:block|extends|include|append|prepend)\b.+/m,lookbehind:!0},mixin:[{pattern:/(^[\t ]*)mixin .+/m,lookbehind:!0,inside:{keyword:/^mixin/,"function":/\w+(?=\s*\(|\s*$)/,punctuation:/[(),.]/}},{pattern:/(^[\t ]*)\+.+/m,lookbehind:!0,inside:{name:{pattern:/^\+\w+/,alias:"function"},rest:e.languages.javascript}}],script:{pattern:/(^[\t ]*script(?:(?:&[^(]+)?\([^)]+\))*[\t ]+).+/m,lookbehind:!0,inside:{rest:e.languages.javascript}},"plain-text":{pattern:/(^[\t ]*(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?[\t ]+).+/m,lookbehind:!0},tag:{pattern:/(^[\t ]*)(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?:?/m,lookbehind:!0,inside:{attributes:[{pattern:/&[^(]+\([^)]+\)/,inside:{rest:e.languages.javascript}},{pattern:/\([^)]+\)/,inside:{"attr-value":{pattern:/(=\s*)(?:\{[^}]*\}|[^,)\r\n]+)/,lookbehind:!0,inside:{rest:e.languages.javascript}},"attr-name":/[\w-]+(?=\s*!?=|\s*[,)])/,punctuation:/[!=(),]+/}}],punctuation:/:/}},code:[{pattern:/(^[\t ]*(?:-|!?=)).+/m,lookbehind:!0,inside:{rest:e.languages.javascript}}],punctuation:/[.\-!=|]+/};for(var t="(^([\\t ]*)):{{filter_name}}((?:\\r?\\n|\\r(?!\\n))(?:\\2[\\t ]+.+|\\s*?(?=\\r?\\n|\\r)))+",n=[{filter:"atpl",language:"twig"},{filter:"coffee",language:"coffeescript"},"ejs","handlebars","hogan","less","livescript","markdown","mustache","plates",{filter:"sass",language:"scss"},"stylus","swig"],a={},i=0,r=n.length;r>i;i++){var s=n[i];s="string"==typeof s?{filter:s,language:s}:s,e.languages[s.language]&&(a["filter-"+s.filter]={pattern:RegExp(t.replace("{{filter_name}}",s.filter),"m"),lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},rest:e.languages[s.language]}})}e.languages.insertBefore("jade","filter",a)}(Prism);
\ No newline at end of file

From d48b275d4723e1e7aa150a63eb9521cae27b6f2b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 24 Aug 2015 20:11:17 +0200
Subject: [PATCH 215/310] Add tests for Jade

---
 .../coffeescript+jade_usage.test              | 19 ++++
 .../handlebars+jade_usage.test                | 15 +++
 tests/languages/jade/code_feature.test        | 36 +++++++
 tests/languages/jade/comment_feature.test     | 22 +++++
 tests/languages/jade/doctype_feature.test     | 15 +++
 .../languages/jade/flow-control_feature.test  | 75 ++++++++++++++
 tests/languages/jade/keyword_feature.test     | 27 ++++++
 tests/languages/jade/mixin_feature.test       | 35 +++++++
 .../jade/multiline-plain-text_feature.test    | 30 ++++++
 .../jade/multiline-script_feature.test        | 58 +++++++++++
 tests/languages/jade/plain-text_feature.test  | 19 ++++
 tests/languages/jade/script_feature.test      | 38 ++++++++
 tests/languages/jade/tag_feature.test         | 97 +++++++++++++++++++
 .../languages/less+jade/less+jade_usage.test  | 20 ++++
 .../markdown+jade/markdown+jade_usage.test    | 18 ++++
 .../languages/markup+jade/markup_feature.test | 29 ++++++
 .../languages/scss+jade/scss+jade_usage.test  | 17 ++++
 .../stylus+jade/style+jade_usage.test         | 18 ++++
 .../languages/twig+jade/twig+jade_usage.test  | 19 ++++
 19 files changed, 607 insertions(+)
 create mode 100644 tests/languages/coffeescript+jade/coffeescript+jade_usage.test
 create mode 100644 tests/languages/handlebars+jade/handlebars+jade_usage.test
 create mode 100644 tests/languages/jade/code_feature.test
 create mode 100644 tests/languages/jade/comment_feature.test
 create mode 100644 tests/languages/jade/doctype_feature.test
 create mode 100644 tests/languages/jade/flow-control_feature.test
 create mode 100644 tests/languages/jade/keyword_feature.test
 create mode 100644 tests/languages/jade/mixin_feature.test
 create mode 100644 tests/languages/jade/multiline-plain-text_feature.test
 create mode 100644 tests/languages/jade/multiline-script_feature.test
 create mode 100644 tests/languages/jade/plain-text_feature.test
 create mode 100644 tests/languages/jade/script_feature.test
 create mode 100644 tests/languages/jade/tag_feature.test
 create mode 100644 tests/languages/less+jade/less+jade_usage.test
 create mode 100644 tests/languages/markdown+jade/markdown+jade_usage.test
 create mode 100644 tests/languages/markup+jade/markup_feature.test
 create mode 100644 tests/languages/scss+jade/scss+jade_usage.test
 create mode 100644 tests/languages/stylus+jade/style+jade_usage.test
 create mode 100644 tests/languages/twig+jade/twig+jade_usage.test

diff --git a/tests/languages/coffeescript+jade/coffeescript+jade_usage.test b/tests/languages/coffeescript+jade/coffeescript+jade_usage.test
new file mode 100644
index 0000000000..ccf8963ba1
--- /dev/null
+++ b/tests/languages/coffeescript+jade/coffeescript+jade_usage.test
@@ -0,0 +1,19 @@
+:coffee
+	"#{foo}"
+
+----------------------------------------------------
+
+[
+	["filter-coffee", [
+		["filter-name", ":coffee"],
+		["string", [
+			"\"",
+			["interpolation", "#{foo}"],
+			"\""
+		]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for coffee filter (CoffeeScript) in Jade.
\ No newline at end of file
diff --git a/tests/languages/handlebars+jade/handlebars+jade_usage.test b/tests/languages/handlebars+jade/handlebars+jade_usage.test
new file mode 100644
index 0000000000..f95ba773bc
--- /dev/null
+++ b/tests/languages/handlebars+jade/handlebars+jade_usage.test
@@ -0,0 +1,15 @@
+:handlebars
+	{{!comment}}
+
+----------------------------------------------------
+
+[
+	["filter-handlebars", [
+		["filter-name", ":handlebars"],
+		["handlebars-comment", "{{!comment}}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for handlebars filter in Jade.
\ No newline at end of file
diff --git a/tests/languages/jade/code_feature.test b/tests/languages/jade/code_feature.test
new file mode 100644
index 0000000000..6bb436bae7
--- /dev/null
+++ b/tests/languages/jade/code_feature.test
@@ -0,0 +1,36 @@
+- if(foo)
+
+p= 'This code is' + ' <escaped>!'
+
+span
+	!= 'Not escaped'
+
+----------------------------------------------------
+
+[
+	["punctuation", "-"],
+	["code", [
+		["keyword", "if"],
+		["punctuation", "("],
+		"foo",
+		["punctuation", ")"]
+	]],
+
+	["tag", ["p"]],
+	["punctuation", "="],
+	["code", [
+		["string", "'This code is'"],
+		["operator", "+"],
+		["string", "' <escaped>!'"]
+	]],
+
+	["tag", ["span"]],
+	["punctuation", "!="],
+	["code", [
+		["string", "'Not escaped'"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for inline code.
\ No newline at end of file
diff --git a/tests/languages/jade/comment_feature.test b/tests/languages/jade/comment_feature.test
new file mode 100644
index 0000000000..1ca737a566
--- /dev/null
+++ b/tests/languages/jade/comment_feature.test
@@ -0,0 +1,22 @@
+// foo
+ bar
+
+	// foo
+		bar baz
+
+// foo
+
+	// bar
+
+----------------------------------------------------
+
+[
+	["comment", "// foo\r\n bar"],
+	["comment", "// foo\r\n\t\tbar baz"],
+	["comment", "// foo"],
+	["comment", "// bar"]
+]
+
+----------------------------------------------------
+
+Checks for single-line comments.
\ No newline at end of file
diff --git a/tests/languages/jade/doctype_feature.test b/tests/languages/jade/doctype_feature.test
new file mode 100644
index 0000000000..7c13b12e2c
--- /dev/null
+++ b/tests/languages/jade/doctype_feature.test
@@ -0,0 +1,15 @@
+doctype html
+doctype 1.1
+doctype html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN"
+
+----------------------------------------------------
+
+[
+	["doctype", "doctype html"],
+	["doctype", "doctype 1.1"],
+	["doctype", "doctype html PUBLIC \"-//W3C//DTD XHTML Basic 1.1//EN\""]
+]
+
+----------------------------------------------------
+
+Checks for doctypes.
\ No newline at end of file
diff --git a/tests/languages/jade/flow-control_feature.test b/tests/languages/jade/flow-control_feature.test
new file mode 100644
index 0000000000..2b68ddf8dc
--- /dev/null
+++ b/tests/languages/jade/flow-control_feature.test
@@ -0,0 +1,75 @@
+each val, index in [1,2,3]
+
+if foo
+else if bar
+else
+
+unless foo
+
+while n < 4
+
+case foo
+	when "bar"
+	default
+
+----------------------------------------------------
+
+[
+	["flow-control", [
+		["each", [
+			["keyword", "each"],
+			" val",
+			["punctuation", ","],
+			" index ",
+			["keyword", "in"]
+		]],
+		["punctuation", "["],
+		["number", "1"],
+		["punctuation", ","],
+		["number", "2"],
+		["punctuation", ","],
+		["number", "3"],
+		["punctuation", "]"]
+	]],
+
+	["flow-control", [
+		["branch", "if"],
+		" foo"
+	]],
+	["flow-control", [
+        ["branch", "else"],
+        ["keyword", "if"],
+        " bar"
+    ]],
+    ["flow-control", [
+        ["branch", "else"]
+    ]],
+
+    ["flow-control", [
+        ["branch", "unless"],
+        " foo"
+    ]],
+
+    ["flow-control", [
+        ["branch", "while"],
+        " n ",
+        ["operator", "<"],
+        ["number", "4"]
+    ]],
+
+    ["flow-control", [
+        ["branch", "case"],
+        " foo"
+    ]],
+    ["flow-control", [
+        ["branch", "when"],
+        ["string", "\"bar\""]
+    ]],
+    ["flow-control", [
+        ["branch", "default"]
+    ]]
+]
+
+----------------------------------------------------
+
+Checks for all flow-control structures.
\ No newline at end of file
diff --git a/tests/languages/jade/keyword_feature.test b/tests/languages/jade/keyword_feature.test
new file mode 100644
index 0000000000..21a5383cdb
--- /dev/null
+++ b/tests/languages/jade/keyword_feature.test
@@ -0,0 +1,27 @@
+block title
+
+	extends ./foo.jade
+
+include ./bar.jade
+
+block append foo
+append bar
+
+block prepend foo
+prepend bar
+
+----------------------------------------------------
+
+[
+	["keyword", "block title"],
+	["keyword", "extends ./foo.jade"],
+	["keyword", "include ./bar.jade"],
+	["keyword", "block append foo"],
+	["keyword", "append bar"],
+	["keyword", "block prepend foo"],
+	["keyword", "prepend bar"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/jade/mixin_feature.test b/tests/languages/jade/mixin_feature.test
new file mode 100644
index 0000000000..ef515b3847
--- /dev/null
+++ b/tests/languages/jade/mixin_feature.test
@@ -0,0 +1,35 @@
+mixin foo
+mixin pet(name)
+
++foo
++pet('cat')
+
+----------------------------------------------------
+
+[
+	["mixin", [
+		["keyword", "mixin"],
+		["function", "foo"]
+	]],
+	["mixin", [
+		["keyword", "mixin"],
+		["function", "pet"],
+		["punctuation", "("],
+		"name",
+		["punctuation", ")"]
+	]],
+
+	["mixin", [
+		["name", "+foo"]
+	]],
+	["mixin", [
+		["name", "+pet"],
+		["punctuation", "("],
+		["string", "'cat'"],
+		["punctuation", ")"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for mixins declaration and usage.
\ No newline at end of file
diff --git a/tests/languages/jade/multiline-plain-text_feature.test b/tests/languages/jade/multiline-plain-text_feature.test
new file mode 100644
index 0000000000..fc14a71a68
--- /dev/null
+++ b/tests/languages/jade/multiline-plain-text_feature.test
@@ -0,0 +1,30 @@
+div.
+ foobar
+
+ baz
+.
+	div.
+		foobar
+		baz
+
+----------------------------------------------------
+
+[
+	["tag", [
+		"div"
+	]],
+	["punctuation", "."],
+	["multiline-plain-text", "\r\n foobar\r\n\r\n baz"],
+
+	["punctuation", "."],
+
+	["tag", [
+		"div"
+	]],
+	["punctuation", "."],
+	["multiline-plain-text", "\r\n\t\tfoobar\r\n\t\tbaz"]
+]
+
+----------------------------------------------------
+
+Checks for multi-line plain text.
\ No newline at end of file
diff --git a/tests/languages/jade/multiline-script_feature.test b/tests/languages/jade/multiline-script_feature.test
new file mode 100644
index 0000000000..5648bf3d6c
--- /dev/null
+++ b/tests/languages/jade/multiline-script_feature.test
@@ -0,0 +1,58 @@
+script.
+ alert(42);
+
+.
+	script(type='text/javascript').
+
+		if(foo) {
+			bar(1 + 5);
+		}
+
+----------------------------------------------------
+
+[
+	["tag", [
+		"script"
+	]],
+	["punctuation", "."],
+	["multiline-script", [
+		["function", "alert"],
+		["punctuation", "("],
+		["number", "42"],
+		["punctuation", ")"],
+		["punctuation", ";"]
+	]],
+
+	["punctuation", "."],
+
+	["tag", [
+		"script",
+		["attributes", [
+			["punctuation", "("],
+			["attr-name", "type"],
+			["punctuation", "="],
+			["attr-value", [["string", "'text/javascript'"]]],
+			["punctuation", ")"]
+		]]
+	]],
+	["punctuation", "."],
+	["multiline-script", [
+		["keyword", "if"],
+		["punctuation", "("],
+		"foo",
+		["punctuation", ")"],
+		["punctuation", "{"],
+		["function", "bar"],
+		["punctuation", "("],
+		["number", "1"],
+		["operator", "+"],
+		["number", "5"],
+		["punctuation", ")"],
+		["punctuation", ";"],
+		["punctuation", "}"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for multi-line scripts. The alone dot serves as a separator.
\ No newline at end of file
diff --git a/tests/languages/jade/plain-text_feature.test b/tests/languages/jade/plain-text_feature.test
new file mode 100644
index 0000000000..5e97fb0140
--- /dev/null
+++ b/tests/languages/jade/plain-text_feature.test
@@ -0,0 +1,19 @@
+div foo
+	span foo bar
+
+----------------------------------------------------
+
+[
+	["tag", [
+		"div"
+	]],
+	["plain-text", "foo"],
+	["tag", [
+		"span"
+	]],
+	["plain-text", "foo bar"]
+]
+
+----------------------------------------------------
+
+Checks for single-line plain text.
\ No newline at end of file
diff --git a/tests/languages/jade/script_feature.test b/tests/languages/jade/script_feature.test
new file mode 100644
index 0000000000..649fbf39e7
--- /dev/null
+++ b/tests/languages/jade/script_feature.test
@@ -0,0 +1,38 @@
+script alert(42);
+	script(type='text/javascript') alert(42);
+
+----------------------------------------------------
+
+[
+	["tag", [
+		"script"
+	]],
+	["script", [
+		["function", "alert"],
+		["punctuation", "("],
+		["number", "42"],
+		["punctuation", ")"],
+		["punctuation", ";"]
+	]],
+	["tag", [
+		"script",
+		["attributes", [
+			["punctuation", "("],
+			["attr-name", "type"],
+			["punctuation", "="],
+			["attr-value", [["string", "'text/javascript'"]]],
+			["punctuation", ")"]
+		]]
+	]],
+	["script", [
+		["function", "alert"],
+		["punctuation", "("],
+		["number", "42"],
+		["punctuation", ")"],
+		["punctuation", ";"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for single-line scripts.
\ No newline at end of file
diff --git a/tests/languages/jade/tag_feature.test b/tests/languages/jade/tag_feature.test
new file mode 100644
index 0000000000..415f8bd9b1
--- /dev/null
+++ b/tests/languages/jade/tag_feature.test
@@ -0,0 +1,97 @@
+div
+	span&attributes({'data-foo': 'bar'})
+
+input(data-bar="foo", type='checkbox', checked)
+
+a(style={color: 'red', background: 'green'})
+
+div(unescaped!="<code>")
+
+a.button
+.content
+
+a#main-link
+#content
+
+a: span
+
+----------------------------------------------------
+
+[
+	["tag", ["div"]],
+	["tag", [
+		"span",
+		["attributes", [
+			["operator", "&"],
+			["function", "attributes"],
+			["punctuation", "("],
+			["punctuation", "{"],
+			["string", "'data-foo'"],
+			["punctuation", ":"],
+			["string", "'bar'"],
+			["punctuation", "}"],
+			["punctuation", ")"]
+		]]
+	]],
+
+	["tag", [
+		"input",
+		["attributes", [
+			["punctuation", "("],
+			["attr-name", "data-bar"],
+			["punctuation", "="],
+			["attr-value", [["string", "\"foo\""]]],
+			["punctuation", ","],
+			["attr-name", "type"],
+			["punctuation", "="],
+			["attr-value", [["string", "'checkbox'"]]],
+			["punctuation", ","],
+			["attr-name", "checked"],
+			["punctuation", ")"]
+		]]
+	]],
+
+	["tag", [
+		"a",
+		["attributes", [
+			["punctuation", "("],
+			["attr-name", "style"],
+			["punctuation", "="],
+			["attr-value", [
+				["punctuation", "{"],
+				"color",
+				["punctuation", ":"],
+				["string", "'red'"],
+				["punctuation", ","],
+				" background",
+				["punctuation", ":"],
+				["string", "'green'"],
+				["punctuation", "}"]
+			]],
+			["punctuation", ")"]
+		]]
+	]],
+
+	["tag", [
+		"div",
+		["attributes", [
+			["punctuation", "("],
+			["attr-name", "unescaped"],
+			["punctuation", "!="],
+			["attr-value", [["string", "\"<code>\""]]],
+			["punctuation", ")"]
+		]]
+	]],
+
+	["tag", ["a.button"]],
+	["tag", [".content"]],
+	["tag", ["a#main-link"]],
+	["tag", ["#content"]],
+
+	["tag", ["a", ["punctuation", ":"]]],
+	["tag", ["span"]]
+]
+
+----------------------------------------------------
+
+Checks for tags and attributes.
\ No newline at end of file
diff --git a/tests/languages/less+jade/less+jade_usage.test b/tests/languages/less+jade/less+jade_usage.test
new file mode 100644
index 0000000000..1cc8b350c8
--- /dev/null
+++ b/tests/languages/less+jade/less+jade_usage.test
@@ -0,0 +1,20 @@
+:less
+	@foo: #123;
+
+----------------------------------------------------
+
+[
+	["filter-less", [
+		["filter-name", ":less"],
+		["variable", [
+			"@foo",
+			["punctuation", ":"]
+		]],
+		" #123",
+		["punctuation", ";"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for less filter in Jade.
\ No newline at end of file
diff --git a/tests/languages/markdown+jade/markdown+jade_usage.test b/tests/languages/markdown+jade/markdown+jade_usage.test
new file mode 100644
index 0000000000..01e6c3e796
--- /dev/null
+++ b/tests/languages/markdown+jade/markdown+jade_usage.test
@@ -0,0 +1,18 @@
+:markdown
+  # title
+
+----------------------------------------------------
+
+[
+	["filter-markdown", [
+		["filter-name", ":markdown"],
+		["title", [
+			["punctuation", "#"],
+			" title"
+		]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for markdown filter in Jade.
\ No newline at end of file
diff --git a/tests/languages/markup+jade/markup_feature.test b/tests/languages/markup+jade/markup_feature.test
new file mode 100644
index 0000000000..d78e69b92a
--- /dev/null
+++ b/tests/languages/markup+jade/markup_feature.test
@@ -0,0 +1,29 @@
+<div>
+	<span>
+
+----------------------------------------------------
+
+[
+	["markup", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"div"
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+	["markup", [
+		["tag", [
+            ["tag", [
+                ["punctuation", "<"],
+                "span"
+            ]],
+            ["punctuation", ">"]
+        ]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for Markup inside Jade.
\ No newline at end of file
diff --git a/tests/languages/scss+jade/scss+jade_usage.test b/tests/languages/scss+jade/scss+jade_usage.test
new file mode 100644
index 0000000000..035147844b
--- /dev/null
+++ b/tests/languages/scss+jade/scss+jade_usage.test
@@ -0,0 +1,17 @@
+:sass
+  @extend .foo;
+
+----------------------------------------------------
+
+[
+	["filter-sass", [
+		["filter-name", ":sass"],
+		["keyword", "@extend"],
+		" .foo",
+		["punctuation", ";"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for sass filter (Scss) in Jade.
\ No newline at end of file
diff --git a/tests/languages/stylus+jade/style+jade_usage.test b/tests/languages/stylus+jade/style+jade_usage.test
new file mode 100644
index 0000000000..08e4af83a0
--- /dev/null
+++ b/tests/languages/stylus+jade/style+jade_usage.test
@@ -0,0 +1,18 @@
+:stylus
+  font-size = 14px
+
+----------------------------------------------------
+
+[
+	["filter-stylus", [
+		["filter-name", ":stylus"],
+		["variable", "\r\n  font-size"],
+		["operator", "="],
+		["number", "14"],
+		["keyword", "px"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for stylus filter in Jade.
\ No newline at end of file
diff --git a/tests/languages/twig+jade/twig+jade_usage.test b/tests/languages/twig+jade/twig+jade_usage.test
new file mode 100644
index 0000000000..90f32d1452
--- /dev/null
+++ b/tests/languages/twig+jade/twig+jade_usage.test
@@ -0,0 +1,19 @@
+:atpl
+	{{42}}
+
+----------------------------------------------------
+
+[
+	["filter-atpl", [
+	    ["filter-name", ":atpl"],
+	    ["tag", [
+		    ["ld", [["punctuation", "{{"]]],
+		    ["number", "42"],
+		    ["rd", [["punctuation", "}}"]]]
+	    ]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for atpl filter (Twig) in Jade.
\ No newline at end of file

From 21e20b9e8f3cbfec10cb6bc83cc8eb39156a20cb Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 25 Aug 2015 07:40:27 +0200
Subject: [PATCH 216/310] Java: fix number regexp + simplified number regexp
 and optimized operator regexp

---
 components/prism-java.js     | 4 ++--
 components/prism-java.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-java.js b/components/prism-java.js
index 8bc51ae809..b011c2fc7d 100644
--- a/components/prism-java.js
+++ b/components/prism-java.js
@@ -1,8 +1,8 @@
 Prism.languages.java = Prism.languages.extend('clike', {
 	'keyword': /\b(abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while)\b/,
-	'number': /\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp\-]+\b|\b\d*\.?\d+[e]?[\d]*[df]\b|\b\d*\.?\d+\b/i,
+	'number': /\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp\-]+\b|\b\d*\.?\d+(?:e[+-]?\d+)?[df]?\b/i,
 	'operator': {
-		pattern: /(^|[^\.])(?:\+=|\+\+?|-=|--?|!=?|<{1,2}=?|>{1,3}=?|==?|&=|&&?|\|=|\|\|?|\?|\*=?|\/=?|%=?|\^=?|:|~)/m,
+		pattern: /(^|[^.])(?:\+[+=]?|-[-=]?|!=?|<<?=?|>>?>?=?|==?|&[&=]?|\|[|=]?|\*=?|\/=?|%=?|\^=?|[?:~])/m,
 		lookbehind: true
 	}
 });
\ No newline at end of file
diff --git a/components/prism-java.min.js b/components/prism-java.min.js
index 215ee2bdc4..fb93276c99 100644
--- a/components/prism-java.min.js
+++ b/components/prism-java.min.js
@@ -1 +1 @@
-Prism.languages.java=Prism.languages.extend("clike",{keyword:/\b(abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while)\b/,number:/\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp\-]+\b|\b\d*\.?\d+[e]?[\d]*[df]\b|\b\d*\.?\d+\b/i,operator:{pattern:/(^|[^\.])(?:\+=|\+\+?|-=|--?|!=?|<{1,2}=?|>{1,3}=?|==?|&=|&&?|\|=|\|\|?|\?|\*=?|\/=?|%=?|\^=?|:|~)/m,lookbehind:!0}});
\ No newline at end of file
+Prism.languages.java=Prism.languages.extend("clike",{keyword:/\b(abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while)\b/,number:/\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp\-]+\b|\b\d*\.?\d+(?:e[+-]?\d+)?[df]?\b/i,operator:{pattern:/(^|[^.])(?:\+[+=]?|-[-=]?|!=?|<<?=?|>>?>?=?|==?|&[&=]?|\|[|=]?|\*=?|\/=?|%=?|\^=?|[?:~])/m,lookbehind:!0}});
\ No newline at end of file

From 34add3599de51f09c8e927d305c84083c2297bed Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 25 Aug 2015 07:41:11 +0200
Subject: [PATCH 217/310] Add tests for Java

---
 tests/languages/java/keyword_feature.test  | 51 ++++++++++++++++++++++
 tests/languages/java/number_feature.test   | 27 ++++++++++++
 tests/languages/java/operator_feature.test | 33 ++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 tests/languages/java/keyword_feature.test
 create mode 100644 tests/languages/java/number_feature.test
 create mode 100644 tests/languages/java/operator_feature.test

diff --git a/tests/languages/java/keyword_feature.test b/tests/languages/java/keyword_feature.test
new file mode 100644
index 0000000000..4a6613c868
--- /dev/null
+++ b/tests/languages/java/keyword_feature.test
@@ -0,0 +1,51 @@
+abstract continue for
+new ;
+switch assert default
+goto package synchronized
+boolean do if private
+this break double
+implements ;
+protected throw byte else
+import public throws case
+enum
+instanceof ;
+return transient catch
+extends ;
+int short try char
+final
+interface ;
+static void
+class ;
+finally long
+strictfp volatile const
+float native super while
+
+----------------------------------------------------
+
+[
+	["keyword", "abstract"], ["keyword", "continue"], ["keyword", "for"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "switch"], ["keyword", "assert"], ["keyword", "default"],
+	["keyword", "goto"], ["keyword", "package"], ["keyword", "synchronized"],
+	["keyword", "boolean"], ["keyword", "do"], ["keyword", "if"], ["keyword", "private"],
+	["keyword", "this"], ["keyword", "break"], ["keyword", "double"],
+	["keyword", "implements"], ["punctuation", ";"],
+	["keyword", "protected"], ["keyword", "throw"], ["keyword", "byte"], ["keyword", "else"],
+	["keyword", "import"], ["keyword", "public"], ["keyword", "throws"], ["keyword", "case"],
+	["keyword", "enum"],
+	["keyword", "instanceof"], ["punctuation", ";"],
+	["keyword", "return"], ["keyword", "transient"], ["keyword", "catch"],
+	["keyword", "extends"], ["punctuation", ";"],
+	["keyword", "int"], ["keyword", "short"], ["keyword", "try"], ["keyword", "char"],
+	["keyword", "final"],
+	["keyword", "interface"], ["punctuation", ";"],
+	["keyword", "static"],	["keyword", "void"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "finally"], ["keyword", "long"],
+	["keyword", "strictfp"], ["keyword", "volatile"], ["keyword", "const"],
+	["keyword", "float"], ["keyword", "native"], ["keyword", "super"], ["keyword", "while"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/java/number_feature.test b/tests/languages/java/number_feature.test
new file mode 100644
index 0000000000..b88f082c19
--- /dev/null
+++ b/tests/languages/java/number_feature.test
@@ -0,0 +1,27 @@
+0b11110000
+0xBadFace
+0x1.8p1
+0xa.fp-2
+42
+42d
+1.2e3f
+0.1E-4f
+0.2e+1f
+
+----------------------------------------------------
+
+[
+	["number", "0b11110000"],
+	["number", "0xBadFace"],
+	["number", "0x1.8p1"],
+	["number", "0xa.fp-2"],
+	["number", "42"],
+	["number", "42d"],
+	["number", "1.2e3f"],
+	["number", "0.1E-4f"],
+	["number", "0.2e+1f"]
+]
+
+----------------------------------------------------
+
+Checks for binary, hexadecimal and decimal numbers.
\ No newline at end of file
diff --git a/tests/languages/java/operator_feature.test b/tests/languages/java/operator_feature.test
new file mode 100644
index 0000000000..87f4906b6d
--- /dev/null
+++ b/tests/languages/java/operator_feature.test
@@ -0,0 +1,33 @@
++ ++ +=
+- -- -=
+! !=
+< << <= <<=
+> >> >>> >= >>= >>>=
+= ==
+& && &=
+| || |=
+? : ~
+* *=
+/ /=
+% %=
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "++"], ["operator", "+="],
+	["operator", "-"], ["operator", "--"], ["operator", "-="],
+	["operator", "!"], ["operator", "!="],
+	["operator", "<"], ["operator", "<<"], ["operator", "<="], ["operator", "<<="],
+	["operator", ">"], ["operator", ">>"], ["operator", ">>>"], ["operator", ">="], ["operator", ">>="], ["operator", ">>>="],
+	["operator", "="], ["operator", "=="],
+	["operator", "&"], ["operator", "&&"], ["operator", "&="],
+	["operator", "|"], ["operator", "||"], ["operator", "|="],
+	["operator", "?"], ["operator", ":"], ["operator", "~"],
+	["operator", "*"], ["operator", "*="],
+	["operator", "/"], ["operator", "/="],
+	["operator", "%"], ["operator", "%="]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file

From ac792bd73844f889ba65d80acf24e80b11f92c1c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 25 Aug 2015 08:04:33 +0200
Subject: [PATCH 218/310] Prism loader must handle dependency array.

---
 tests/helper/prism-loader.js | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/tests/helper/prism-loader.js b/tests/helper/prism-loader.js
index 31f3689d63..2885ad3028 100644
--- a/tests/helper/prism-loader.js
+++ b/tests/helper/prism-loader.js
@@ -19,15 +19,33 @@ module.exports = {
 			loadedLanguages: [],
 			Prism: this.createEmptyPrism()
 		};
-		languages = Array.isArray(languages) ? languages : [languages];
 
-		for (var i = 0, l = languages.length; i < l; i++) {
-			context = this.loadLanguage(languages[i], context);
-		}
+		context = this.loadLanguages(languages, context);
 
 		return context.Prism;
 	},
 
+	/**
+	 * Loads the given languages and appends the config to the given Prism object
+	 *
+	 * @private
+	 * @param {string|string[]} languages
+	 * @param {{loadedLanguages: string[], Prism: Prism}} context
+	 * @returns {{loadedLanguages: string[], Prism: Prism}}
+	 */
+	loadLanguages: function (languages, context) {
+		if (typeof languages === 'string') {
+			languages = [languages];
+		}
+
+		var self = this;
+
+		languages.forEach(function (language) {
+			context = self.loadLanguage(language, context);
+		});
+
+		return context;
+	},
 
 	/**
 	 * Loads the given language (including recursively loading the dependencies) and
@@ -50,7 +68,7 @@ module.exports = {
 
 		// if the language has a dependency -> load it first
 		if (languagesCatalog[language].require) {
-			context = this.loadLanguage(languagesCatalog[language].require, context);
+			context = this.loadLanguages(languagesCatalog[language].require, context);
 		}
 
 		// load the language itself

From 91038ee1cc57c05cbfd798962134dd2d1a8e7f80 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 25 Aug 2015 08:05:09 +0200
Subject: [PATCH 219/310] Add tests for JSX

---
 tests/languages/jsx/tag_feature.test | 48 ++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 tests/languages/jsx/tag_feature.test

diff --git a/tests/languages/jsx/tag_feature.test b/tests/languages/jsx/tag_feature.test
new file mode 100644
index 0000000000..7d523beaa7
--- /dev/null
+++ b/tests/languages/jsx/tag_feature.test
@@ -0,0 +1,48 @@
+var myDivElement = <div className="foo" />;
+var myElement = <MyComponent someProperty={true} />;
+
+----------------------------------------------------
+
+[
+	["keyword", "var"],
+	" myDivElement ",
+	["operator", "="],
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"div"
+		]],
+		["attr-name", ["className"]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "\""],
+			"foo",
+			["punctuation", "\""]
+		]],
+		["punctuation", "/>"]
+	]],
+	["punctuation", ";"],
+
+	["keyword", "var"],
+	" myElement ",
+	["operator", "="],
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"MyComponent"
+		]],
+		["attr-name", ["someProperty"]],
+		["script", [
+			 ["punctuation", "="],
+			 ["punctuation", "{"],
+			 ["keyword", "true"],
+			 ["punctuation", "}"]
+		]],
+		["punctuation", "/>"]
+	]],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for JSX tags.
\ No newline at end of file

From bcac7d4619297f1a555087c380faeae71b56a0d5 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 25 Aug 2015 08:46:10 +0200
Subject: [PATCH 220/310] Julia: Simplify comment regexp + improved number
 regexp + improved operator regexp

---
 components/prism-julia.js     | 6 +++---
 components/prism-julia.min.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/prism-julia.js b/components/prism-julia.js
index e437310168..89141d4ebc 100644
--- a/components/prism-julia.js
+++ b/components/prism-julia.js
@@ -1,12 +1,12 @@
 Prism.languages.julia= {
 	'comment': {
-		pattern: /(^|[^\\])#.*?(\r?\n|$)/,
+		pattern: /(^|[^\\])#.*/,
 		lookbehind: true
 	},
 	'string': /"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,
 	'keyword' : /\b(abstract|baremodule|begin|bitstype|break|catch|ccall|const|continue|do|else|elseif|end|export|finally|for|function|global|if|immutable|import|importall|let|local|macro|module|print|println|quote|return|try|type|typealias|using|while)\b/,
 	'boolean' : /\b(true|false)\b/,
-	'number' : /\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
-	'operator' : /[-+]{1,2}|=?<|=?>|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,
+	'number' : /\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:[efp][+-]?\d+)?j?\b/i,
+	'operator': /\+=?|-=?|\*=?|\/[\/=]?|\\=?|\^=?|%=?|÷=?|!=?=?|&=?|\|[=>]?|\$=?|<(?:<=?|[=:])?|>(?:=|>>?=?)?|==?=?|[~≠≤≥]/,
 	'punctuation' : /[{}[\];(),.:]/
 };
\ No newline at end of file
diff --git a/components/prism-julia.min.js b/components/prism-julia.min.js
index 473908148d..6fb219cf8b 100644
--- a/components/prism-julia.min.js
+++ b/components/prism-julia.min.js
@@ -1 +1 @@
-Prism.languages.julia={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,keyword:/\b(abstract|baremodule|begin|bitstype|break|catch|ccall|const|continue|do|else|elseif|end|export|finally|for|function|global|if|immutable|import|importall|let|local|macro|module|print|println|quote|return|try|type|typealias|using|while)\b/,"boolean":/\b(true|false)\b/,number:/\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]{1,2}|=?<|=?>|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.julia={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,keyword:/\b(abstract|baremodule|begin|bitstype|break|catch|ccall|const|continue|do|else|elseif|end|export|finally|for|function|global|if|immutable|import|importall|let|local|macro|module|print|println|quote|return|try|type|typealias|using|while)\b/,"boolean":/\b(true|false)\b/,number:/\b-?(0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:[efp][+-]?\d+)?j?\b/i,operator:/\+=?|-=?|\*=?|\/[\/=]?|\\=?|\^=?|%=?|÷=?|!=?=?|&=?|\|[=>]?|\$=?|<(?:<=?|[=:])?|>(?:=|>>?=?)?|==?=?|[~≠≤≥]/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file

From 04c5e9ee16720e054bdca5c3227abfd4a393c757 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Tue, 25 Aug 2015 08:47:24 +0200
Subject: [PATCH 221/310] Add tests for Julia

---
 tests/languages/julia/boolean_feature.test  | 13 +++++++
 tests/languages/julia/comment_feature.test  | 13 +++++++
 tests/languages/julia/keyword_feature.test  | 31 ++++++++++++++++
 tests/languages/julia/number_feature.test   | 33 +++++++++++++++++
 tests/languages/julia/operator_feature.test | 41 +++++++++++++++++++++
 tests/languages/julia/string_feature.test   | 29 +++++++++++++++
 6 files changed, 160 insertions(+)
 create mode 100644 tests/languages/julia/boolean_feature.test
 create mode 100644 tests/languages/julia/comment_feature.test
 create mode 100644 tests/languages/julia/keyword_feature.test
 create mode 100644 tests/languages/julia/number_feature.test
 create mode 100644 tests/languages/julia/operator_feature.test
 create mode 100644 tests/languages/julia/string_feature.test

diff --git a/tests/languages/julia/boolean_feature.test b/tests/languages/julia/boolean_feature.test
new file mode 100644
index 0000000000..4019c444f8
--- /dev/null
+++ b/tests/languages/julia/boolean_feature.test
@@ -0,0 +1,13 @@
+true
+false
+
+----------------------------------------------------
+
+[
+	["boolean", "true"],
+	["boolean", "false"]
+]
+
+----------------------------------------------------
+
+Checks for booleans.
\ No newline at end of file
diff --git a/tests/languages/julia/comment_feature.test b/tests/languages/julia/comment_feature.test
new file mode 100644
index 0000000000..054d6023d1
--- /dev/null
+++ b/tests/languages/julia/comment_feature.test
@@ -0,0 +1,13 @@
+#
+# foobar
+
+----------------------------------------------------
+
+[
+	["comment", "#"],
+	["comment", "# foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/julia/keyword_feature.test b/tests/languages/julia/keyword_feature.test
new file mode 100644
index 0000000000..e2cfa8c88f
--- /dev/null
+++ b/tests/languages/julia/keyword_feature.test
@@ -0,0 +1,31 @@
+abstract baremodule begin
+bitstype break catch
+ccall const continue
+do else elseif end
+export finally for
+function global if
+immutable import importall
+let local macro module
+print println quote
+return try type
+typealias using while
+
+----------------------------------------------------
+
+[
+	["keyword", "abstract"], ["keyword", "baremodule"], ["keyword", "begin"],
+	["keyword", "bitstype"], ["keyword", "break"], ["keyword", "catch"],
+	["keyword", "ccall"], ["keyword", "const"], ["keyword", "continue"],
+	["keyword", "do"], ["keyword", "else"], ["keyword", "elseif"], ["keyword", "end"],
+	["keyword", "export"], ["keyword", "finally"], ["keyword", "for"],
+	["keyword", "function"], ["keyword", "global"], ["keyword", "if"],
+	["keyword", "immutable"], ["keyword", "import"], ["keyword", "importall"],
+	["keyword", "let"], ["keyword", "local"], ["keyword", "macro"], ["keyword", "module"],
+	["keyword", "print"], ["keyword", "println"], ["keyword", "quote"],
+	["keyword", "return"], ["keyword", "try"], ["keyword", "type"],
+	["keyword", "typealias"], ["keyword", "using"], ["keyword", "while"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/julia/number_feature.test b/tests/languages/julia/number_feature.test
new file mode 100644
index 0000000000..72fc7a48e5
--- /dev/null
+++ b/tests/languages/julia/number_feature.test
@@ -0,0 +1,33 @@
+0b0011
+0o274
+0xBadFace
+42
+1.23
+1e10
+2.5e-4
+0.5f0
+2.5f-4
+0x1p0
+0x1.8p3
+0x.4p-1
+
+----------------------------------------------------
+
+[
+	["number", "0b0011"],
+	["number", "0o274"],
+	["number", "0xBadFace"],
+	["number", "42"],
+	["number", "1.23"],
+	["number", "1e10"],
+	["number", "2.5e-4"],
+	["number", "0.5f0"],
+	["number", "2.5f-4"],
+	["number", "0x1p0"],
+	["number", "0x1.8p3"],
+	["number", "0x.4p-1"]
+]
+
+----------------------------------------------------
+
+Checks for binary, octal, hexadecimal and decimal numbers.
\ No newline at end of file
diff --git a/tests/languages/julia/operator_feature.test b/tests/languages/julia/operator_feature.test
new file mode 100644
index 0000000000..57f0d68c8b
--- /dev/null
+++ b/tests/languages/julia/operator_feature.test
@@ -0,0 +1,41 @@
++ +=
+- -=
+* *=
+/ /= //
+\ \=
+^ ^=
+% %=
+÷ ÷=
+! != !==
+& &=
+| |= |>
+$ $=
+< <= <: << <<=
+> >= >> >>= >>> >>>=
+= == ===
+~ ≠ ≤ ≥
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "+="],
+	["operator", "-"], ["operator", "-="],
+	["operator", "*"], ["operator", "*="],
+	["operator", "/"], ["operator", "/="], ["operator", "//"],
+	["operator", "\\"], ["operator", "\\="],
+	["operator", "^"], ["operator", "^="],
+	["operator", "%"], ["operator", "%="],
+	["operator", "÷"], ["operator", "÷="],
+	["operator", "!"], ["operator", "!="], ["operator", "!=="],
+	["operator", "&"], ["operator", "&="],
+	["operator", "|"], ["operator", "|="], ["operator", "|>"],
+	["operator", "$"], ["operator", "$="],
+	["operator", "<"], ["operator", "<="], ["operator", "<:"], ["operator", "<<"], ["operator", "<<="],
+	["operator", ">"], ["operator", ">="], ["operator", ">>"], ["operator", ">>="], ["operator", ">>>"], ["operator", ">>>="],
+	["operator", "="], ["operator", "=="], ["operator", "==="],
+	["operator", "~"], ["operator", "≠"], ["operator", "≤"], ["operator", "≥"]
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/julia/string_feature.test b/tests/languages/julia/string_feature.test
new file mode 100644
index 0000000000..207b3f4425
--- /dev/null
+++ b/tests/languages/julia/string_feature.test
@@ -0,0 +1,29 @@
+""
+"fo\"o"
+'x'
+'\''
+'\u2200'
+"""foo"""
+"""fo"o
+bar"""
+'''foo'''
+'''fo'o
+bar'''
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"o\""],
+	["string", "'x'"],
+	["string", "'\\''"],
+	["string", "'\\u2200'"],
+	["string", "\"\"\"foo\"\"\""],
+	["string", "\"\"\"fo\"o\r\nbar\"\"\""],
+	["string", "'''foo'''"],
+	["string", "'''fo'o\r\nbar'''"]
+]
+
+----------------------------------------------------
+
+Checks for strings and characters.
\ No newline at end of file

From 90c75d5d2462fcc9503f7785c015f2f2d777a8a0 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 07:42:03 +0200
Subject: [PATCH 222/310] JSX: Allow for one level of nesting. Fix #717

---
 components/prism-jsx.js     | 3 ++-
 components/prism-jsx.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/prism-jsx.js b/components/prism-jsx.js
index 10c5f097bc..a777484f64 100644
--- a/components/prism-jsx.js
+++ b/components/prism-jsx.js
@@ -9,7 +9,8 @@ Prism.languages.jsx.tag.inside['attr-value'].pattern = /=[^\{](?:('|")[\w\W]*?(\
 
 Prism.languages.insertBefore('inside', 'attr-value',{
 	'script': {
-		pattern: /=(\{[\w\W]*?\})/i,
+		// Allow for one level of nesting
+		pattern: /=(\{(?:\{[^}]*\}|[^}])+\})/i,
 		inside: {
 			'function' : Prism.languages.javascript.function,
 			'punctuation': /[={}[\];(),.:]/,
diff --git a/components/prism-jsx.min.js b/components/prism-jsx.min.js
index 72c788985a..0bfe9b1cb2 100644
--- a/components/prism-jsx.min.js
+++ b/components/prism-jsx.min.js
@@ -1 +1 @@
-!function(a){var s=a.util.clone(a.languages.javascript);a.languages.jsx=a.languages.extend("markup",s),a.languages.jsx.tag.pattern=/<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+|(\{[\w\W]*?\})))?\s*)*\/?>/i,a.languages.jsx.tag.inside["attr-value"].pattern=/=[^\{](?:('|")[\w\W]*?(\1)|[^\s>]+)/i,a.languages.insertBefore("inside","attr-value",{script:{pattern:/=(\{[\w\W]*?\})/i,inside:{"function":a.languages.javascript.function,punctuation:/[={}[\];(),.:]/,keyword:a.languages.javascript.keyword},alias:"language-javascript"}},a.languages.jsx.tag)}(Prism);
\ No newline at end of file
+!function(a){var s=a.util.clone(a.languages.javascript);a.languages.jsx=a.languages.extend("markup",s),a.languages.jsx.tag.pattern=/<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+|(\{[\w\W]*?\})))?\s*)*\/?>/i,a.languages.jsx.tag.inside["attr-value"].pattern=/=[^\{](?:('|")[\w\W]*?(\1)|[^\s>]+)/i,a.languages.insertBefore("inside","attr-value",{script:{pattern:/=(\{(?:\{[^}]*\}|[^}])+\})/i,inside:{"function":a.languages.javascript.function,punctuation:/[={}[\];(),.:]/,keyword:a.languages.javascript.keyword},alias:"language-javascript"}},a.languages.jsx.tag)}(Prism);
\ No newline at end of file

From 23a444c91afe71e77d65dabfb82fe5f8e078e090 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 08:13:12 +0200
Subject: [PATCH 223/310] Keyman: Move header statements above keywords

---
 components/prism-keyman.js     | 4 ++--
 components/prism-keyman.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-keyman.js b/components/prism-keyman.js
index 9c3e0bf5b6..7541c8f1ea 100644
--- a/components/prism-keyman.js
+++ b/components/prism-keyman.js
@@ -2,12 +2,12 @@ Prism.languages.keyman = {
 	'comment': /\bc\s.*/i,
 	'function': /\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT|CAPS|NCAPS)\s+)*([TKU]_[a-z0-9_?]+|".+?"|'.+?')\s*\]/i,  // virtual key
 	'string': /("|')((?!\1).)*\1/,
-	'keyword': /\b(any|baselayout|beep|call|context|deadkey|dk|if|index|layer|notany|nul|outs|platform|return|reset|save|set|store|use)\b/i,  // rule keywords
-	'atrule': /\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,   // structural keywords
 	'bold': [   // header statements, system stores and variable system stores
 		/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embedjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,
 		/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i
 	],
+	'keyword': /\b(any|baselayout|beep|call|context|deadkey|dk|if|index|layer|notany|nul|outs|platform|return|reset|save|set|store|use)\b/i,  // rule keywords
+	'atrule': /\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,   // structural keywords
 	'number': /\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i, // U+####, x###, d### characters and numbers
 	'operator': /[+>\\,()]/,
 	'tag': /\$(keyman|kmfl|weaver|keymanweb|keymanonly):/i   // prefixes
diff --git a/components/prism-keyman.min.js b/components/prism-keyman.min.js
index 1c6d17995a..3868b408d6 100644
--- a/components/prism-keyman.min.js
+++ b/components/prism-keyman.min.js
@@ -1 +1 @@
-Prism.languages.keyman={comment:/\bc\s.*/i,"function":/\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT|CAPS|NCAPS)\s+)*([TKU]_[a-z0-9_?]+|".+?"|'.+?')\s*\]/i,string:/("|')((?!\1).)*\1/,keyword:/\b(any|baselayout|beep|call|context|deadkey|dk|if|index|layer|notany|nul|outs|platform|return|reset|save|set|store|use)\b/i,atrule:/\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,bold:[/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embedjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i],number:/\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i,operator:/[+>\\,()]/,tag:/\$(keyman|kmfl|weaver|keymanweb|keymanonly):/i};
\ No newline at end of file
+Prism.languages.keyman={comment:/\bc\s.*/i,"function":/\[\s*((CTRL|SHIFT|ALT|LCTRL|RCTRL|LALT|RALT|CAPS|NCAPS)\s+)*([TKU]_[a-z0-9_?]+|".+?"|'.+?')\s*\]/i,string:/("|')((?!\1).)*\1/,bold:[/&(baselayout|bitmap|capsononly|capsalwaysoff|shiftfreescaps|copyright|ethnologuecode|hotkey|includecodes|keyboardversion|kmw_embedcss|kmw_embedjs|kmw_helpfile|kmw_helptext|kmw_rtl|language|layer|layoutfile|message|mnemoniclayout|name|oldcharposmatching|platform|targets|version|visualkeyboard|windowslanguages)\b/i,/\b(bitmap|bitmaps|caps on only|caps always off|shift frees caps|copyright|hotkey|language|layout|message|name|version)\b/i],keyword:/\b(any|baselayout|beep|call|context|deadkey|dk|if|index|layer|notany|nul|outs|platform|return|reset|save|set|store|use)\b/i,atrule:/\b(ansi|begin|unicode|group|using keys|match|nomatch)\b/i,number:/\b(U\+[\dA-F]+|d\d+|x[\da-f]+|\d+)\b/i,operator:/[+>\\,()]/,tag:/\$(keyman|kmfl|weaver|keymanweb|keymanonly):/i};
\ No newline at end of file

From b58a5b137c2c99780f72a8f51e62f1aea8c5ec35 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 08:13:52 +0200
Subject: [PATCH 224/310] Add tests for Keyman

---
 tests/languages/keyman/atrule_feature.test   | 15 +++++
 tests/languages/keyman/bold_feature.test     | 59 ++++++++++++++++++++
 tests/languages/keyman/comment_feature.test  | 13 +++++
 tests/languages/keyman/function_feature.test | 39 +++++++++++++
 tests/languages/keyman/keyword_feature.test  | 21 +++++++
 tests/languages/keyman/number_feature.test   | 21 +++++++
 tests/languages/keyman/operator_feature.test | 15 +++++
 tests/languages/keyman/string_feature.test   | 17 ++++++
 tests/languages/keyman/tag_feature.test      | 19 +++++++
 9 files changed, 219 insertions(+)
 create mode 100644 tests/languages/keyman/atrule_feature.test
 create mode 100644 tests/languages/keyman/bold_feature.test
 create mode 100644 tests/languages/keyman/comment_feature.test
 create mode 100644 tests/languages/keyman/function_feature.test
 create mode 100644 tests/languages/keyman/keyword_feature.test
 create mode 100644 tests/languages/keyman/number_feature.test
 create mode 100644 tests/languages/keyman/operator_feature.test
 create mode 100644 tests/languages/keyman/string_feature.test
 create mode 100644 tests/languages/keyman/tag_feature.test

diff --git a/tests/languages/keyman/atrule_feature.test b/tests/languages/keyman/atrule_feature.test
new file mode 100644
index 0000000000..1171caf3be
--- /dev/null
+++ b/tests/languages/keyman/atrule_feature.test
@@ -0,0 +1,15 @@
+ansi begin unicode
+group using keys
+match nomatch
+
+----------------------------------------------------
+
+[
+	["atrule", "ansi"], ["atrule", "begin"], ["atrule", "unicode"],
+	["atrule", "group"], ["atrule", "using keys"],
+	["atrule", "match"], ["atrule", "nomatch"]
+]
+
+----------------------------------------------------
+
+Checks for all structural keywords.
\ No newline at end of file
diff --git a/tests/languages/keyman/bold_feature.test b/tests/languages/keyman/bold_feature.test
new file mode 100644
index 0000000000..58e731c2ce
--- /dev/null
+++ b/tests/languages/keyman/bold_feature.test
@@ -0,0 +1,59 @@
+&baselayout &bitmap &capsononly
+&capsalwaysoff &shiftfreescaps
+&copyright &ethnologuecode
+&hotkey &includecodes
+&keyboardversion &kmw_embedcss
+&kmw_embedjs &kmw_helpfile
+&kmw_helptext &kmw_rtl
+&language &layer &layoutfile
+&message &mnemoniclayout
+&name &oldcharposmatching
+&platform &targets &version
+&visualkeyboard &windowslanguages
+
+bitmap
+bitmaps
+caps on only
+caps always off
+shift frees caps
+copyright
+hotkey
+language
+layout
+message
+name
+version
+
+----------------------------------------------------
+
+[
+	["bold", "&baselayout"], ["bold", "&bitmap"], ["bold", "&capsononly"],
+	["bold", "&capsalwaysoff"], ["bold", "&shiftfreescaps"],
+	["bold", "&copyright"], ["bold", "&ethnologuecode"],
+	["bold", "&hotkey"], ["bold", "&includecodes"],
+	["bold", "&keyboardversion"], ["bold", "&kmw_embedcss"],
+	["bold", "&kmw_embedjs"], ["bold", "&kmw_helpfile"],
+	["bold", "&kmw_helptext"], ["bold", "&kmw_rtl"],
+	["bold", "&language"], ["bold", "&layer"], ["bold", "&layoutfile"],
+	["bold", "&message"], ["bold", "&mnemoniclayout"],
+	["bold", "&name"], ["bold", "&oldcharposmatching"],
+	["bold", "&platform"], ["bold", "&targets"], ["bold", "&version"],
+	["bold", "&visualkeyboard"], ["bold", "&windowslanguages"],
+	
+	["bold", "bitmap"],
+	["bold", "bitmaps"],
+	["bold", "caps on only"],
+	["bold", "caps always off"],
+	["bold", "shift frees caps"],
+	["bold", "copyright"],
+	["bold", "hotkey"],
+	["bold", "language"],
+	["bold", "layout"],
+	["bold", "message"],
+	["bold", "name"],
+	["bold", "version"]
+]
+
+----------------------------------------------------
+
+Checks for header statements, system stores and variable system stores.
\ No newline at end of file
diff --git a/tests/languages/keyman/comment_feature.test b/tests/languages/keyman/comment_feature.test
new file mode 100644
index 0000000000..3056bde85d
--- /dev/null
+++ b/tests/languages/keyman/comment_feature.test
@@ -0,0 +1,13 @@
+c Foo
+	c Foobar
+
+----------------------------------------------------
+
+[
+	["comment", "c Foo"],
+	["comment", "c Foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/keyman/function_feature.test b/tests/languages/keyman/function_feature.test
new file mode 100644
index 0000000000..3852ade1b2
--- /dev/null
+++ b/tests/languages/keyman/function_feature.test
@@ -0,0 +1,39 @@
+['c']
+["f"]
+[K_SEL]
+[K_KANJI?15]
+[T_SCHWA]
+[U_0259]
+[CTRL 'a']
+[SHIFT "b"]
+[ALT K_C]
+[LCTRL T_D]
+[RCTRL U_E259]
+[LALT K_F]
+[RALT K_G]
+[CAPS K_H]
+[NCAPS K_I]
+
+----------------------------------------------------
+
+[
+	["function", "['c']"],
+	["function", "[\"f\"]"],
+	["function", "[K_SEL]"],
+	["function", "[K_KANJI?15]"],
+	["function", "[T_SCHWA]"],
+	["function", "[U_0259]"],
+	["function", "[CTRL 'a']"],
+	["function", "[SHIFT \"b\"]"],
+	["function", "[ALT K_C]"],
+	["function", "[LCTRL T_D]"],
+	["function", "[RCTRL U_E259]"],
+	["function", "[LALT K_F]"],
+	["function", "[RALT K_G]"],
+	["function", "[CAPS K_H]"],
+	["function", "[NCAPS K_I]"]
+]
+
+----------------------------------------------------
+
+Checks for keys, with all possible modifiers.
\ No newline at end of file
diff --git a/tests/languages/keyman/keyword_feature.test b/tests/languages/keyman/keyword_feature.test
new file mode 100644
index 0000000000..7bbd2303ee
--- /dev/null
+++ b/tests/languages/keyman/keyword_feature.test
@@ -0,0 +1,21 @@
+any baselayout beep
+call context deadkey
+dk if index layer
+notany nul outs
+platform return reset
+save set store use
+
+----------------------------------------------------
+
+[
+	["keyword", "any"], ["keyword", "baselayout"], ["keyword", "beep"],
+	["keyword", "call"], ["keyword", "context"], ["keyword", "deadkey"],
+	["keyword", "dk"], ["keyword", "if"], ["keyword", "index"], ["keyword", "layer"],
+	["keyword", "notany"], ["keyword", "nul"], ["keyword", "outs"],
+	["keyword", "platform"], ["keyword", "return"], ["keyword", "reset"],
+	["keyword", "save"], ["keyword", "set"], ["keyword", "store"], ["keyword", "use"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/keyman/number_feature.test b/tests/languages/keyman/number_feature.test
new file mode 100644
index 0000000000..c71eb6e02d
--- /dev/null
+++ b/tests/languages/keyman/number_feature.test
@@ -0,0 +1,21 @@
+U+0041
+d67
+d1114111
+x20
+x10FFFF
+4177777
+
+----------------------------------------------------
+
+[
+	["number", "U+0041"],
+	["number", "d67"],
+	["number", "d1114111"],
+	["number", "x20"],
+	["number", "x10FFFF"],
+	["number", "4177777"]
+]
+
+----------------------------------------------------
+
+Checks for unicode, decimal, hexadecimal and octal character codes.
\ No newline at end of file
diff --git a/tests/languages/keyman/operator_feature.test b/tests/languages/keyman/operator_feature.test
new file mode 100644
index 0000000000..bc439e8597
--- /dev/null
+++ b/tests/languages/keyman/operator_feature.test
@@ -0,0 +1,15 @@
++ >
+\ ,
+( )
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", ">"],
+	["operator", "\\"], ["operator", ","],
+	["operator", "("], ["operator", ")"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/keyman/string_feature.test b/tests/languages/keyman/string_feature.test
new file mode 100644
index 0000000000..ac457afe06
--- /dev/null
+++ b/tests/languages/keyman/string_feature.test
@@ -0,0 +1,17 @@
+''
+""
+'foo'
+"bar"
+
+----------------------------------------------------
+
+[
+	["string", "''"],
+	["string", "\"\""],
+	["string", "'foo'"],
+	["string", "\"bar\""]
+]
+
+----------------------------------------------------
+
+Checks for single-quoted and double-quoted strings.
\ No newline at end of file
diff --git a/tests/languages/keyman/tag_feature.test b/tests/languages/keyman/tag_feature.test
new file mode 100644
index 0000000000..2aa760ae32
--- /dev/null
+++ b/tests/languages/keyman/tag_feature.test
@@ -0,0 +1,19 @@
+$keyman:
+$kmfl:
+$weaver:
+$keymanweb:
+$keymanonly:
+
+----------------------------------------------------
+
+[
+	["tag", "$keyman:"],
+	["tag", "$kmfl:"],
+	["tag", "$weaver:"],
+	["tag", "$keymanweb:"],
+	["tag", "$keymanonly:"]
+]
+
+----------------------------------------------------
+
+Checks for all prefixes.
\ No newline at end of file

From 132b41ab308a2dedf87ac3c5260cc17e2562e3e4 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 08:27:14 +0200
Subject: [PATCH 225/310] LaTeX: Simplify comment regexp

---
 components/prism-latex.js     | 2 +-
 components/prism-latex.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-latex.js b/components/prism-latex.js
index faeec076d7..8c7a7825c4 100644
--- a/components/prism-latex.js
+++ b/components/prism-latex.js
@@ -1,5 +1,5 @@
 Prism.languages.latex = {
-	'comment': /%.*?(\r?\n|$)$/m,
+	'comment': /%.*/m,
 	'string': /(\$)(\\?.)*?\1/,
 	'punctuation': /[{}]/,
 	'selector': /\\[a-z;,:\.]*/i
diff --git a/components/prism-latex.min.js b/components/prism-latex.min.js
index baaa28d4b3..a8da0d2989 100644
--- a/components/prism-latex.min.js
+++ b/components/prism-latex.min.js
@@ -1 +1 @@
-Prism.languages.latex={comment:/%.*?(\r?\n|$)$/m,string:/(\$)(\\?.)*?\1/,punctuation:/[{}]/,selector:/\\[a-z;,:\.]*/i};
\ No newline at end of file
+Prism.languages.latex={comment:/%.*/m,string:/(\$)(\\?.)*?\1/,punctuation:/[{}]/,selector:/\\[a-z;,:\.]*/i};
\ No newline at end of file

From 9621d16b8c28aad43b3422b9e8794fe43b7f3224 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 08:27:50 +0200
Subject: [PATCH 226/310] Add tests for LaTeX

---
 tests/languages/latex/comment_feature.test  | 13 +++++++++++++
 tests/languages/latex/selector_feature.test | 13 +++++++++++++
 tests/languages/latex/string_feature.test   | 15 +++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 tests/languages/latex/comment_feature.test
 create mode 100644 tests/languages/latex/selector_feature.test
 create mode 100644 tests/languages/latex/string_feature.test

diff --git a/tests/languages/latex/comment_feature.test b/tests/languages/latex/comment_feature.test
new file mode 100644
index 0000000000..2f59d3c3f4
--- /dev/null
+++ b/tests/languages/latex/comment_feature.test
@@ -0,0 +1,13 @@
+%
+% foobar
+
+----------------------------------------------------
+
+[
+	["comment", "%"],
+	["comment", "% foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/latex/selector_feature.test b/tests/languages/latex/selector_feature.test
new file mode 100644
index 0000000000..b3da081688
--- /dev/null
+++ b/tests/languages/latex/selector_feature.test
@@ -0,0 +1,13 @@
+\begin
+\usepackage
+
+----------------------------------------------------
+
+[
+	["selector", "\\begin"],
+	["selector", "\\usepackage"]
+]
+
+----------------------------------------------------
+
+Checks for selectors.
\ No newline at end of file
diff --git a/tests/languages/latex/string_feature.test b/tests/languages/latex/string_feature.test
new file mode 100644
index 0000000000..b2212f2dd9
--- /dev/null
+++ b/tests/languages/latex/string_feature.test
@@ -0,0 +1,15 @@
+$$
+$foo$
+$\$$
+
+----------------------------------------------------
+
+[
+	["string", "$$"],
+	["string", "$foo$"],
+	["string", "$\\$$"]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From 80d826044eb7307841614dd8f1f2bd52b5bfe78d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 08:51:12 +0200
Subject: [PATCH 227/310] Less: Remove useless part in property regexp

---
 components/prism-less.js     | 2 +-
 components/prism-less.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-less.js b/components/prism-less.js
index 0ed468c543..712488a6c8 100644
--- a/components/prism-less.js
+++ b/components/prism-less.js
@@ -29,7 +29,7 @@ Prism.languages.less = Prism.languages.extend('css', {
 		}
 	},
 
-	'property': /(\b|\B)(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,
+	'property': /(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,
 	'punctuation': /[{}();:,]/,
 	'operator': /[+\-*\/]/
 });
diff --git a/components/prism-less.min.js b/components/prism-less.min.js
index e470eab9b0..c3847a769a 100644
--- a/components/prism-less.min.js
+++ b/components/prism-less.min.js
@@ -1 +1 @@
-Prism.languages.less=Prism.languages.extend("css",{comment:[/\/\*[\w\W]*?\*\//,{pattern:/(^|[^\\])\/\/.*/,lookbehind:!0}],atrule:{pattern:/@[\w-]+?(?:\([^{}]+\)|[^(){};])*?(?=\s*\{)/i,inside:{punctuation:/[:()]/}},selector:{pattern:/(?:@\{[\w-]+\}|[^{};\s@])(?:@\{[\w-]+\}|\([^{}]*\)|[^{};@])*?(?=\s*\{)/,inside:{variable:/@+[\w-]+/}},property:/(\b|\B)(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,punctuation:/[{}();:,]/,operator:/[+\-*\/]/}),Prism.languages.insertBefore("less","punctuation",{"function":Prism.languages.less.function}),Prism.languages.insertBefore("less","property",{variable:[{pattern:/@[\w-]+\s*:/,inside:{punctuation:/:/}},/@@?[\w-]+/],"mixin-usage":{pattern:/([{;]\s*)[.#](?!\d)[\w-]+.*?(?=[(;])/,lookbehind:!0,alias:"function"}});
\ No newline at end of file
+Prism.languages.less=Prism.languages.extend("css",{comment:[/\/\*[\w\W]*?\*\//,{pattern:/(^|[^\\])\/\/.*/,lookbehind:!0}],atrule:{pattern:/@[\w-]+?(?:\([^{}]+\)|[^(){};])*?(?=\s*\{)/i,inside:{punctuation:/[:()]/}},selector:{pattern:/(?:@\{[\w-]+\}|[^{};\s@])(?:@\{[\w-]+\}|\([^{}]*\)|[^{};@])*?(?=\s*\{)/,inside:{variable:/@+[\w-]+/}},property:/(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,punctuation:/[{}();:,]/,operator:/[+\-*\/]/}),Prism.languages.insertBefore("less","punctuation",{"function":Prism.languages.less.function}),Prism.languages.insertBefore("less","property",{variable:[{pattern:/@[\w-]+\s*:/,inside:{punctuation:/:/}},/@@?[\w-]+/],"mixin-usage":{pattern:/([{;]\s*)[.#](?!\d)[\w-]+.*?(?=[(;])/,lookbehind:!0,alias:"function"}});
\ No newline at end of file

From 2b0c124ab7ac5d4e864948c3b09389c1fd86a141 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 08:51:45 +0200
Subject: [PATCH 228/310] Add tests for Less

---
 tests/languages/less/atrule_feature.test   | 25 ++++++++++++++++++++++
 tests/languages/less/comment_feature.test  | 18 ++++++++++++++++
 tests/languages/less/operator_feature.test | 14 ++++++++++++
 tests/languages/less/property_feature.test | 19 ++++++++++++++++
 tests/languages/less/selector_feature.test | 24 +++++++++++++++++++++
 5 files changed, 100 insertions(+)
 create mode 100644 tests/languages/less/atrule_feature.test
 create mode 100644 tests/languages/less/comment_feature.test
 create mode 100644 tests/languages/less/operator_feature.test
 create mode 100644 tests/languages/less/property_feature.test
 create mode 100644 tests/languages/less/selector_feature.test

diff --git a/tests/languages/less/atrule_feature.test b/tests/languages/less/atrule_feature.test
new file mode 100644
index 0000000000..333d672217
--- /dev/null
+++ b/tests/languages/less/atrule_feature.test
@@ -0,0 +1,25 @@
+@media {}
+@media screen and (min-width: 320px) {}
+
+----------------------------------------------------
+
+[
+	["atrule", [
+		"@media"
+	]],
+	["punctuation", "{"], ["punctuation", "}"],
+
+	["atrule", [
+		"@media screen and ",
+		["punctuation", "("],
+		"min-width",
+		["punctuation", ":"],
+		" 320px",
+		["punctuation", ")"]
+	]],
+	["punctuation", "{"], ["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for at-rules.
\ No newline at end of file
diff --git a/tests/languages/less/comment_feature.test b/tests/languages/less/comment_feature.test
new file mode 100644
index 0000000000..c728423922
--- /dev/null
+++ b/tests/languages/less/comment_feature.test
@@ -0,0 +1,18 @@
+//
+// foobar
+/**/
+/* foo
+bar */
+
+----------------------------------------------------
+
+[
+	["comment", "//"],
+	["comment", "// foobar"],
+	["comment", "/**/"],
+	["comment", "/* foo\r\nbar */"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
\ No newline at end of file
diff --git a/tests/languages/less/operator_feature.test b/tests/languages/less/operator_feature.test
new file mode 100644
index 0000000000..7093994955
--- /dev/null
+++ b/tests/languages/less/operator_feature.test
@@ -0,0 +1,14 @@
++ - * /
+
+----------------------------------------------------
+
+[
+	["operator", "+"],
+	["operator", "-"],
+	["operator", "*"],
+	["operator", "/"]
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/less/property_feature.test b/tests/languages/less/property_feature.test
new file mode 100644
index 0000000000..85288c4b8d
--- /dev/null
+++ b/tests/languages/less/property_feature.test
@@ -0,0 +1,19 @@
+font-weight:
+@{foobar} :
+background-@{foo}:
+box-shadow+:
+transform+_:
+
+----------------------------------------------------
+
+[
+	["property", "font-weight"], ["punctuation", ":"],
+	["property", "@{foobar}"], ["punctuation", ":"],
+	["property", "background-@{foo}"], ["punctuation", ":"],
+	["property", "box-shadow+"], ["punctuation", ":"],
+	["property", "transform+_"], ["punctuation", ":"]
+]
+
+----------------------------------------------------
+
+Checks for properties.
\ No newline at end of file
diff --git a/tests/languages/less/selector_feature.test b/tests/languages/less/selector_feature.test
new file mode 100644
index 0000000000..ae82f146b6
--- /dev/null
+++ b/tests/languages/less/selector_feature.test
@@ -0,0 +1,24 @@
+.bordered {}
+.@{foo} {}
+.foo (@bg: #fff, @color: #000) {}
+
+----------------------------------------------------
+
+[
+	["selector", [".bordered"]],
+	["punctuation", "{"], ["punctuation", "}"],
+	["selector", [".@{foo}"]],
+	["punctuation", "{"], ["punctuation", "}"],
+	["selector", [
+		".foo (",
+		["variable", "@bg"],
+		": #fff, ",
+		["variable", "@color"],
+		": #000)"
+	]],
+	["punctuation", "{"], ["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for selectors and mixin declarations.
\ No newline at end of file

From 80aedb2aeabe1dbfdfdf697ee86217c0b92137bc Mon Sep 17 00:00:00 2001
From: Lea Verou <lea@verou.me>
Date: Wed, 26 Aug 2015 14:49:26 +0200
Subject: [PATCH 229/310] Updated documentation since the example was not
 relevant any more

---
 extending.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extending.html b/extending.html
index a061791f42..ee09bdfff6 100644
--- a/extending.html
+++ b/extending.html
@@ -45,8 +45,8 @@ <h1>Language definitions</h1>
 		<dt>lookbehind</dt>
 		<dd>This option mitigates JavaScript’s lack of lookbehind. When set to <code>true</code>, 
 		the first capturing group in the regex <code>pattern</code> is discarded when matching this token, so it effectively behaves 
-		as if it was lookbehind. For an example of this, check out the JavaScript language definition, in particular the regex and comment tokens:
-		<pre data-src="components/prism-javascript.js"></pre></dd>
+		as if it was lookbehind. For an example of this, check out the C-like language definition, in particular the comment and class-name tokens:
+		<pre data-src="components/prism-clike.js"></pre></dd>
 		
 		<dt>rest</dt>
 		<dd>Accepts an object literal with tokens and appends them to the end of the current object literal. Useful for referring to tokens defined elsewhere. For an example where <code>rest</code> is useful, check the Markup definitions above.</dd>
@@ -203,4 +203,4 @@ <h2>Returns</h2>
 <script src="code.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>

From 02b220e000eb37363b27871d1bd32c8b4e4e012c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 19:46:48 +0200
Subject: [PATCH 230/310] Fix computation of line numbers for single-line code
 blocks. Fix #721

---
 plugins/line-numbers/prism-line-numbers.js     | 3 ++-
 plugins/line-numbers/prism-line-numbers.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/line-numbers/prism-line-numbers.js b/plugins/line-numbers/prism-line-numbers.js
index 9cf273fce4..d8a25bf71a 100644
--- a/plugins/line-numbers/prism-line-numbers.js
+++ b/plugins/line-numbers/prism-line-numbers.js
@@ -28,7 +28,8 @@ Prism.hooks.add('complete', function (env) {
 		pre.className += ' line-numbers';
 	}
 
-	var linesNum = env.code.match(/\n(?!$)/g).length + 1;
+	var match = env.code.match(/\n(?!$)/g);
+	var linesNum = match ? match.length + 1 : 1;
 	var lineNumbersWrapper;
 
 	var lines = new Array(linesNum + 1);
diff --git a/plugins/line-numbers/prism-line-numbers.min.js b/plugins/line-numbers/prism-line-numbers.min.js
index 65f6e55b9d..6cd713b3f9 100644
--- a/plugins/line-numbers/prism-line-numbers.min.js
+++ b/plugins/line-numbers/prism-line-numbers.min.js
@@ -1 +1 @@
-Prism.hooks.add("complete",function(e){if(e.code){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=e.code.match(/\n(?!$)/g).length+1,l=new Array(n+1);l=l.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}}});
\ No newline at end of file
+Prism.hooks.add("complete",function(e){if(e.code){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=e.code.match(/\n(?!$)/g),l=n?n.length+1:1,m=new Array(l+1);m=m.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=m,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}}});
\ No newline at end of file

From 8147c9bf78a3cc7539af16bef7925bffef2f7e8d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 20:25:31 +0200
Subject: [PATCH 231/310] LOLCODE: Removed useless parentheses

---
 components/prism-lolcode.js     | 4 ++--
 components/prism-lolcode.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-lolcode.js b/components/prism-lolcode.js
index 09e343308e..eff6f614bf 100644
--- a/components/prism-lolcode.js
+++ b/components/prism-lolcode.js
@@ -43,12 +43,12 @@ Prism.languages.lolcode = {
 		lookbehind: true
 	},
 	'variable': {
-		pattern: /(^|\s)(?:IT)(?=\s|,|$)/,
+		pattern: /(^|\s)IT(?=\s|,|$)/,
 		lookbehind: true
 	},
 	'operator': {
 		pattern: /(^|\s)(?:NOT|BOTH SAEM|DIFFRINT|(?:SUM|DIFF|PRODUKT|QUOSHUNT|MOD|BIGGR|SMALLR|BOTH|EITHER|WON|ALL|ANY) OF)(?=\s|,|$)/,
 		lookbehind: true
 	},
-	'punctuation': /\.{3}|\u2026|,|!/
+	'punctuation': /\.{3}|…|,|!/
 };
\ No newline at end of file
diff --git a/components/prism-lolcode.min.js b/components/prism-lolcode.min.js
index 76cd604088..adc51b6095 100644
--- a/components/prism-lolcode.min.js
+++ b/components/prism-lolcode.min.js
@@ -1 +1 @@
-Prism.languages.lolcode={comment:[/\bOBTW\s+[\s\S]*?\s+TLDR\b/,/\bBTW.+/],string:{pattern:/"(?::.|[^"])*"/,inside:{variable:/:\{[^}]+\}/,symbol:[/:\([a-f\d]+\)/i,/:\[[^\]]+\]/,/:[)>o":]/]}},number:/(-|\b)\d*\.?\d+/,symbol:{pattern:/(^|\s)(?:A )?(?:YARN|NUMBR|NUMBAR|TROOF|BUKKIT|NOOB)(?=\s|,|$)/,lookbehind:!0,inside:{keyword:/A(?=\s)/}},label:{pattern:/((?:^|\s)(?:IM IN YR|IM OUTTA YR) )[a-zA-Z]\w*/,lookbehind:!0,alias:"string"},"function":{pattern:/((?:^|\s)(?:I IZ|HOW IZ I|IZ) )[a-zA-Z]\w*/,lookbehind:!0},keyword:[{pattern:/(^|\s)(?:O HAI IM|KTHX|HAI|KTHXBYE|I HAS A|ITZ(?: A)?|R|AN|MKAY|SMOOSH|MAEK|IS NOW(?: A)?|VISIBLE|GIMMEH|O RLY\?|YA RLY|NO WAI|OIC|MEBBE|WTF\?|OMG|OMGWTF|GTFO|IM IN YR|IM OUTTA YR|FOUND YR|YR|TIL|WILE|UPPIN|NERFIN|I IZ|HOW IZ I|IF U SAY SO|SRS|HAS A|LIEK(?: A)?|IZ)(?=\s|,|$)/,lookbehind:!0},/'Z(?=\s|,|$)/],"boolean":{pattern:/(^|\s)(?:WIN|FAIL)(?=\s|,|$)/,lookbehind:!0},variable:{pattern:/(^|\s)(?:IT)(?=\s|,|$)/,lookbehind:!0},operator:{pattern:/(^|\s)(?:NOT|BOTH SAEM|DIFFRINT|(?:SUM|DIFF|PRODUKT|QUOSHUNT|MOD|BIGGR|SMALLR|BOTH|EITHER|WON|ALL|ANY) OF)(?=\s|,|$)/,lookbehind:!0},punctuation:/\.{3}|\u2026|,|!/};
\ No newline at end of file
+Prism.languages.lolcode={comment:[/\bOBTW\s+[\s\S]*?\s+TLDR\b/,/\bBTW.+/],string:{pattern:/"(?::.|[^"])*"/,inside:{variable:/:\{[^}]+\}/,symbol:[/:\([a-f\d]+\)/i,/:\[[^\]]+\]/,/:[)>o":]/]}},number:/(-|\b)\d*\.?\d+/,symbol:{pattern:/(^|\s)(?:A )?(?:YARN|NUMBR|NUMBAR|TROOF|BUKKIT|NOOB)(?=\s|,|$)/,lookbehind:!0,inside:{keyword:/A(?=\s)/}},label:{pattern:/((?:^|\s)(?:IM IN YR|IM OUTTA YR) )[a-zA-Z]\w*/,lookbehind:!0,alias:"string"},"function":{pattern:/((?:^|\s)(?:I IZ|HOW IZ I|IZ) )[a-zA-Z]\w*/,lookbehind:!0},keyword:[{pattern:/(^|\s)(?:O HAI IM|KTHX|HAI|KTHXBYE|I HAS A|ITZ(?: A)?|R|AN|MKAY|SMOOSH|MAEK|IS NOW(?: A)?|VISIBLE|GIMMEH|O RLY\?|YA RLY|NO WAI|OIC|MEBBE|WTF\?|OMG|OMGWTF|GTFO|IM IN YR|IM OUTTA YR|FOUND YR|YR|TIL|WILE|UPPIN|NERFIN|I IZ|HOW IZ I|IF U SAY SO|SRS|HAS A|LIEK(?: A)?|IZ)(?=\s|,|$)/,lookbehind:!0},/'Z(?=\s|,|$)/],"boolean":{pattern:/(^|\s)(?:WIN|FAIL)(?=\s|,|$)/,lookbehind:!0},variable:{pattern:/(^|\s)IT(?=\s|,|$)/,lookbehind:!0},operator:{pattern:/(^|\s)(?:NOT|BOTH SAEM|DIFFRINT|(?:SUM|DIFF|PRODUKT|QUOSHUNT|MOD|BIGGR|SMALLR|BOTH|EITHER|WON|ALL|ANY) OF)(?=\s|,|$)/,lookbehind:!0},punctuation:/\.{3}|…|,|!/};
\ No newline at end of file

From 13975a3fb4d95661d4a166154fb615aa9369fed4 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 20:26:18 +0200
Subject: [PATCH 232/310] Add tests for LOLCODE

---
 tests/languages/lolcode/boolean_feature.test  | 13 +++
 tests/languages/lolcode/comment_feature.test  | 14 +++
 tests/languages/lolcode/function_feature.test | 18 ++++
 tests/languages/lolcode/keyword_feature.test  | 93 +++++++++++++++++++
 tests/languages/lolcode/label_feature.test    | 15 +++
 tests/languages/lolcode/number_feature.test   | 13 +++
 tests/languages/lolcode/operator_feature.test | 39 ++++++++
 tests/languages/lolcode/string_feature.test   | 33 +++++++
 tests/languages/lolcode/symbol_feature.test   | 27 ++++++
 tests/languages/lolcode/variable_feature.test | 11 +++
 10 files changed, 276 insertions(+)
 create mode 100644 tests/languages/lolcode/boolean_feature.test
 create mode 100644 tests/languages/lolcode/comment_feature.test
 create mode 100644 tests/languages/lolcode/function_feature.test
 create mode 100644 tests/languages/lolcode/keyword_feature.test
 create mode 100644 tests/languages/lolcode/label_feature.test
 create mode 100644 tests/languages/lolcode/number_feature.test
 create mode 100644 tests/languages/lolcode/operator_feature.test
 create mode 100644 tests/languages/lolcode/string_feature.test
 create mode 100644 tests/languages/lolcode/symbol_feature.test
 create mode 100644 tests/languages/lolcode/variable_feature.test

diff --git a/tests/languages/lolcode/boolean_feature.test b/tests/languages/lolcode/boolean_feature.test
new file mode 100644
index 0000000000..4409cfe073
--- /dev/null
+++ b/tests/languages/lolcode/boolean_feature.test
@@ -0,0 +1,13 @@
+WIN
+FAIL
+
+----------------------------------------------------
+
+[
+	["boolean", "WIN"],
+	["boolean", "FAIL"]
+]
+
+----------------------------------------------------
+
+Checks for booleans.
\ No newline at end of file
diff --git a/tests/languages/lolcode/comment_feature.test b/tests/languages/lolcode/comment_feature.test
new file mode 100644
index 0000000000..6031e27b02
--- /dev/null
+++ b/tests/languages/lolcode/comment_feature.test
@@ -0,0 +1,14 @@
+OBTW foo
+bar TLDR
+	BTW foobar
+
+----------------------------------------------------
+
+[
+	["comment", "OBTW foo\r\nbar TLDR"],
+	["comment", "BTW foobar"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
\ No newline at end of file
diff --git a/tests/languages/lolcode/function_feature.test b/tests/languages/lolcode/function_feature.test
new file mode 100644
index 0000000000..0f3dc0d0d2
--- /dev/null
+++ b/tests/languages/lolcode/function_feature.test
@@ -0,0 +1,18 @@
+I IZ foobar
+	HOW IZ I foobar
+IZ fooBAR
+
+----------------------------------------------------
+
+[
+	["keyword", "I IZ"],
+	["function", "foobar"],
+	["keyword", "HOW IZ I"],
+	["function", "foobar"],
+	["keyword", "IZ"],
+	["function", "fooBAR"]
+]
+
+----------------------------------------------------
+
+Checks for functions.
\ No newline at end of file
diff --git a/tests/languages/lolcode/keyword_feature.test b/tests/languages/lolcode/keyword_feature.test
new file mode 100644
index 0000000000..bb59d25f00
--- /dev/null
+++ b/tests/languages/lolcode/keyword_feature.test
@@ -0,0 +1,93 @@
+O HAI IM
+KTHX
+HAI
+KTHXBYE
+I HAS A
+ITZ
+ITZ A
+R
+AN
+MKAY
+SMOOSH
+MAEK
+IS NOW
+IS NOW A
+VISIBLE
+GIMMEH
+O RLY?
+YA RLY
+NO WAI
+OIC
+MEBBE
+WTF?
+OMG
+OMGWTF
+GTFO
+IM IN YR
+IM OUTTA YR
+FOUND YR
+YR
+TIL
+WILE
+UPPIN
+NERFIN
+I IZ
+HOW IZ I foo
+IF U SAY SO
+SRS
+HAS A
+LIEK
+LIEK A
+IZ
+foo'Z
+
+----------------------------------------------------
+
+[
+	["keyword", "O HAI IM"],
+	["keyword", "KTHX"],
+	["keyword", "HAI"],
+	["keyword", "KTHXBYE"],
+	["keyword", "I HAS A"],
+	["keyword", "ITZ"],
+	["keyword", "ITZ A"],
+	["keyword", "R"],
+	["keyword", "AN"],
+	["keyword", "MKAY"],
+	["keyword", "SMOOSH"],
+	["keyword", "MAEK"],
+	["keyword", "IS NOW"],
+	["keyword", "IS NOW A"],
+	["keyword", "VISIBLE"],
+	["keyword", "GIMMEH"],
+	["keyword", "O RLY?"],
+	["keyword", "YA RLY"],
+	["keyword", "NO WAI"],
+	["keyword", "OIC"],
+	["keyword", "MEBBE"],
+	["keyword", "WTF?"],
+	["keyword", "OMG"],
+	["keyword", "OMGWTF"],
+	["keyword", "GTFO"],
+	["keyword", "IM IN YR"],
+	["keyword", "IM OUTTA YR"],
+	["keyword", "FOUND YR"],
+	["keyword", "YR"],
+	["keyword", "TIL"],
+	["keyword", "WILE"],
+	["keyword", "UPPIN"],
+	["keyword", "NERFIN"],
+	["keyword", "I IZ"],
+	["keyword", "HOW IZ I"], ["function", "foo"],
+	["keyword", "IF U SAY SO"],
+	["keyword", "SRS"],
+	["keyword", "HAS A"],
+	["keyword", "LIEK"],
+	["keyword", "LIEK A"],
+	["keyword", "IZ"],
+	"\r\nfoo", ["keyword", "'Z"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/lolcode/label_feature.test b/tests/languages/lolcode/label_feature.test
new file mode 100644
index 0000000000..7722d2a357
--- /dev/null
+++ b/tests/languages/lolcode/label_feature.test
@@ -0,0 +1,15 @@
+IM IN YR foobar
+	IM OUTTA YR fooBAR
+
+----------------------------------------------------
+
+[
+	["keyword", "IM IN YR"],
+	["label", "foobar"],
+	["keyword", "IM OUTTA YR"],
+	["label", "fooBAR"]
+]
+
+----------------------------------------------------
+
+Checks for labels.
\ No newline at end of file
diff --git a/tests/languages/lolcode/number_feature.test b/tests/languages/lolcode/number_feature.test
new file mode 100644
index 0000000000..060d6d2959
--- /dev/null
+++ b/tests/languages/lolcode/number_feature.test
@@ -0,0 +1,13 @@
+42
+3.14159
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.
\ No newline at end of file
diff --git a/tests/languages/lolcode/operator_feature.test b/tests/languages/lolcode/operator_feature.test
new file mode 100644
index 0000000000..c55dcc18b0
--- /dev/null
+++ b/tests/languages/lolcode/operator_feature.test
@@ -0,0 +1,39 @@
+NOT
+BOTH SAEM
+DIFFRINT
+SUM OF
+DIFF OF
+PRODUKT OF
+QUOSHUNT OF
+MOD OF
+BIGGR OF
+SMALLR OF
+BOTH OF
+EITHER OF
+WON OF
+ALL OF
+ANY OF
+
+----------------------------------------------------
+
+[
+	["operator", "NOT"],
+	["operator", "BOTH SAEM"],
+	["operator", "DIFFRINT"],
+	["operator", "SUM OF"],
+	["operator", "DIFF OF"],
+	["operator", "PRODUKT OF"],
+	["operator", "QUOSHUNT OF"],
+	["operator", "MOD OF"],
+	["operator", "BIGGR OF"],
+	["operator", "SMALLR OF"],
+	["operator", "BOTH OF"],
+	["operator", "EITHER OF"],
+	["operator", "WON OF"],
+	["operator", "ALL OF"],
+	["operator", "ANY OF"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/lolcode/string_feature.test b/tests/languages/lolcode/string_feature.test
new file mode 100644
index 0000000000..813228db3b
--- /dev/null
+++ b/tests/languages/lolcode/string_feature.test
@@ -0,0 +1,33 @@
+""
+"foobar"
+"fo:"o"
+"foo:)bar:>baz"
+"foo:{bar}baz"
+
+----------------------------------------------------
+
+[
+	["string", ["\"\""]],
+	["string", ["\"foobar\""]],
+	["string", [
+		"\"fo",
+		["symbol", ":\""],
+		"o\""
+	]],
+	["string", [
+		"\"foo",
+		["symbol", ":)"],
+		"bar",
+		["symbol", ":>"],
+		"baz\""
+	]],
+	["string", [
+		"\"foo",
+		["variable", ":{bar}"],
+		"baz\""
+	]]
+]
+
+----------------------------------------------------
+
+Checks for strings, with variables and symbols in them.
\ No newline at end of file
diff --git a/tests/languages/lolcode/symbol_feature.test b/tests/languages/lolcode/symbol_feature.test
new file mode 100644
index 0000000000..7f1534a175
--- /dev/null
+++ b/tests/languages/lolcode/symbol_feature.test
@@ -0,0 +1,27 @@
+YARN A YARN
+NUMBR A NUMBR
+NUMBAR A NUMBAR
+TROOF A TROOF
+BUKKIT A BUKKIT
+NOOB A NOOB
+
+----------------------------------------------------
+
+[
+	["symbol", ["YARN"]],
+	["symbol", [["keyword", "A"], " YARN"]],
+	["symbol", ["NUMBR"]],
+	["symbol", [["keyword", "A"], " NUMBR"]],
+	["symbol", ["NUMBAR"]],
+	["symbol", [["keyword", "A"], " NUMBAR"]],
+	["symbol", ["TROOF"]],
+	["symbol", [["keyword", "A"], " TROOF"]],
+	["symbol", ["BUKKIT"]],
+	["symbol", [["keyword", "A"], " BUKKIT"]],
+	["symbol", ["NOOB"]],
+	["symbol", [["keyword", "A"], " NOOB"]]
+]
+
+----------------------------------------------------
+
+Checks for symbols, optionally prefixed by "A ".
\ No newline at end of file
diff --git a/tests/languages/lolcode/variable_feature.test b/tests/languages/lolcode/variable_feature.test
new file mode 100644
index 0000000000..1066c33733
--- /dev/null
+++ b/tests/languages/lolcode/variable_feature.test
@@ -0,0 +1,11 @@
+IT
+
+----------------------------------------------------
+
+[
+	["variable", "IT"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From e0f89843b72e2e55fac41486353f72d5410c916b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 26 Aug 2015 20:30:11 +0200
Subject: [PATCH 233/310] Makefile example: Add known failures

---
 examples/prism-makefile.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/examples/prism-makefile.html b/examples/prism-makefile.html
index 738c9a9759..8cbbe7127a 100644
--- a/examples/prism-makefile.html
+++ b/examples/prism-makefile.html
@@ -263,4 +263,14 @@ <h2>Complete example</h2>
             > tmp.dir/$$X ; done
         cd tmp.dir ; zoo aM ../tar.zoo *
         -rm -rf tmp.dir
-</code></pre>
\ No newline at end of file
+</code></pre>
+
+<h2>Known failures</h2>
+<p>There are certain edge cases where Prism will fail.
+    There are always such cases in every regex-based syntax highlighter.
+    However, Prism dares to be open and honest about them.
+    If a failure is listed here, it doesn’t mean it will never be fixed. This is more of a “known bugs” list, just with a certain type of bug.
+</p>
+
+<h3>Comment-like substring</h3>
+<pre><code>"foo # bar";</code></pre>
\ No newline at end of file

From 14da55c1a6396efe07ff03b1d3fae827b75a6589 Mon Sep 17 00:00:00 2001
From: Daniel Flint <nauzilus@gmail.com>
Date: Thu, 27 Aug 2015 14:18:16 +1000
Subject: [PATCH 234/310] Update definitions for command/alias/operators.

Double and single quoted strings behave differently, the later uses interpolation and can contain nested PowerShell.
---
 components/prism-powershell.js | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/components/prism-powershell.js b/components/prism-powershell.js
index 615c46f1a0..6f7494b60f 100644
--- a/components/prism-powershell.js
+++ b/components/prism-powershell.js
@@ -9,10 +9,18 @@ Prism.languages.powershell = {
 			lookbehind: true
 		}
 	],
-	'string': {
-		pattern: /("|')(`?[\w\W])*?\1/m,
-		inside: {}
-	},
+	'string': [
+		{
+			pattern: /"(`?[\w\W])*?"/m,
+			inside: {
+				'powershell': {
+					pattern: /[^`]\$\(.*?\)/,
+					inside: {}
+				}
+			}
+		},
+		/'('?[\w\W])*?'/m
+	],
 	// Matches name spaces as well as casts, attribute decorators. Force starting with letter to avoid matching array indices
 	'namespace': /\[[a-z][\w\W]*?\]/i,
 	'boolean': /\$(true|false)\b/i,
@@ -22,13 +30,17 @@ Prism.languages.powershell = {
 	// Cmdlets and aliases. Aliases should come last, otherwise "write" gets preferred over "write-host" for example
 	// Get-Command | ?{ $_.ModuleName -match "Microsoft.PowerShell.(Util|Core|Management)" }
 	// Get-Alias | ?{ $_.ReferencedCommand.Module.Name -match "Microsoft.PowerShell.(Util|Core|Management)" }
-	'function': /\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-(Computer|Content|EventLog|History|Item|ItemProperty|Variable)|Compare-(Object)|Complete-(Transaction)|Connect-(PSSession)|ConvertFrom-(Csv|Json|StringData)|Convert-(Path)|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-(Process)|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-(PSSession)|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-(PSSession)|Exit-(PSSession)|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-(Object)|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-(Object)|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-(Path)|Limit-(EventLog)|Measure-(Command)|Measure-(Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-(Location)|Push-(Location)|Read-(Host)|Receive-(Job)|Receive-(PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-(ComputerMachinePassword)|Resolve-(Path)|Restart-(Computer|Service)|Restore-(Computer)|Resume-(Job|Service)|Save-(Help)|Select-(Object|String|Xml)|Send-(MailMessage)|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-(Object)|Split-(Path)|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-(Object)|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-(Command)|Unblock-(File)|Undo-(Transaction)|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData)|Update-(Help|List|TypeData)|Use-(Transaction)|Wait-(Event|Job|Process)|Where-(Object)|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)|ac|cat|cd|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i,
+	'function': [
+		/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,
+		/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i
+	],
 	'operator': {
-		pattern: /(\W)-(and|x?or|not|eq|ne|gt|ge|lt|le|Like|(Not)?(Like|Match|Contains|In)|Replace)\b/i,
+		pattern: /(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)|[-+*/%]=?)\s*\b/i,
 		lookbehind: true
 	},
 	'punctuation': /[|{}[\];(),.]/
 };
 // Variable interpolation inside strings
-Prism.languages.powershell.string.inside.boolean = Prism.languages.powershell.boolean;
-Prism.languages.powershell.string.inside.variable = Prism.languages.powershell.variable;
\ No newline at end of file
+Prism.languages.powershell.string[0].inside.boolean = Prism.languages.powershell.boolean;
+Prism.languages.powershell.string[0].inside.variable = Prism.languages.powershell.variable;
+Prism.languages.powershell.string[0].inside.powershell.inside = Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file

From 16faf6bcc141a0856d1475d04a871a7f071852f5 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 27 Aug 2015 08:12:24 +0200
Subject: [PATCH 235/310] Makefile: Handle \r\n in comments and strings + fix
 "-include" keyword

---
 components/prism-makefile.js     | 6 +++---
 components/prism-makefile.min.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/prism-makefile.js b/components/prism-makefile.js
index a678fabac8..a2b47a46eb 100644
--- a/components/prism-makefile.js
+++ b/components/prism-makefile.js
@@ -1,9 +1,9 @@
 Prism.languages.makefile = {
 	'comment': {
-		pattern: /(^|[^\\])#(?:\\[\s\S]|.)*/,
+		pattern: /(^|[^\\])#(?:\\(?:\r\n|[\s\S])|.)*/,
 		lookbehind: true
 	},
-	'string': /(["'])(?:\\[\s\S]|(?!\1)[^\\\r\n])*\1/,
+	'string': /(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
 
 	// Built-in target names
 	'builtin': /\.[A-Z][^:#=\s]+(?=\s*:(?!=))/,
@@ -19,7 +19,7 @@ Prism.languages.makefile = {
 
 	'keyword': [
 		// Directives
-		/\b(?:define|else|endef|endif|export|ifn?def|ifn?eq|-?include|override|private|sinclude|undefine|unexport|vpath)\b/,
+		/-include\b|\b(?:define|else|endef|endif|export|ifn?def|ifn?eq|include|override|private|sinclude|undefine|unexport|vpath)\b/,
 		// Functions
 		{
 			pattern: /(\()(?:addsuffix|abspath|and|basename|call|dir|error|eval|file|filter(?:-out)?|findstring|firstword|flavor|foreach|guile|if|info|join|lastword|load|notdir|or|origin|patsubst|realpath|shell|sort|strip|subst|suffix|value|warning|wildcard|word(?:s|list)?)(?=[ \t])/,
diff --git a/components/prism-makefile.min.js b/components/prism-makefile.min.js
index 85d6f42ca2..92288541dd 100644
--- a/components/prism-makefile.min.js
+++ b/components/prism-makefile.min.js
@@ -1 +1 @@
-Prism.languages.makefile={comment:{pattern:/(^|[^\\])#(?:\\[\s\S]|.)*/,lookbehind:!0},string:/(["'])(?:\\[\s\S]|(?!\1)[^\\\r\n])*\1/,builtin:/\.[A-Z][^:#=\s]+(?=\s*:(?!=))/,symbol:{pattern:/^[^:=\r\n]+(?=\s*:(?!=))/m,inside:{variable:/\$+(?:[^(){}:#=\s]+|(?=[({]))/}},variable:/\$+(?:[^(){}:#=\s]+|\([@*%<^+?][DF]\)|(?=[({]))/,keyword:[/\b(?:define|else|endef|endif|export|ifn?def|ifn?eq|-?include|override|private|sinclude|undefine|unexport|vpath)\b/,{pattern:/(\()(?:addsuffix|abspath|and|basename|call|dir|error|eval|file|filter(?:-out)?|findstring|firstword|flavor|foreach|guile|if|info|join|lastword|load|notdir|or|origin|patsubst|realpath|shell|sort|strip|subst|suffix|value|warning|wildcard|word(?:s|list)?)(?=[ \t])/,lookbehind:!0}],operator:/(?:::|[?:+!])?=|[|@]/,punctuation:/[:;(){}]/};
\ No newline at end of file
+Prism.languages.makefile={comment:{pattern:/(^|[^\\])#(?:\\(?:\r\n|[\s\S])|.)*/,lookbehind:!0},string:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,builtin:/\.[A-Z][^:#=\s]+(?=\s*:(?!=))/,symbol:{pattern:/^[^:=\r\n]+(?=\s*:(?!=))/m,inside:{variable:/\$+(?:[^(){}:#=\s]+|(?=[({]))/}},variable:/\$+(?:[^(){}:#=\s]+|\([@*%<^+?][DF]\)|(?=[({]))/,keyword:[/-include\b|\b(?:define|else|endef|endif|export|ifn?def|ifn?eq|include|override|private|sinclude|undefine|unexport|vpath)\b/,{pattern:/(\()(?:addsuffix|abspath|and|basename|call|dir|error|eval|file|filter(?:-out)?|findstring|firstword|flavor|foreach|guile|if|info|join|lastword|load|notdir|or|origin|patsubst|realpath|shell|sort|strip|subst|suffix|value|warning|wildcard|word(?:s|list)?)(?=[ \t])/,lookbehind:!0}],operator:/(?:::|[?:+!])?=|[|@]/,punctuation:/[:;(){}]/};
\ No newline at end of file

From bcfae5655bd7a128ac7827a5677da1f0cb10dac9 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 27 Aug 2015 08:13:00 +0200
Subject: [PATCH 236/310] Add test for Makefile

---
 tests/languages/makefile/builtin_feature.test | 15 ++++
 tests/languages/makefile/comment_feature.test | 16 ++++
 tests/languages/makefile/keyword_feature.test | 73 +++++++++++++++++++
 .../languages/makefile/operator_feature.test  | 15 ++++
 tests/languages/makefile/string_feature.test  | 23 ++++++
 tests/languages/makefile/symbol_feature.test  | 18 +++++
 .../languages/makefile/variable_feature.test  | 19 +++++
 7 files changed, 179 insertions(+)
 create mode 100644 tests/languages/makefile/builtin_feature.test
 create mode 100644 tests/languages/makefile/comment_feature.test
 create mode 100644 tests/languages/makefile/keyword_feature.test
 create mode 100644 tests/languages/makefile/operator_feature.test
 create mode 100644 tests/languages/makefile/string_feature.test
 create mode 100644 tests/languages/makefile/symbol_feature.test
 create mode 100644 tests/languages/makefile/variable_feature.test

diff --git a/tests/languages/makefile/builtin_feature.test b/tests/languages/makefile/builtin_feature.test
new file mode 100644
index 0000000000..6f6a1a30e4
--- /dev/null
+++ b/tests/languages/makefile/builtin_feature.test
@@ -0,0 +1,15 @@
+.PHONY:
+.DELETE_ON_ERROR:
+.SECONDEXPANSION:
+
+----------------------------------------------------
+
+[
+	["builtin", ".PHONY"], ["punctuation", ":"],
+	["builtin", ".DELETE_ON_ERROR"], ["punctuation", ":"],
+	["builtin", ".SECONDEXPANSION"], ["punctuation", ":"]
+]
+
+----------------------------------------------------
+
+Checks for built-in target names.
\ No newline at end of file
diff --git a/tests/languages/makefile/comment_feature.test b/tests/languages/makefile/comment_feature.test
new file mode 100644
index 0000000000..0e0c6c4358
--- /dev/null
+++ b/tests/languages/makefile/comment_feature.test
@@ -0,0 +1,16 @@
+#
+# foobar
+# foo \
+bar
+
+----------------------------------------------------
+
+[
+	["comment", "#"],
+	["comment", "# foobar"],
+	["comment", "# foo \\\r\nbar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/makefile/keyword_feature.test b/tests/languages/makefile/keyword_feature.test
new file mode 100644
index 0000000000..dcbbcc895a
--- /dev/null
+++ b/tests/languages/makefile/keyword_feature.test
@@ -0,0 +1,73 @@
+define else endef endif
+export ifdef ifndef ifeq
+ifneq -include include
+override private sinclude
+undefine unexport vpath
+
+(addsuffix foo) (abspath foo)
+(and foo) (basename foo)
+(call foo) (dir foo) (error foo)
+(eval foo) (file foo) (filter foo)
+(filter-out foo) (findstring foo)
+(firstword foo) (flavor foo)
+(foreach foo) (guile foo)
+(if foo) (info foo) (join foo)
+(lastword foo) (load foo)
+(notdir foo) (or foo) (origin foo)
+(patsubst foo) (realpath foo)
+(shell foo) (sort foo) (strip foo)
+(subst foo) (suffix foo) (value foo)
+(warning foo) (wildcard foo)
+(word foo) (words foo) (wordlist foo)
+
+----------------------------------------------------
+
+[
+	["keyword", "define"], ["keyword", "else"], ["keyword", "endef"], ["keyword", "endif"],
+	["keyword", "export"], ["keyword", "ifdef"], ["keyword", "ifndef"], ["keyword", "ifeq"],
+	["keyword", "ifneq"], ["keyword", "-include"], ["keyword", "include"],
+	["keyword", "override"], ["keyword", "private"], ["keyword", "sinclude"],
+	["keyword", "undefine"], ["keyword", "unexport"], ["keyword", "vpath"],
+
+	["punctuation", "("], ["keyword", "addsuffix"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "abspath"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "and"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "basename"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "call"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "dir"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "error"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "eval"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "file"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "filter"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "filter-out"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "findstring"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "firstword"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "flavor"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "foreach"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "guile"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "if"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "info"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "join"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "lastword"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "load"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "notdir"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "or"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "origin"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "patsubst"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "realpath"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "shell"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "sort"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "strip"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "subst"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "suffix"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "value"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "warning"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "wildcard"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "word"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "words"], " foo", ["punctuation", ")"],
+	["punctuation", "("], ["keyword", "wordlist"], " foo", ["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for keywords and functions.
\ No newline at end of file
diff --git a/tests/languages/makefile/operator_feature.test b/tests/languages/makefile/operator_feature.test
new file mode 100644
index 0000000000..d0df60addd
--- /dev/null
+++ b/tests/languages/makefile/operator_feature.test
@@ -0,0 +1,15 @@
+= ::= ?=
+:= += !=
+| @
+
+----------------------------------------------------
+
+[
+	["operator", "="], ["operator", "::="], ["operator", "?="],
+	["operator", ":="], ["operator", "+="], ["operator", "!="],
+	["operator", "|"], ["operator", "@"]
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/makefile/string_feature.test b/tests/languages/makefile/string_feature.test
new file mode 100644
index 0000000000..ece27c813c
--- /dev/null
+++ b/tests/languages/makefile/string_feature.test
@@ -0,0 +1,23 @@
+""
+''
+"fo\"o"
+'fo\'o'
+"foo\
+bar"
+'foo\
+bar'
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "''"],
+	["string", "\"fo\\\"o\""],
+	["string", "'fo\\'o'"],
+	["string", "\"foo\\\r\nbar\""],
+	["string", "'foo\\\r\nbar'"]
+]
+
+----------------------------------------------------
+
+Checks for single-quoted and double-quoted strings.
\ No newline at end of file
diff --git a/tests/languages/makefile/symbol_feature.test b/tests/languages/makefile/symbol_feature.test
new file mode 100644
index 0000000000..d1fe40b5d0
--- /dev/null
+++ b/tests/languages/makefile/symbol_feature.test
@@ -0,0 +1,18 @@
+edit :
+%oo:
+$(foo):
+
+----------------------------------------------------
+
+[
+	["symbol", ["edit "]], ["punctuation", ":"],
+	["symbol", ["%oo"]], ["punctuation", ":"],
+	["symbol", [
+		["variable", "$"],
+		"(foo)"
+	]], ["punctuation", ":"]
+]
+
+----------------------------------------------------
+
+Checks for targets, optionally containing interpolation.
\ No newline at end of file
diff --git a/tests/languages/makefile/variable_feature.test b/tests/languages/makefile/variable_feature.test
new file mode 100644
index 0000000000..84431d07d0
--- /dev/null
+++ b/tests/languages/makefile/variable_feature.test
@@ -0,0 +1,19 @@
+$@
+$$<
+$(@D)
+$(foobar)
+$(2)
+
+----------------------------------------------------
+
+[
+	["variable", "$@"],
+	["variable", "$$<"],
+	["variable", "$(@D)"],
+	["variable", "$"], ["punctuation", "("], "foobar", ["punctuation", ")"],
+	["variable", "$"], ["punctuation", "("], "2", ["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From 791dad0d64cd61bf8481bb92855e337ac24cbe0e Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 27 Aug 2015 20:57:37 +0200
Subject: [PATCH 237/310] Tests: Increase the minimum number of dashes for the
 separation + fix test-suite page to match the actual behaviour.

---
 test-suite.html           | 8 ++++----
 tests/helper/test-case.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test-suite.html b/test-suite.html
index accd149d92..51d397d627 100644
--- a/test-suite.html
+++ b/test-suite.html
@@ -47,14 +47,14 @@ <h3>Example 2: testing language injection</h3>
 		<p>If you want to test language injection, you typically need to load two or more languages where one language is the “main” language that is being tested, with all other languages being injected into it.</p>
 		<p>You need to define multiple languages by separating them using a <code>+</code> sign: <code>markup+php</code>.</p>
 		<p>The languages are loaded in order, so first markup (+ dependencies) is loaded, then php (+ dependencies). The test loader ensures that no language is loaded more than once (for example if two languages have the same dependencies).</p>
-		<p>By default the first language is the main language: <code>markup+php</code> will have <code>markup</code> as main language. This is equal to putting your code in the following code block:</p>
+		<p>By default the last language is the main language: <code>php+markup</code> will have <code>markup</code> as main language. This is equal to putting your code in the following code block:</p>
 		<pre><code class="language-markup">...
 &lt;pre>&lt;code class="language-markup">
 	&lt;!-- your code here -->
 &lt;/code>&lt;pre>
 ...</code></pre>
 
-		<p>If you need to load the languages in a given order, but you don't want to use the first language as main language, you can mark the main language with an exclamation mark: <code>markup+php!</code>. This will use <code>php</code> as main language. (You can only define one main language. The test runner will fail all tests in directories with more than one main language.)</p>
+		<p>If you need to load the languages in a given order, but you don't want to use the first language as main language, you can mark the main language with an exclamation mark: <code>php!+markup</code>. This will use <code>php</code> as main language. (You can only define one main language. The test runner will fail all tests in directories with more than one main language.)</p>
 
 		<p><em>Note: by loading multiple languages you can do integration tests (ensure that loading two or more languages together won't break anything).</em></p>
 	</section>
@@ -66,7 +66,7 @@ <h2>Creating your test case file</h2>
 		<ul>
 			<li><code>issue{issueid}</code>: reference a github issue id (example: <code>issue588.test</code>).</li>
 			<li><code>{featurename}_feature</code>: group all tests to one feature in one file (example: <code>string_interpolation_feature.test</code>).</li>
-			<li><code>{language}_inclusion</code>: test inclusion of one language into the other (example: <code>markup/php_inclusion.test</code> will test php inclusion into markup).</li>
+			<li><code>{language}_inclusion</code>: test inclusion of one language into the other (example: <code>markup!+css/css_inclusion.test</code> will test CSS inclusion into markup).</li>
 		</ul>
 		<p>You can use all conventions as a prefix, so <code>string_interpolation_feature_inline.test</code> is possible. <strong>But please take a minute or two to think of a proper name of your test case file. You are writing code not only for the computers, but also for your fellow developers.</strong></p>
 	</section>
@@ -79,7 +79,7 @@ <h2>Writing your test</h2>
 ----
 ... the simplified token stream you expect ...</code></pre>
 
-		<p>Your file is built up of two or three sections, separated by three or more dashes <code>-</code>, starting at the begin of the line:</p>
+		<p>Your file is built up of two or three sections, separated by four or more dashes <code>-</code>, starting at the begin of the line:</p>
 		<ol>
 			<li>Your language snippet. The code you want to compile using Prism. (<strong>required</strong>)</li>
 			<li>The simplified token stream you expect. Needs to be valid JSON. (<strong>required</strong>)</li>
diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index 1fbe8c4b7d..cba3117698 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -120,7 +120,7 @@ module.exports = {
 	 */
 	parseTestCaseFile: function (filePath) {
 		var testCaseSource = fs.readFileSync(filePath, "utf8");
-		var testCaseParts = testCaseSource.split(/^----*\w*$/m);
+		var testCaseParts = testCaseSource.split(/^-{4,}\w*$/m);
 
 		try {
 			var testCase = {

From 4c551e8bcc88e29959aa91461dec316f7485dd70 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 27 Aug 2015 20:58:43 +0200
Subject: [PATCH 238/310] Markup: Simplify patterns + handle \r\n and \r

---
 components/prism-markdown.js     | 30 ++++++++++++++----------------
 components/prism-markdown.min.js |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/components/prism-markdown.js b/components/prism-markdown.js
index 94a71546a1..f089f15167 100644
--- a/components/prism-markdown.js
+++ b/components/prism-markdown.js
@@ -2,15 +2,13 @@ Prism.languages.markdown = Prism.languages.extend('markup', {});
 Prism.languages.insertBefore('markdown', 'prolog', {
 	'blockquote': {
 		// > ...
-		pattern: /(^|\n)>(?:[\t ]*>)*/,
-		lookbehind: true,
+		pattern: /^>(?:[\t ]*>)*/m,
 		alias: 'punctuation'
 	},
 	'code': [
 		{
 			// Prefixed by 4 spaces or 1 tab
-			pattern: /(^|\n)(?: {4}|\t).+/,
-			lookbehind: true,
+			pattern: /^(?: {4}|\t).+/m,
 			alias: 'keyword'
 		},
 		{
@@ -27,7 +25,7 @@ Prism.languages.insertBefore('markdown', 'prolog', {
 
 			// title 2
 			// -------
-			pattern: /\w+.*\n(?:==+|--+)/,
+			pattern: /\w+.*(?:\r?\n|\r)(?:==+|--+)/,
 			alias: 'important',
 			inside: {
 				punctuation: /==+$|--+$/
@@ -36,7 +34,7 @@ Prism.languages.insertBefore('markdown', 'prolog', {
 		{
 			// # title 1
 			// ###### title 6
-			pattern: /((?:^|\n)\s*)#+.+/,
+			pattern: /(^\s*)#+.+/m,
 			lookbehind: true,
 			alias: 'important',
 			inside: {
@@ -49,7 +47,7 @@ Prism.languages.insertBefore('markdown', 'prolog', {
 		// ---
 		// * * *
 		// -----------
-		pattern: /((?:^|\n)\s*)([*-])([\t ]*\2){2,}(?=\s*(?:\n|$))/,
+		pattern: /(^\s*)([*-])([\t ]*\2){2,}(?=\s*$)/m,
 		lookbehind: true,
 		alias: 'punctuation'
 	},
@@ -58,7 +56,7 @@ Prism.languages.insertBefore('markdown', 'prolog', {
 		// + item
 		// - item
 		// 1. item
-		pattern: /((?:^|\n)\s*)(?:[*+-]|\d+\.)(?=[\t ].)/,
+		pattern: /(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,
 		lookbehind: true,
 		alias: 'punctuation'
 	},
@@ -67,14 +65,14 @@ Prism.languages.insertBefore('markdown', 'prolog', {
 		// [id]: http://example.com 'Optional title'
 		// [id]: http://example.com (Optional title)
 		// [id]: <http://example.com> "Optional title"
-		pattern: /!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:[^>]|\\>)+>)(?:[\t ]+(?:"(?:[^"]|\\")*"|'(?:[^']|\\')*'|\((?:[^)]|\\\))*\)))?/,
+		pattern: /!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,
 		inside: {
 			'variable': {
 				pattern: /^(!?\[)[^\]]+/,
 				lookbehind: true
 			},
-			'string': /(?:"(?:[^"]|\\")*"|'(?:[^']|\\')*'|\((?:[^)]|\\\))*\))$/,
-			'punctuation': /[[\]\(\)<>:]/
+			'string': /(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,
+			'punctuation': /^[\[\]!:]|[<>]/
 		},
 		alias: 'url'
 	},
@@ -83,10 +81,10 @@ Prism.languages.insertBefore('markdown', 'prolog', {
 		// __strong__
 
 		// Allow only one line break
-		pattern: /(^|[^\\])(\*\*|__)(?:\n(?!\n)|.)+?\2/,
+		pattern: /(^|[^\\])(\*\*|__)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,
 		lookbehind: true,
 		inside: {
-			'punctuation': /^\*\*|^__|\*\*\s*$|__\s*$/
+			'punctuation': /^\*\*|^__|\*\*$|__$/
 		}
 	},
 	'italic': {
@@ -94,7 +92,7 @@ Prism.languages.insertBefore('markdown', 'prolog', {
 		// _em_
 
 		// Allow only one line break
-		pattern: /(^|[^\\])(?:\*(?:\n(?!\n)|.)+?\*|_(?:\n(?!\n)|.)+?_)/,
+		pattern: /(^|[^\\])([*_])(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,
 		lookbehind: true,
 		inside: {
 			'punctuation': /^[*_]|[*_]$/
@@ -103,14 +101,14 @@ Prism.languages.insertBefore('markdown', 'prolog', {
 	'url': {
 		// [example](http://example.com "Optional title")
 		// [example] [id]
-		pattern: /!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:[^"]|\\")*")?\)| ?\[[^\]\n]*\])/,
+		pattern: /!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,
 		inside: {
 			'variable': {
 				pattern: /(!?\[)[^\]]+(?=\]$)/,
 				lookbehind: true
 			},
 			'string': {
-				pattern: /"(?:[^"]|\\")*"(?=\)$)/
+				pattern: /"(?:\\.|[^"\\])*"(?=\)$)/
 			}
 		}
 	}
diff --git a/components/prism-markdown.min.js b/components/prism-markdown.min.js
index b685298ebd..bf40e3a1df 100644
--- a/components/prism-markdown.min.js
+++ b/components/prism-markdown.min.js
@@ -1 +1 @@
-Prism.languages.markdown=Prism.languages.extend("markup",{}),Prism.languages.insertBefore("markdown","prolog",{blockquote:{pattern:/(^|\n)>(?:[\t ]*>)*/,lookbehind:!0,alias:"punctuation"},code:[{pattern:/(^|\n)(?: {4}|\t).+/,lookbehind:!0,alias:"keyword"},{pattern:/``.+?``|`[^`\n]+`/,alias:"keyword"}],title:[{pattern:/\w+.*\n(?:==+|--+)/,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/((?:^|\n)\s*)#+.+/,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/((?:^|\n)\s*)([*-])([\t ]*\2){2,}(?=\s*(?:\n|$))/,lookbehind:!0,alias:"punctuation"},list:{pattern:/((?:^|\n)\s*)(?:[*+-]|\d+\.)(?=[\t ].)/,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:[^>]|\\>)+>)(?:[\t ]+(?:"(?:[^"]|\\")*"|'(?:[^']|\\')*'|\((?:[^)]|\\\))*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:[^"]|\\")*"|'(?:[^']|\\')*'|\((?:[^)]|\\\))*\))$/,punctuation:/[[\]\(\)<>:]/},alias:"url"},bold:{pattern:/(^|[^\\])(\*\*|__)(?:\n(?!\n)|.)+?\2/,lookbehind:!0,inside:{punctuation:/^\*\*|^__|\*\*\s*$|__\s*$/}},italic:{pattern:/(^|[^\\])(?:\*(?:\n(?!\n)|.)+?\*|_(?:\n(?!\n)|.)+?_)/,lookbehind:!0,inside:{punctuation:/^[*_]|[*_]$/}},url:{pattern:/!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:[^"]|\\")*")?\)| ?\[[^\]\n]*\])/,inside:{variable:{pattern:/(!?\[)[^\]]+(?=\]$)/,lookbehind:!0},string:{pattern:/"(?:[^"]|\\")*"(?=\)$)/}}}}),Prism.languages.markdown.bold.inside.url=Prism.util.clone(Prism.languages.markdown.url),Prism.languages.markdown.italic.inside.url=Prism.util.clone(Prism.languages.markdown.url),Prism.languages.markdown.bold.inside.italic=Prism.util.clone(Prism.languages.markdown.italic),Prism.languages.markdown.italic.inside.bold=Prism.util.clone(Prism.languages.markdown.bold);
\ No newline at end of file
+Prism.languages.markdown=Prism.languages.extend("markup",{}),Prism.languages.insertBefore("markdown","prolog",{blockquote:{pattern:/^>(?:[\t ]*>)*/m,alias:"punctuation"},code:[{pattern:/^(?: {4}|\t).+/m,alias:"keyword"},{pattern:/``.+?``|`[^`\n]+`/,alias:"keyword"}],title:[{pattern:/\w+.*(?:\r?\n|\r)(?:==+|--+)/,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/(^\s*)#+.+/m,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/(^\s*)([*-])([\t ]*\2){2,}(?=\s*$)/m,lookbehind:!0,alias:"punctuation"},list:{pattern:/(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,punctuation:/^[\[\]!:]|[<>]/},alias:"url"},bold:{pattern:/(^|[^\\])(\*\*|__)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,inside:{punctuation:/^\*\*|^__|\*\*$|__$/}},italic:{pattern:/(^|[^\\])([*_])(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,inside:{punctuation:/^[*_]|[*_]$/}},url:{pattern:/!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,inside:{variable:{pattern:/(!?\[)[^\]]+(?=\]$)/,lookbehind:!0},string:{pattern:/"(?:\\.|[^"\\])*"(?=\)$)/}}}}),Prism.languages.markdown.bold.inside.url=Prism.util.clone(Prism.languages.markdown.url),Prism.languages.markdown.italic.inside.url=Prism.util.clone(Prism.languages.markdown.url),Prism.languages.markdown.bold.inside.italic=Prism.util.clone(Prism.languages.markdown.italic),Prism.languages.markdown.italic.inside.bold=Prism.util.clone(Prism.languages.markdown.bold);
\ No newline at end of file

From 8c0a2653922a840e91f56d3649aaf1dc5114771f Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 27 Aug 2015 20:59:06 +0200
Subject: [PATCH 239/310] Rename some test files to match documentation

---
 .../markup!+css/{markup+css_usage.test => css_inclusion.test}     | 0
 .../{markup+javascript_usage.test => javascript_inclusion.test}   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/languages/markup!+css/{markup+css_usage.test => css_inclusion.test} (100%)
 rename tests/languages/markup!+javascript/{markup+javascript_usage.test => javascript_inclusion.test} (100%)

diff --git a/tests/languages/markup!+css/markup+css_usage.test b/tests/languages/markup!+css/css_inclusion.test
similarity index 100%
rename from tests/languages/markup!+css/markup+css_usage.test
rename to tests/languages/markup!+css/css_inclusion.test
diff --git a/tests/languages/markup!+javascript/markup+javascript_usage.test b/tests/languages/markup!+javascript/javascript_inclusion.test
similarity index 100%
rename from tests/languages/markup!+javascript/markup+javascript_usage.test
rename to tests/languages/markup!+javascript/javascript_inclusion.test

From 5d3956a39e9d709f47f7f410541e73031732588d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 27 Aug 2015 20:59:58 +0200
Subject: [PATCH 240/310] Add tests for Markdown

---
 .../markdown/blockquote_feature.test          | 15 ++++
 tests/languages/markdown/bold_feature.test    | 70 +++++++++++++++++++
 tests/languages/markdown/code_feature.test    | 22 ++++++
 tests/languages/markdown/hr_feature.test      | 15 ++++
 tests/languages/markdown/italic_feature.test  | 46 ++++++++++++
 tests/languages/markdown/list_feature.test    | 22 ++++++
 tests/languages/markdown/title_feature.test   | 34 +++++++++
 .../markdown/url-reference_feature.test       | 56 +++++++++++++++
 tests/languages/markdown/url_feature.test     | 25 +++++++
 9 files changed, 305 insertions(+)
 create mode 100644 tests/languages/markdown/blockquote_feature.test
 create mode 100644 tests/languages/markdown/bold_feature.test
 create mode 100644 tests/languages/markdown/code_feature.test
 create mode 100644 tests/languages/markdown/hr_feature.test
 create mode 100644 tests/languages/markdown/italic_feature.test
 create mode 100644 tests/languages/markdown/list_feature.test
 create mode 100644 tests/languages/markdown/title_feature.test
 create mode 100644 tests/languages/markdown/url-reference_feature.test
 create mode 100644 tests/languages/markdown/url_feature.test

diff --git a/tests/languages/markdown/blockquote_feature.test b/tests/languages/markdown/blockquote_feature.test
new file mode 100644
index 0000000000..3d0a4dffd5
--- /dev/null
+++ b/tests/languages/markdown/blockquote_feature.test
@@ -0,0 +1,15 @@
+> foo
+>> foo
+> > foo
+
+----------------------------------------------------
+
+[
+	["blockquote", ">"], " foo\r\n",
+	["blockquote", ">>"], " foo\r\n",
+	["blockquote", "> >"], " foo"
+]
+
+----------------------------------------------------
+
+Checks for blockquotes.
\ No newline at end of file
diff --git a/tests/languages/markdown/bold_feature.test b/tests/languages/markdown/bold_feature.test
new file mode 100644
index 0000000000..7d8e8ba6cd
--- /dev/null
+++ b/tests/languages/markdown/bold_feature.test
@@ -0,0 +1,70 @@
+**foobar**
+**foo
+bar**
+__foobar__
+__foo
+bar__
+
+__foo*bar*baz__
+__foo_bar_baz__
+__foo[bar](baz)__
+
+----------------------------------------------------
+
+[
+	["bold", [
+		["punctuation", "**"],
+		"foobar",
+		["punctuation", "**"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		"foo\r\nbar",
+		["punctuation", "**"]
+	]],
+	["bold", [
+		["punctuation", "__"],
+		"foobar",
+		["punctuation", "__"]
+	]],
+	["bold", [
+		["punctuation", "__"],
+		"foo\r\nbar",
+		["punctuation", "__"]
+	]],
+
+	["bold", [
+		["punctuation", "__"],
+		"foo",
+		["italic", [
+			["punctuation", "*"],
+			"bar",
+			["punctuation", "*"]
+		]],
+		"baz",
+		["punctuation", "__"]
+	]],
+	["bold", [
+		["punctuation", "__"],
+		"foo",
+		["italic", [
+			["punctuation", "_"],
+			"bar",
+			["punctuation", "_"]
+		]],
+		"baz",
+		["punctuation", "__"]
+	]],
+	["bold", [
+		["punctuation", "__"],
+		"foo",
+		["url", [
+			"[bar](baz)"
+		]],
+		["punctuation", "__"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for bold. Also tests for inclusion of italic and url.
\ No newline at end of file
diff --git a/tests/languages/markdown/code_feature.test b/tests/languages/markdown/code_feature.test
new file mode 100644
index 0000000000..2696ca72e2
--- /dev/null
+++ b/tests/languages/markdown/code_feature.test
@@ -0,0 +1,22 @@
+`foo bar baz`
+``foo `bar` baz``
+
+    foobar
+
+	foobar
+
+----------------------------------------------------
+
+[
+	["code", "`foo bar baz`"],
+	["code", "``foo `bar` baz``"],
+	["code", "    foobar"],
+	["code", "\tfoobar"]
+]
+
+----------------------------------------------------
+
+Checks for code blocks and inline code. The first code block is
+indented with 4 spaces, the second one is indented with 1 tab.
+The initial dot is necessary because of the first part being trimmed
+by the test runner.
\ No newline at end of file
diff --git a/tests/languages/markdown/hr_feature.test b/tests/languages/markdown/hr_feature.test
new file mode 100644
index 0000000000..412022652e
--- /dev/null
+++ b/tests/languages/markdown/hr_feature.test
@@ -0,0 +1,15 @@
+***
+---
+* * *
+
+----------------------------------------------------
+
+[
+	["hr", "***"],
+	["hr", "---"],
+	["hr", "* * *"]
+]
+
+----------------------------------------------------
+
+Checks for hr.
\ No newline at end of file
diff --git a/tests/languages/markdown/italic_feature.test b/tests/languages/markdown/italic_feature.test
new file mode 100644
index 0000000000..02ced18027
--- /dev/null
+++ b/tests/languages/markdown/italic_feature.test
@@ -0,0 +1,46 @@
+*foobar*
+*foo
+bar*
+_foobar_
+_foo
+bar_
+
+_foo[bar](baz)_
+
+----------------------------------------------------
+
+[
+	["italic", [
+		["punctuation", "*"],
+		"foobar",
+		["punctuation", "*"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		"foo\r\nbar",
+		["punctuation", "*"]
+	]],
+	["italic", [
+		["punctuation", "_"],
+		"foobar",
+		["punctuation", "_"]
+	]],
+	["italic", [
+		["punctuation", "_"],
+		"foo\r\nbar",
+		["punctuation", "_"]
+	]],
+
+	["italic", [
+		["punctuation", "_"],
+		"foo",
+		["url", [
+			"[bar](baz)"
+		]],
+		["punctuation", "_"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for italic. Also tests for inclusion of url.
\ No newline at end of file
diff --git a/tests/languages/markdown/list_feature.test b/tests/languages/markdown/list_feature.test
new file mode 100644
index 0000000000..bfc9f8e359
--- /dev/null
+++ b/tests/languages/markdown/list_feature.test
@@ -0,0 +1,22 @@
+* foo
++ bar
+- baz
+
+1. foo
+  2. bar
+42. baz
+
+----------------------------------------------------
+
+[
+	["list", "*"], " foo\r\n",
+	["list", "+"], " bar\r\n",
+	["list", "-"], " baz\r\n\r\n",
+	["list", "1."], " foo\r\n  ",
+	["list", "2."], " bar\r\n",
+	["list", "42."], " baz"
+]
+
+----------------------------------------------------
+
+Checks for list symbols.
\ No newline at end of file
diff --git a/tests/languages/markdown/title_feature.test b/tests/languages/markdown/title_feature.test
new file mode 100644
index 0000000000..e02e86fb7b
--- /dev/null
+++ b/tests/languages/markdown/title_feature.test
@@ -0,0 +1,34 @@
+title 1
+==
+
+foobar
+======
+
+title 2
+--
+
+# title 1
+## title 2
+### title 3
+#### title 4
+##### title 5
+###### title 6
+
+----------------------------------------------------
+
+[
+	["title", ["title 1\r\n", ["punctuation", "=="]]],
+	["title", ["foobar\r\n", ["punctuation", "======"]]],
+	["title", ["title 2\r\n", ["punctuation", "--"]]],
+
+	["title", [["punctuation", "#"], " title 1"]],
+	["title", [["punctuation", "##"], " title 2"]],
+	["title", [["punctuation", "###"], " title 3"]],
+	["title", [["punctuation", "####"], " title 4"]],
+	["title", [["punctuation", "#####"], " title 5"]],
+	["title", [["punctuation", "######"], " title 6"]]
+]
+
+----------------------------------------------------
+
+Checks for titles.
\ No newline at end of file
diff --git a/tests/languages/markdown/url-reference_feature.test b/tests/languages/markdown/url-reference_feature.test
new file mode 100644
index 0000000000..4dc25bafde
--- /dev/null
+++ b/tests/languages/markdown/url-reference_feature.test
@@ -0,0 +1,56 @@
+[foo]: http://prismjs.com
+[foo]: http://prismjs.com "foo\"bar"
+[foo]: http://prismjs.com 'foo\'bar'
+![foo]: http://prismjs.com (foo (bar\) baz)
+[foo]: <http://prismjs.com> "Prism"
+
+----------------------------------------------------
+
+[
+	["url-reference", [
+		["punctuation", "["],
+		["variable", "foo"],
+		["punctuation", "]"],
+		["punctuation", ":"],
+		" http://prismjs.com"
+	]],
+	["url-reference", [
+		["punctuation", "["],
+		["variable", "foo"],
+		["punctuation", "]"],
+		["punctuation", ":"],
+		" http://prismjs.com ",
+		["string", "\"foo\\\"bar\""]
+	]],
+	["url-reference", [
+		["punctuation", "["],
+		["variable", "foo"],
+		["punctuation", "]"],
+		["punctuation", ":"],
+		" http://prismjs.com ",
+		["string", "'foo\\'bar'"]
+	]],
+	["url-reference", [
+		["punctuation", "!"],
+		["punctuation", "["],
+		["variable", "foo"],
+		["punctuation", "]"],
+		["punctuation", ":"],
+		" http://prismjs.com ",
+		["string", "(foo (bar\\) baz)"]
+	]],
+	["url-reference", [
+		["punctuation", "["],
+		["variable", "foo"],
+		["punctuation", "]"],
+		["punctuation", ":"],
+		["punctuation", "<"],
+		"http://prismjs.com",
+		["punctuation", ">"],
+		["string", "\"Prism\""]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for URL references.
\ No newline at end of file
diff --git a/tests/languages/markdown/url_feature.test b/tests/languages/markdown/url_feature.test
new file mode 100644
index 0000000000..ca8b9cff72
--- /dev/null
+++ b/tests/languages/markdown/url_feature.test
@@ -0,0 +1,25 @@
+[foo](http://prismjs.com)
+![foo](http://prismjs.com "Foo\"bar")
+[foo] [bar]
+
+----------------------------------------------------
+
+[
+	["url", [
+		"[foo](http://prismjs.com)"
+	]],
+	["url", [
+		"![foo](http://prismjs.com ",
+		["string", "\"Foo\\\"bar\""],
+		")"
+	]],
+	["url", [
+		"[foo] [",
+		["variable", "bar"],
+		"]"
+	]]
+]
+
+----------------------------------------------------
+
+Checks for URLs.
\ No newline at end of file

From 52829b3c3e8841bca8b6fe48ad3272d32a50e427 Mon Sep 17 00:00:00 2001
From: Anuj Nair <anuj.r.nair@gmail.com>
Date: Thu, 27 Aug 2015 21:48:00 -0700
Subject: [PATCH 241/310] Issue 675 - fixing inline style for Coy theme

---
 themes/prism-coy.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/prism-coy.css b/themes/prism-coy.css
index 7a325d63a8..b661042113 100644
--- a/themes/prism-coy.css
+++ b/themes/prism-coy.css
@@ -74,6 +74,7 @@ pre[class*="language-"] {
 	border-radius: 0.3em;
 	color: #c92c2c;
 	border: 1px solid rgba(0, 0, 0, 0.1);
+	display: inline;
 }
 
 pre[class*="language-"]:before,

From a3cbecc221f092d15b0605a21466aad2be0f52a8 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 07:58:10 +0200
Subject: [PATCH 242/310] MATLAB: Simplify string pattern to remove lookbehind

---
 components/prism-matlab.js     | 5 +----
 components/prism-matlab.min.js | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/components/prism-matlab.js b/components/prism-matlab.js
index b75b10994f..e210edb83c 100644
--- a/components/prism-matlab.js
+++ b/components/prism-matlab.js
@@ -1,9 +1,6 @@
 Prism.languages.matlab = {
 	// We put string before comment, because of printf() patterns that contain "%"
-	'string': {
-		pattern: /(^|\W)'(?:''|[^'\n])*'/,
-		lookbehind: true
-	},
+	'string': /\B'(?:''|[^'\n])*'/,
 	'comment': [
 		/%\{[\s\S]*?\}%/,
 		/%.+/
diff --git a/components/prism-matlab.min.js b/components/prism-matlab.min.js
index 4fa7d4a9f1..42dc38121f 100644
--- a/components/prism-matlab.min.js
+++ b/components/prism-matlab.min.js
@@ -1 +1 @@
-Prism.languages.matlab={string:{pattern:/(^|\W)'(?:''|[^'\n])*'/,lookbehind:!0},comment:[/%\{[\s\S]*?\}%/,/%.+/],number:/\b-?(?:\d*\.?\d+(?:[eE][+-]?\d+)?(?:[ij])?|[ij])\b/,keyword:/\b(?:break|case|catch|continue|else|elseif|end|for|function|if|inf|NaN|otherwise|parfor|pause|pi|return|switch|try|while)\b/,"function":/(?!\d)\w+(?=\s*\()/,operator:/\.?[*^\/\\']|[+\-:@]|[<>=~]=?|&&?|\|\|?/,punctuation:/\.{3}|[.,;\[\](){}!]/};
\ No newline at end of file
+Prism.languages.matlab={string:/\B'(?:''|[^'\n])*'/,comment:[/%\{[\s\S]*?\}%/,/%.+/],number:/\b-?(?:\d*\.?\d+(?:[eE][+-]?\d+)?(?:[ij])?|[ij])\b/,keyword:/\b(?:break|case|catch|continue|else|elseif|end|for|function|if|inf|NaN|otherwise|parfor|pause|pi|return|switch|try|while)\b/,"function":/(?!\d)\w+(?=\s*\()/,operator:/\.?[*^\/\\']|[+\-:@]|[<>=~]=?|&&?|\|\|?/,punctuation:/\.{3}|[.,;\[\](){}!]/};
\ No newline at end of file

From 6f9ca82c96b16122126d1e73a6ff0877641bd834 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 07:58:53 +0200
Subject: [PATCH 243/310] Add tests for MATLAB

---
 tests/languages/matlab/comment_feature.test  | 16 +++++++++++
 tests/languages/matlab/function_feature.test | 13 +++++++++
 tests/languages/matlab/keyword_feature.test  | 21 ++++++++++++++
 tests/languages/matlab/number_feature.test   | 27 ++++++++++++++++++
 tests/languages/matlab/operator_feature.test | 29 ++++++++++++++++++++
 tests/languages/matlab/string_feature.test   | 13 +++++++++
 6 files changed, 119 insertions(+)
 create mode 100644 tests/languages/matlab/comment_feature.test
 create mode 100644 tests/languages/matlab/function_feature.test
 create mode 100644 tests/languages/matlab/keyword_feature.test
 create mode 100644 tests/languages/matlab/number_feature.test
 create mode 100644 tests/languages/matlab/operator_feature.test
 create mode 100644 tests/languages/matlab/string_feature.test

diff --git a/tests/languages/matlab/comment_feature.test b/tests/languages/matlab/comment_feature.test
new file mode 100644
index 0000000000..533e2f8f7b
--- /dev/null
+++ b/tests/languages/matlab/comment_feature.test
@@ -0,0 +1,16 @@
+% foobar
+%{}%
+%{ foo
+bar }%
+
+----------------------------------------------------
+
+[
+	["comment", "% foobar"],
+	["comment", "%{}%"],
+	["comment", "%{ foo\r\nbar }%"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
\ No newline at end of file
diff --git a/tests/languages/matlab/function_feature.test b/tests/languages/matlab/function_feature.test
new file mode 100644
index 0000000000..4c0100a479
--- /dev/null
+++ b/tests/languages/matlab/function_feature.test
@@ -0,0 +1,13 @@
+foo()
+foo_42()
+
+----------------------------------------------------
+
+[
+	["function", "foo"], ["punctuation", "("], ["punctuation", ")"],
+	["function", "foo_42"], ["punctuation", "("], ["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for functions.
\ No newline at end of file
diff --git a/tests/languages/matlab/keyword_feature.test b/tests/languages/matlab/keyword_feature.test
new file mode 100644
index 0000000000..c71e3f83a9
--- /dev/null
+++ b/tests/languages/matlab/keyword_feature.test
@@ -0,0 +1,21 @@
+break case catch continue
+else elseif end for
+function if inf NaN
+otherwise parfor pause
+pi return switch
+try while
+
+----------------------------------------------------
+
+[
+	["keyword", "break"], ["keyword", "case"], ["keyword", "catch"], ["keyword", "continue"],
+	["keyword", "else"], ["keyword", "elseif"], ["keyword", "end"], ["keyword", "for"],
+	["keyword", "function"], ["keyword", "if"], ["keyword", "inf"], ["keyword", "NaN"],
+	["keyword", "otherwise"], ["keyword", "parfor"], ["keyword", "pause"],
+	["keyword", "pi"], ["keyword", "return"], ["keyword", "switch"],
+	["keyword", "try"], ["keyword", "while"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/matlab/number_feature.test b/tests/languages/matlab/number_feature.test
new file mode 100644
index 0000000000..4bd7a44840
--- /dev/null
+++ b/tests/languages/matlab/number_feature.test
@@ -0,0 +1,27 @@
+42
+3.14159
+2.1e2
+3.2E+4
+0.1e-5
+3i
+2j
+i
+j
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "2.1e2"],
+	["number", "3.2E+4"],
+	["number", "0.1e-5"],
+	["number", "3i"],
+	["number", "2j"],
+	["number", "i"],
+	["number", "j"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.
\ No newline at end of file
diff --git a/tests/languages/matlab/operator_feature.test b/tests/languages/matlab/operator_feature.test
new file mode 100644
index 0000000000..fd021bb410
--- /dev/null
+++ b/tests/languages/matlab/operator_feature.test
@@ -0,0 +1,29 @@
+.' .^
+.* ./ .\
+@ ^ :
++ - ~
+* / \
+< <= > >=
+== ~=
+& &&
+| ||
+A'
+
+----------------------------------------------------
+
+[
+	["operator", ".'"], ["operator", ".^"],
+	["operator", ".*"], ["operator", "./"], ["operator", ".\\"],
+	["operator", "@"], ["operator", "^"], ["operator", ":"],
+	["operator", "+"], ["operator", "-"], ["operator", "~"],
+	["operator", "*"], ["operator", "/"], ["operator", "\\"],
+	["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
+	["operator", "=="], ["operator", "~="],
+	["operator", "&"], ["operator", "&&"],
+	["operator", "|"], ["operator", "||"],
+	"\r\nA", ["operator", "'"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/matlab/string_feature.test b/tests/languages/matlab/string_feature.test
new file mode 100644
index 0000000000..d3d0d6cab1
--- /dev/null
+++ b/tests/languages/matlab/string_feature.test
@@ -0,0 +1,13 @@
+''
+'foo''bar'
+
+----------------------------------------------------
+
+[
+	["string", "''"],
+	["string", "'foo''bar'"]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From a92e4bd3b8c478d279ba1e848151c02420138c76 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 08:31:17 +0200
Subject: [PATCH 244/310] NASM: Converted indents to tabs, removed uneeded
 escapes, added lookbehinds

---
 components/prism-nasm.js     | 40 ++++++++++++++++++++----------------
 components/prism-nasm.min.js |  2 +-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/components/prism-nasm.js b/components/prism-nasm.js
index b10725451f..b47af8c990 100644
--- a/components/prism-nasm.js
+++ b/components/prism-nasm.js
@@ -1,20 +1,24 @@
 Prism.languages.nasm = {
-    'comment': /;.*$/m,
-    'string': /("|'|`)(\\?.)*?\1/m,
-    'label': {
-        pattern: /^\s*[A-Za-z\._\?\$][\w\.\?\$@~#]*:/m,
-        alias: 'function'
-    },
-    'keyword': [
-        /\[?BITS (16|32|64)\]?/m,
-        /^\s*section\s*[a-zA-Z\.]+:?/im,
-        /(?:extern|global)[^;]*/im,
-        /(?:CPU|FLOAT|DEFAULT).*$/m
-    ],
-    'register': {
-        pattern: /\b(?:st\d|[xyz]mm\d\d?|[cdt]r\d|r\d\d?[bwd]?|[er]?[abcd]x|[abcd][hl]|[er]?(bp|sp|si|di)|[cdefgs]s)\b/i,
-        alias: 'variable'
-    },
-    'number': /(\b|-|(?=\$))(0[hx][\da-f]*\.?[\da-f]+(p[+-]?\d+)?|\d[\da-f]+[hx]|\$\d[\da-f]*|0[oq][0-7]+|[0-7]+[oq]|0[by][01]+|[01]+[by]|0[dt]\d+|\d*\.?\d+(\.?e[+-]?\d+)?[dt]?)\b/i,
-    'operator': /[\[\]\*+\-\/%<>=&|\$!]/m
+	'comment': /;.*$/m,
+	'string': /("|'|`)(\\?.)*?\1/m,
+	'label': {
+		pattern: /(^\s*)[A-Za-z._?$][\w.?$@~#]*:/m,
+		lookbehind: true,
+		alias: 'function'
+	},
+	'keyword': [
+		/\[?BITS (16|32|64)\]?/m,
+		{
+			pattern: /(^\s*)section\s*[a-zA-Z\.]+:?/im,
+			lookbehind: true
+		},
+		/(?:extern|global)[^;\r\n]*/im,
+		/(?:CPU|FLOAT|DEFAULT).*$/m
+	],
+	'register': {
+		pattern: /\b(?:st\d|[xyz]mm\d\d?|[cdt]r\d|r\d\d?[bwd]?|[er]?[abcd]x|[abcd][hl]|[er]?(bp|sp|si|di)|[cdefgs]s)\b/i,
+		alias: 'variable'
+	},
+	'number': /(\b|-|(?=\$))(0[hx][\da-f]*\.?[\da-f]+(p[+-]?\d+)?|\d[\da-f]+[hx]|\$\d[\da-f]*|0[oq][0-7]+|[0-7]+[oq]|0[by][01]+|[01]+[by]|0[dt]\d+|\d*\.?\d+(\.?e[+-]?\d+)?[dt]?)\b/i,
+	'operator': /[\[\]*+\-\/%<>=&|$!]/
 };
diff --git a/components/prism-nasm.min.js b/components/prism-nasm.min.js
index 32960690ac..d117778d8d 100644
--- a/components/prism-nasm.min.js
+++ b/components/prism-nasm.min.js
@@ -1 +1 @@
-Prism.languages.nasm={comment:/;.*$/m,string:/("|'|`)(\\?.)*?\1/m,label:{pattern:/^\s*[A-Za-z\._\?\$][\w\.\?\$@~#]*:/m,alias:"function"},keyword:[/\[?BITS (16|32|64)\]?/m,/^\s*section\s*[a-zA-Z\.]+:?/im,/(?:extern|global)[^;]*/im,/(?:CPU|FLOAT|DEFAULT).*$/m],register:{pattern:/\b(?:st\d|[xyz]mm\d\d?|[cdt]r\d|r\d\d?[bwd]?|[er]?[abcd]x|[abcd][hl]|[er]?(bp|sp|si|di)|[cdefgs]s)\b/i,alias:"variable"},number:/(\b|-|(?=\$))(0[hx][\da-f]*\.?[\da-f]+(p[+-]?\d+)?|\d[\da-f]+[hx]|\$\d[\da-f]*|0[oq][0-7]+|[0-7]+[oq]|0[by][01]+|[01]+[by]|0[dt]\d+|\d*\.?\d+(\.?e[+-]?\d+)?[dt]?)\b/i,operator:/[\[\]\*+\-\/%<>=&|\$!]/m};
\ No newline at end of file
+Prism.languages.nasm={comment:/;.*$/m,string:/("|'|`)(\\?.)*?\1/m,label:{pattern:/(^\s*)[A-Za-z._?$][\w.?$@~#]*:/m,lookbehind:!0,alias:"function"},keyword:[/\[?BITS (16|32|64)\]?/m,{pattern:/(^\s*)section\s*[a-zA-Z\.]+:?/im,lookbehind:!0},/(?:extern|global)[^;\r\n]*/im,/(?:CPU|FLOAT|DEFAULT).*$/m],register:{pattern:/\b(?:st\d|[xyz]mm\d\d?|[cdt]r\d|r\d\d?[bwd]?|[er]?[abcd]x|[abcd][hl]|[er]?(bp|sp|si|di)|[cdefgs]s)\b/i,alias:"variable"},number:/(\b|-|(?=\$))(0[hx][\da-f]*\.?[\da-f]+(p[+-]?\d+)?|\d[\da-f]+[hx]|\$\d[\da-f]*|0[oq][0-7]+|[0-7]+[oq]|0[by][01]+|[01]+[by]|0[dt]\d+|\d*\.?\d+(\.?e[+-]?\d+)?[dt]?)\b/i,operator:/[\[\]*+\-\/%<>=&|$!]/};
\ No newline at end of file

From 561e46cb97c11d41f31a952ef64782f81bb16dc9 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 08:34:10 +0200
Subject: [PATCH 245/310] Add tests for NASM

---
 tests/languages/nasm/comment_feature.test  | 13 +++
 tests/languages/nasm/keyword_feature.test  | 30 +++++++
 tests/languages/nasm/label_feature.test    | 15 ++++
 tests/languages/nasm/number_feature.test   | 97 ++++++++++++++++++++++
 tests/languages/nasm/operator_feature.test | 17 ++++
 tests/languages/nasm/register_feature.test | 43 ++++++++++
 tests/languages/nasm/string_feature.test   | 21 +++++
 7 files changed, 236 insertions(+)
 create mode 100644 tests/languages/nasm/comment_feature.test
 create mode 100644 tests/languages/nasm/keyword_feature.test
 create mode 100644 tests/languages/nasm/label_feature.test
 create mode 100644 tests/languages/nasm/number_feature.test
 create mode 100644 tests/languages/nasm/operator_feature.test
 create mode 100644 tests/languages/nasm/register_feature.test
 create mode 100644 tests/languages/nasm/string_feature.test

diff --git a/tests/languages/nasm/comment_feature.test b/tests/languages/nasm/comment_feature.test
new file mode 100644
index 0000000000..44659860b3
--- /dev/null
+++ b/tests/languages/nasm/comment_feature.test
@@ -0,0 +1,13 @@
+;
+; foo
+
+----------------------------------------------------
+
+[
+	["comment", ";"],
+	["comment", "; foo"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/nasm/keyword_feature.test b/tests/languages/nasm/keyword_feature.test
new file mode 100644
index 0000000000..699387c02c
--- /dev/null
+++ b/tests/languages/nasm/keyword_feature.test
@@ -0,0 +1,30 @@
+BITS 16 BITS 32 BITS 64
+[BITS 16] [BITS 32] [BITS 64]
+
+section Foo.bar
+section foobar:
+
+extern _printf
+global _main
+
+CPU 8086
+FLOAT DAZ
+DEFAULT REL
+
+----------------------------------------------------
+
+[
+	["keyword", "BITS 16"], ["keyword", "BITS 32"], ["keyword", "BITS 64"],
+	["keyword", "[BITS 16]"], ["keyword", "[BITS 32]"], ["keyword", "[BITS 64]"],
+	["keyword", "section Foo.bar"],
+	["keyword", "section foobar:"],
+	["keyword", "extern _printf"],
+	["keyword", "global _main"],
+	["keyword", "CPU 8086"],
+	["keyword", "FLOAT DAZ"],
+	["keyword", "DEFAULT REL"]
+]
+
+----------------------------------------------------
+
+Checks for keywords.
\ No newline at end of file
diff --git a/tests/languages/nasm/label_feature.test b/tests/languages/nasm/label_feature.test
new file mode 100644
index 0000000000..e9be0d1956
--- /dev/null
+++ b/tests/languages/nasm/label_feature.test
@@ -0,0 +1,15 @@
+foo42:
+.foo:
+..@foo:
+
+----------------------------------------------------
+
+[
+	["label", "foo42:"],
+	["label", ".foo:"],
+	["label", "..@foo:"]
+]
+
+----------------------------------------------------
+
+Checks for labels.
\ No newline at end of file
diff --git a/tests/languages/nasm/number_feature.test b/tests/languages/nasm/number_feature.test
new file mode 100644
index 0000000000..6ffd995a1b
--- /dev/null
+++ b/tests/languages/nasm/number_feature.test
@@ -0,0 +1,97 @@
+0xBadFace
+0x4f.ab
+0x4p2
+0x2.ap-8
+0x1p+1
+
+0hBadFace
+0h4f.ab
+0h4p2
+0h2.ap-8
+0h1p+1
+42fh
+4ab2x
+
+$4
+$2a4f
+
+0o75
+0q75
+75o
+75q
+
+0b0101
+0y0101
+0101b
+0101y
+
+0d42
+0t42
+42
+3.14159
+4.2e4
+2e-1
+3.1e+2
+42d
+3.14159d
+4.2e4d
+2e-1d
+3.1e+2d
+42t
+3.14159t
+4.2e4t
+2e-1t
+3.1e+2t
+
+----------------------------------------------------
+
+[
+	["number", "0xBadFace"],
+	["number", "0x4f.ab"],
+	["number", "0x4p2"],
+	["number", "0x2.ap-8"],
+	["number", "0x1p+1"],
+
+	["number", "0hBadFace"],
+	["number", "0h4f.ab"],
+	["number", "0h4p2"],
+	["number", "0h2.ap-8"],
+	["number", "0h1p+1"],
+	["number", "42fh"],
+	["number", "4ab2x"],
+
+	["number", "$4"],
+	["number", "$2a4f"],
+
+	["number", "0o75"],
+	["number", "0q75"],
+	["number", "75o"],
+	["number", "75q"],
+
+	["number", "0b0101"],
+	["number", "0y0101"],
+	["number", "0101b"],
+	["number", "0101y"],
+
+	["number", "0d42"],
+	["number", "0t42"],
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "4.2e4"],
+	["number", "2e-1"],
+	["number", "3.1e+2"],
+	["number", "42d"],
+	["number", "3.14159d"],
+	["number", "4.2e4d"],
+	["number", "2e-1d"],
+	["number", "3.1e+2d"],
+	["number", "42t"],
+	["number", "3.14159t"],
+	["number", "4.2e4t"],
+	["number", "2e-1t"],
+	["number", "3.1e+2t"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.
\ No newline at end of file
diff --git a/tests/languages/nasm/operator_feature.test b/tests/languages/nasm/operator_feature.test
new file mode 100644
index 0000000000..0202fc4a14
--- /dev/null
+++ b/tests/languages/nasm/operator_feature.test
@@ -0,0 +1,17 @@
+[ ]
+* + - /
+% < > =
+& | $ !
+
+----------------------------------------------------
+
+[
+	["operator", "["], ["operator", "]"],
+	["operator", "*"], ["operator", "+"], ["operator", "-"], ["operator", "/"],
+	["operator", "%"], ["operator", "<"], ["operator", ">"], ["operator", "="],
+	["operator", "&"], ["operator", "|"], ["operator", "$"], ["operator", "!"]
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/nasm/register_feature.test b/tests/languages/nasm/register_feature.test
new file mode 100644
index 0000000000..77f054ec15
--- /dev/null
+++ b/tests/languages/nasm/register_feature.test
@@ -0,0 +1,43 @@
+st0 st1
+xmm1 xmm2
+ymm1 ymm2
+zmm1 zmm2
+cr1 dr1 tr1
+r1 r42
+r1b r1w r1d
+ax bx cx dx
+eax ebx ecx edx
+rax rbx rcx rdx
+ah bh ch dh
+al bl cl dl
+bp sp si di
+ebp esp esi edi
+rbp rsp rsi rdi
+cs ds es
+fs gs ss
+
+----------------------------------------------------
+
+[
+	["register", "st0"], ["register", "st1"],
+	["register", "xmm1"], ["register", "xmm2"],
+	["register", "ymm1"], ["register", "ymm2"],
+	["register", "zmm1"], ["register", "zmm2"],
+	["register", "cr1"], ["register", "dr1"], ["register", "tr1"],
+	["register", "r1"], ["register", "r42"],
+	["register", "r1b"], ["register", "r1w"], ["register", "r1d"],
+	["register", "ax"], ["register", "bx"], ["register", "cx"], ["register", "dx"],
+	["register", "eax"], ["register", "ebx"], ["register", "ecx"], ["register", "edx"],
+	["register", "rax"], ["register", "rbx"], ["register", "rcx"], ["register", "rdx"],
+	["register", "ah"], ["register", "bh"], ["register", "ch"], ["register", "dh"],
+	["register", "al"], ["register", "bl"], ["register", "cl"], ["register", "dl"],
+	["register", "bp"], ["register", "sp"], ["register", "si"], ["register", "di"],
+	["register", "ebp"], ["register", "esp"], ["register", "esi"], ["register", "edi"],
+	["register", "rbp"], ["register", "rsp"], ["register", "rsi"], ["register", "rdi"],
+	["register", "cs"], ["register", "ds"], ["register", "es"],
+	["register", "fs"], ["register", "gs"], ["register", "ss"]
+]
+
+----------------------------------------------------
+
+Checks for registers.
\ No newline at end of file
diff --git a/tests/languages/nasm/string_feature.test b/tests/languages/nasm/string_feature.test
new file mode 100644
index 0000000000..6cbc1ea97b
--- /dev/null
+++ b/tests/languages/nasm/string_feature.test
@@ -0,0 +1,21 @@
+""
+"fo\"o"
+''
+'fo\'o'
+``
+`fo\`o`
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"o\""],
+	["string", "''"],
+	["string", "'fo\\'o'"],
+	["string", "``"],
+	["string", "`fo\\`o`"]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From 626754bb82b35a80dfa3d60169f474c9771d27cf Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 08:39:03 +0200
Subject: [PATCH 246/310] Renamed inclusion tests according to documentation.

---
 .../{coffeescript+haml_usage.test => coffeescript_inclusion.test} | 0
 .../{javascript+haml_usage.test => javascript_inclusion.test}     | 0
 .../less+haml/{less+haml_usage.test => less_inclusion.test}       | 0
 .../{markdown+haml_usage.test => markdown_inclusion.test}         | 0
 .../scss+haml/{scss+haml_usage.test => scss_inclusion.test}       | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/languages/coffeescript+haml/{coffeescript+haml_usage.test => coffeescript_inclusion.test} (100%)
 rename tests/languages/javascript+haml/{javascript+haml_usage.test => javascript_inclusion.test} (100%)
 rename tests/languages/less+haml/{less+haml_usage.test => less_inclusion.test} (100%)
 rename tests/languages/markdown+haml/{markdown+haml_usage.test => markdown_inclusion.test} (100%)
 rename tests/languages/scss+haml/{scss+haml_usage.test => scss_inclusion.test} (100%)

diff --git a/tests/languages/coffeescript+haml/coffeescript+haml_usage.test b/tests/languages/coffeescript+haml/coffeescript_inclusion.test
similarity index 100%
rename from tests/languages/coffeescript+haml/coffeescript+haml_usage.test
rename to tests/languages/coffeescript+haml/coffeescript_inclusion.test
diff --git a/tests/languages/javascript+haml/javascript+haml_usage.test b/tests/languages/javascript+haml/javascript_inclusion.test
similarity index 100%
rename from tests/languages/javascript+haml/javascript+haml_usage.test
rename to tests/languages/javascript+haml/javascript_inclusion.test
diff --git a/tests/languages/less+haml/less+haml_usage.test b/tests/languages/less+haml/less_inclusion.test
similarity index 100%
rename from tests/languages/less+haml/less+haml_usage.test
rename to tests/languages/less+haml/less_inclusion.test
diff --git a/tests/languages/markdown+haml/markdown+haml_usage.test b/tests/languages/markdown+haml/markdown_inclusion.test
similarity index 100%
rename from tests/languages/markdown+haml/markdown+haml_usage.test
rename to tests/languages/markdown+haml/markdown_inclusion.test
diff --git a/tests/languages/scss+haml/scss+haml_usage.test b/tests/languages/scss+haml/scss_inclusion.test
similarity index 100%
rename from tests/languages/scss+haml/scss+haml_usage.test
rename to tests/languages/scss+haml/scss_inclusion.test

From a67f77de259fef3833fc772aaf7e4ec6407184ba Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 08:40:48 +0200
Subject: [PATCH 247/310] Renamed inclusion tests according to documentation.

---
 .../{javascript+http_usage.test => javascript_inclusion.test}     | 0
 .../markup+http/{markup+http_usage.test => markup_inclusion.test} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/languages/javascript+http/{javascript+http_usage.test => javascript_inclusion.test} (100%)
 rename tests/languages/markup+http/{markup+http_usage.test => markup_inclusion.test} (100%)

diff --git a/tests/languages/javascript+http/javascript+http_usage.test b/tests/languages/javascript+http/javascript_inclusion.test
similarity index 100%
rename from tests/languages/javascript+http/javascript+http_usage.test
rename to tests/languages/javascript+http/javascript_inclusion.test
diff --git a/tests/languages/markup+http/markup+http_usage.test b/tests/languages/markup+http/markup_inclusion.test
similarity index 100%
rename from tests/languages/markup+http/markup+http_usage.test
rename to tests/languages/markup+http/markup_inclusion.test

From b9eeb1f94f6328af4e3c321142fdd3ac1157b6b7 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 08:42:31 +0200
Subject: [PATCH 248/310] Renamed inclusion tests according to documentation.

---
 .../{coffeescript+jade_usage.test => coffeescript_inclusion.test} | 0
 .../{handlebars+jade_usage.test => handlebars_inclusion.test}     | 0
 .../less+jade/{less+jade_usage.test => less_inclusion.test}       | 0
 .../{markdown+jade_usage.test => markdown_inclusion.test}         | 0
 .../scss+jade/{scss+jade_usage.test => scss_inclusion.test}       | 0
 .../stylus+jade/{style+jade_usage.test => stylus_inclusion.test}  | 0
 .../twig+jade/{twig+jade_usage.test => twig_inclusion.test}       | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/languages/coffeescript+jade/{coffeescript+jade_usage.test => coffeescript_inclusion.test} (100%)
 rename tests/languages/handlebars+jade/{handlebars+jade_usage.test => handlebars_inclusion.test} (100%)
 rename tests/languages/less+jade/{less+jade_usage.test => less_inclusion.test} (100%)
 rename tests/languages/markdown+jade/{markdown+jade_usage.test => markdown_inclusion.test} (100%)
 rename tests/languages/scss+jade/{scss+jade_usage.test => scss_inclusion.test} (100%)
 rename tests/languages/stylus+jade/{style+jade_usage.test => stylus_inclusion.test} (100%)
 rename tests/languages/twig+jade/{twig+jade_usage.test => twig_inclusion.test} (100%)

diff --git a/tests/languages/coffeescript+jade/coffeescript+jade_usage.test b/tests/languages/coffeescript+jade/coffeescript_inclusion.test
similarity index 100%
rename from tests/languages/coffeescript+jade/coffeescript+jade_usage.test
rename to tests/languages/coffeescript+jade/coffeescript_inclusion.test
diff --git a/tests/languages/handlebars+jade/handlebars+jade_usage.test b/tests/languages/handlebars+jade/handlebars_inclusion.test
similarity index 100%
rename from tests/languages/handlebars+jade/handlebars+jade_usage.test
rename to tests/languages/handlebars+jade/handlebars_inclusion.test
diff --git a/tests/languages/less+jade/less+jade_usage.test b/tests/languages/less+jade/less_inclusion.test
similarity index 100%
rename from tests/languages/less+jade/less+jade_usage.test
rename to tests/languages/less+jade/less_inclusion.test
diff --git a/tests/languages/markdown+jade/markdown+jade_usage.test b/tests/languages/markdown+jade/markdown_inclusion.test
similarity index 100%
rename from tests/languages/markdown+jade/markdown+jade_usage.test
rename to tests/languages/markdown+jade/markdown_inclusion.test
diff --git a/tests/languages/scss+jade/scss+jade_usage.test b/tests/languages/scss+jade/scss_inclusion.test
similarity index 100%
rename from tests/languages/scss+jade/scss+jade_usage.test
rename to tests/languages/scss+jade/scss_inclusion.test
diff --git a/tests/languages/stylus+jade/style+jade_usage.test b/tests/languages/stylus+jade/stylus_inclusion.test
similarity index 100%
rename from tests/languages/stylus+jade/style+jade_usage.test
rename to tests/languages/stylus+jade/stylus_inclusion.test
diff --git a/tests/languages/twig+jade/twig+jade_usage.test b/tests/languages/twig+jade/twig_inclusion.test
similarity index 100%
rename from tests/languages/twig+jade/twig+jade_usage.test
rename to tests/languages/twig+jade/twig_inclusion.test

From 118eb8d47c9b56e79a06171f3af98a6a998e67c7 Mon Sep 17 00:00:00 2001
From: Daniel Flint <nauzilus@gmail.com>
Date: Fri, 28 Aug 2015 23:03:44 +1000
Subject: [PATCH 249/310] Starting with powershell tests

---
 components/prism-powershell.js                |  8 ++--
 components/prism-powershell.min.js            |  2 +-
 .../languages/powershell/comment_feature.test | 20 ++++++++++
 .../languages/powershell/string_feature.test  | 37 +++++++++++++++++++
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 tests/languages/powershell/comment_feature.test
 create mode 100644 tests/languages/powershell/string_feature.test

diff --git a/components/prism-powershell.js b/components/prism-powershell.js
index 6f7494b60f..284eb268dc 100644
--- a/components/prism-powershell.js
+++ b/components/prism-powershell.js
@@ -13,13 +13,13 @@ Prism.languages.powershell = {
 		{
 			pattern: /"(`?[\w\W])*?"/m,
 			inside: {
-				'powershell': {
+				'function': {
 					pattern: /[^`]\$\(.*?\)/,
 					inside: {}
 				}
 			}
 		},
-		/'('?[\w\W])*?'/m
+		/'([\w\W])*?'/m
 	],
 	// Matches name spaces as well as casts, attribute decorators. Force starting with letter to avoid matching array indices
 	'namespace': /\[[a-z][\w\W]*?\]/i,
@@ -35,7 +35,7 @@ Prism.languages.powershell = {
 		/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i
 	],
 	'operator': {
-		pattern: /(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)|[-+*/%]=?)\s*\b/i,
+		pattern: /(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+*\/%]=?)/i,
 		lookbehind: true
 	},
 	'punctuation': /[|{}[\];(),.]/
@@ -43,4 +43,4 @@ Prism.languages.powershell = {
 // Variable interpolation inside strings
 Prism.languages.powershell.string[0].inside.boolean = Prism.languages.powershell.boolean;
 Prism.languages.powershell.string[0].inside.variable = Prism.languages.powershell.variable;
-Prism.languages.powershell.string[0].inside.powershell.inside = Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
+Prism.languages.powershell.string[0].inside.function.inside = Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
diff --git a/components/prism-powershell.min.js b/components/prism-powershell.min.js
index cbaf60c82d..2243c3bfbc 100644
--- a/components/prism-powershell.min.js
+++ b/components/prism-powershell.min.js
@@ -1 +1 @@
-Prism.languages.powershell={comment:[{pattern:/(^|[^`])<#[\w\W]*?#>/,lookbehind:!0},{pattern:/(^|[^`])#.*?(\r?\n|$)/,lookbehind:!0}],string:{pattern:/("|')(`?[\w\W])*?\1/m,inside:{}},namespace:/\[[a-z][\w\W]*?\]/i,"boolean":/\$(true|false)\b/i,variable:/\$\w+\b/i,keyword:/\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|In|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,"function":/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-(Computer|Content|EventLog|History|Item|ItemProperty|Variable)|Compare-(Object)|Complete-(Transaction)|Connect-(PSSession)|ConvertFrom-(Csv|Json|StringData)|Convert-(Path)|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-(Process)|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-(PSSession)|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-(PSSession)|Exit-(PSSession)|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-(Object)|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-(Object)|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-(Path)|Limit-(EventLog)|Measure-(Command)|Measure-(Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-(Location)|Push-(Location)|Read-(Host)|Receive-(Job)|Receive-(PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-(ComputerMachinePassword)|Resolve-(Path)|Restart-(Computer|Service)|Restore-(Computer)|Resume-(Job|Service)|Save-(Help)|Select-(Object|String|Xml)|Send-(MailMessage)|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-(Object)|Split-(Path)|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-(Object)|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-(Command)|Unblock-(File)|Undo-(Transaction)|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData)|Update-(Help|List|TypeData)|Use-(Transaction)|Wait-(Event|Job|Process)|Where-(Object)|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)|ac|cat|cd|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i,operator:{pattern:/(\W)-(and|x?or|not|eq|ne|gt|ge|lt|le|Like|(Not)?(Like|Match|Contains|In)|Replace)\b/i,lookbehind:!0},punctuation:/[|{}[\];(),.]/},Prism.languages.powershell.string.inside.boolean=Prism.languages.powershell.boolean,Prism.languages.powershell.string.inside.variable=Prism.languages.powershell.variable;
\ No newline at end of file
+Prism.languages.powershell={comment:[{pattern:/(^|[^`])<#[\w\W]*?#>/,lookbehind:!0},{pattern:/(^|[^`])#.*?(\r?\n|$)/,lookbehind:!0}],string:[{pattern:/"(`?[\w\W])*?"/m,inside:{"function":{pattern:/[^`]\$\(.*?\)/,inside:{}}}},/'([\w\W])*?'/m],namespace:/\[[a-z][\w\W]*?\]/i,"boolean":/\$(true|false)\b/i,variable:/\$\w+\b/i,keyword:/\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|In|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,"function":[/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i],operator:{pattern:/(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+*\/%]=?)/i,lookbehind:!0},punctuation:/[|{}[\];(),.]/},Prism.languages.powershell.string[0].inside.boolean=Prism.languages.powershell.boolean,Prism.languages.powershell.string[0].inside.variable=Prism.languages.powershell.variable,Prism.languages.powershell.string[0].inside.function.inside=Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
diff --git a/tests/languages/powershell/comment_feature.test b/tests/languages/powershell/comment_feature.test
new file mode 100644
index 0000000000..242c4a3b30
--- /dev/null
+++ b/tests/languages/powershell/comment_feature.test
@@ -0,0 +1,20 @@
+# single comment
+# comment with $variable
+<# multi
+	line
+	comment
+#>
+not a `# comment
+
+----------------------------------------------------
+
+[
+	["comment", "# single comment\r\n"],
+	["comment", "# comment with $variable\r\n"],
+	["comment", "<# multi\r\n\tline\r\n\tcomment\r\n#>"],
+	"\r\nnot a `# comment"
+]
+
+----------------------------------------------------
+
+Testing comments
\ No newline at end of file
diff --git a/tests/languages/powershell/string_feature.test b/tests/languages/powershell/string_feature.test
new file mode 100644
index 0000000000..017a1fb3fc
--- /dev/null
+++ b/tests/languages/powershell/string_feature.test
@@ -0,0 +1,37 @@
+"a simple string"
+"has $interpolated variables"
+"has $($nesting -and 'interpolation')"
+"string `"with`" escaping"
+'non-interpolated $string'
+'also ''with'' escaping'
+
+----------------------------------------------------
+
+[
+	["string", ["\"a simple string\""]],
+	["string", [
+		"\"has ",["variable", "$interpolated"]," variables\""]
+	],
+	["string", [
+		"\"has",
+		[
+			"function",
+			[
+				" $",
+				["punctuation", "("],
+				["variable", "$nesting"],
+				["operator", "-and"],
+				["string", "'interpolation'"],
+				["punctuation", ")"]
+			]
+		],
+		"\""]
+	],
+	["string", ["\"string `\"with`\" escaping\""]],
+	["string", "'non-interpolated $string'"],
+	["string", "'also '"],["string", "'with'"],["string", "' escaping'"]
+]
+
+----------------------------------------------------
+
+Testing strings

From c2ed02da1e2b2e605832fd5df01160408b81604c Mon Sep 17 00:00:00 2001
From: Daniel Flint <nauzilus@gmail.com>
Date: Fri, 28 Aug 2015 23:29:11 +1000
Subject: [PATCH 250/310] More tests

---
 components/prism-powershell.js                |  4 +-
 components/prism-powershell.min.js            |  2 +-
 .../powershell/opvarbool_feature.test         | 74 +++++++++++++++++++
 3 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 tests/languages/powershell/opvarbool_feature.test

diff --git a/components/prism-powershell.js b/components/prism-powershell.js
index 284eb268dc..2cff8bd29c 100644
--- a/components/prism-powershell.js
+++ b/components/prism-powershell.js
@@ -26,7 +26,7 @@ Prism.languages.powershell = {
 	'boolean': /\$(true|false)\b/i,
 	'variable': /\$\w+\b/i,
 	// per http://technet.microsoft.com/en-us/library/hh847744.aspx
-	'keyword': /\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|In|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,
+	'keyword': /\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,
 	// Cmdlets and aliases. Aliases should come last, otherwise "write" gets preferred over "write-host" for example
 	// Get-Command | ?{ $_.ModuleName -match "Microsoft.PowerShell.(Util|Core|Management)" }
 	// Get-Alias | ?{ $_.ReferencedCommand.Module.Name -match "Microsoft.PowerShell.(Util|Core|Management)" }
@@ -35,7 +35,7 @@ Prism.languages.powershell = {
 		/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i
 	],
 	'operator': {
-		pattern: /(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+*\/%]=?)/i,
+		pattern: /(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+]{2}|[-+*\/%]=?)/i,
 		lookbehind: true
 	},
 	'punctuation': /[|{}[\];(),.]/
diff --git a/components/prism-powershell.min.js b/components/prism-powershell.min.js
index 2243c3bfbc..84949d000b 100644
--- a/components/prism-powershell.min.js
+++ b/components/prism-powershell.min.js
@@ -1 +1 @@
-Prism.languages.powershell={comment:[{pattern:/(^|[^`])<#[\w\W]*?#>/,lookbehind:!0},{pattern:/(^|[^`])#.*?(\r?\n|$)/,lookbehind:!0}],string:[{pattern:/"(`?[\w\W])*?"/m,inside:{"function":{pattern:/[^`]\$\(.*?\)/,inside:{}}}},/'([\w\W])*?'/m],namespace:/\[[a-z][\w\W]*?\]/i,"boolean":/\$(true|false)\b/i,variable:/\$\w+\b/i,keyword:/\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|In|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,"function":[/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i],operator:{pattern:/(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+*\/%]=?)/i,lookbehind:!0},punctuation:/[|{}[\];(),.]/},Prism.languages.powershell.string[0].inside.boolean=Prism.languages.powershell.boolean,Prism.languages.powershell.string[0].inside.variable=Prism.languages.powershell.variable,Prism.languages.powershell.string[0].inside.function.inside=Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
+Prism.languages.powershell={comment:[{pattern:/(^|[^`])<#[\w\W]*?#>/,lookbehind:!0},{pattern:/(^|[^`])#.*?(\r?\n|$)/,lookbehind:!0}],string:[{pattern:/"(`?[\w\W])*?"/m,inside:{"function":{pattern:/[^`]\$\(.*?\)/,inside:{}}}},/'([\w\W])*?'/m],namespace:/\[[a-z][\w\W]*?\]/i,"boolean":/\$(true|false)\b/i,variable:/\$\w+\b/i,keyword:/\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,"function":[/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i],operator:{pattern:/(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+]{2}|[-+*\/%]=?)/i,lookbehind:!0},punctuation:/[|{}[\];(),.]/},Prism.languages.powershell.string[0].inside.boolean=Prism.languages.powershell.boolean,Prism.languages.powershell.string[0].inside.variable=Prism.languages.powershell.variable,Prism.languages.powershell.string[0].inside.function.inside=Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
diff --git a/tests/languages/powershell/opvarbool_feature.test b/tests/languages/powershell/opvarbool_feature.test
new file mode 100644
index 0000000000..ae8457779a
--- /dev/null
+++ b/tests/languages/powershell/opvarbool_feature.test
@@ -0,0 +1,74 @@
+[System.String]::Empty;
+[Foo.Bar+Baz]::Abc;
+[int] 42;
+$foo $bar_baz $var4u $1
+$true $True $false $true_as $falsey
+-eq -ne -gt -ge -lt -le -shl -shr -not -band -and -bxor -bor -or
+-Like -Match -Contains -In -NotLike -NotMatch -NotContains -NotIn -Replace -Join
+-is -isNot -as
+-= += *= /= %= - + * / % -- ++
+
+----------------------------------------------------
+
+[
+	["namespace", "[System.String]"],"::Empty",["punctuation", ";"],
+	["namespace", "[Foo.Bar+Baz]"],"::Abc",["punctuation", ";"],
+	["namespace", "[int]"]," 42",["punctuation", ";"],
+	
+	["variable", "$foo"],
+	["variable", "$bar_baz"],
+	["variable", "$var4u"],
+	["variable", "$1"],
+	
+	["boolean", "$true"],
+	["boolean", "$True"],
+	["boolean", "$false"],
+	["variable", "$true_as"],
+	["variable", "$falsey"],
+	
+	["operator", "-eq"], 
+	["operator", "-ne"], 
+	["operator", "-gt"], 
+	["operator", "-ge"], 
+	["operator", "-lt"], 
+	["operator", "-le"], 
+	["operator", "-shl"], 
+	["operator", "-shr"], 
+	["operator", "-not"], 
+	["operator", "-band"], 
+	["operator", "-and"], 
+	["operator", "-bxor"], 
+	["operator", "-bor"], 
+	["operator", "-or"], 
+	
+	["operator", "-Like"], 
+	["operator", "-Match"], 
+	["operator", "-Contains"], 
+	["operator", "-In"], 
+	["operator", "-NotLike"], 
+	["operator", "-NotMatch"], 
+	["operator", "-NotContains"], 
+	["operator", "-NotIn"], 
+	["operator", "-Replace"], 
+	["operator", "-Join"], 
+	["operator", "-is"], 
+	["operator", "-isNot"], 
+	["operator", "-as"], 
+	
+	["operator", "-="],
+	["operator", "+="],
+	["operator", "*="],
+	["operator", "/="],
+	["operator", "%="],
+	["operator", "-"],
+	["operator", "+"],
+	["operator", "*"],
+	["operator", "/"],
+	["operator", "%"],
+	["operator", "--"],
+	["operator", "++"]
+
+]
+----------------------------------------------------
+
+Testing namespaces, operators, variables and Booleans
\ No newline at end of file

From bbd83d4557df7e99b4f93110c1f8177e402a1c64 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 22:31:50 +0200
Subject: [PATCH 251/310] NSIS: Simplified patterns

---
 components/prism-nsis.js     | 8 ++++----
 components/prism-nsis.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-nsis.js b/components/prism-nsis.js
index 6afa00ae01..99f7a97895 100644
--- a/components/prism-nsis.js
+++ b/components/prism-nsis.js
@@ -5,15 +5,15 @@
  */
  Prism.languages.nsis = {
 	'comment': {
-		pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])(#|;).*?(\r?\n|$))/,
+		pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|[#;].*)/,
 		lookbehind: true
 	},
 	'string': /("|')(\\?.)*?\1/,
-	'keyword': /\b(Abort|Add(BrandingImage|Size)|AdvSplash|Allow(RootDirInstall|SkipFiles)|AutoCloseWindow|Banner|BG(Font|Gradient|Image)|BrandingText|BringToFront|Call(\b|InstDLL)|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|Create(Directory|Font|ShortCut)|Delete(\b|INISec|INIStr|RegKey|RegValue)|Detail(Print|sButtonText)|Dialer|Dir(Text|Var|Verify)|EnableWindow|Enum(RegKey|RegValue)|Exch|Exec(\b|Shell|Wait)|ExpandEnvStrings|File(\b|BufSize|Close|ErrorText|Open|Read|ReadByte|ReadUTF16LE|ReadWord|WriteUTF16LE|Seek|Write|WriteByte|WriteWord)|Find(Close|First|Next|Window)|FlushINI|Get(CurInstType|CurrentAddress|DlgItem|DLLVersion|DLLVersionLocal|ErrorLevel|FileTime|FileTimeLocal|FullPathName|Function(\b|Address|End)|InstDirError|LabelAddress|TempFileName)|Goto|HideWindow|Icon|If(Abort|Errors|FileExists|RebootFlag|Silent)|InitPluginsDir|Install(ButtonText|Colors|Dir|DirRegKey)|InstProgressFlags|Inst(Type|TypeGetText|TypeSetText)|Int(Cmp|CmpU|Fmt|Op)|IsWindow|Lang(DLL|String)|License(BkColor|Data|ForceSelection|LangString|Text)|LoadLanguageFile|LockWindow|Log(Set|Text)|Manifest(DPIAware|SupportedOS)|Math|MessageBox|MiscButtonText|Name|Nop|ns(Dialogs|Exec)|NSISdl|OutFile|Page(\b|Callbacks)|Pop|Push|Quit|Read(EnvStr|INIStr|RegDWORD|RegStr)|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|Section(\b|End|GetFlags|GetInstTypes|GetSize|GetText|Group|In|SetFlags|SetInstTypes|SetSize|SetText)|SendMessage|Set(AutoClose|BrandingImage|Compress|Compressor|CompressorDictSize|CtlColors|CurInstType|DatablockOptimize|DateSave|DetailsPrint|DetailsView|ErrorLevel|Errors|FileAttributes|Font|OutPath|Overwrite|PluginUnload|RebootFlag|RegView|ShellVarContext|Silent)|Show(InstDetails|UninstDetails|Window)|Silent(Install|UnInstall)|Sleep|SpaceTexts|Splash|StartMenu|Str(Cmp|CmpS|Cpy|Len)|SubCaption|System|Unicode|Uninstall(ButtonText|Caption|Icon|SubCaption|Text)|UninstPage|UnRegDLL|UserInfo|Var|VI(AddVersionKey|FileVersion|ProductVersion)|VPatch|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|Write(RegStr|Uninstaller)|XPStyle)\b/,
+	'keyword': /\b(Abort|Add(BrandingImage|Size)|AdvSplash|Allow(RootDirInstall|SkipFiles)|AutoCloseWindow|Banner|BG(Font|Gradient|Image)|BrandingText|BringToFront|Call(InstDLL)?|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|Create(Directory|Font|ShortCut)|Delete(INISec|INIStr|RegKey|RegValue)?|Detail(Print|sButtonText)|Dialer|Dir(Text|Var|Verify)|EnableWindow|Enum(RegKey|RegValue)|Exch|Exec(Shell|Wait)?|ExpandEnvStrings|File(BufSize|Close|ErrorText|Open|Read|ReadByte|ReadUTF16LE|ReadWord|WriteUTF16LE|Seek|Write|WriteByte|WriteWord)?|Find(Close|First|Next|Window)|FlushINI|Get(CurInstType|CurrentAddress|DlgItem|DLLVersion(Local)?|ErrorLevel|FileTime(Local)?|FullPathName|Function(Address|End)?|InstDirError|LabelAddress|TempFileName)|Goto|HideWindow|Icon|If(Abort|Errors|FileExists|RebootFlag|Silent)|InitPluginsDir|Install(ButtonText|Colors|Dir(RegKey)?)|InstProgressFlags|Inst(Type(GetText|SetText)?)|Int(CmpU?|Fmt|Op)|IsWindow|Lang(DLL|String)|License(BkColor|Data|ForceSelection|LangString|Text)|LoadLanguageFile|LockWindow|Log(Set|Text)|Manifest(DPIAware|SupportedOS)|Math|MessageBox|MiscButtonText|Name|Nop|ns(Dialogs|Exec)|NSISdl|OutFile|Page(Callbacks)?|Pop|Push|Quit|Read(EnvStr|INIStr|RegDWORD|RegStr)|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|Section(End|GetFlags|GetInstTypes|GetSize|GetText|Group|In|SetFlags|SetInstTypes|SetSize|SetText)?|SendMessage|Set(AutoClose|BrandingImage|Compress|Compressor(DictSize)?|CtlColors|CurInstType|DatablockOptimize|DateSave|Details(Print|View)|ErrorLevel|Errors|FileAttributes|Font|OutPath|Overwrite|PluginUnload|RebootFlag|RegView|ShellVarContext|Silent)|Show(InstDetails|UninstDetails|Window)|Silent(Install|UnInstall)|Sleep|SpaceTexts|Splash|StartMenu|Str(CmpS?|Cpy|Len)|SubCaption|System|Unicode|Uninstall(ButtonText|Caption|Icon|SubCaption|Text)|UninstPage|UnRegDLL|UserInfo|Var|VI(AddVersionKey|FileVersion|ProductVersion)|VPatch|WindowIcon|Write(INIStr|RegBin|RegDWORD|RegExpandStr|RegStr|Uninstaller)|XPStyle)\b/,
 	'property': /\b(admin|all|auto|both|colored|false|force|hide|highest|lastused|leave|listonly|none|normal|notset|off|on|open|print|show|silent|silentlog|smooth|textonly|true|user|ARCHIVE|FILE_(ATTRIBUTE_ARCHIVE|ATTRIBUTE_NORMAL|ATTRIBUTE_OFFLINE|ATTRIBUTE_READONLY|ATTRIBUTE_SYSTEM|ATTRIBUTE_TEMPORARY)|HK(CR|CU|DD|LM|PD|U)|HKEY_(CLASSES_ROOT|CURRENT_CONFIG|CURRENT_USER|DYN_DATA|LOCAL_MACHINE|PERFORMANCE_DATA|USERS)|ID(ABORT|CANCEL|IGNORE|NO|OK|RETRY|YES)|MB_(ABORTRETRYIGNORE|DEFBUTTON1|DEFBUTTON2|DEFBUTTON3|DEFBUTTON4|ICONEXCLAMATION|ICONINFORMATION|ICONQUESTION|ICONSTOP|OK|OKCANCEL|RETRYCANCEL|RIGHT|RTLREADING|SETFOREGROUND|TOPMOST|USERICON|YESNO)|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)\b/,
-	'variable': /(\$(\(|\{)?[-_\w]+)(\)|\})?/i,
+	'variable': /\$[({]?[-_\w]+[)}]?/i,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
-	'operator': /[-+]{1,2}|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,
+	'operator': /[-+&|]{1,2}|<=?|>=?|==?=?|[?*\/~^%]/,
 	'punctuation': /[{}[\];(),.:]/,
 	'important': /!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)\b/i
 };
diff --git a/components/prism-nsis.min.js b/components/prism-nsis.min.js
index 7d342edb21..fadfbd71ed 100644
--- a/components/prism-nsis.min.js
+++ b/components/prism-nsis.min.js
@@ -1 +1 @@
-Prism.languages.nsis={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])(#|;).*?(\r?\n|$))/,lookbehind:!0},string:/("|')(\\?.)*?\1/,keyword:/\b(Abort|Add(BrandingImage|Size)|AdvSplash|Allow(RootDirInstall|SkipFiles)|AutoCloseWindow|Banner|BG(Font|Gradient|Image)|BrandingText|BringToFront|Call(\b|InstDLL)|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|Create(Directory|Font|ShortCut)|Delete(\b|INISec|INIStr|RegKey|RegValue)|Detail(Print|sButtonText)|Dialer|Dir(Text|Var|Verify)|EnableWindow|Enum(RegKey|RegValue)|Exch|Exec(\b|Shell|Wait)|ExpandEnvStrings|File(\b|BufSize|Close|ErrorText|Open|Read|ReadByte|ReadUTF16LE|ReadWord|WriteUTF16LE|Seek|Write|WriteByte|WriteWord)|Find(Close|First|Next|Window)|FlushINI|Get(CurInstType|CurrentAddress|DlgItem|DLLVersion|DLLVersionLocal|ErrorLevel|FileTime|FileTimeLocal|FullPathName|Function(\b|Address|End)|InstDirError|LabelAddress|TempFileName)|Goto|HideWindow|Icon|If(Abort|Errors|FileExists|RebootFlag|Silent)|InitPluginsDir|Install(ButtonText|Colors|Dir|DirRegKey)|InstProgressFlags|Inst(Type|TypeGetText|TypeSetText)|Int(Cmp|CmpU|Fmt|Op)|IsWindow|Lang(DLL|String)|License(BkColor|Data|ForceSelection|LangString|Text)|LoadLanguageFile|LockWindow|Log(Set|Text)|Manifest(DPIAware|SupportedOS)|Math|MessageBox|MiscButtonText|Name|Nop|ns(Dialogs|Exec)|NSISdl|OutFile|Page(\b|Callbacks)|Pop|Push|Quit|Read(EnvStr|INIStr|RegDWORD|RegStr)|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|Section(\b|End|GetFlags|GetInstTypes|GetSize|GetText|Group|In|SetFlags|SetInstTypes|SetSize|SetText)|SendMessage|Set(AutoClose|BrandingImage|Compress|Compressor|CompressorDictSize|CtlColors|CurInstType|DatablockOptimize|DateSave|DetailsPrint|DetailsView|ErrorLevel|Errors|FileAttributes|Font|OutPath|Overwrite|PluginUnload|RebootFlag|RegView|ShellVarContext|Silent)|Show(InstDetails|UninstDetails|Window)|Silent(Install|UnInstall)|Sleep|SpaceTexts|Splash|StartMenu|Str(Cmp|CmpS|Cpy|Len)|SubCaption|System|Unicode|Uninstall(ButtonText|Caption|Icon|SubCaption|Text)|UninstPage|UnRegDLL|UserInfo|Var|VI(AddVersionKey|FileVersion|ProductVersion)|VPatch|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|Write(RegStr|Uninstaller)|XPStyle)\b/,property:/\b(admin|all|auto|both|colored|false|force|hide|highest|lastused|leave|listonly|none|normal|notset|off|on|open|print|show|silent|silentlog|smooth|textonly|true|user|ARCHIVE|FILE_(ATTRIBUTE_ARCHIVE|ATTRIBUTE_NORMAL|ATTRIBUTE_OFFLINE|ATTRIBUTE_READONLY|ATTRIBUTE_SYSTEM|ATTRIBUTE_TEMPORARY)|HK(CR|CU|DD|LM|PD|U)|HKEY_(CLASSES_ROOT|CURRENT_CONFIG|CURRENT_USER|DYN_DATA|LOCAL_MACHINE|PERFORMANCE_DATA|USERS)|ID(ABORT|CANCEL|IGNORE|NO|OK|RETRY|YES)|MB_(ABORTRETRYIGNORE|DEFBUTTON1|DEFBUTTON2|DEFBUTTON3|DEFBUTTON4|ICONEXCLAMATION|ICONINFORMATION|ICONQUESTION|ICONSTOP|OK|OKCANCEL|RETRYCANCEL|RIGHT|RTLREADING|SETFOREGROUND|TOPMOST|USERICON|YESNO)|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)\b/,variable:/(\$(\(|\{)?[-_\w]+)(\)|\})?/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+]{1,2}|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/,important:/!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)\b/i};
\ No newline at end of file
+Prism.languages.nsis={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|[#;].*)/,lookbehind:!0},string:/("|')(\\?.)*?\1/,keyword:/\b(Abort|Add(BrandingImage|Size)|AdvSplash|Allow(RootDirInstall|SkipFiles)|AutoCloseWindow|Banner|BG(Font|Gradient|Image)|BrandingText|BringToFront|Call(InstDLL)?|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|Create(Directory|Font|ShortCut)|Delete(INISec|INIStr|RegKey|RegValue)?|Detail(Print|sButtonText)|Dialer|Dir(Text|Var|Verify)|EnableWindow|Enum(RegKey|RegValue)|Exch|Exec(Shell|Wait)?|ExpandEnvStrings|File(BufSize|Close|ErrorText|Open|Read|ReadByte|ReadUTF16LE|ReadWord|WriteUTF16LE|Seek|Write|WriteByte|WriteWord)?|Find(Close|First|Next|Window)|FlushINI|Get(CurInstType|CurrentAddress|DlgItem|DLLVersion(Local)?|ErrorLevel|FileTime(Local)?|FullPathName|Function(Address|End)?|InstDirError|LabelAddress|TempFileName)|Goto|HideWindow|Icon|If(Abort|Errors|FileExists|RebootFlag|Silent)|InitPluginsDir|Install(ButtonText|Colors|Dir(RegKey)?)|InstProgressFlags|Inst(Type(GetText|SetText)?)|Int(CmpU?|Fmt|Op)|IsWindow|Lang(DLL|String)|License(BkColor|Data|ForceSelection|LangString|Text)|LoadLanguageFile|LockWindow|Log(Set|Text)|Manifest(DPIAware|SupportedOS)|Math|MessageBox|MiscButtonText|Name|Nop|ns(Dialogs|Exec)|NSISdl|OutFile|Page(Callbacks)?|Pop|Push|Quit|Read(EnvStr|INIStr|RegDWORD|RegStr)|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|Section(End|GetFlags|GetInstTypes|GetSize|GetText|Group|In|SetFlags|SetInstTypes|SetSize|SetText)?|SendMessage|Set(AutoClose|BrandingImage|Compress|Compressor(DictSize)?|CtlColors|CurInstType|DatablockOptimize|DateSave|Details(Print|View)|ErrorLevel|Errors|FileAttributes|Font|OutPath|Overwrite|PluginUnload|RebootFlag|RegView|ShellVarContext|Silent)|Show(InstDetails|UninstDetails|Window)|Silent(Install|UnInstall)|Sleep|SpaceTexts|Splash|StartMenu|Str(CmpS?|Cpy|Len)|SubCaption|System|Unicode|Uninstall(ButtonText|Caption|Icon|SubCaption|Text)|UninstPage|UnRegDLL|UserInfo|Var|VI(AddVersionKey|FileVersion|ProductVersion)|VPatch|WindowIcon|Write(INIStr|RegBin|RegDWORD|RegExpandStr|RegStr|Uninstaller)|XPStyle)\b/,property:/\b(admin|all|auto|both|colored|false|force|hide|highest|lastused|leave|listonly|none|normal|notset|off|on|open|print|show|silent|silentlog|smooth|textonly|true|user|ARCHIVE|FILE_(ATTRIBUTE_ARCHIVE|ATTRIBUTE_NORMAL|ATTRIBUTE_OFFLINE|ATTRIBUTE_READONLY|ATTRIBUTE_SYSTEM|ATTRIBUTE_TEMPORARY)|HK(CR|CU|DD|LM|PD|U)|HKEY_(CLASSES_ROOT|CURRENT_CONFIG|CURRENT_USER|DYN_DATA|LOCAL_MACHINE|PERFORMANCE_DATA|USERS)|ID(ABORT|CANCEL|IGNORE|NO|OK|RETRY|YES)|MB_(ABORTRETRYIGNORE|DEFBUTTON1|DEFBUTTON2|DEFBUTTON3|DEFBUTTON4|ICONEXCLAMATION|ICONINFORMATION|ICONQUESTION|ICONSTOP|OK|OKCANCEL|RETRYCANCEL|RIGHT|RTLREADING|SETFOREGROUND|TOPMOST|USERICON|YESNO)|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)\b/,variable:/\$[({]?[-_\w]+[)}]?/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+&|]{1,2}|<=?|>=?|==?=?|[?*\/~^%]/,punctuation:/[{}[\];(),.:]/,important:/!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)\b/i};
\ No newline at end of file

From dcd30998787ffe194b2b175374e6d183cda5ee1a Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 22:32:24 +0200
Subject: [PATCH 252/310] Add tests for NSIS

---
 tests/languages/nsis/comment_feature.test   |  18 +
 tests/languages/nsis/important_feature.test |  69 ++++
 tests/languages/nsis/keyword_feature.test   | 433 ++++++++++++++++++++
 tests/languages/nsis/number_feature.test    |  19 +
 tests/languages/nsis/operator_feature.test  |  21 +
 tests/languages/nsis/property_feature.test  | 111 +++++
 tests/languages/nsis/string_feature.test    |  17 +
 tests/languages/nsis/variable_feature.test  |  15 +
 8 files changed, 703 insertions(+)
 create mode 100644 tests/languages/nsis/comment_feature.test
 create mode 100644 tests/languages/nsis/important_feature.test
 create mode 100644 tests/languages/nsis/keyword_feature.test
 create mode 100644 tests/languages/nsis/number_feature.test
 create mode 100644 tests/languages/nsis/operator_feature.test
 create mode 100644 tests/languages/nsis/property_feature.test
 create mode 100644 tests/languages/nsis/string_feature.test
 create mode 100644 tests/languages/nsis/variable_feature.test

diff --git a/tests/languages/nsis/comment_feature.test b/tests/languages/nsis/comment_feature.test
new file mode 100644
index 0000000000..0ed2723294
--- /dev/null
+++ b/tests/languages/nsis/comment_feature.test
@@ -0,0 +1,18 @@
+/* foo */
+/* foo
+bar */
+# foo
+; bar
+
+----------------------------------------------------
+
+[
+	["comment", "/* foo */"],
+	["comment", "/* foo\r\nbar */"],
+	["comment", "# foo"],
+	["comment", "; bar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/nsis/important_feature.test b/tests/languages/nsis/important_feature.test
new file mode 100644
index 0000000000..9265872403
--- /dev/null
+++ b/tests/languages/nsis/important_feature.test
@@ -0,0 +1,69 @@
+!addincludedir
+!addplugindir
+!appendfile
+!cd
+!define
+!delfile
+!echo
+!else
+!endif
+!error
+!execute
+!finalize
+!getdllversionsystem
+!ifdef
+!ifmacrodef
+!ifmacrondef
+!ifndef
+!if
+!include
+!insertmacro
+!macroend
+!macro
+!makensis
+!packhdr
+!searchparse
+!searchreplace
+!tempfile
+!undef
+!verbose
+!warning
+
+----------------------------------------------------
+
+[
+	["important", "!addincludedir"],
+	["important", "!addplugindir"],
+	["important", "!appendfile"],
+	["important", "!cd"],
+	["important", "!define"],
+	["important", "!delfile"],
+	["important", "!echo"],
+	["important", "!else"],
+	["important", "!endif"],
+	["important", "!error"],
+	["important", "!execute"],
+	["important", "!finalize"],
+	["important", "!getdllversionsystem"],
+	["important", "!ifdef"],
+	["important", "!ifmacrodef"],
+	["important", "!ifmacrondef"],
+	["important", "!ifndef"],
+	["important", "!if"],
+	["important", "!include"],
+	["important", "!insertmacro"],
+	["important", "!macroend"],
+	["important", "!macro"],
+	["important", "!makensis"],
+	["important", "!packhdr"],
+	["important", "!searchparse"],
+	["important", "!searchreplace"],
+	["important", "!tempfile"],
+	["important", "!undef"],
+	["important", "!verbose"],
+	["important", "!warning"]
+]
+
+----------------------------------------------------
+
+Checks for compiler instructions.
\ No newline at end of file
diff --git a/tests/languages/nsis/keyword_feature.test b/tests/languages/nsis/keyword_feature.test
new file mode 100644
index 0000000000..fab48bc81e
--- /dev/null
+++ b/tests/languages/nsis/keyword_feature.test
@@ -0,0 +1,433 @@
+Abort
+AddBrandingImage
+AddSize
+AdvSplash
+AllowRootDirInstall
+AllowSkipFiles
+AutoCloseWindow
+Banner
+BGFont
+BGGradient
+BGImage
+BrandingText
+BringToFront
+Call
+CallInstDLL
+Caption
+ChangeUI
+CheckBitmap
+ClearErrors
+CompletedText
+ComponentText
+CopyFiles
+CRCCheck
+CreateDirectory
+CreateFont
+CreateShortCut
+Delete
+DeleteINISec
+DeleteINIStr
+DeleteRegKey
+DeleteRegValue
+DetailPrint
+DetailsButtonText
+Dialer
+DirText
+DirVar
+DirVerify
+EnableWindow
+EnumRegKey
+EnumRegValue
+Exch
+Exec
+ExecShell
+ExecWait
+ExpandEnvStrings
+File
+FileBufSize
+FileClose
+FileErrorText
+FileOpen
+FileRead
+FileReadByte
+FileReadUTF16LE
+FileReadWord
+FileWriteUTF16LE
+FileSeek
+FileWrite
+FileWriteByte
+FileWriteWord
+FindClose
+FindFirst
+FindNext
+FindWindow
+FlushINI
+GetCurInstType
+GetCurrentAddress
+GetDlgItem
+GetDLLVersion
+GetDLLVersionLocal
+GetErrorLevel
+GetFileTime
+GetFileTimeLocal
+GetFullPathName
+GetFunction
+GetFunctionAddress
+GetFunctionEnd
+GetInstDirError
+GetLabelAddress
+GetTempFileName
+Goto
+HideWindow
+Icon
+IfAbort
+IfErrors
+IfFileExists
+IfRebootFlag
+IfSilent
+InitPluginsDir
+InstallButtonText
+InstallColors
+InstallDir
+InstallDirRegKey
+InstProgressFlags
+InstType
+InstTypeGetText
+InstTypeSetText
+IntCmp
+IntCmpU
+IntFmt
+IntOp
+IsWindow
+LangDLL
+LangString
+LicenseBkColor
+LicenseData
+LicenseForceSelection
+LicenseLangString
+LicenseText
+LoadLanguageFile
+LockWindow
+LogSet
+LogText
+ManifestDPIAware
+ManifestSupportedOS
+Math
+MessageBox
+MiscButtonText
+Name
+Nop
+nsDialogs
+nsExec
+NSISdl
+OutFile
+Page
+PageCallbacks
+Pop
+Push
+Quit
+ReadEnvStr
+ReadINIStr
+ReadRegDWORD
+ReadRegStr
+Reboot
+RegDLL
+Rename
+RequestExecutionLevel
+ReserveFile
+Return
+RMDir
+SearchPath
+Section
+SectionEnd
+SectionGetFlags
+SectionGetInstTypes
+SectionGetSize
+SectionGetText
+SectionGroup
+SectionIn
+SectionSetFlags
+SectionSetInstTypes
+SectionSetSize
+SectionSetText
+SendMessage
+SetAutoClose
+SetBrandingImage
+SetCompress
+SetCompressor
+SetCompressorDictSize
+SetCtlColors
+SetCurInstType
+SetDatablockOptimize
+SetDateSave
+SetDetailsPrint
+SetDetailsView
+SetErrorLevel
+SetErrors
+SetFileAttributes
+SetFont
+SetOutPath
+SetOverwrite
+SetPluginUnload
+SetRebootFlag
+SetRegView
+SetShellVarContext
+SetSilent
+ShowInstDetails
+ShowUninstDetails
+ShowWindow
+SilentInstall
+SilentUnInstall
+Sleep
+SpaceTexts
+Splash
+StartMenu
+StrCmp
+StrCmpS
+StrCpy
+StrLen
+SubCaption
+System
+Unicode
+UninstallButtonText
+UninstallCaption
+UninstallIcon
+UninstallSubCaption
+UninstallText
+UninstPage
+UnRegDLL
+UserInfo
+Var
+VIAddVersionKey
+VIFileVersion
+VIProductVersion
+VPatch
+WindowIcon
+WriteINIStr
+WriteRegBin
+WriteRegDWORD
+WriteRegExpandStr
+WriteRegStr
+WriteUninstaller
+XPStyle
+
+----------------------------------------------------
+
+[
+	["keyword", "Abort"],
+	["keyword", "AddBrandingImage"],
+	["keyword", "AddSize"],
+	["keyword", "AdvSplash"],
+	["keyword", "AllowRootDirInstall"],
+	["keyword", "AllowSkipFiles"],
+	["keyword", "AutoCloseWindow"],
+	["keyword", "Banner"],
+	["keyword", "BGFont"],
+	["keyword", "BGGradient"],
+	["keyword", "BGImage"],
+	["keyword", "BrandingText"],
+	["keyword", "BringToFront"],
+	["keyword", "Call"],
+	["keyword", "CallInstDLL"],
+	["keyword", "Caption"],
+	["keyword", "ChangeUI"],
+	["keyword", "CheckBitmap"],
+	["keyword", "ClearErrors"],
+	["keyword", "CompletedText"],
+	["keyword", "ComponentText"],
+	["keyword", "CopyFiles"],
+	["keyword", "CRCCheck"],
+	["keyword", "CreateDirectory"],
+	["keyword", "CreateFont"],
+	["keyword", "CreateShortCut"],
+	["keyword", "Delete"],
+	["keyword", "DeleteINISec"],
+	["keyword", "DeleteINIStr"],
+	["keyword", "DeleteRegKey"],
+	["keyword", "DeleteRegValue"],
+	["keyword", "DetailPrint"],
+	["keyword", "DetailsButtonText"],
+	["keyword", "Dialer"],
+	["keyword", "DirText"],
+	["keyword", "DirVar"],
+	["keyword", "DirVerify"],
+	["keyword", "EnableWindow"],
+	["keyword", "EnumRegKey"],
+	["keyword", "EnumRegValue"],
+	["keyword", "Exch"],
+	["keyword", "Exec"],
+	["keyword", "ExecShell"],
+	["keyword", "ExecWait"],
+	["keyword", "ExpandEnvStrings"],
+	["keyword", "File"],
+	["keyword", "FileBufSize"],
+	["keyword", "FileClose"],
+	["keyword", "FileErrorText"],
+	["keyword", "FileOpen"],
+	["keyword", "FileRead"],
+	["keyword", "FileReadByte"],
+	["keyword", "FileReadUTF16LE"],
+	["keyword", "FileReadWord"],
+	["keyword", "FileWriteUTF16LE"],
+	["keyword", "FileSeek"],
+	["keyword", "FileWrite"],
+	["keyword", "FileWriteByte"],
+	["keyword", "FileWriteWord"],
+	["keyword", "FindClose"],
+	["keyword", "FindFirst"],
+	["keyword", "FindNext"],
+	["keyword", "FindWindow"],
+	["keyword", "FlushINI"],
+	["keyword", "GetCurInstType"],
+	["keyword", "GetCurrentAddress"],
+	["keyword", "GetDlgItem"],
+	["keyword", "GetDLLVersion"],
+	["keyword", "GetDLLVersionLocal"],
+	["keyword", "GetErrorLevel"],
+	["keyword", "GetFileTime"],
+	["keyword", "GetFileTimeLocal"],
+	["keyword", "GetFullPathName"],
+	["keyword", "GetFunction"],
+	["keyword", "GetFunctionAddress"],
+	["keyword", "GetFunctionEnd"],
+	["keyword", "GetInstDirError"],
+	["keyword", "GetLabelAddress"],
+	["keyword", "GetTempFileName"],
+	["keyword", "Goto"],
+	["keyword", "HideWindow"],
+	["keyword", "Icon"],
+	["keyword", "IfAbort"],
+	["keyword", "IfErrors"],
+	["keyword", "IfFileExists"],
+	["keyword", "IfRebootFlag"],
+	["keyword", "IfSilent"],
+	["keyword", "InitPluginsDir"],
+	["keyword", "InstallButtonText"],
+	["keyword", "InstallColors"],
+	["keyword", "InstallDir"],
+	["keyword", "InstallDirRegKey"],
+	["keyword", "InstProgressFlags"],
+	["keyword", "InstType"],
+	["keyword", "InstTypeGetText"],
+	["keyword", "InstTypeSetText"],
+	["keyword", "IntCmp"],
+	["keyword", "IntCmpU"],
+	["keyword", "IntFmt"],
+	["keyword", "IntOp"],
+	["keyword", "IsWindow"],
+	["keyword", "LangDLL"],
+	["keyword", "LangString"],
+	["keyword", "LicenseBkColor"],
+	["keyword", "LicenseData"],
+	["keyword", "LicenseForceSelection"],
+	["keyword", "LicenseLangString"],
+	["keyword", "LicenseText"],
+	["keyword", "LoadLanguageFile"],
+	["keyword", "LockWindow"],
+	["keyword", "LogSet"],
+	["keyword", "LogText"],
+	["keyword", "ManifestDPIAware"],
+	["keyword", "ManifestSupportedOS"],
+	["keyword", "Math"],
+	["keyword", "MessageBox"],
+	["keyword", "MiscButtonText"],
+	["keyword", "Name"],
+	["keyword", "Nop"],
+	["keyword", "nsDialogs"],
+	["keyword", "nsExec"],
+	["keyword", "NSISdl"],
+	["keyword", "OutFile"],
+	["keyword", "Page"],
+	["keyword", "PageCallbacks"],
+	["keyword", "Pop"],
+	["keyword", "Push"],
+	["keyword", "Quit"],
+	["keyword", "ReadEnvStr"],
+	["keyword", "ReadINIStr"],
+	["keyword", "ReadRegDWORD"],
+	["keyword", "ReadRegStr"],
+	["keyword", "Reboot"],
+	["keyword", "RegDLL"],
+	["keyword", "Rename"],
+	["keyword", "RequestExecutionLevel"],
+	["keyword", "ReserveFile"],
+	["keyword", "Return"],
+	["keyword", "RMDir"],
+	["keyword", "SearchPath"],
+	["keyword", "Section"],
+	["keyword", "SectionEnd"],
+	["keyword", "SectionGetFlags"],
+	["keyword", "SectionGetInstTypes"],
+	["keyword", "SectionGetSize"],
+	["keyword", "SectionGetText"],
+	["keyword", "SectionGroup"],
+	["keyword", "SectionIn"],
+	["keyword", "SectionSetFlags"],
+	["keyword", "SectionSetInstTypes"],
+	["keyword", "SectionSetSize"],
+	["keyword", "SectionSetText"],
+	["keyword", "SendMessage"],
+	["keyword", "SetAutoClose"],
+	["keyword", "SetBrandingImage"],
+	["keyword", "SetCompress"],
+	["keyword", "SetCompressor"],
+	["keyword", "SetCompressorDictSize"],
+	["keyword", "SetCtlColors"],
+	["keyword", "SetCurInstType"],
+	["keyword", "SetDatablockOptimize"],
+	["keyword", "SetDateSave"],
+	["keyword", "SetDetailsPrint"],
+	["keyword", "SetDetailsView"],
+	["keyword", "SetErrorLevel"],
+	["keyword", "SetErrors"],
+	["keyword", "SetFileAttributes"],
+	["keyword", "SetFont"],
+	["keyword", "SetOutPath"],
+	["keyword", "SetOverwrite"],
+	["keyword", "SetPluginUnload"],
+	["keyword", "SetRebootFlag"],
+	["keyword", "SetRegView"],
+	["keyword", "SetShellVarContext"],
+	["keyword", "SetSilent"],
+	["keyword", "ShowInstDetails"],
+	["keyword", "ShowUninstDetails"],
+	["keyword", "ShowWindow"],
+	["keyword", "SilentInstall"],
+	["keyword", "SilentUnInstall"],
+	["keyword", "Sleep"],
+	["keyword", "SpaceTexts"],
+	["keyword", "Splash"],
+	["keyword", "StartMenu"],
+	["keyword", "StrCmp"],
+	["keyword", "StrCmpS"],
+	["keyword", "StrCpy"],
+	["keyword", "StrLen"],
+	["keyword", "SubCaption"],
+	["keyword", "System"],
+	["keyword", "Unicode"],
+	["keyword", "UninstallButtonText"],
+	["keyword", "UninstallCaption"],
+	["keyword", "UninstallIcon"],
+	["keyword", "UninstallSubCaption"],
+	["keyword", "UninstallText"],
+	["keyword", "UninstPage"],
+	["keyword", "UnRegDLL"],
+	["keyword", "UserInfo"],
+	["keyword", "Var"],
+	["keyword", "VIAddVersionKey"],
+	["keyword", "VIFileVersion"],
+	["keyword", "VIProductVersion"],
+	["keyword", "VPatch"],
+	["keyword", "WindowIcon"],
+	["keyword", "WriteINIStr"],
+	["keyword", "WriteRegBin"],
+	["keyword", "WriteRegDWORD"],
+	["keyword", "WriteRegExpandStr"],
+	["keyword", "WriteRegStr"],
+	["keyword", "WriteUninstaller"],
+	["keyword", "XPStyle"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/nsis/number_feature.test b/tests/languages/nsis/number_feature.test
new file mode 100644
index 0000000000..e1ff9219c0
--- /dev/null
+++ b/tests/languages/nsis/number_feature.test
@@ -0,0 +1,19 @@
+0xBadFace
+42
+3.14159
+3.2e4
+1.0e-5
+
+----------------------------------------------------
+
+[
+	["number", "0xBadFace"],
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "3.2e4"],
+	["number", "1.0e-5"]
+]
+
+----------------------------------------------------
+
+Checks for hexadecimal and decimal numbers.
\ No newline at end of file
diff --git a/tests/languages/nsis/operator_feature.test b/tests/languages/nsis/operator_feature.test
new file mode 100644
index 0000000000..341fbb83fa
--- /dev/null
+++ b/tests/languages/nsis/operator_feature.test
@@ -0,0 +1,21 @@
++ - ++ --
+< <= > >=
+= == ===
+& && | ||
+? * / ~
+^ %
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "-"], ["operator", "++"], ["operator", "--"],
+	["operator", "<"], ["operator", "<="], ["operator", ">"], ["operator", ">="],
+	["operator", "="], ["operator", "=="], ["operator", "==="],
+	["operator", "&"], ["operator", "&&"], ["operator", "|"], ["operator", "||"],
+	["operator", "?"], ["operator", "*"], ["operator", "/"], ["operator", "~"],
+	["operator", "^"], ["operator", "%"]
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/nsis/property_feature.test b/tests/languages/nsis/property_feature.test
new file mode 100644
index 0000000000..9c29e9ab85
--- /dev/null
+++ b/tests/languages/nsis/property_feature.test
@@ -0,0 +1,111 @@
+admin all auto both
+colored false force
+hide highest lastused
+leave listonly none
+normal notset off
+on open print show
+silent silentlog
+smooth textonly
+true user
+
+ARCHIVE
+FILE_ATTRIBUTE_ARCHIVE
+FILE_ATTRIBUTE_NORMAL
+FILE_ATTRIBUTE_OFFLINE
+FILE_ATTRIBUTE_READONLY
+FILE_ATTRIBUTE_SYSTEM
+FILE_ATTRIBUTE_TEMPORARY
+HKCR HKCU HKDD HKLM
+HKPD HKU
+HKEY_CLASSES_ROOT
+HKEY_CURRENT_CONFIG
+HKEY_CURRENT_USER
+HKEY_DYN_DATA
+HKEY_LOCAL_MACHINE
+HKEY_PERFORMANCE_DATA
+HKEY_USERS
+IDABORT IDCANCEL
+IDIGNORE IDNO
+IDOK IDRETRY IDYES
+MB_ABORTRETRYIGNORE
+MB_DEFBUTTON1
+MB_DEFBUTTON2
+MB_DEFBUTTON3
+MB_DEFBUTTON4
+MB_ICONEXCLAMATION
+MB_ICONINFORMATION
+MB_ICONQUESTION
+MB_ICONSTOP
+MB_OK
+MB_OKCANCEL
+MB_RETRYCANCEL
+MB_RIGHT
+MB_RTLREADING
+MB_SETFOREGROUND
+MB_TOPMOST
+MB_USERICON
+MB_YESNO
+NORMAL OFFLINE
+READONLY SHCTX
+SHELL_CONTEXT
+SYSTEM TEMPORARY
+
+----------------------------------------------------
+
+[
+	["property", "admin"], ["property", "all"], ["property", "auto"], ["property", "both"],
+	["property", "colored"], ["property", "false"], ["property", "force"],
+	["property", "hide"], ["property", "highest"], ["property", "lastused"],
+	["property", "leave"], ["property", "listonly"], ["property", "none"],
+	["property", "normal"], ["property", "notset"], ["property", "off"],
+	["property", "on"], ["property", "open"], ["property", "print"], ["property", "show"],
+	["property", "silent"], ["property", "silentlog"],
+	["property", "smooth"], ["property", "textonly"],
+	["property", "true"], ["property", "user"],
+	
+	["property", "ARCHIVE"],
+	["property", "FILE_ATTRIBUTE_ARCHIVE"],
+	["property", "FILE_ATTRIBUTE_NORMAL"],
+	["property", "FILE_ATTRIBUTE_OFFLINE"],
+	["property", "FILE_ATTRIBUTE_READONLY"],
+	["property", "FILE_ATTRIBUTE_SYSTEM"],
+	["property", "FILE_ATTRIBUTE_TEMPORARY"],
+	["property", "HKCR"], ["property", "HKCU"], ["property", "HKDD"], ["property", "HKLM"],
+	["property", "HKPD"], ["property", "HKU"],
+	["property", "HKEY_CLASSES_ROOT"],
+	["property", "HKEY_CURRENT_CONFIG"],
+	["property", "HKEY_CURRENT_USER"],
+	["property", "HKEY_DYN_DATA"],
+	["property", "HKEY_LOCAL_MACHINE"],
+	["property", "HKEY_PERFORMANCE_DATA"],
+	["property", "HKEY_USERS"],
+	["property", "IDABORT"], ["property", "IDCANCEL"],
+	["property", "IDIGNORE"], ["property", "IDNO"],
+	["property", "IDOK"], ["property", "IDRETRY"], ["property", "IDYES"],
+	["property", "MB_ABORTRETRYIGNORE"],
+	["property", "MB_DEFBUTTON1"],
+	["property", "MB_DEFBUTTON2"],
+	["property", "MB_DEFBUTTON3"],
+	["property", "MB_DEFBUTTON4"],
+	["property", "MB_ICONEXCLAMATION"],
+	["property", "MB_ICONINFORMATION"],
+	["property", "MB_ICONQUESTION"],
+	["property", "MB_ICONSTOP"],
+	["property", "MB_OK"],
+	["property", "MB_OKCANCEL"],
+	["property", "MB_RETRYCANCEL"],
+	["property", "MB_RIGHT"],
+	["property", "MB_RTLREADING"],
+	["property", "MB_SETFOREGROUND"],
+	["property", "MB_TOPMOST"],
+	["property", "MB_USERICON"],
+	["property", "MB_YESNO"],
+	["property", "NORMAL"], ["property", "OFFLINE"],
+	["property", "READONLY"], ["property", "SHCTX"],
+	["property", "SHELL_CONTEXT"],
+	["property", "SYSTEM"], ["property", "TEMPORARY"]
+]
+
+----------------------------------------------------
+
+Checks for all properties.
\ No newline at end of file
diff --git a/tests/languages/nsis/string_feature.test b/tests/languages/nsis/string_feature.test
new file mode 100644
index 0000000000..f4098761e6
--- /dev/null
+++ b/tests/languages/nsis/string_feature.test
@@ -0,0 +1,17 @@
+""
+"fo\"o"
+''
+'fo\'o'
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"o\""],
+	["string", "''"],
+	["string", "'fo\\'o'"]
+]
+
+----------------------------------------------------
+
+Checks for single-quoted and double-quoted strings.
\ No newline at end of file
diff --git a/tests/languages/nsis/variable_feature.test b/tests/languages/nsis/variable_feature.test
new file mode 100644
index 0000000000..0703ec69ae
--- /dev/null
+++ b/tests/languages/nsis/variable_feature.test
@@ -0,0 +1,15 @@
+$LANGUAGE
+$(myLicenseData)
+${LANG_ENGLISH}
+
+----------------------------------------------------
+
+[
+	["variable", "$LANGUAGE"],
+	["variable", "$(myLicenseData)"],
+	["variable", "${LANG_ENGLISH}"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From 1d3314752c699b163e7ae3d02d1005a0b7813fee Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 22:51:55 +0200
Subject: [PATCH 253/310] Objective-C: Simplified regexps + fix strings +
 handle \r

---
 components/prism-objectivec.js     | 6 +++---
 components/prism-objectivec.min.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/prism-objectivec.js b/components/prism-objectivec.js
index 5f5db4bc26..2a205bd3c8 100644
--- a/components/prism-objectivec.js
+++ b/components/prism-objectivec.js
@@ -1,5 +1,5 @@
 Prism.languages.objectivec = Prism.languages.extend('c', {
-	'keyword': /(\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while|in|self|super)\b)|((?=[\w|@])(@interface|@end|@implementation|@protocol|@class|@public|@protected|@private|@property|@try|@catch|@finally|@throw|@synthesize|@dynamic|@selector)\b)/,
-	'string': /(?:("|')([^\n\\\1]|\\.|\\\r*\n)*?\1)|(@"([^\n\\"]|\\.|\\\r*\n)*?")/,
-	'operator': /[-+]{1,2}|!=?|<{1,2}=?|>{1,2}=?|\->|={1,2}|\^|~|%|&{1,2}|\|?\||\?|\*|\/|@/
+	'keyword': /\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while|in|self|super)\b|(@interface|@end|@implementation|@protocol|@class|@public|@protected|@private|@property|@try|@catch|@finally|@throw|@synthesize|@dynamic|@selector)\b/,
+	'string': /("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|@"(\\(?:\r\n|[\s\S])|[^"\\\r\n])*"/,
+	'operator': /[+=&|]{1,2}|!=?|<<?=?|>>?=?|\-[->]?|[~^%?*\/@]/
 });
diff --git a/components/prism-objectivec.min.js b/components/prism-objectivec.min.js
index 0bf208ce2d..a826f9adc8 100644
--- a/components/prism-objectivec.min.js
+++ b/components/prism-objectivec.min.js
@@ -1 +1 @@
-Prism.languages.objectivec=Prism.languages.extend("c",{keyword:/(\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while|in|self|super)\b)|((?=[\w|@])(@interface|@end|@implementation|@protocol|@class|@public|@protected|@private|@property|@try|@catch|@finally|@throw|@synthesize|@dynamic|@selector)\b)/,string:/(?:("|')([^\n\\\1]|\\.|\\\r*\n)*?\1)|(@"([^\n\\"]|\\.|\\\r*\n)*?")/,operator:/[-+]{1,2}|!=?|<{1,2}=?|>{1,2}=?|\->|={1,2}|\^|~|%|&{1,2}|\|?\||\?|\*|\/|@/});
\ No newline at end of file
+Prism.languages.objectivec=Prism.languages.extend("c",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while|in|self|super)\b|(@interface|@end|@implementation|@protocol|@class|@public|@protected|@private|@property|@try|@catch|@finally|@throw|@synthesize|@dynamic|@selector)\b/,string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|@"(\\(?:\r\n|[\s\S])|[^"\\\r\n])*"/,operator:/[+=&|]{1,2}|!=?|<<?=?|>>?=?|\-[->]?|[~^%?*\/@]/});
\ No newline at end of file

From 7f0054d3b9c91de0ab4a34d18bdf174440956b3d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 22:52:40 +0200
Subject: [PATCH 254/310] Add tests for Objective-C

---
 .../languages/objectivec/keyword_feature.test | 59 +++++++++++++++++++
 .../objectivec/operator_feature.test          | 25 ++++++++
 .../languages/objectivec/string_feature.test  | 34 +++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 tests/languages/objectivec/keyword_feature.test
 create mode 100644 tests/languages/objectivec/operator_feature.test
 create mode 100644 tests/languages/objectivec/string_feature.test

diff --git a/tests/languages/objectivec/keyword_feature.test b/tests/languages/objectivec/keyword_feature.test
new file mode 100644
index 0000000000..80ee516e2a
--- /dev/null
+++ b/tests/languages/objectivec/keyword_feature.test
@@ -0,0 +1,59 @@
+asm typeof inline
+auto break case
+char const continue
+default do double
+else enum extern
+float for goto
+if int long
+register return
+short signed
+sizeof static
+struct switch
+typedef union
+unsigned void
+volatile while
+in self super
+
+@interface @end
+@implementation
+@protocol @class
+@public @protected
+@private @property
+@try @catch
+@finally @throw
+@synthesize
+@dynamic @selector
+
+----------------------------------------------------
+
+[
+	["keyword", "asm"], ["keyword", "typeof"], ["keyword", "inline"],
+	["keyword", "auto"], ["keyword", "break"], ["keyword", "case"],
+	["keyword", "char"], ["keyword", "const"], ["keyword", "continue"],
+	["keyword", "default"], ["keyword", "do"], ["keyword", "double"],
+	["keyword", "else"], ["keyword", "enum"], ["keyword", "extern"],
+	["keyword", "float"], ["keyword", "for"], ["keyword", "goto"],
+	["keyword", "if"], ["keyword", "int"], ["keyword", "long"],
+	["keyword", "register"], ["keyword", "return"],
+	["keyword", "short"], ["keyword", "signed"],
+	["keyword", "sizeof"], ["keyword", "static"],
+	["keyword", "struct"], ["keyword", "switch"],
+	["keyword", "typedef"], ["keyword", "union"],
+	["keyword", "unsigned"], ["keyword", "void"],
+	["keyword", "volatile"], ["keyword", "while"],
+	["keyword", "in"], ["keyword", "self"], ["keyword", "super"],
+
+	["keyword", "@interface"], ["keyword", "@end"],
+	["keyword", "@implementation"],
+	["keyword", "@protocol"], ["keyword", "@class"],
+	["keyword", "@public"], ["keyword", "@protected"],
+	["keyword", "@private"], ["keyword", "@property"],
+	["keyword", "@try"], ["keyword", "@catch"],
+	["keyword", "@finally"], ["keyword", "@throw"],
+	["keyword", "@synthesize"],
+	["keyword", "@dynamic"], ["keyword", "@selector"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/objectivec/operator_feature.test b/tests/languages/objectivec/operator_feature.test
new file mode 100644
index 0000000000..e241410d19
--- /dev/null
+++ b/tests/languages/objectivec/operator_feature.test
@@ -0,0 +1,25 @@
++ - ++ --
+! !=
+< << <= <<=
+> >> >= >>=
+-> = ==
+^ ~ %
+& && | ||
+? * / @
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "-"], ["operator", "++"], ["operator", "--"],
+	["operator", "!"], ["operator", "!="],
+	["operator", "<"], ["operator", "<<"], ["operator", "<="], ["operator", "<<="],
+	["operator", ">"], ["operator", ">>"], ["operator", ">="], ["operator", ">>="],
+	["operator", "->"], ["operator", "="], ["operator", "=="],
+	["operator", "^"], ["operator", "~"], ["operator", "%"],
+	["operator", "&"], ["operator", "&&"], ["operator", "|"], ["operator", "||"],
+	["operator", "?"], ["operator", "*"], ["operator", "/"], ["operator", "@"]
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/objectivec/string_feature.test b/tests/languages/objectivec/string_feature.test
new file mode 100644
index 0000000000..d6c7b30da0
--- /dev/null
+++ b/tests/languages/objectivec/string_feature.test
@@ -0,0 +1,34 @@
+""
+"fo\"o"
+"foo\
+bar"
+
+''
+'fo\'o'
+'foo\
+bar'
+
+@""
+@"fo\"o"
+@"foo\
+bar"
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"o\""],
+	["string", "\"foo\\\r\nbar\""],
+
+	["string", "''"],
+	["string", "'fo\\'o'"],
+	["string", "'foo\\\r\nbar'"],
+
+	["string", "@\"\""],
+	["string", "@\"fo\\\"o\""],
+	["string", "@\"foo\\\r\nbar\""]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From c03c8a42cb0c2460fc801913e59621cddff27f5c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 23:26:44 +0200
Subject: [PATCH 255/310] Pascal: Simplified regexps

---
 components/prism-pascal.js     | 18 +++++++-----------
 components/prism-pascal.min.js |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/components/prism-pascal.js b/components/prism-pascal.js
index 47164fe825..90e01347e7 100644
--- a/components/prism-pascal.js
+++ b/components/prism-pascal.js
@@ -10,30 +10,26 @@ Prism.languages.pascal = {
 		/\{[\s\S]+?\}/,
 		/\/\/.*/
 	],
-	'string': [
-		/(?:'(?:''|[^'\n])*'|#[&$%]?[a-f\d]+)+/i,
-		// Char
-		/\^[a-z]/i
-	],
+	'string': /(?:'(?:''|[^'\r\n])*'|#[&$%]?[a-f\d]+)+|\^[a-z]/i,
 	'keyword': [
 		{
 			// Turbo Pascal
-			pattern: /(^|(?!&)[\s\S])\b(?:absolute|array|asm|begin|case|const|constructor|destructor|do|downto|else|end|file|for|function|goto|if|implementation|inherited|inline|interface|label|nil|object|of|operator|packed|procedure|program|record|reintroduce|repeat|self|set|string|then|to|type|unit|until|uses|var|while|with)\b/i,
+			pattern: /(^|[^&])\b(?:absolute|array|asm|begin|case|const|constructor|destructor|do|downto|else|end|file|for|function|goto|if|implementation|inherited|inline|interface|label|nil|object|of|operator|packed|procedure|program|record|reintroduce|repeat|self|set|string|then|to|type|unit|until|uses|var|while|with)\b/i,
 			lookbehind: true
 		},
 		{
 			// Free Pascal
-			pattern: /(^|(?!&)[\s\S])\b(?:dispose|exit|false|new|true)\b/i,
+			pattern: /(^|[^&])\b(?:dispose|exit|false|new|true)\b/i,
 			lookbehind: true
 		},
 		{
 			// Object Pascal
-			pattern: /(^|(?!&)[\s\S])\b(?:class|dispinterface|except|exports|finalization|finally|initialization|inline|library|on|out|packed|property|raise|resourcestring|threadvar|try)\b/i,
+			pattern: /(^|[^&])\b(?:class|dispinterface|except|exports|finalization|finally|initialization|inline|library|on|out|packed|property|raise|resourcestring|threadvar|try)\b/i,
 			lookbehind: true
 		},
 		{
 			// Modifiers
-			pattern: /(^|(?!&)[\s\S])\b(?:absolute|abstract|alias|assembler|bitpacked|break|cdecl|continue|cppdecl|cvar|default|deprecated|dynamic|enumerator|experimental|export|external|far|far16|forward|generic|helper|implements|index|interrupt|iochecks|local|message|name|near|nodefault|noreturn|nostackframe|oldfpccall|otherwise|overload|override|pascal|platform|private|protected|public|published|read|register|reintroduce|result|safecall|saveregisters|softfloat|specialize|static|stdcall|stored|strict|unaligned|unimplemented|varargs|virtual|write)\b/i,
+			pattern: /(^|[^&])\b(?:absolute|abstract|alias|assembler|bitpacked|break|cdecl|continue|cppdecl|cvar|default|deprecated|dynamic|enumerator|experimental|export|external|far|far16|forward|generic|helper|implements|index|interrupt|iochecks|local|message|name|near|nodefault|noreturn|nostackframe|oldfpccall|otherwise|overload|override|pascal|platform|private|protected|public|published|read|register|reintroduce|result|safecall|saveregisters|softfloat|specialize|static|stdcall|stored|strict|unaligned|unimplemented|varargs|virtual|write)\b/i,
 			lookbehind: true
 		}
 	],
@@ -44,9 +40,9 @@ Prism.languages.pascal = {
 		/([+-]|\b)\d+(?:\.\d+)?(?:e[+-]?\d+)?/i
 	],
 	'operator': [
-		/\.\.|\*\*|:=|[<>]{2}|[<>+\-*\/]=?|[@^=]/i,
+		/\.\.|\*\*|:=|<[<=>]?|>[>=]?|[+\-*\/]=?|[@^=]/i,
 		{
-			pattern: /(^|(?!&)[\s\S])\b(?:and|as|div|exclude|in|include|is|mod|not|or|shl|shr|xor)\b/,
+			pattern: /(^|[^&])\b(?:and|as|div|exclude|in|include|is|mod|not|or|shl|shr|xor)\b/,
 			lookbehind: true
 		}
 	],
diff --git a/components/prism-pascal.min.js b/components/prism-pascal.min.js
index d16b865e58..52b992e8a2 100644
--- a/components/prism-pascal.min.js
+++ b/components/prism-pascal.min.js
@@ -1 +1 @@
-Prism.languages.pascal={comment:[/\(\*[\s\S]+?\*\)/,/\{[\s\S]+?\}/,/\/\/.*/],string:[/(?:'(?:''|[^'\n])*'|#[&$%]?[a-f\d]+)+/i,/\^[a-z]/i],keyword:[{pattern:/(^|(?!&)[\s\S])\b(?:absolute|array|asm|begin|case|const|constructor|destructor|do|downto|else|end|file|for|function|goto|if|implementation|inherited|inline|interface|label|nil|object|of|operator|packed|procedure|program|record|reintroduce|repeat|self|set|string|then|to|type|unit|until|uses|var|while|with)\b/i,lookbehind:!0},{pattern:/(^|(?!&)[\s\S])\b(?:dispose|exit|false|new|true)\b/i,lookbehind:!0},{pattern:/(^|(?!&)[\s\S])\b(?:class|dispinterface|except|exports|finalization|finally|initialization|inline|library|on|out|packed|property|raise|resourcestring|threadvar|try)\b/i,lookbehind:!0},{pattern:/(^|(?!&)[\s\S])\b(?:absolute|abstract|alias|assembler|bitpacked|break|cdecl|continue|cppdecl|cvar|default|deprecated|dynamic|enumerator|experimental|export|external|far|far16|forward|generic|helper|implements|index|interrupt|iochecks|local|message|name|near|nodefault|noreturn|nostackframe|oldfpccall|otherwise|overload|override|pascal|platform|private|protected|public|published|read|register|reintroduce|result|safecall|saveregisters|softfloat|specialize|static|stdcall|stored|strict|unaligned|unimplemented|varargs|virtual|write)\b/i,lookbehind:!0}],number:[/[+-]?(?:[&%]\d+|\$[a-f\d]+)/i,/([+-]|\b)\d+(?:\.\d+)?(?:e[+-]?\d+)?/i],operator:[/\.\.|\*\*|:=|[<>]{2}|[<>+\-*\/]=?|[@^=]/i,{pattern:/(^|(?!&)[\s\S])\b(?:and|as|div|exclude|in|include|is|mod|not|or|shl|shr|xor)\b/,lookbehind:!0}],punctuation:/\(\.|\.\)|[()\[\]:;,.]/};
\ No newline at end of file
+Prism.languages.pascal={comment:[/\(\*[\s\S]+?\*\)/,/\{[\s\S]+?\}/,/\/\/.*/],string:/(?:'(?:''|[^'\r\n])*'|#[&$%]?[a-f\d]+)+|\^[a-z]/i,keyword:[{pattern:/(^|[^&])\b(?:absolute|array|asm|begin|case|const|constructor|destructor|do|downto|else|end|file|for|function|goto|if|implementation|inherited|inline|interface|label|nil|object|of|operator|packed|procedure|program|record|reintroduce|repeat|self|set|string|then|to|type|unit|until|uses|var|while|with)\b/i,lookbehind:!0},{pattern:/(^|[^&])\b(?:dispose|exit|false|new|true)\b/i,lookbehind:!0},{pattern:/(^|[^&])\b(?:class|dispinterface|except|exports|finalization|finally|initialization|inline|library|on|out|packed|property|raise|resourcestring|threadvar|try)\b/i,lookbehind:!0},{pattern:/(^|[^&])\b(?:absolute|abstract|alias|assembler|bitpacked|break|cdecl|continue|cppdecl|cvar|default|deprecated|dynamic|enumerator|experimental|export|external|far|far16|forward|generic|helper|implements|index|interrupt|iochecks|local|message|name|near|nodefault|noreturn|nostackframe|oldfpccall|otherwise|overload|override|pascal|platform|private|protected|public|published|read|register|reintroduce|result|safecall|saveregisters|softfloat|specialize|static|stdcall|stored|strict|unaligned|unimplemented|varargs|virtual|write)\b/i,lookbehind:!0}],number:[/[+-]?(?:[&%]\d+|\$[a-f\d]+)/i,/([+-]|\b)\d+(?:\.\d+)?(?:e[+-]?\d+)?/i],operator:[/\.\.|\*\*|:=|<[<=>]?|>[>=]?|[+\-*\/]=?|[@^=]/i,{pattern:/(^|[^&])\b(?:and|as|div|exclude|in|include|is|mod|not|or|shl|shr|xor)\b/,lookbehind:!0}],punctuation:/\(\.|\.\)|[()\[\]:;,.]/};
\ No newline at end of file

From 395743456bfb1620d3d629db18abb80a17fa1b9a Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 23:27:24 +0200
Subject: [PATCH 256/310] Add tests for Pascal

---
 tests/languages/pascal/comment_feature.test  |  23 +++
 tests/languages/pascal/keyword_feature.test  | 143 +++++++++++++++++++
 tests/languages/pascal/number_feature.test   |  25 ++++
 tests/languages/pascal/operator_feature.test |  31 ++++
 tests/languages/pascal/string_feature.test   |  21 +++
 5 files changed, 243 insertions(+)
 create mode 100644 tests/languages/pascal/comment_feature.test
 create mode 100644 tests/languages/pascal/keyword_feature.test
 create mode 100644 tests/languages/pascal/number_feature.test
 create mode 100644 tests/languages/pascal/operator_feature.test
 create mode 100644 tests/languages/pascal/string_feature.test

diff --git a/tests/languages/pascal/comment_feature.test b/tests/languages/pascal/comment_feature.test
new file mode 100644
index 0000000000..2994975152
--- /dev/null
+++ b/tests/languages/pascal/comment_feature.test
@@ -0,0 +1,23 @@
+(* foo *)
+(* foo
+bar *)
+{ foo }
+{ foo
+bar }
+//
+// foobar
+
+----------------------------------------------------
+
+[
+	["comment", "(* foo *)"],
+	["comment", "(* foo\r\nbar *)"],
+	["comment", "{ foo }"],
+	["comment", "{ foo\r\nbar }"],
+	["comment", "//"],
+	["comment", "// foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/pascal/keyword_feature.test b/tests/languages/pascal/keyword_feature.test
new file mode 100644
index 0000000000..a31f485606
--- /dev/null
+++ b/tests/languages/pascal/keyword_feature.test
@@ -0,0 +1,143 @@
+absolute array asm
+begin case const
+constructor
+destructor
+do downto else
+end file for
+function goto
+if implementation
+inherited inline
+interface label
+nil object of
+operator packed
+procedure program
+record reintroduce
+repeat self
+set string then
+to type unit
+until uses var
+while with
+
+dispose exit false
+new true
+
+class dispinterface
+except exports
+finalization
+finally
+initialization
+inline library
+on out packed
+property raise
+resourcestring
+threadvar try
+
+absolute abstract
+alias assembler
+bitpacked break
+cdecl continue
+cppdecl cvar
+default deprecated
+dynamic enumerator
+experimental
+export external
+far far16
+forward generic
+helper implements
+index interrupt
+iochecks local
+message name near
+nodefault noreturn
+nostackframe
+oldfpccall
+otherwise
+overload override 
+pascal platform
+private protected
+public published
+read register
+reintroduce result
+safecall saveregisters
+softfloat specialize
+static stdcall
+stored strict
+unaligned
+unimplemented
+varargs virtual
+write
+
+----------------------------------------------------
+
+[
+	["keyword", "absolute"], ["keyword", "array"], ["keyword", "asm"],
+	["keyword", "begin"], ["keyword", "case"], ["keyword", "const"],
+	["keyword", "constructor"],
+	["keyword", "destructor"],
+	["keyword", "do"], ["keyword", "downto"], ["keyword", "else"],
+	["keyword", "end"], ["keyword", "file"], ["keyword", "for"],
+	["keyword", "function"], ["keyword", "goto"],
+	["keyword", "if"], ["keyword", "implementation"],
+	["keyword", "inherited"], ["keyword", "inline"],
+	["keyword", "interface"], ["keyword", "label"],
+	["keyword", "nil"], ["keyword", "object"], ["keyword", "of"],
+	["keyword", "operator"], ["keyword", "packed"],
+	["keyword", "procedure"], ["keyword", "program"],
+	["keyword", "record"], ["keyword", "reintroduce"],
+	["keyword", "repeat"], ["keyword", "self"],
+	["keyword", "set"], ["keyword", "string"], ["keyword", "then"],
+	["keyword", "to"], ["keyword", "type"], ["keyword", "unit"],
+	["keyword", "until"], ["keyword", "uses"], ["keyword", "var"],
+	["keyword", "while"], ["keyword", "with"],
+
+	["keyword", "dispose"], ["keyword", "exit"], ["keyword", "false"],
+	["keyword", "new"], ["keyword", "true"],
+
+	["keyword", "class"], ["keyword", "dispinterface"],
+	["keyword", "except"], ["keyword", "exports"],
+	["keyword", "finalization"],
+	["keyword", "finally"],
+	["keyword", "initialization"],
+	["keyword", "inline"], ["keyword", "library"],
+	["keyword", "on"], ["keyword", "out"], ["keyword", "packed"],
+	["keyword", "property"], ["keyword", "raise"],
+	["keyword", "resourcestring"],
+	["keyword", "threadvar"], ["keyword", "try"],
+
+	["keyword", "absolute"], ["keyword", "abstract"],
+	["keyword", "alias"], ["keyword", "assembler"],
+	["keyword", "bitpacked"], ["keyword", "break"],
+	["keyword", "cdecl"], ["keyword", "continue"],
+	["keyword", "cppdecl"], ["keyword", "cvar"],
+	["keyword", "default"], ["keyword", "deprecated"],
+	["keyword", "dynamic"], ["keyword", "enumerator"],
+	["keyword", "experimental"],
+	["keyword", "export"], ["keyword", "external"],
+	["keyword", "far"], ["keyword", "far16"],
+	["keyword", "forward"], ["keyword", "generic"],
+	["keyword", "helper"], ["keyword", "implements"],
+	["keyword", "index"], ["keyword", "interrupt"],
+	["keyword", "iochecks"], ["keyword", "local"],
+	["keyword", "message"], ["keyword", "name"], ["keyword", "near"],
+	["keyword", "nodefault"], ["keyword", "noreturn"],
+	["keyword", "nostackframe"],
+	["keyword", "oldfpccall"],
+	["keyword", "otherwise"],
+	["keyword", "overload"], ["keyword", "override"],
+	["keyword", "pascal"], ["keyword", "platform"],
+	["keyword", "private"], ["keyword", "protected"],
+	["keyword", "public"], ["keyword", "published"],
+	["keyword", "read"], ["keyword", "register"],
+	["keyword", "reintroduce"], ["keyword", "result"],
+	["keyword", "safecall"], ["keyword", "saveregisters"],
+	["keyword", "softfloat"], ["keyword", "specialize"],
+	["keyword", "static"], ["keyword", "stdcall"],
+	["keyword", "stored"], ["keyword", "strict"],
+	["keyword", "unaligned"],
+	["keyword", "unimplemented"],
+	["keyword", "varargs"], ["keyword", "virtual"],
+	["keyword", "write"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/pascal/number_feature.test b/tests/languages/pascal/number_feature.test
new file mode 100644
index 0000000000..39b32e58ea
--- /dev/null
+++ b/tests/languages/pascal/number_feature.test
@@ -0,0 +1,25 @@
+42
+3.14159
+2.1e4
+1.0e-1
+3.8e+24
+$7aff
+&17
+%11110101
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "2.1e4"],
+	["number", "1.0e-1"],
+	["number", "3.8e+24"],
+	["number", "$7aff"],
+	["number", "&17"],
+	["number", "%11110101"]
+]
+
+----------------------------------------------------
+
+Checks for decimal, hexadecimal, octal and binary numbers.
\ No newline at end of file
diff --git a/tests/languages/pascal/operator_feature.test b/tests/languages/pascal/operator_feature.test
new file mode 100644
index 0000000000..b800b035b5
--- /dev/null
+++ b/tests/languages/pascal/operator_feature.test
@@ -0,0 +1,31 @@
+.. ** :=
+< << <= > >> >=
++ - * /
++= -= *= /=
+@ ^ =
+
+and as div
+exclude in
+include is
+mod not or
+shl shr xor
+
+----------------------------------------------------
+
+[
+	["operator", ".."], ["operator", "**"], ["operator", ":="],
+	["operator", "<"], ["operator", "<<"], ["operator", "<="], ["operator", ">"], ["operator", ">>"], ["operator", ">="],
+	["operator", "+"], ["operator", "-"], ["operator", "*"], ["operator", "/"],
+	["operator", "+="], ["operator", "-="], ["operator", "*="], ["operator", "/="],
+	["operator", "@"], ["operator", "^"], ["operator", "="],
+
+	["operator", "and"], ["operator", "as"], ["operator", "div"],
+	["operator", "exclude"], ["operator", "in"],
+	["operator", "include"], ["operator", "is"],
+	["operator", "mod"], ["operator", "not"], ["operator", "or"],
+	["operator", "shl"], ["operator", "shr"], ["operator", "xor"]
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/pascal/string_feature.test b/tests/languages/pascal/string_feature.test
new file mode 100644
index 0000000000..c33a448a94
--- /dev/null
+++ b/tests/languages/pascal/string_feature.test
@@ -0,0 +1,21 @@
+''
+'fo''o'
+^G
+#7
+#$f4
+'foo'#9'bar'
+
+----------------------------------------------------
+
+[
+	["string", "''"],
+	["string", "'fo''o'"],
+	["string", "^G"],
+	["string", "#7"],
+	["string", "#$f4"],
+	["string", "'foo'#9'bar'"]
+]
+
+----------------------------------------------------
+
+Checks for strings and chars.
\ No newline at end of file

From e9d382e877057473d68ec85cfef8513de9baaf31 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 23:28:58 +0200
Subject: [PATCH 257/310] Objective-C: Fix operator regexp

---
 components/prism-objectivec.js     | 2 +-
 components/prism-objectivec.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-objectivec.js b/components/prism-objectivec.js
index 2a205bd3c8..0471d10964 100644
--- a/components/prism-objectivec.js
+++ b/components/prism-objectivec.js
@@ -1,5 +1,5 @@
 Prism.languages.objectivec = Prism.languages.extend('c', {
 	'keyword': /\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while|in|self|super)\b|(@interface|@end|@implementation|@protocol|@class|@public|@protected|@private|@property|@try|@catch|@finally|@throw|@synthesize|@dynamic|@selector)\b/,
 	'string': /("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|@"(\\(?:\r\n|[\s\S])|[^"\\\r\n])*"/,
-	'operator': /[+=&|]{1,2}|!=?|<<?=?|>>?=?|\-[->]?|[~^%?*\/@]/
+	'operator': /-[->]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|\|?|[~^%?*\/@]/
 });
diff --git a/components/prism-objectivec.min.js b/components/prism-objectivec.min.js
index a826f9adc8..a4af591d1c 100644
--- a/components/prism-objectivec.min.js
+++ b/components/prism-objectivec.min.js
@@ -1 +1 @@
-Prism.languages.objectivec=Prism.languages.extend("c",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while|in|self|super)\b|(@interface|@end|@implementation|@protocol|@class|@public|@protected|@private|@property|@try|@catch|@finally|@throw|@synthesize|@dynamic|@selector)\b/,string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|@"(\\(?:\r\n|[\s\S])|[^"\\\r\n])*"/,operator:/[+=&|]{1,2}|!=?|<<?=?|>>?=?|\-[->]?|[~^%?*\/@]/});
\ No newline at end of file
+Prism.languages.objectivec=Prism.languages.extend("c",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while|in|self|super)\b|(@interface|@end|@implementation|@protocol|@class|@public|@protected|@private|@property|@try|@catch|@finally|@throw|@synthesize|@dynamic|@selector)\b/,string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|@"(\\(?:\r\n|[\s\S])|[^"\\\r\n])*"/,operator:/-[->]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|\|?|[~^%?*\/@]/});
\ No newline at end of file

From 44ad8dcbbc14528d6168e2a29ef2fe4d521a4c65 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 28 Aug 2015 23:29:50 +0200
Subject: [PATCH 258/310] NSIS: Fix operator regexp

---
 components/prism-nsis.js     | 2 +-
 components/prism-nsis.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-nsis.js b/components/prism-nsis.js
index 99f7a97895..66de20a6c8 100644
--- a/components/prism-nsis.js
+++ b/components/prism-nsis.js
@@ -13,7 +13,7 @@
 	'property': /\b(admin|all|auto|both|colored|false|force|hide|highest|lastused|leave|listonly|none|normal|notset|off|on|open|print|show|silent|silentlog|smooth|textonly|true|user|ARCHIVE|FILE_(ATTRIBUTE_ARCHIVE|ATTRIBUTE_NORMAL|ATTRIBUTE_OFFLINE|ATTRIBUTE_READONLY|ATTRIBUTE_SYSTEM|ATTRIBUTE_TEMPORARY)|HK(CR|CU|DD|LM|PD|U)|HKEY_(CLASSES_ROOT|CURRENT_CONFIG|CURRENT_USER|DYN_DATA|LOCAL_MACHINE|PERFORMANCE_DATA|USERS)|ID(ABORT|CANCEL|IGNORE|NO|OK|RETRY|YES)|MB_(ABORTRETRYIGNORE|DEFBUTTON1|DEFBUTTON2|DEFBUTTON3|DEFBUTTON4|ICONEXCLAMATION|ICONINFORMATION|ICONQUESTION|ICONSTOP|OK|OKCANCEL|RETRYCANCEL|RIGHT|RTLREADING|SETFOREGROUND|TOPMOST|USERICON|YESNO)|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)\b/,
 	'variable': /\$[({]?[-_\w]+[)}]?/i,
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
-	'operator': /[-+&|]{1,2}|<=?|>=?|==?=?|[?*\/~^%]/,
+	'operator': /--?|\+\+?|<=?|>=?|==?=?|&&?|\|?\||[?*\/~^%]/,
 	'punctuation': /[{}[\];(),.:]/,
 	'important': /!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)\b/i
 };
diff --git a/components/prism-nsis.min.js b/components/prism-nsis.min.js
index fadfbd71ed..bbc510b593 100644
--- a/components/prism-nsis.min.js
+++ b/components/prism-nsis.min.js
@@ -1 +1 @@
-Prism.languages.nsis={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|[#;].*)/,lookbehind:!0},string:/("|')(\\?.)*?\1/,keyword:/\b(Abort|Add(BrandingImage|Size)|AdvSplash|Allow(RootDirInstall|SkipFiles)|AutoCloseWindow|Banner|BG(Font|Gradient|Image)|BrandingText|BringToFront|Call(InstDLL)?|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|Create(Directory|Font|ShortCut)|Delete(INISec|INIStr|RegKey|RegValue)?|Detail(Print|sButtonText)|Dialer|Dir(Text|Var|Verify)|EnableWindow|Enum(RegKey|RegValue)|Exch|Exec(Shell|Wait)?|ExpandEnvStrings|File(BufSize|Close|ErrorText|Open|Read|ReadByte|ReadUTF16LE|ReadWord|WriteUTF16LE|Seek|Write|WriteByte|WriteWord)?|Find(Close|First|Next|Window)|FlushINI|Get(CurInstType|CurrentAddress|DlgItem|DLLVersion(Local)?|ErrorLevel|FileTime(Local)?|FullPathName|Function(Address|End)?|InstDirError|LabelAddress|TempFileName)|Goto|HideWindow|Icon|If(Abort|Errors|FileExists|RebootFlag|Silent)|InitPluginsDir|Install(ButtonText|Colors|Dir(RegKey)?)|InstProgressFlags|Inst(Type(GetText|SetText)?)|Int(CmpU?|Fmt|Op)|IsWindow|Lang(DLL|String)|License(BkColor|Data|ForceSelection|LangString|Text)|LoadLanguageFile|LockWindow|Log(Set|Text)|Manifest(DPIAware|SupportedOS)|Math|MessageBox|MiscButtonText|Name|Nop|ns(Dialogs|Exec)|NSISdl|OutFile|Page(Callbacks)?|Pop|Push|Quit|Read(EnvStr|INIStr|RegDWORD|RegStr)|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|Section(End|GetFlags|GetInstTypes|GetSize|GetText|Group|In|SetFlags|SetInstTypes|SetSize|SetText)?|SendMessage|Set(AutoClose|BrandingImage|Compress|Compressor(DictSize)?|CtlColors|CurInstType|DatablockOptimize|DateSave|Details(Print|View)|ErrorLevel|Errors|FileAttributes|Font|OutPath|Overwrite|PluginUnload|RebootFlag|RegView|ShellVarContext|Silent)|Show(InstDetails|UninstDetails|Window)|Silent(Install|UnInstall)|Sleep|SpaceTexts|Splash|StartMenu|Str(CmpS?|Cpy|Len)|SubCaption|System|Unicode|Uninstall(ButtonText|Caption|Icon|SubCaption|Text)|UninstPage|UnRegDLL|UserInfo|Var|VI(AddVersionKey|FileVersion|ProductVersion)|VPatch|WindowIcon|Write(INIStr|RegBin|RegDWORD|RegExpandStr|RegStr|Uninstaller)|XPStyle)\b/,property:/\b(admin|all|auto|both|colored|false|force|hide|highest|lastused|leave|listonly|none|normal|notset|off|on|open|print|show|silent|silentlog|smooth|textonly|true|user|ARCHIVE|FILE_(ATTRIBUTE_ARCHIVE|ATTRIBUTE_NORMAL|ATTRIBUTE_OFFLINE|ATTRIBUTE_READONLY|ATTRIBUTE_SYSTEM|ATTRIBUTE_TEMPORARY)|HK(CR|CU|DD|LM|PD|U)|HKEY_(CLASSES_ROOT|CURRENT_CONFIG|CURRENT_USER|DYN_DATA|LOCAL_MACHINE|PERFORMANCE_DATA|USERS)|ID(ABORT|CANCEL|IGNORE|NO|OK|RETRY|YES)|MB_(ABORTRETRYIGNORE|DEFBUTTON1|DEFBUTTON2|DEFBUTTON3|DEFBUTTON4|ICONEXCLAMATION|ICONINFORMATION|ICONQUESTION|ICONSTOP|OK|OKCANCEL|RETRYCANCEL|RIGHT|RTLREADING|SETFOREGROUND|TOPMOST|USERICON|YESNO)|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)\b/,variable:/\$[({]?[-_\w]+[)}]?/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/[-+&|]{1,2}|<=?|>=?|==?=?|[?*\/~^%]/,punctuation:/[{}[\];(),.:]/,important:/!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)\b/i};
\ No newline at end of file
+Prism.languages.nsis={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|[#;].*)/,lookbehind:!0},string:/("|')(\\?.)*?\1/,keyword:/\b(Abort|Add(BrandingImage|Size)|AdvSplash|Allow(RootDirInstall|SkipFiles)|AutoCloseWindow|Banner|BG(Font|Gradient|Image)|BrandingText|BringToFront|Call(InstDLL)?|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|Create(Directory|Font|ShortCut)|Delete(INISec|INIStr|RegKey|RegValue)?|Detail(Print|sButtonText)|Dialer|Dir(Text|Var|Verify)|EnableWindow|Enum(RegKey|RegValue)|Exch|Exec(Shell|Wait)?|ExpandEnvStrings|File(BufSize|Close|ErrorText|Open|Read|ReadByte|ReadUTF16LE|ReadWord|WriteUTF16LE|Seek|Write|WriteByte|WriteWord)?|Find(Close|First|Next|Window)|FlushINI|Get(CurInstType|CurrentAddress|DlgItem|DLLVersion(Local)?|ErrorLevel|FileTime(Local)?|FullPathName|Function(Address|End)?|InstDirError|LabelAddress|TempFileName)|Goto|HideWindow|Icon|If(Abort|Errors|FileExists|RebootFlag|Silent)|InitPluginsDir|Install(ButtonText|Colors|Dir(RegKey)?)|InstProgressFlags|Inst(Type(GetText|SetText)?)|Int(CmpU?|Fmt|Op)|IsWindow|Lang(DLL|String)|License(BkColor|Data|ForceSelection|LangString|Text)|LoadLanguageFile|LockWindow|Log(Set|Text)|Manifest(DPIAware|SupportedOS)|Math|MessageBox|MiscButtonText|Name|Nop|ns(Dialogs|Exec)|NSISdl|OutFile|Page(Callbacks)?|Pop|Push|Quit|Read(EnvStr|INIStr|RegDWORD|RegStr)|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|Section(End|GetFlags|GetInstTypes|GetSize|GetText|Group|In|SetFlags|SetInstTypes|SetSize|SetText)?|SendMessage|Set(AutoClose|BrandingImage|Compress|Compressor(DictSize)?|CtlColors|CurInstType|DatablockOptimize|DateSave|Details(Print|View)|ErrorLevel|Errors|FileAttributes|Font|OutPath|Overwrite|PluginUnload|RebootFlag|RegView|ShellVarContext|Silent)|Show(InstDetails|UninstDetails|Window)|Silent(Install|UnInstall)|Sleep|SpaceTexts|Splash|StartMenu|Str(CmpS?|Cpy|Len)|SubCaption|System|Unicode|Uninstall(ButtonText|Caption|Icon|SubCaption|Text)|UninstPage|UnRegDLL|UserInfo|Var|VI(AddVersionKey|FileVersion|ProductVersion)|VPatch|WindowIcon|Write(INIStr|RegBin|RegDWORD|RegExpandStr|RegStr|Uninstaller)|XPStyle)\b/,property:/\b(admin|all|auto|both|colored|false|force|hide|highest|lastused|leave|listonly|none|normal|notset|off|on|open|print|show|silent|silentlog|smooth|textonly|true|user|ARCHIVE|FILE_(ATTRIBUTE_ARCHIVE|ATTRIBUTE_NORMAL|ATTRIBUTE_OFFLINE|ATTRIBUTE_READONLY|ATTRIBUTE_SYSTEM|ATTRIBUTE_TEMPORARY)|HK(CR|CU|DD|LM|PD|U)|HKEY_(CLASSES_ROOT|CURRENT_CONFIG|CURRENT_USER|DYN_DATA|LOCAL_MACHINE|PERFORMANCE_DATA|USERS)|ID(ABORT|CANCEL|IGNORE|NO|OK|RETRY|YES)|MB_(ABORTRETRYIGNORE|DEFBUTTON1|DEFBUTTON2|DEFBUTTON3|DEFBUTTON4|ICONEXCLAMATION|ICONINFORMATION|ICONQUESTION|ICONSTOP|OK|OKCANCEL|RETRYCANCEL|RIGHT|RTLREADING|SETFOREGROUND|TOPMOST|USERICON|YESNO)|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)\b/,variable:/\$[({]?[-_\w]+[)}]?/i,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/--?|\+\+?|<=?|>=?|==?=?|&&?|\|?\||[?*\/~^%]/,punctuation:/[{}[\];(),.:]/,important:/!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)\b/i};
\ No newline at end of file

From fce9b0cee0728e53e77618c5cc65dde2b6369410 Mon Sep 17 00:00:00 2001
From: Daniel Flint <nauzilus@gmail.com>
Date: Sat, 29 Aug 2015 09:20:35 +1000
Subject: [PATCH 259/310] Remaining test cases for PowerShell

---
 components/prism-powershell.js                |   6 +-
 components/prism-powershell.min.js            |   2 +-
 .../languages/powershell/boolean_feature.test |  18 +
 .../powershell/function_feature.test          | 398 ++++++++++++++++++
 .../languages/powershell/keyword_feature.test |  46 ++
 .../powershell/namespace_feature.test         |  14 +
 ...ool_feature.test => operator_feature.test} |  25 +-
 .../powershell/variable_feature.test          |  15 +
 8 files changed, 498 insertions(+), 26 deletions(-)
 create mode 100644 tests/languages/powershell/boolean_feature.test
 create mode 100644 tests/languages/powershell/function_feature.test
 create mode 100644 tests/languages/powershell/keyword_feature.test
 create mode 100644 tests/languages/powershell/namespace_feature.test
 rename tests/languages/powershell/{opvarbool_feature.test => operator_feature.test} (62%)
 create mode 100644 tests/languages/powershell/variable_feature.test

diff --git a/components/prism-powershell.js b/components/prism-powershell.js
index 2cff8bd29c..235d75487a 100644
--- a/components/prism-powershell.js
+++ b/components/prism-powershell.js
@@ -25,8 +25,6 @@ Prism.languages.powershell = {
 	'namespace': /\[[a-z][\w\W]*?\]/i,
 	'boolean': /\$(true|false)\b/i,
 	'variable': /\$\w+\b/i,
-	// per http://technet.microsoft.com/en-us/library/hh847744.aspx
-	'keyword': /\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,
 	// Cmdlets and aliases. Aliases should come last, otherwise "write" gets preferred over "write-host" for example
 	// Get-Command | ?{ $_.ModuleName -match "Microsoft.PowerShell.(Util|Core|Management)" }
 	// Get-Alias | ?{ $_.ReferencedCommand.Module.Name -match "Microsoft.PowerShell.(Util|Core|Management)" }
@@ -34,8 +32,10 @@ Prism.languages.powershell = {
 		/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,
 		/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i
 	],
+	// per http://technet.microsoft.com/en-us/library/hh847744.aspx
+	'keyword': /\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,
 	'operator': {
-		pattern: /(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+]{2}|[-+*\/%]=?)/i,
+		pattern: /(\W?)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+]{2}|[-+*\/%]=?)/i,
 		lookbehind: true
 	},
 	'punctuation': /[|{}[\];(),.]/
diff --git a/components/prism-powershell.min.js b/components/prism-powershell.min.js
index 84949d000b..111ae8178c 100644
--- a/components/prism-powershell.min.js
+++ b/components/prism-powershell.min.js
@@ -1 +1 @@
-Prism.languages.powershell={comment:[{pattern:/(^|[^`])<#[\w\W]*?#>/,lookbehind:!0},{pattern:/(^|[^`])#.*?(\r?\n|$)/,lookbehind:!0}],string:[{pattern:/"(`?[\w\W])*?"/m,inside:{"function":{pattern:/[^`]\$\(.*?\)/,inside:{}}}},/'([\w\W])*?'/m],namespace:/\[[a-z][\w\W]*?\]/i,"boolean":/\$(true|false)\b/i,variable:/\$\w+\b/i,keyword:/\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,"function":[/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i],operator:{pattern:/(\W)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+]{2}|[-+*\/%]=?)/i,lookbehind:!0},punctuation:/[|{}[\];(),.]/},Prism.languages.powershell.string[0].inside.boolean=Prism.languages.powershell.boolean,Prism.languages.powershell.string[0].inside.variable=Prism.languages.powershell.variable,Prism.languages.powershell.string[0].inside.function.inside=Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
+Prism.languages.powershell={comment:[{pattern:/(^|[^`])<#[\w\W]*?#>/,lookbehind:!0},{pattern:/(^|[^`])#.*?(\r?\n|$)/,lookbehind:!0}],string:[{pattern:/"(`?[\w\W])*?"/m,inside:{"function":{pattern:/[^`]\$\(.*?\)/,inside:{}}}},/'([\w\W])*?'/m],namespace:/\[[a-z][\w\W]*?\]/i,"boolean":/\$(true|false)\b/i,variable:/\$\w+\b/i,"function":[/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i],keyword:/\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,operator:{pattern:/(\W?)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+]{2}|[-+*\/%]=?)/i,lookbehind:!0},punctuation:/[|{}[\];(),.]/},Prism.languages.powershell.string[0].inside.boolean=Prism.languages.powershell.boolean,Prism.languages.powershell.string[0].inside.variable=Prism.languages.powershell.variable,Prism.languages.powershell.string[0].inside.function.inside=Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
diff --git a/tests/languages/powershell/boolean_feature.test b/tests/languages/powershell/boolean_feature.test
new file mode 100644
index 0000000000..aae876a208
--- /dev/null
+++ b/tests/languages/powershell/boolean_feature.test
@@ -0,0 +1,18 @@
+$true $True $TRUE
+$false $False $FALSE
+
+----------------------------------------------------
+
+[
+	["boolean", "$true"],
+	["boolean", "$True"],
+	["boolean", "$TRUE"],
+	
+	["boolean", "$false"],
+	["boolean", "$False"],
+	["boolean", "$FALSE"]
+
+]
+----------------------------------------------------
+
+Testing Booleans
\ No newline at end of file
diff --git a/tests/languages/powershell/function_feature.test b/tests/languages/powershell/function_feature.test
new file mode 100644
index 0000000000..e7b07af93d
--- /dev/null
+++ b/tests/languages/powershell/function_feature.test
@@ -0,0 +1,398 @@
+ac cat chdir clc cli clp clv compare copy cp cpi cpp cvpa dbp del diff dir ebp
+echo epal epcsv epsn erase fc fl ft fw gal gbp gc gci gcs gdr gi gl gm gp gps
+group gsv gu gv gwmi iex ii ipal ipcsv ipsn irm iwmi iwr kill lp ls measure mi
+mount move mp mv nal ndr ni nv ogv popd ps pushd pwd rbp rd rdr ren ri rm rmdir
+rni rnp rp rv rvpa rwmi sal saps sasv sbp sc select set shcm si sl sleep sls
+sort sp spps spsv start sv swmi tee trcm type write
+
+Add-Computer Add-Content Add-History Add-Member Add-PSSnapin Add-Type
+Checkpoint-Computer Clear-Content Clear-EventLog Clear-History Clear-Item
+Clear-ItemProperty Clear-Variable Compare-Object Complete-Transaction
+Connect-PSSession ConvertFrom-Csv ConvertFrom-Json ConvertFrom-StringData
+Convert-Path ConvertTo-Csv ConvertTo-Html ConvertTo-Json ConvertTo-Xml
+Copy-Item Copy-ItemProperty Debug-Process Disable-ComputerRestore
+Disable-PSBreakpoint Disable-PSRemoting Disable-PSSessionConfiguration
+Disconnect-PSSession Enable-ComputerRestore Enable-PSBreakpoint
+Enable-PSRemoting Enable-PSSessionConfiguration Enter-PSSession Exit-PSSession
+Export-Alias Export-Clixml Export-Console Export-Csv Export-FormatData
+Export-ModuleMember Export-PSSession ForEach-Object Format-Custom Format-List
+Format-Table Format-Wide Get-Alias Get-ChildItem Get-Command
+Get-ComputerRestorePoint Get-Content Get-ControlPanelItem Get-Culture Get-Date
+Get-Event Get-EventLog Get-EventSubscriber Get-FormatData Get-Help Get-History
+Get-Host Get-HotFix Get-Item Get-ItemProperty Get-Job Get-Location Get-Member
+Get-Module Get-Process Get-PSBreakpoint Get-PSCallStack Get-PSDrive
+Get-PSProvider Get-PSSession Get-PSSessionConfiguration Get-PSSnapin Get-Random
+Get-Service Get-TraceSource Get-Transaction Get-TypeData Get-UICulture
+Get-Unique Get-Variable Get-WmiObject Group-Object Import-Alias Import-Clixml
+Import-Csv Import-LocalizedData Import-Module Import-PSSession Invoke-Command
+Invoke-Expression Invoke-History Invoke-Item Invoke-RestMethod Invoke-WebRequest
+Invoke-WmiMethod Join-Path Limit-EventLog Measure-Command Measure-Object
+Move-Item Move-ItemProperty New-Alias New-Event New-EventLog New-Item
+New-ItemProperty New-Module New-ModuleManifest New-Object New-PSDrive
+New-PSSession New-PSSessionConfigurationFile New-PSSessionOption
+New-PSTransportOption New-Service New-TimeSpan New-Variable New-WebServiceProxy
+Out-Default Out-File Out-GridView Out-Host Out-Null Out-Printer Out-String
+Pop-Location Push-Location Read-Host Receive-Job Receive-PSSession
+Register-EngineEvent Register-ObjectEvent Register-PSSessionConfiguration
+Register-WmiEvent Remove-Computer Remove-Event Remove-EventLog Remove-Item
+Remove-ItemProperty Remove-Job Remove-Module Remove-PSBreakpoint Remove-PSDrive
+Remove-PSSession Remove-PSSnapin Remove-TypeData Remove-Variable
+Remove-WmiObject Rename-Computer Rename-Item Rename-ItemProperty
+Reset-ComputerMachinePassword Resolve-Path Restart-Computer Restart-Service
+Restore-Computer Resume-Job Resume-Service Save-Help Select-Object Select-String
+Select-Xml Send-MailMessage Set-Alias Set-Content Set-Date Set-Item
+Set-ItemProperty Set-Location Set-PSBreakpoint Set-PSDebug
+Set-PSSessionConfiguration Set-Service Set-StrictMode Set-TraceSource
+Set-Variable Set-WmiInstance Show-Command Show-ControlPanelItem Show-EventLog
+Sort-Object Split-Path Start-Job Start-Process Start-Service Start-Sleep
+Start-Transaction Stop-Computer Stop-Job Stop-Process Stop-Service Suspend-Job
+Suspend-Service Tee-Object Test-ComputerSecureChannel Test-Connection
+Test-ModuleManifest Test-Path Test-PSSessionConfigurationFile Trace-Command
+Unblock-File Undo-Transaction Unregister-Event
+Unregister-PSSessionConfiguration Update-FormatData Update-Help Update-List
+Update-TypeData Use-Transaction Wait-Event Wait-Job Wait-Process Where-Object
+Write-Debug Write-Error Write-EventLog Write-Host Write-Output Write-Progress
+Write-Verbose Write-Warning
+
+----------------------------------------------------
+
+[
+	["function", "ac"],
+	["function", "cat"],
+	["function", "chdir"],
+	["function", "clc"],
+	["function", "cli"],
+	["function", "clp"],
+	["function", "clv"],
+	["function", "compare"],
+	["function", "copy"],
+	["function", "cp"],
+	["function", "cpi"],
+	["function", "cpp"],
+	["function", "cvpa"],
+	["function", "dbp"],
+	["function", "del"],
+	["function", "diff"],
+	["function", "dir"],
+	["function", "ebp"],
+	["function", "echo"],
+	["function", "epal"],
+	["function", "epcsv"],
+	["function", "epsn"],
+	["function", "erase"],
+	["function", "fc"],
+	["function", "fl"],
+	["function", "ft"],
+	["function", "fw"],
+	["function", "gal"],
+	["function", "gbp"],
+	["function", "gc"],
+	["function", "gci"],
+	["function", "gcs"],
+	["function", "gdr"],
+	["function", "gi"],
+	["function", "gl"],
+	["function", "gm"],
+	["function", "gp"],
+	["function", "gps"],
+	["function", "group"],
+	["function", "gsv"],
+	["function", "gu"],
+	["function", "gv"],
+	["function", "gwmi"],
+	["function", "iex"],
+	["function", "ii"],
+	["function", "ipal"],
+	["function", "ipcsv"],
+	["function", "ipsn"],
+	["function", "irm"],
+	["function", "iwmi"],
+	["function", "iwr"],
+	["function", "kill"],
+	["function", "lp"],
+	["function", "ls"],
+	["function", "measure"],
+	["function", "mi"],
+	["function", "mount"],
+	["function", "move"],
+	["function", "mp"],
+	["function", "mv"],
+	["function", "nal"],
+	["function", "ndr"],
+	["function", "ni"],
+	["function", "nv"],
+	["function", "ogv"],
+	["function", "popd"],
+	["function", "ps"],
+	["function", "pushd"],
+	["function", "pwd"],
+	["function", "rbp"],
+	["function", "rd"],
+	["function", "rdr"],
+	["function", "ren"],
+	["function", "ri"],
+	["function", "rm"],
+	["function", "rmdir"],
+	["function", "rni"],
+	["function", "rnp"],
+	["function", "rp"],
+	["function", "rv"],
+	["function", "rvpa"],
+	["function", "rwmi"],
+	["function", "sal"],
+	["function", "saps"],
+	["function", "sasv"],
+	["function", "sbp"],
+	["function", "sc"],
+	["function", "select"],
+	["function", "set"],
+	["function", "shcm"],
+	["function", "si"],
+	["function", "sl"],
+	["function", "sleep"],
+	["function", "sls"],
+	["function", "sort"],
+	["function", "sp"],
+	["function", "spps"],
+	["function", "spsv"],
+	["function", "start"],
+	["function", "sv"],
+	["function", "swmi"],
+	["function", "tee"],
+	["function", "trcm"],
+	["function", "type"],
+	["function", "write"],
+
+	["function", "Add-Computer"],
+	["function", "Add-Content"],
+	["function", "Add-History"],
+	["function", "Add-Member"],
+	["function", "Add-PSSnapin"],
+	["function", "Add-Type"],
+	["function", "Checkpoint-Computer"],
+	["function", "Clear-Content"],
+	["function", "Clear-EventLog"],
+	["function", "Clear-History"],
+	["function", "Clear-Item"],
+	["function", "Clear-ItemProperty"],
+	["function", "Clear-Variable"],
+	["function", "Compare-Object"],
+	["function", "Complete-Transaction"],
+	["function", "Connect-PSSession"],
+	["function", "ConvertFrom-Csv"],
+	["function", "ConvertFrom-Json"],
+	["function", "ConvertFrom-StringData"],
+	["function", "Convert-Path"],
+	["function", "ConvertTo-Csv"],
+	["function", "ConvertTo-Html"],
+	["function", "ConvertTo-Json"],
+	["function", "ConvertTo-Xml"],
+	["function", "Copy-Item"],
+	["function", "Copy-ItemProperty"],
+	["function", "Debug-Process"],
+	["function", "Disable-ComputerRestore"],
+	["function", "Disable-PSBreakpoint"],
+	["function", "Disable-PSRemoting"],
+	["function", "Disable-PSSessionConfiguration"],
+	["function", "Disconnect-PSSession"],
+	["function", "Enable-ComputerRestore"],
+	["function", "Enable-PSBreakpoint"],
+	["function", "Enable-PSRemoting"],
+	["function", "Enable-PSSessionConfiguration"],
+	["function", "Enter-PSSession"],
+	["function", "Exit-PSSession"],
+	["function", "Export-Alias"],
+	["function", "Export-Clixml"],
+	["function", "Export-Console"],
+	["function", "Export-Csv"],
+	["function", "Export-FormatData"],
+	["function", "Export-ModuleMember"],
+	["function", "Export-PSSession"],
+	["function", "ForEach-Object"],
+	["function", "Format-Custom"],
+	["function", "Format-List"],
+	["function", "Format-Table"],
+	["function", "Format-Wide"],
+	["function", "Get-Alias"],
+	["function", "Get-ChildItem"],
+	["function", "Get-Command"],
+	["function", "Get-ComputerRestorePoint"],
+	["function", "Get-Content"],
+	["function", "Get-ControlPanelItem"],
+	["function", "Get-Culture"],
+	["function", "Get-Date"],
+	["function", "Get-Event"],
+	["function", "Get-EventLog"],
+	["function", "Get-EventSubscriber"],
+	["function", "Get-FormatData"],
+	["function", "Get-Help"],
+	["function", "Get-History"],
+	["function", "Get-Host"],
+	["function", "Get-HotFix"],
+	["function", "Get-Item"],
+	["function", "Get-ItemProperty"],
+	["function", "Get-Job"],
+	["function", "Get-Location"],
+	["function", "Get-Member"],
+	["function", "Get-Module"],
+	["function", "Get-Process"],
+	["function", "Get-PSBreakpoint"],
+	["function", "Get-PSCallStack"],
+	["function", "Get-PSDrive"],
+	["function", "Get-PSProvider"],
+	["function", "Get-PSSession"],
+	["function", "Get-PSSessionConfiguration"],
+	["function", "Get-PSSnapin"],
+	["function", "Get-Random"],
+	["function", "Get-Service"],
+	["function", "Get-TraceSource"],
+	["function", "Get-Transaction"],
+	["function", "Get-TypeData"],
+	["function", "Get-UICulture"],
+	["function", "Get-Unique"],
+	["function", "Get-Variable"],
+	["function", "Get-WmiObject"],
+	["function", "Group-Object"],
+	["function", "Import-Alias"],
+	["function", "Import-Clixml"],
+	["function", "Import-Csv"],
+	["function", "Import-LocalizedData"],
+	["function", "Import-Module"],
+	["function", "Import-PSSession"],
+	["function", "Invoke-Command"],
+	["function", "Invoke-Expression"],
+	["function", "Invoke-History"],
+	["function", "Invoke-Item"],
+	["function", "Invoke-RestMethod"],
+	["function", "Invoke-WebRequest"],
+	["function", "Invoke-WmiMethod"],
+	["function", "Join-Path"],
+	["function", "Limit-EventLog"],
+	["function", "Measure-Command"],
+	["function", "Measure-Object"],
+	["function", "Move-Item"],
+	["function", "Move-ItemProperty"],
+	["function", "New-Alias"],
+	["function", "New-Event"],
+	["function", "New-EventLog"],
+	["function", "New-Item"],
+	["function", "New-ItemProperty"],
+	["function", "New-Module"],
+	["function", "New-ModuleManifest"],
+	["function", "New-Object"],
+	["function", "New-PSDrive"],
+	["function", "New-PSSession"],
+	["function", "New-PSSessionConfigurationFile"],
+	["function", "New-PSSessionOption"],
+	["function", "New-PSTransportOption"],
+	["function", "New-Service"],
+	["function", "New-TimeSpan"],
+	["function", "New-Variable"],
+	["function", "New-WebServiceProxy"],
+	["function", "Out-Default"],
+	["function", "Out-File"],
+	["function", "Out-GridView"],
+	["function", "Out-Host"],
+	["function", "Out-Null"],
+	["function", "Out-Printer"],
+	["function", "Out-String"],
+	["function", "Pop-Location"],
+	["function", "Push-Location"],
+	["function", "Read-Host"],
+	["function", "Receive-Job"],
+	["function", "Receive-PSSession"],
+	["function", "Register-EngineEvent"],
+	["function", "Register-ObjectEvent"],
+	["function", "Register-PSSessionConfiguration"],
+	["function", "Register-WmiEvent"],
+	["function", "Remove-Computer"],
+	["function", "Remove-Event"],
+	["function", "Remove-EventLog"],
+	["function", "Remove-Item"],
+	["function", "Remove-ItemProperty"],
+	["function", "Remove-Job"],
+	["function", "Remove-Module"],
+	["function", "Remove-PSBreakpoint"],
+	["function", "Remove-PSDrive"],
+	["function", "Remove-PSSession"],
+	["function", "Remove-PSSnapin"],
+	["function", "Remove-TypeData"],
+	["function", "Remove-Variable"],
+	["function", "Remove-WmiObject"],
+	["function", "Rename-Computer"],
+	["function", "Rename-Item"],
+	["function", "Rename-ItemProperty"],
+	["function", "Reset-ComputerMachinePassword"],
+	["function", "Resolve-Path"],
+	["function", "Restart-Computer"],
+	["function", "Restart-Service"],
+	["function", "Restore-Computer"],
+	["function", "Resume-Job"],
+	["function", "Resume-Service"],
+	["function", "Save-Help"],
+	["function", "Select-Object"],
+	["function", "Select-String"],
+	["function", "Select-Xml"],
+	["function", "Send-MailMessage"],
+	["function", "Set-Alias"],
+	["function", "Set-Content"],
+	["function", "Set-Date"],
+	["function", "Set-Item"],
+	["function", "Set-ItemProperty"],
+	["function", "Set-Location"],
+	["function", "Set-PSBreakpoint"],
+	["function", "Set-PSDebug"],
+	["function", "Set-PSSessionConfiguration"],
+	["function", "Set-Service"],
+	["function", "Set-StrictMode"],
+	["function", "Set-TraceSource"],
+	["function", "Set-Variable"],
+	["function", "Set-WmiInstance"],
+	["function", "Show-Command"],
+	["function", "Show-ControlPanelItem"],
+	["function", "Show-EventLog"],
+	["function", "Sort-Object"],
+	["function", "Split-Path"],
+	["function", "Start-Job"],
+	["function", "Start-Process"],
+	["function", "Start-Service"],
+	["function", "Start-Sleep"],
+	["function", "Start-Transaction"],
+	["function", "Stop-Computer"],
+	["function", "Stop-Job"],
+	["function", "Stop-Process"],
+	["function", "Stop-Service"],
+	["function", "Suspend-Job"],
+	["function", "Suspend-Service"],
+	["function", "Tee-Object"],
+	["function", "Test-ComputerSecureChannel"],
+	["function", "Test-Connection"],
+	["function", "Test-ModuleManifest"],
+	["function", "Test-Path"],
+	["function", "Test-PSSessionConfigurationFile"],
+	["function", "Trace-Command"],
+	["function", "Unblock-File"],
+	["function", "Undo-Transaction"],
+	["function", "Unregister-Event"],
+	["function", "Unregister-PSSessionConfiguration"],
+	["function", "Update-FormatData"],
+	["function", "Update-Help"],
+	["function", "Update-List"],
+	["function", "Update-TypeData"],
+	["function", "Use-Transaction"],
+	["function", "Wait-Event"],
+	["function", "Wait-Job"],
+	["function", "Wait-Process"],
+	["function", "Where-Object"],
+	["function", "Write-Debug"],
+	["function", "Write-Error"],
+	["function", "Write-EventLog"],
+	["function", "Write-Host"],
+	["function", "Write-Output"],
+	["function", "Write-Progress"],
+	["function", "Write-Verbose"],
+	["function", "Write-Warning"]
+]
+----------------------------------------------------
+
+Testing functions and aliases
\ No newline at end of file
diff --git a/tests/languages/powershell/keyword_feature.test b/tests/languages/powershell/keyword_feature.test
new file mode 100644
index 0000000000..ce058862a4
--- /dev/null
+++ b/tests/languages/powershell/keyword_feature.test
@@ -0,0 +1,46 @@
+Begin Break Catch Class Continue Data Define Do DynamicParam Else ElseIf End
+Exit Filter Finally For ForEach From Function If InlineScript Parallel Param
+Process Return Sequence Switch Throw Trap Try Until Using Var While Workflow
+
+----------------------------------------------------
+
+[
+	["keyword", "Begin"],
+	["keyword", "Break"],
+	["keyword", "Catch"],
+	["keyword", "Class"],
+	["keyword", "Continue"],
+	["keyword", "Data"],
+	["keyword", "Define"],
+	["keyword", "Do"],
+	["keyword", "DynamicParam"],
+	["keyword", "Else"],
+	["keyword", "ElseIf"],
+	["keyword", "End"],
+	["keyword", "Exit"],
+	["keyword", "Filter"],
+	["keyword", "Finally"],
+	["keyword", "For"],
+	["keyword", "ForEach"],
+	["keyword", "From"],
+	["keyword", "Function"],
+	["keyword", "If"],
+	["keyword", "InlineScript"],
+	["keyword", "Parallel"],
+	["keyword", "Param"],
+	["keyword", "Process"],
+	["keyword", "Return"],
+	["keyword", "Sequence"],
+	["keyword", "Switch"],
+	["keyword", "Throw"],
+	["keyword", "Trap"],
+	["keyword", "Try"],
+	["keyword", "Until"],
+	["keyword", "Using"],
+	["keyword", "Var"],
+	["keyword", "While"],
+	["keyword", "Workflow"]
+]
+----------------------------------------------------
+
+Testing keywords
\ No newline at end of file
diff --git a/tests/languages/powershell/namespace_feature.test b/tests/languages/powershell/namespace_feature.test
new file mode 100644
index 0000000000..92d0b94c8f
--- /dev/null
+++ b/tests/languages/powershell/namespace_feature.test
@@ -0,0 +1,14 @@
+[System.String]::Empty;
+[Foo.Bar+Baz]::Abc;
+[int] 42;
+
+----------------------------------------------------
+
+[
+	["namespace", "[System.String]"],"::Empty",["punctuation", ";"],
+	["namespace", "[Foo.Bar+Baz]"],"::Abc",["punctuation", ";"],
+	["namespace", "[int]"]," 42",["punctuation", ";"]
+]
+----------------------------------------------------
+
+Testing namespaces
\ No newline at end of file
diff --git a/tests/languages/powershell/opvarbool_feature.test b/tests/languages/powershell/operator_feature.test
similarity index 62%
rename from tests/languages/powershell/opvarbool_feature.test
rename to tests/languages/powershell/operator_feature.test
index ae8457779a..cbcb25bae5 100644
--- a/tests/languages/powershell/opvarbool_feature.test
+++ b/tests/languages/powershell/operator_feature.test
@@ -1,9 +1,4 @@
-[System.String]::Empty;
-[Foo.Bar+Baz]::Abc;
-[int] 42;
-$foo $bar_baz $var4u $1
-$true $True $false $true_as $falsey
--eq -ne -gt -ge -lt -le -shl -shr -not -band -and -bxor -bor -or
+! -eq -ne -gt -ge -lt -le -shl -shr -not -band -and -bxor -bor -or
 -Like -Match -Contains -In -NotLike -NotMatch -NotContains -NotIn -Replace -Join
 -is -isNot -as
 -= += *= /= %= - + * / % -- ++
@@ -11,21 +6,7 @@ $true $True $false $true_as $falsey
 ----------------------------------------------------
 
 [
-	["namespace", "[System.String]"],"::Empty",["punctuation", ";"],
-	["namespace", "[Foo.Bar+Baz]"],"::Abc",["punctuation", ";"],
-	["namespace", "[int]"]," 42",["punctuation", ";"],
-	
-	["variable", "$foo"],
-	["variable", "$bar_baz"],
-	["variable", "$var4u"],
-	["variable", "$1"],
-	
-	["boolean", "$true"],
-	["boolean", "$True"],
-	["boolean", "$false"],
-	["variable", "$true_as"],
-	["variable", "$falsey"],
-	
+	["operator", "!"], 
 	["operator", "-eq"], 
 	["operator", "-ne"], 
 	["operator", "-gt"], 
@@ -71,4 +52,4 @@ $true $True $false $true_as $falsey
 ]
 ----------------------------------------------------
 
-Testing namespaces, operators, variables and Booleans
\ No newline at end of file
+Testing operators.
\ No newline at end of file
diff --git a/tests/languages/powershell/variable_feature.test b/tests/languages/powershell/variable_feature.test
new file mode 100644
index 0000000000..a956ea7265
--- /dev/null
+++ b/tests/languages/powershell/variable_feature.test
@@ -0,0 +1,15 @@
+$foo $bar_baz $var4u $1 $true_as $falsey
+
+----------------------------------------------------
+
+[
+	["variable", "$foo"],
+	["variable", "$bar_baz"],
+	["variable", "$var4u"],
+	["variable", "$1"],
+	["variable", "$true_as"],
+	["variable", "$falsey"]
+]
+----------------------------------------------------
+
+Testing variables
\ No newline at end of file

From 27ea7685b6f7b8721ae1bb970ca6349e8b2c27be Mon Sep 17 00:00:00 2001
From: Daniel Flint <nauzilus@gmail.com>
Date: Sat, 29 Aug 2015 10:29:39 +1000
Subject: [PATCH 260/310] Incorporate code review feedback

---
 components/prism-powershell.js                  | 12 +++++++-----
 components/prism-powershell.min.js              |  2 +-
 tests/languages/powershell/comment_feature.test |  9 +++++----
 tests/languages/powershell/string_feature.test  |  8 +++++++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/components/prism-powershell.js b/components/prism-powershell.js
index 235d75487a..53ad662c7b 100644
--- a/components/prism-powershell.js
+++ b/components/prism-powershell.js
@@ -5,21 +5,22 @@ Prism.languages.powershell = {
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^`])#.*?(\r?\n|$)/,
+			pattern: /(^|[^`])#.+/,
 			lookbehind: true
 		}
 	],
 	'string': [
 		{
-			pattern: /"(`?[\w\W])*?"/m,
+			pattern: /"(`?[\w\W])*?"/,
 			inside: {
 				'function': {
 					pattern: /[^`]\$\(.*?\)/,
+					// Populated at end of file
 					inside: {}
 				}
 			}
 		},
-		/'([\w\W])*?'/m
+		/'([^']|'')*'/
 	],
 	// Matches name spaces as well as casts, attribute decorators. Force starting with letter to avoid matching array indices
 	'namespace': /\[[a-z][\w\W]*?\]/i,
@@ -35,12 +36,13 @@ Prism.languages.powershell = {
 	// per http://technet.microsoft.com/en-us/library/hh847744.aspx
 	'keyword': /\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,
 	'operator': {
-		pattern: /(\W?)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+]{2}|[-+*\/%]=?)/i,
+		pattern: /(\W?)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|-[-=]?|\+[+=]?|[*\/%]=?)/i,
 		lookbehind: true
 	},
 	'punctuation': /[|{}[\];(),.]/
 };
-// Variable interpolation inside strings
+
+// Variable interpolation inside strings, and nested expressions
 Prism.languages.powershell.string[0].inside.boolean = Prism.languages.powershell.boolean;
 Prism.languages.powershell.string[0].inside.variable = Prism.languages.powershell.variable;
 Prism.languages.powershell.string[0].inside.function.inside = Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
diff --git a/components/prism-powershell.min.js b/components/prism-powershell.min.js
index 111ae8178c..72473afa41 100644
--- a/components/prism-powershell.min.js
+++ b/components/prism-powershell.min.js
@@ -1 +1 @@
-Prism.languages.powershell={comment:[{pattern:/(^|[^`])<#[\w\W]*?#>/,lookbehind:!0},{pattern:/(^|[^`])#.*?(\r?\n|$)/,lookbehind:!0}],string:[{pattern:/"(`?[\w\W])*?"/m,inside:{"function":{pattern:/[^`]\$\(.*?\)/,inside:{}}}},/'([\w\W])*?'/m],namespace:/\[[a-z][\w\W]*?\]/i,"boolean":/\$(true|false)\b/i,variable:/\$\w+\b/i,"function":[/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i],keyword:/\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,operator:{pattern:/(\W?)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|[-+]{2}|[-+*\/%]=?)/i,lookbehind:!0},punctuation:/[|{}[\];(),.]/},Prism.languages.powershell.string[0].inside.boolean=Prism.languages.powershell.boolean,Prism.languages.powershell.string[0].inside.variable=Prism.languages.powershell.variable,Prism.languages.powershell.string[0].inside.function.inside=Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
+Prism.languages.powershell={comment:[{pattern:/(^|[^`])<#[\w\W]*?#>/,lookbehind:!0},{pattern:/(^|[^`])#.+/,lookbehind:!0}],string:[{pattern:/"(`?[\w\W])*?"/,inside:{"function":{pattern:/[^`]\$\(.*?\)/,inside:{}}}},/'([^']|'')*'/],namespace:/\[[a-z][\w\W]*?\]/i,"boolean":/\$(true|false)\b/i,variable:/\$\w+\b/i,"function":[/\b(Add-(Computer|Content|History|Member|PSSnapin|Type)|Checkpoint-Computer|Clear-(Content|EventLog|History|Item|ItemProperty|Variable)|Compare-Object|Complete-Transaction|Connect-PSSession|ConvertFrom-(Csv|Json|StringData)|Convert-Path|ConvertTo-(Csv|Html|Json|Xml)|Copy-(Item|ItemProperty)|Debug-Process|Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Disconnect-PSSession|Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)|Enter-PSSession|Exit-PSSession|Export-(Alias|Clixml|Console|Csv|FormatData|ModuleMember|PSSession)|ForEach-Object|Format-(Custom|List|Table|Wide)|Get-(Alias|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Culture|Date|Event|EventLog|EventSubscriber|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|WmiObject)|Group-Object|Import-(Alias|Clixml|Csv|LocalizedData|Module|PSSession)|Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)|Join-Path|Limit-EventLog|Measure-(Command|Object)|Move-(Item|ItemProperty)|New-(Alias|Event|EventLog|Item|ItemProperty|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy)|Out-(Default|File|GridView|Host|Null|Printer|String)|Pop-Location|Push-Location|Read-Host|Receive-(Job|PSSession)|Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)|Remove-(Computer|Event|EventLog|Item|ItemProperty|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)|Rename-(Computer|Item|ItemProperty)|Reset-ComputerMachinePassword|Resolve-Path|Restart-(Computer|Service)|Restore-Computer|Resume-(Job|Service)|Save-Help|Select-(Object|String|Xml)|Send-MailMessage|Set-(Alias|Content|Date|Item|ItemProperty|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)|Show-(Command|ControlPanelItem|EventLog)|Sort-Object|Split-Path|Start-(Job|Process|Service|Sleep|Transaction)|Stop-(Computer|Job|Process|Service)|Suspend-(Job|Service)|Tee-Object|Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)|Trace-Command|Unblock-File|Undo-Transaction|Unregister-(Event|PSSessionConfiguration)|Update-(FormatData|Help|List|TypeData)|Use-Transaction|Wait-(Event|Job|Process)|Where-Object|Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning))\b/i,/\b(ac|cat|chdir|clc|cli|clp|clv|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|ebp|echo|epal|epcsv|epsn|erase|fc|fl|ft|fw|gal|gbp|gc|gci|gcs|gdr|gi|gl|gm|gp|gps|group|gsv|gu|gv|gwmi|iex|ii|ipal|ipcsv|ipsn|irm|iwmi|iwr|kill|lp|ls|measure|mi|mount|move|mp|mv|nal|ndr|ni|nv|ogv|popd|ps|pushd|pwd|rbp|rd|rdr|ren|ri|rm|rmdir|rni|rnp|rp|rv|rvpa|rwmi|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls|sort|sp|spps|spsv|start|sv|swmi|tee|trcm|type|write)\b/i],keyword:/\b(Begin|Break|Catch|Class|Continue|Data|Define|Do|DynamicParam|Else|ElseIf|End|Exit|Filter|Finally|For|ForEach|From|Function|If|InlineScript|Parallel|Param|Process|Return|Sequence|Switch|Throw|Trap|Try|Until|Using|Var|While|Workflow)\b/i,operator:{pattern:/(\W?)(!|-(eq|ne|gt|ge|lt|le|sh[lr]|not|b?(and|x?or)|(Not)?(Like|Match|Contains|In)|Replace|Join|is(Not)?|as)\b|-[-=]?|\+[+=]?|[*\/%]=?)/i,lookbehind:!0},punctuation:/[|{}[\];(),.]/},Prism.languages.powershell.string[0].inside.boolean=Prism.languages.powershell.boolean,Prism.languages.powershell.string[0].inside.variable=Prism.languages.powershell.variable,Prism.languages.powershell.string[0].inside.function.inside=Prism.util.clone(Prism.languages.powershell);
\ No newline at end of file
diff --git a/tests/languages/powershell/comment_feature.test b/tests/languages/powershell/comment_feature.test
index 242c4a3b30..5f6becc78d 100644
--- a/tests/languages/powershell/comment_feature.test
+++ b/tests/languages/powershell/comment_feature.test
@@ -4,15 +4,16 @@
 	line
 	comment
 #>
-not a `# comment
+not a `# comment # is a comment
 
 ----------------------------------------------------
 
 [
-	["comment", "# single comment\r\n"],
-	["comment", "# comment with $variable\r\n"],
+	["comment", "# single comment"],
+	["comment", "# comment with $variable"],
 	["comment", "<# multi\r\n\tline\r\n\tcomment\r\n#>"],
-	"\r\nnot a `# comment"
+	"\r\nnot a `# comment ",
+	["comment", "# is a comment"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/powershell/string_feature.test b/tests/languages/powershell/string_feature.test
index 017a1fb3fc..ab8a785869 100644
--- a/tests/languages/powershell/string_feature.test
+++ b/tests/languages/powershell/string_feature.test
@@ -4,6 +4,9 @@
 "string `"with`" escaping"
 'non-interpolated $string'
 'also ''with'' escaping'
+'''twas also escaped'
+an empty '' string
+'can''t'
 
 ----------------------------------------------------
 
@@ -29,7 +32,10 @@
 	],
 	["string", ["\"string `\"with`\" escaping\""]],
 	["string", "'non-interpolated $string'"],
-	["string", "'also '"],["string", "'with'"],["string", "' escaping'"]
+	["string", "'also ''with'' escaping'"],
+	["string", "'''twas also escaped'"],
+	"\r\nan empty ",["string", "''"], " string\r\n",
+	["string", "'can''t'"]
 ]
 
 ----------------------------------------------------

From 56b3d295cb7782d0609cc8ec88198a5758045e7a Mon Sep 17 00:00:00 2001
From: Anuj Nair <anuj.r.nair@gmail.com>
Date: Fri, 28 Aug 2015 23:42:08 -0700
Subject: [PATCH 261/310] Issue 324 - Fixing word wrap on long code lines,
 which is breaking the line-numbers plugin

---
 themes/prism-coy.css      | 1 +
 themes/prism-dark.css     | 1 +
 themes/prism-funky.css    | 1 +
 themes/prism-okaidia.css  | 1 +
 themes/prism-tomorrow.css | 1 +
 themes/prism-twilight.css | 1 +
 themes/prism.css          | 1 +
 7 files changed, 7 insertions(+)

diff --git a/themes/prism-coy.css b/themes/prism-coy.css
index b661042113..39bfc9fe59 100644
--- a/themes/prism-coy.css
+++ b/themes/prism-coy.css
@@ -13,6 +13,7 @@ pre[class*="language-"] {
 	white-space: pre;
 	word-spacing: normal;
 	word-break: normal;
+	word-wrap: normal;
 	line-height: 1.5;
 
 	-moz-tab-size: 4;
diff --git a/themes/prism-dark.css b/themes/prism-dark.css
index 1c4daa2227..74b1a65d88 100644
--- a/themes/prism-dark.css
+++ b/themes/prism-dark.css
@@ -14,6 +14,7 @@ pre[class*="language-"] {
 	white-space: pre;
 	word-spacing: normal;
 	word-break: normal;
+	word-wrap: normal;
 	line-height: 1.5;
 
 	-moz-tab-size: 4;
diff --git a/themes/prism-funky.css b/themes/prism-funky.css
index 30135635ee..56dee03203 100644
--- a/themes/prism-funky.css
+++ b/themes/prism-funky.css
@@ -12,6 +12,7 @@ pre[class*="language-"] {
 	white-space: pre;
 	word-spacing: normal;
 	word-break: normal;
+	word-wrap: normal;
 	line-height: 1.5;
 
 	-moz-tab-size: 4;
diff --git a/themes/prism-okaidia.css b/themes/prism-okaidia.css
index 0fac6828db..3b9e2a6110 100644
--- a/themes/prism-okaidia.css
+++ b/themes/prism-okaidia.css
@@ -14,6 +14,7 @@ pre[class*="language-"] {
 	white-space: pre;
 	word-spacing: normal;
 	word-break: normal;
+	word-wrap: normal;
 	line-height: 1.5;
 
 	-moz-tab-size: 4;
diff --git a/themes/prism-tomorrow.css b/themes/prism-tomorrow.css
index 44f0f7edd0..f44ab818ff 100644
--- a/themes/prism-tomorrow.css
+++ b/themes/prism-tomorrow.css
@@ -13,6 +13,7 @@ pre[class*="language-"] {
 	white-space: pre;
 	word-spacing: normal;
 	word-break: normal;
+	word-wrap: normal;
 	line-height: 1.5;
 
 	-moz-tab-size: 4;
diff --git a/themes/prism-twilight.css b/themes/prism-twilight.css
index ab0813410e..e873fa6f21 100644
--- a/themes/prism-twilight.css
+++ b/themes/prism-twilight.css
@@ -13,6 +13,7 @@ pre[class*="language-"] {
 	white-space: pre;
 	word-spacing: normal;
 	word-break: normal;
+	word-wrap: normal;
 	line-height: 1.5;
 
 	-moz-tab-size: 4;
diff --git a/themes/prism.css b/themes/prism.css
index 3a57f8e817..e81ebeddc6 100644
--- a/themes/prism.css
+++ b/themes/prism.css
@@ -14,6 +14,7 @@ pre[class*="language-"] {
 	white-space: pre;
 	word-spacing: normal;
 	word-break: normal;
+	word-wrap: normal;
 	line-height: 1.5;
 
 	-moz-tab-size: 4;

From 71b00cce249e99f9acc4014777a8043a687a417e Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 29 Aug 2015 12:45:44 +0200
Subject: [PATCH 262/310] Perl: - Simplified regexps - Made most string and
 regexp patterns multi-line - Added support for regexp's n flag - Added
 missing operators - Fix -s operator - Fix %= operator

---
 components/prism-perl.js     | 94 +++++++++++++++++++++++-------------
 components/prism-perl.min.js |  2 +-
 2 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/components/prism-perl.js b/components/prism-perl.js
index d435e800e2..0f3d2ba355 100644
--- a/components/prism-perl.js
+++ b/components/prism-perl.js
@@ -2,96 +2,124 @@ Prism.languages.perl = {
 	'comment': [
 		{
 			// POD
-			pattern: /((?:^|\n)\s*)=\w+[\s\S]*?=cut.*/,
+			pattern: /(^\s*)=\w+[\s\S]*?=cut.*/m,
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^\\$])#.*?(\r?\n|$)/,
+			pattern: /(^|[^\\$])#.*/,
 			lookbehind: true
 		}
 	],
 	// TODO Could be nice to handle Heredoc too.
 	'string': [
 		// q/.../
-		/\b(?:q|qq|qx|qw)\s*([^a-zA-Z0-9\s\{\(\[<])(\\?.)*?\s*\1/,
+		/\b(?:q|qq|qx|qw)\s*([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1/,
 	
 		// q a...a
-		/\b(?:q|qq|qx|qw)\s+([a-zA-Z0-9])(\\?.)*?\s*\1/,
+		/\b(?:q|qq|qx|qw)\s+([a-zA-Z0-9])(?:[^\\]|\\[\s\S])*?\1/,
 	
 		// q(...)
-		/\b(?:q|qq|qx|qw)\s*\(([^()]|\\.)*\s*\)/,
+		/\b(?:q|qq|qx|qw)\s*\((?:[^()\\]|\\[\s\S])*\)/,
 	
 		// q{...}
-		/\b(?:q|qq|qx|qw)\s*\{([^{}]|\\.)*\s*\}/,
+		/\b(?:q|qq|qx|qw)\s*\{(?:[^{}\\]|\\[\s\S])*\}/,
 	
 		// q[...]
-		/\b(?:q|qq|qx|qw)\s*\[([^[\]]|\\.)*\s*\]/,
+		/\b(?:q|qq|qx|qw)\s*\[(?:[^[\]\\]|\\[\s\S])*\]/,
 	
 		// q<...>
-		/\b(?:q|qq|qx|qw)\s*<([^<>]|\\.)*\s*>/,
+		/\b(?:q|qq|qx|qw)\s*<(?:[^<>\\]|\\[\s\S])*>/,
 
-		// "...", '...', `...`
-		/("|'|`)(\\?.)*?\1/
+		// "...", `...`
+		/("|`)(?:[^\\]|\\[\s\S])*?\1/,
+
+		// '...'
+		// FIXME Multi-line single-quoted strings are not supported as they would break variables containing '
+		/'(?:[^'\\\r\n]|\\.)*'/
 	],
 	'regex': [
 		// m/.../
-		/\b(?:m|qr)\s*([^a-zA-Z0-9\s\{\(\[<])(\\?.)*?\s*\1[msixpodualgc]*/,
+		/\b(?:m|qr)\s*([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1[msixpodualngc]*/,
 	
 		// m a...a
-		/\b(?:m|qr)\s+([a-zA-Z0-9])(\\?.)*?\s*\1[msixpodualgc]*/,
+		/\b(?:m|qr)\s+([a-zA-Z0-9])(?:[^\\]|\\.)*?\1[msixpodualngc]*/,
 	
 		// m(...)
-		/\b(?:m|qr)\s*\(([^()]|\\.)*\s*\)[msixpodualgc]*/,
+		/\b(?:m|qr)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngc]*/,
 	
 		// m{...}
-		/\b(?:m|qr)\s*\{([^{}]|\\.)*\s*\}[msixpodualgc]*/,
+		/\b(?:m|qr)\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngc]*/,
 	
 		// m[...]
-		/\b(?:m|qr)\s*\[([^[\]]|\\.)*\s*\][msixpodualgc]*/,
+		/\b(?:m|qr)\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngc]*/,
 	
 		// m<...>
-		/\b(?:m|qr)\s*<([^<>]|\\.)*\s*>[msixpodualgc]*/,
-	
+		/\b(?:m|qr)\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngc]*/,
+
+		// The lookbehinds prevent -s from breaking
+		// FIXME We don't handle change of separator like s(...)[...]
 		// s/.../.../
-		/\b(?:s|tr|y)\s*([^a-zA-Z0-9\s\{\(\[<])(\\?.)*?\s*\1\s*((?!\1).|\\.)*\s*\1[msixpodualgcer]*/,
+		{
+			pattern: /(^|[^-]\b)(?:s|tr|y)\s*([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\2(?:[^\\]|\\[\s\S])*?\2[msixpodualngcer]*/,
+			lookbehind: true
+		},
 	
 		// s a...a...a
-		/\b(?:s|tr|y)\s+([a-zA-Z0-9])(\\?.)*?\s*\1\s*((?!\1).|\\.)*\s*\1[msixpodualgcer]*/,
+		{
+			pattern: /(^|[^-]\b)(?:s|tr|y)\s+([a-zA-Z0-9])(?:[^\\]|\\[\s\S])*?\2(?:[^\\]|\\[\s\S])*?\2[msixpodualngcer]*/,
+			lookbehind: true
+		},
 	
 		// s(...)(...)
-		/\b(?:s|tr|y)\s*\(([^()]|\\.)*\s*\)\s*\(\s*([^()]|\\.)*\s*\)[msixpodualgcer]*/,
+		{
+			pattern: /(^|[^-]\b)(?:s|tr|y)\s*\((?:[^()\\]|\\[\s\S])*\)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngcer]*/,
+			lookbehind: true
+		},
 	
 		// s{...}{...}
-		/\b(?:s|tr|y)\s*\{([^{}]|\\.)*\s*\}\s*\{\s*([^{}]|\\.)*\s*\}[msixpodualgcer]*/,
+		{
+			pattern: /(^|[^-]\b)(?:s|tr|y)\s*\{(?:[^{}\\]|\\[\s\S])*\}\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngcer]*/,
+			lookbehind: true
+		},
 	
 		// s[...][...]
-		/\b(?:s|tr|y)\s*\[([^[\]]|\\.)*\s*\]\s*\[\s*([^[\]]|\\.)*\s*\][msixpodualgcer]*/,
+		{
+			pattern: /(^|[^-]\b)(?:s|tr|y)\s*\[(?:[^[\]\\]|\\[\s\S])*\]\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngcer]*/,
+			lookbehind: true
+		},
 	
 		// s<...><...>
-		/\b(?:s|tr|y)\s*<([^<>]|\\.)*\s*>\s*<\s*([^<>]|\\.)*\s*>[msixpodualgcer]*/,
+		{
+			pattern: /(^|[^-]\b)(?:s|tr|y)\s*<(?:[^<>\\]|\\[\s\S])*>\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngcer]*/,
+			lookbehind: true
+		},
 	
 		// /.../
-		/\/(\[.+?]|\\.|[^\/\r\n])*\/[msixpodualgc]*(?=\s*($|[\r\n,.;})&|\-+*=~<>!?^]|(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b))/
+		// The look-ahead tries to prevent two divisions on
+		// the same line from being highlighted as regex.
+		// This does not support multi-line regex.
+		/\/(?:[^\/\\\r\n]|\\.)*\/[msixpodualngc]*(?=\s*(?:$|[\r\n,.;})&|\-+*~<>!?^]|(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b))/
 	],
 
 	// FIXME Not sure about the handling of ::, ', and #
 	'variable': [
 		// ${^POSTMATCH}
-		/[&*\$@%]\{\^[A-Z]+\}/,
+		/[&*$@%]\{\^[A-Z]+\}/,
 		// $^V
-		/[&*\$@%]\^[A-Z_]/,
+		/[&*$@%]\^[A-Z_]/,
 		// ${...}
-		/[&*\$@%]#?(?=\{)/,
+		/[&*$@%]#?(?=\{)/,
 		// $foo
-		/[&*\$@%]#?((::)*'?(?!\d)[\w$]+)+(::)*/i,
+		/[&*$@%]#?((::)*'?(?!\d)[\w$]+)+(::)*/i,
 		// $1
-		/[&*\$@%]\d+/,
+		/[&*$@%]\d+/,
 		// $_, @_, %!
-		/[\$@%][!"#\$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~]/
+		// The negative lookahead prevents from breaking the %= operator
+		/(?!%=)[$@%][!"#$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~]/
 	],
 	'filehandle': {
 		// <>, <FOO>, _
-		pattern: /<(?!=).*>|\b_\b/,
+		pattern: /<(?![<=])\S*>|\b_\b/,
 		alias: 'symbol'
 	},
 	'vstring': {
@@ -106,7 +134,7 @@ Prism.languages.perl = {
 		}
 	},
 	'keyword': /\b(any|break|continue|default|delete|die|do|else|elsif|eval|for|foreach|given|goto|if|last|local|my|next|our|package|print|redo|require|say|state|sub|switch|undef|unless|until|use|when|while)\b/,
-	'number': /(\n|\b)-?(0x[\dA-Fa-f](_?[\dA-Fa-f])*|0b[01](_?[01])*|(\d(_?\d)*)?\.?\d(_?\d)*([Ee]-?\d+)?)\b/,
-	'operator': /-[rwxoRWXOezsfdlpSbctugkTBMAC]\b|[-+*=~\/|&]{1,2}|<=?|>=?|\.{1,3}|[!?\\^]|\b(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b/,
+	'number': /\b-?(0x[\dA-Fa-f](_?[\dA-Fa-f])*|0b[01](_?[01])*|(\d(_?\d)*)?\.?\d(_?\d)*([Ee][+-]?\d+)?)\b/,
+	'operator': /-[rwxoRWXOezsfdlpSbctugkTBMAC]\b|\+[+=]?|-[-=>]?|\*\*?=?|\/\/?=?|=[=~>]?|~[~=]?|\|\|?=?|&&?=?|<(?:=>?|<=?)?|>>?=?|![~=]?|[%^]=?|\.(?:=|\.\.?)?|[\\?]|\bx(?:=|\b)|\b(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor)\b/,
 	'punctuation': /[{}[\];(),:]/
 };
diff --git a/components/prism-perl.min.js b/components/prism-perl.min.js
index f71a20fa5c..c1e72454cb 100644
--- a/components/prism-perl.min.js
+++ b/components/prism-perl.min.js
@@ -1 +1 @@
-Prism.languages.perl={comment:[{pattern:/((?:^|\n)\s*)=\w+[\s\S]*?=cut.*/,lookbehind:!0},{pattern:/(^|[^\\$])#.*?(\r?\n|$)/,lookbehind:!0}],string:[/\b(?:q|qq|qx|qw)\s*([^a-zA-Z0-9\s\{\(\[<])(\\?.)*?\s*\1/,/\b(?:q|qq|qx|qw)\s+([a-zA-Z0-9])(\\?.)*?\s*\1/,/\b(?:q|qq|qx|qw)\s*\(([^()]|\\.)*\s*\)/,/\b(?:q|qq|qx|qw)\s*\{([^{}]|\\.)*\s*\}/,/\b(?:q|qq|qx|qw)\s*\[([^[\]]|\\.)*\s*\]/,/\b(?:q|qq|qx|qw)\s*<([^<>]|\\.)*\s*>/,/("|'|`)(\\?.)*?\1/],regex:[/\b(?:m|qr)\s*([^a-zA-Z0-9\s\{\(\[<])(\\?.)*?\s*\1[msixpodualgc]*/,/\b(?:m|qr)\s+([a-zA-Z0-9])(\\?.)*?\s*\1[msixpodualgc]*/,/\b(?:m|qr)\s*\(([^()]|\\.)*\s*\)[msixpodualgc]*/,/\b(?:m|qr)\s*\{([^{}]|\\.)*\s*\}[msixpodualgc]*/,/\b(?:m|qr)\s*\[([^[\]]|\\.)*\s*\][msixpodualgc]*/,/\b(?:m|qr)\s*<([^<>]|\\.)*\s*>[msixpodualgc]*/,/\b(?:s|tr|y)\s*([^a-zA-Z0-9\s\{\(\[<])(\\?.)*?\s*\1\s*((?!\1).|\\.)*\s*\1[msixpodualgcer]*/,/\b(?:s|tr|y)\s+([a-zA-Z0-9])(\\?.)*?\s*\1\s*((?!\1).|\\.)*\s*\1[msixpodualgcer]*/,/\b(?:s|tr|y)\s*\(([^()]|\\.)*\s*\)\s*\(\s*([^()]|\\.)*\s*\)[msixpodualgcer]*/,/\b(?:s|tr|y)\s*\{([^{}]|\\.)*\s*\}\s*\{\s*([^{}]|\\.)*\s*\}[msixpodualgcer]*/,/\b(?:s|tr|y)\s*\[([^[\]]|\\.)*\s*\]\s*\[\s*([^[\]]|\\.)*\s*\][msixpodualgcer]*/,/\b(?:s|tr|y)\s*<([^<>]|\\.)*\s*>\s*<\s*([^<>]|\\.)*\s*>[msixpodualgcer]*/,/\/(\[.+?]|\\.|[^\/\r\n])*\/[msixpodualgc]*(?=\s*($|[\r\n,.;})&|\-+*=~<>!?^]|(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b))/],variable:[/[&*\$@%]\{\^[A-Z]+\}/,/[&*\$@%]\^[A-Z_]/,/[&*\$@%]#?(?=\{)/,/[&*\$@%]#?((::)*'?(?!\d)[\w$]+)+(::)*/i,/[&*\$@%]\d+/,/[\$@%][!"#\$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~]/],filehandle:{pattern:/<(?!=).*>|\b_\b/,alias:"symbol"},vstring:{pattern:/v\d+(\.\d+)*|\d+(\.\d+){2,}/,alias:"string"},"function":{pattern:/sub [a-z0-9_]+/i,inside:{keyword:/sub/}},keyword:/\b(any|break|continue|default|delete|die|do|else|elsif|eval|for|foreach|given|goto|if|last|local|my|next|our|package|print|redo|require|say|state|sub|switch|undef|unless|until|use|when|while)\b/,number:/(\n|\b)-?(0x[\dA-Fa-f](_?[\dA-Fa-f])*|0b[01](_?[01])*|(\d(_?\d)*)?\.?\d(_?\d)*([Ee]-?\d+)?)\b/,operator:/-[rwxoRWXOezsfdlpSbctugkTBMAC]\b|[-+*=~\/|&]{1,2}|<=?|>=?|\.{1,3}|[!?\\^]|\b(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b/,punctuation:/[{}[\];(),:]/};
\ No newline at end of file
+Prism.languages.perl={comment:[{pattern:/(^\s*)=\w+[\s\S]*?=cut.*/m,lookbehind:!0},{pattern:/(^|[^\\$])#.*/,lookbehind:!0}],string:[/\b(?:q|qq|qx|qw)\s*([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1/,/\b(?:q|qq|qx|qw)\s+([a-zA-Z0-9])(?:[^\\]|\\[\s\S])*?\1/,/\b(?:q|qq|qx|qw)\s*\((?:[^()\\]|\\[\s\S])*\)/,/\b(?:q|qq|qx|qw)\s*\{(?:[^{}\\]|\\[\s\S])*\}/,/\b(?:q|qq|qx|qw)\s*\[(?:[^[\]\\]|\\[\s\S])*\]/,/\b(?:q|qq|qx|qw)\s*<(?:[^<>\\]|\\[\s\S])*>/,/("|`)(?:[^\\]|\\[\s\S])*?\1/,/'(?:[^'\\\r\n]|\\.)*'/],regex:[/\b(?:m|qr)\s*([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1[msixpodualngc]*/,/\b(?:m|qr)\s+([a-zA-Z0-9])(?:[^\\]|\\.)*?\1[msixpodualngc]*/,/\b(?:m|qr)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngc]*/,/\b(?:m|qr)\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngc]*/,/\b(?:m|qr)\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngc]*/,/\b(?:m|qr)\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngc]*/,{pattern:/(^|[^-]\b)(?:s|tr|y)\s*([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\2(?:[^\\]|\\[\s\S])*?\2[msixpodualngcer]*/,lookbehind:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s+([a-zA-Z0-9])(?:[^\\]|\\[\s\S])*?\2(?:[^\\]|\\[\s\S])*?\2[msixpodualngcer]*/,lookbehind:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*\((?:[^()\\]|\\[\s\S])*\)\s*\((?:[^()\\]|\\[\s\S])*\)[msixpodualngcer]*/,lookbehind:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*\{(?:[^{}\\]|\\[\s\S])*\}\s*\{(?:[^{}\\]|\\[\s\S])*\}[msixpodualngcer]*/,lookbehind:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*\[(?:[^[\]\\]|\\[\s\S])*\]\s*\[(?:[^[\]\\]|\\[\s\S])*\][msixpodualngcer]*/,lookbehind:!0},{pattern:/(^|[^-]\b)(?:s|tr|y)\s*<(?:[^<>\\]|\\[\s\S])*>\s*<(?:[^<>\\]|\\[\s\S])*>[msixpodualngcer]*/,lookbehind:!0},/\/(?:[^\/\\\r\n]|\\.)*\/[msixpodualngc]*(?=\s*(?:$|[\r\n,.;})&|\-+*~<>!?^]|(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor|x)\b))/],variable:[/[&*$@%]\{\^[A-Z]+\}/,/[&*$@%]\^[A-Z_]/,/[&*$@%]#?(?=\{)/,/[&*$@%]#?((::)*'?(?!\d)[\w$]+)+(::)*/i,/[&*$@%]\d+/,/(?!%=)[$@%][!"#$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~]/],filehandle:{pattern:/<(?![<=])\S*>|\b_\b/,alias:"symbol"},vstring:{pattern:/v\d+(\.\d+)*|\d+(\.\d+){2,}/,alias:"string"},"function":{pattern:/sub [a-z0-9_]+/i,inside:{keyword:/sub/}},keyword:/\b(any|break|continue|default|delete|die|do|else|elsif|eval|for|foreach|given|goto|if|last|local|my|next|our|package|print|redo|require|say|state|sub|switch|undef|unless|until|use|when|while)\b/,number:/\b-?(0x[\dA-Fa-f](_?[\dA-Fa-f])*|0b[01](_?[01])*|(\d(_?\d)*)?\.?\d(_?\d)*([Ee][+-]?\d+)?)\b/,operator:/-[rwxoRWXOezsfdlpSbctugkTBMAC]\b|\+[+=]?|-[-=>]?|\*\*?=?|\/\/?=?|=[=~>]?|~[~=]?|\|\|?=?|&&?=?|<(?:=>?|<=?)?|>>?=?|![~=]?|[%^]=?|\.(?:=|\.\.?)?|[\\?]|\bx(?:=|\b)|\b(lt|gt|le|ge|eq|ne|cmp|not|and|or|xor)\b/,punctuation:/[{}[\];(),:]/};
\ No newline at end of file

From eb6fe7d96dfe41d8124a0a9ab5be9a352b31f847 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 29 Aug 2015 12:46:21 +0200
Subject: [PATCH 263/310] Add tests for Perl

---
 tests/languages/perl/comment_feature.test    |  17 +++
 tests/languages/perl/filehandle_feature.test |  17 +++
 tests/languages/perl/function_feature.test   |  13 ++
 tests/languages/perl/keyword_feature.test    |  29 +++++
 tests/languages/perl/number_feature.test     |  33 +++++
 tests/languages/perl/operator_feature.test   |  71 ++++++++++
 tests/languages/perl/regex_feature.test      | 129 ++++++++++++++++++
 tests/languages/perl/string_feature.test     | 130 +++++++++++++++++++
 tests/languages/perl/variable_feature.test   |  47 +++++++
 tests/languages/perl/vstring_feature.test    |  13 ++
 10 files changed, 499 insertions(+)
 create mode 100644 tests/languages/perl/comment_feature.test
 create mode 100644 tests/languages/perl/filehandle_feature.test
 create mode 100644 tests/languages/perl/function_feature.test
 create mode 100644 tests/languages/perl/keyword_feature.test
 create mode 100644 tests/languages/perl/number_feature.test
 create mode 100644 tests/languages/perl/operator_feature.test
 create mode 100644 tests/languages/perl/regex_feature.test
 create mode 100644 tests/languages/perl/string_feature.test
 create mode 100644 tests/languages/perl/variable_feature.test
 create mode 100644 tests/languages/perl/vstring_feature.test

diff --git a/tests/languages/perl/comment_feature.test b/tests/languages/perl/comment_feature.test
new file mode 100644
index 0000000000..503d161564
--- /dev/null
+++ b/tests/languages/perl/comment_feature.test
@@ -0,0 +1,17 @@
+=label foo
+bar
+=cut
+#
+# foobar
+
+----------------------------------------------------
+
+[
+	["comment", "=label foo\r\nbar\r\n=cut"],
+	["comment", "#"],
+	["comment", "# foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/perl/filehandle_feature.test b/tests/languages/perl/filehandle_feature.test
new file mode 100644
index 0000000000..d244e66833
--- /dev/null
+++ b/tests/languages/perl/filehandle_feature.test
@@ -0,0 +1,17 @@
+_
+<>
+<STDIN>
+<FOOBAR>
+
+----------------------------------------------------
+
+[
+	["filehandle", "_"],
+	["filehandle", "<>"],
+	["filehandle", "<STDIN>"],
+	["filehandle", "<FOOBAR>"]
+]
+
+----------------------------------------------------
+
+Checks for file handles.
\ No newline at end of file
diff --git a/tests/languages/perl/function_feature.test b/tests/languages/perl/function_feature.test
new file mode 100644
index 0000000000..552d2f3309
--- /dev/null
+++ b/tests/languages/perl/function_feature.test
@@ -0,0 +1,13 @@
+sub foo
+sub Foo_Bar42
+
+----------------------------------------------------
+
+[
+	["function", [["keyword", "sub"], " foo"]],
+	["function", [["keyword", "sub"], " Foo_Bar42"]]
+]
+
+----------------------------------------------------
+
+Checks for functions.
\ No newline at end of file
diff --git a/tests/languages/perl/keyword_feature.test b/tests/languages/perl/keyword_feature.test
new file mode 100644
index 0000000000..82bab2bc15
--- /dev/null
+++ b/tests/languages/perl/keyword_feature.test
@@ -0,0 +1,29 @@
+any break continue
+default delete die
+do else elsif eval
+for foreach given
+goto if last local
+my next our package
+print redo require
+say state sub
+switch undef unless
+until use when while
+
+----------------------------------------------------
+
+[
+	["keyword", "any"], ["keyword", "break"], ["keyword", "continue"],
+	["keyword", "default"], ["keyword", "delete"], ["keyword", "die"],
+	["keyword", "do"], ["keyword", "else"], ["keyword", "elsif"], ["keyword", "eval"],
+	["keyword", "for"], ["keyword", "foreach"], ["keyword", "given"],
+	["keyword", "goto"], ["keyword", "if"], ["keyword", "last"], ["keyword", "local"],
+	["keyword", "my"], ["keyword", "next"], ["keyword", "our"], ["keyword", "package"],
+	["keyword", "print"], ["keyword", "redo"], ["keyword", "require"],
+	["keyword", "say"], ["keyword", "state"], ["keyword", "sub"],
+	["keyword", "switch"], ["keyword", "undef"], ["keyword", "unless"],
+	["keyword", "until"], ["keyword", "use"], ["keyword", "when"], ["keyword", "while"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/perl/number_feature.test b/tests/languages/perl/number_feature.test
new file mode 100644
index 0000000000..ca0f03db73
--- /dev/null
+++ b/tests/languages/perl/number_feature.test
@@ -0,0 +1,33 @@
+0xFF
+0xBad_Face
+
+0b1100
+0b1111_0000
+
+42
+42_000
+3.14_15_9
+1.2e4
+1_423.6E-2
+0.8E+12
+
+----------------------------------------------------
+
+[
+	["number", "0xFF"],
+	["number", "0xBad_Face"],
+
+	["number", "0b1100"],
+	["number", "0b1111_0000"],
+
+	["number", "42"],
+	["number", "42_000"],
+	["number", "3.14_15_9"],
+	["number", "1.2e4"],
+	["number", "1_423.6E-2"],
+	["number", "0.8E+12"]
+]
+
+----------------------------------------------------
+
+Checks for hexadecimal, binary and decimal numbers.
\ No newline at end of file
diff --git a/tests/languages/perl/operator_feature.test b/tests/languages/perl/operator_feature.test
new file mode 100644
index 0000000000..d9b02044f4
--- /dev/null
+++ b/tests/languages/perl/operator_feature.test
@@ -0,0 +1,71 @@
+-r -w -x -o -R
+-W -X -O -e -z
+-s -f -d -l -p
+-S -b -c -t -u
+-g -k -T -B -M
+-A -C
+
++ ++ +=
+- -- -= ->
+* ** *= **=
+1 / 2
+1 // 2
+$a /= 2
+$a //= 2
+= == =~ =>
+~ ~~ ~=
+| || |= ||=
+& && &= &&=
+< <= << <<= <=>
+> >= >> >>=
+! !~ !=
+% %=
+^ ^=
+. .= .. ...
+\ ?
+
+lt gt le ge
+eq ne cmp not
+and or xor
+x x=
+
+----------------------------------------------------
+
+[
+
+	["operator", "-r"], ["operator", "-w"], ["operator", "-x"], ["operator", "-o"], ["operator", "-R"],
+	["operator", "-W"], ["operator", "-X"], ["operator", "-O"], ["operator", "-e"], ["operator", "-z"],
+	["operator", "-s"], ["operator", "-f"], ["operator", "-d"], ["operator", "-l"], ["operator", "-p"],
+	["operator", "-S"], ["operator", "-b"], ["operator", "-c"], ["operator", "-t"], ["operator", "-u"],
+	["operator", "-g"], ["operator", "-k"], ["operator", "-T"], ["operator", "-B"], ["operator", "-M"],
+	["operator", "-A"], ["operator", "-C"],
+
+	["operator", "+"], ["operator", "++"], ["operator", "+="],
+	["operator", "-"], ["operator", "--"], ["operator", "-="], ["operator", "->"],
+	["operator", "*"], ["operator", "**"], ["operator", "*="], ["operator", "**="],
+	["number", "1"], ["operator", "/"], ["number", "2"],
+	["number", "1"], ["operator", "//"], ["number", "2"],
+	["variable", "$a"], ["operator", "/="], ["number", "2"],
+	["variable", "$a"], ["operator", "//="], ["number", "2"],
+	["operator", "="], ["operator", "=="], ["operator", "=~"], ["operator", "=>"],
+	["operator", "~"], ["operator", "~~"], ["operator", "~="],
+	["operator", "|"], ["operator", "||"], ["operator", "|="], ["operator", "||="],
+	["operator", "&"], ["operator", "&&"], ["operator", "&="], ["operator", "&&="],
+	["operator", "<"], ["operator", "<="], ["operator", "<<"], ["operator", "<<="], ["operator", "<=>"],
+	["operator", ">"], ["operator", ">="], ["operator", ">>"], ["operator", ">>="],
+	["operator", "!"], ["operator", "!~"], ["operator", "!="],
+	["operator", "%"], ["operator", "%="],
+	["operator", "^"], ["operator", "^="],
+	["operator", "."], ["operator", ".="], ["operator", ".."], ["operator", "..."],
+	["operator", "\\"], ["operator", "?"],
+
+	["operator", "lt"], ["operator", "gt"], ["operator", "le"], ["operator", "ge"],
+	["operator", "eq"], ["operator", "ne"], ["operator", "cmp"], ["operator", "not"],
+	["operator", "and"], ["operator", "or"], ["operator", "xor"],
+	["operator", "x"], ["operator", "x="]
+
+]
+
+----------------------------------------------------
+
+Checks for operators.
\ No newline at end of file
diff --git a/tests/languages/perl/regex_feature.test b/tests/languages/perl/regex_feature.test
new file mode 100644
index 0000000000..2fb50e4917
--- /dev/null
+++ b/tests/languages/perl/regex_feature.test
@@ -0,0 +1,129 @@
+m//
+qr!foo\!bar!msix
+m,foo
+bar,aa
+
+qr aa
+m afoob\araaa
+qr pfoo
+barpxpn
+
+m()c
+qr(foo\(\)bar)u
+m(foo
+bar)l
+
+qr{}d
+m{foo\{\}bar}
+qr{foo
+bar}
+
+m[]
+qr[foo\[\]bar]
+m[foo
+bar]
+
+qr<>s
+m<foo\<\>bar>i
+qr<foo
+bar>x
+
+s///
+tr%foo\%bar%baz%c
+y!foo
+bar!foo
+baz!d
+
+s kkkmsix
+tr afoob\arab\azas
+y pfoo
+barpfoo
+bazpr
+
+s()()
+tr(foo\(bar)(ba\)z)
+y(foo
+bar)(foo
+baz)csr
+
+s{}{}
+tr{foo\{bar}{ba\}z}
+y{foo
+bar}{foo
+baz}
+
+y[][]
+s[foo\[bar][ba\]z]u
+y[foo
+bar][foo
+baz]
+
+tr<><>c
+y<foo\<bar><ba\>a>
+s<foo
+bar><foo
+baz>
+
+//
+/foo/gsx
+/foo\/bar/n
+
+----------------------------------------------------
+
+[
+	["regex", "m//"],
+	["regex", "qr!foo\\!bar!msix"],
+	["regex", "m,foo\r\nbar,aa"],
+
+	["regex", "qr aa"],
+	["regex", "m afoob\\araaa"],
+	["regex", "qr pfoo\r\nbarpxpn"],
+
+	["regex", "m()c"],
+	["regex", "qr(foo\\(\\)bar)u"],
+	["regex", "m(foo\r\nbar)l"],
+
+	["regex", "qr{}d"],
+	["regex", "m{foo\\{\\}bar}"],
+	["regex", "qr{foo\r\nbar}"],
+
+	["regex", "m[]"],
+	["regex", "qr[foo\\[\\]bar]"],
+	["regex", "m[foo\r\nbar]"],
+
+	["regex", "qr<>s"],
+	["regex", "m<foo\\<\\>bar>i"],
+	["regex", "qr<foo\r\nbar>x"],
+
+	["regex", "s///"],
+	["regex", "tr%foo\\%bar%baz%c"],
+	["regex", "y!foo\r\nbar!foo\r\nbaz!d"],
+
+	["regex", "s kkkmsix"],
+	["regex", "tr afoob\\arab\\azas"],
+	["regex", "y pfoo\r\nbarpfoo\r\nbazpr"],
+
+	["regex", "s()()"],
+	["regex", "tr(foo\\(bar)(ba\\)z)"],
+	["regex", "y(foo\r\nbar)(foo\r\nbaz)csr"],
+
+	["regex", "s{}{}"],
+	["regex", "tr{foo\\{bar}{ba\\}z}"],
+	["regex", "y{foo\r\nbar}{foo\r\nbaz}"],
+
+	["regex", "y[][]"],
+	["regex", "s[foo\\[bar][ba\\]z]u"],
+	["regex", "y[foo\r\nbar][foo\r\nbaz]"],
+
+	["regex", "tr<><>c"],
+	["regex", "y<foo\\<bar><ba\\>a>"],
+	["regex", "s<foo\r\nbar><foo\r\nbaz>"],
+
+	["regex", "//"],
+	["regex", "/foo/gsx"],
+	["regex", "/foo\\/bar/n"]
+]
+
+----------------------------------------------------
+
+Checks for regex and regex quote-like operators.
\ No newline at end of file
diff --git a/tests/languages/perl/string_feature.test b/tests/languages/perl/string_feature.test
new file mode 100644
index 0000000000..fbad18eb4e
--- /dev/null
+++ b/tests/languages/perl/string_feature.test
@@ -0,0 +1,130 @@
+q//
+q/foobar/
+q/foo\/bar/
+q/foo
+bar/
+
+qq!!
+qq!foobar!
+qq!foo\!bar!
+qq!foo
+bar!
+
+qw__
+qx_foobar_
+qx_foo\_bar_
+qw_foo
+bar_
+
+qw??
+qw?foobar?
+qw?foo\?bar?
+qw?foo
+bar?
+
+q aa
+q afoob\ara
+q 4foobar4
+q pfoo
+barp
+
+qq()
+qq(foobar)
+qq(foo\(\)bar)
+qq(foo
+bar)
+
+qx{}
+qx{foobar}
+qx{foo\{\}bar}
+qx{foo
+bar}
+
+qw[]
+qw[foobar]
+qw[foo\[\]bar]
+qw[foo
+bar]
+
+q<>
+q<foobar>
+q<foo\<\>bar>
+q<foo
+bar>
+
+""
+"foo\"bar"
+"foo
+bar"
+
+''
+'foo\'bar'
+
+``
+`foo\`bar`
+`foo
+bar`
+
+----------------------------------------------------
+
+[
+	["string", "q//"],
+	["string", "q/foobar/"],
+	["string", "q/foo\\/bar/"],
+	["string", "q/foo\r\nbar/"],
+
+	["string", "qq!!"],
+	["string", "qq!foobar!"],
+	["string", "qq!foo\\!bar!"],
+	["string", "qq!foo\r\nbar!"],
+
+	["string", "qw__"],
+	["string", "qx_foobar_"],
+	["string", "qx_foo\\_bar_"],
+	["string", "qw_foo\r\nbar_"],
+
+	["string", "qw??"],
+	["string", "qw?foobar?"],
+	["string", "qw?foo\\?bar?"],
+	["string", "qw?foo\r\nbar?"],
+
+	["string", "q aa"],
+	["string", "q afoob\\ara"],
+	["string", "q 4foobar4"],
+	["string", "q pfoo\r\nbarp"],
+
+	["string", "qq()"],
+	["string", "qq(foobar)"],
+	["string", "qq(foo\\(\\)bar)"],
+	["string", "qq(foo\r\nbar)"],
+
+	["string", "qx{}"],
+	["string", "qx{foobar}"],
+	["string", "qx{foo\\{\\}bar}"],
+	["string", "qx{foo\r\nbar}"],
+
+	["string", "qw[]"],
+	["string", "qw[foobar]"],
+	["string", "qw[foo\\[\\]bar]"],
+	["string", "qw[foo\r\nbar]"],
+
+	["string", "q<>"],
+	["string", "q<foobar>"],
+	["string", "q<foo\\<\\>bar>"],
+	["string", "q<foo\r\nbar>"],
+
+	["string", "\"\""],
+	["string", "\"foo\\\"bar\""],
+	["string", "\"foo\r\nbar\""],
+
+	["string", "''"],
+	["string", "'foo\\'bar'"],
+
+	["string", "``"],
+	["string", "`foo\\`bar`"],
+	["string", "`foo\r\nbar`"]
+]
+
+----------------------------------------------------
+
+Checks for strings and quote operators.
\ No newline at end of file
diff --git a/tests/languages/perl/variable_feature.test b/tests/languages/perl/variable_feature.test
new file mode 100644
index 0000000000..aad023c485
--- /dev/null
+++ b/tests/languages/perl/variable_feature.test
@@ -0,0 +1,47 @@
+$foo
+$#foo
+
+${^POSTMATCH}
+
+$^V
+
+@1
+$42
+
+$$
+$_
+%!
+
+%'foo
+$foo'bar
+
+$::::'foo
+$foo::'bar
+
+----------------------------------------------------
+
+[
+	["variable", "$foo"],
+	["variable", "$#foo"],
+
+	["variable", "${^POSTMATCH}"],
+
+	["variable", "$^V"],
+
+	["variable", "@1"],
+	["variable", "$42"],
+
+	["variable", "$$"],
+	["variable", "$_"],
+	["variable", "%!"],
+
+	["variable", "%'foo"],
+	["variable", "$foo'bar"],
+
+	["variable", "$::::'foo"],
+	["variable", "$foo::'bar"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file
diff --git a/tests/languages/perl/vstring_feature.test b/tests/languages/perl/vstring_feature.test
new file mode 100644
index 0000000000..0af7c1ced9
--- /dev/null
+++ b/tests/languages/perl/vstring_feature.test
@@ -0,0 +1,13 @@
+v1.2
+1.2.3
+
+----------------------------------------------------
+
+[
+	["vstring", "v1.2"],
+	["vstring", "1.2.3"]
+]
+
+----------------------------------------------------
+
+Checks for vstrings.
\ No newline at end of file

From f9d94520e24f4c891862bfc9a1938f312972c843 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 29 Aug 2015 23:16:25 +0200
Subject: [PATCH 264/310] PHP: Simplified patterns

---
 components/prism-php.js     | 8 ++++----
 components/prism-php.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-php.js b/components/prism-php.js
index 825729f96f..846fa00741 100644
--- a/components/prism-php.js
+++ b/components/prism-php.js
@@ -15,7 +15,7 @@ Prism.languages.php = Prism.languages.extend('clike', {
 	'keyword': /\b(and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|private|protected|parent|throw|null|echo|print|trait|namespace|final|yield|goto|instanceof|finally|try|catch)\b/i,
 	'constant': /\b[A-Z0-9_]{2,}\b/,
 	'comment': {
-		pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])(\/\/).*?(\r?\n|$))/,
+		pattern: /(^|[^\\])(?:\/\*[\w\W]*?\*\/|\/\/.*)/,
 		lookbehind: true
 	}
 });
@@ -24,15 +24,15 @@ Prism.languages.php = Prism.languages.extend('clike', {
 // common than strings containing hashes...
 Prism.languages.insertBefore('php', 'class-name', {
 	'shell-comment': {
-		pattern: /(^|[^\\])#.*?(\r?\n|$)/,
+		pattern: /(^|[^\\])#.*/,
 		lookbehind: true,
 		alias: 'comment'
 	}
 });
 
 Prism.languages.insertBefore('php', 'keyword', {
-	'delimiter': /(\?>|<\?php|<\?)/i,
-	'variable': /(\$\w+)\b/i,
+	'delimiter': /\?>|<\?(?:php)?/i,
+	'variable': /\$\w+\b/i,
 	'package': {
 		pattern: /(\\|namespace\s+|use\s+)[\w\\]+/,
 		lookbehind: true,
diff --git a/components/prism-php.min.js b/components/prism-php.min.js
index 0ac8a2a788..e592fe22df 100644
--- a/components/prism-php.min.js
+++ b/components/prism-php.min.js
@@ -1 +1 @@
-Prism.languages.php=Prism.languages.extend("clike",{keyword:/\b(and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|private|protected|parent|throw|null|echo|print|trait|namespace|final|yield|goto|instanceof|finally|try|catch)\b/i,constant:/\b[A-Z0-9_]{2,}\b/,comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])(\/\/).*?(\r?\n|$))/,lookbehind:!0}}),Prism.languages.insertBefore("php","class-name",{"shell-comment":{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0,alias:"comment"}}),Prism.languages.insertBefore("php","keyword",{delimiter:/(\?>|<\?php|<\?)/i,variable:/(\$\w+)\b/i,"package":{pattern:/(\\|namespace\s+|use\s+)[\w\\]+/,lookbehind:!0,inside:{punctuation:/\\/}}}),Prism.languages.insertBefore("php","operator",{property:{pattern:/(->)[\w]+/,lookbehind:!0}}),Prism.languages.markup&&(Prism.hooks.add("before-highlight",function(e){"php"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(/(?:<\?php|<\?)[\w\W]*?(?:\?>)/gi,function(n){return e.tokenStack.push(n),"{{{PHP"+e.tokenStack.length+"}}}"}))}),Prism.hooks.add("before-insert",function(e){"php"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),Prism.hooks.add("after-highlight",function(e){if("php"===e.language){for(var n,a=0;n=e.tokenStack[a];a++)e.highlightedCode=e.highlightedCode.replace("{{{PHP"+(a+1)+"}}}",Prism.highlight(n,e.grammar,"php"));e.element.innerHTML=e.highlightedCode}}),Prism.hooks.add("wrap",function(e){"php"===e.language&&"markup"===e.type&&(e.content=e.content.replace(/(\{\{\{PHP[0-9]+\}\}\})/g,'<span class="token php">$1</span>'))}),Prism.languages.insertBefore("php","comment",{markup:{pattern:/<[^?]\/?(.*?)>/,inside:Prism.languages.markup},php:/\{\{\{PHP[0-9]+\}\}\}/}));
\ No newline at end of file
+Prism.languages.php=Prism.languages.extend("clike",{keyword:/\b(and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|private|protected|parent|throw|null|echo|print|trait|namespace|final|yield|goto|instanceof|finally|try|catch)\b/i,constant:/\b[A-Z0-9_]{2,}\b/,comment:{pattern:/(^|[^\\])(?:\/\*[\w\W]*?\*\/|\/\/.*)/,lookbehind:!0}}),Prism.languages.insertBefore("php","class-name",{"shell-comment":{pattern:/(^|[^\\])#.*/,lookbehind:!0,alias:"comment"}}),Prism.languages.insertBefore("php","keyword",{delimiter:/\?>|<\?(?:php)?/i,variable:/\$\w+\b/i,"package":{pattern:/(\\|namespace\s+|use\s+)[\w\\]+/,lookbehind:!0,inside:{punctuation:/\\/}}}),Prism.languages.insertBefore("php","operator",{property:{pattern:/(->)[\w]+/,lookbehind:!0}}),Prism.languages.markup&&(Prism.hooks.add("before-highlight",function(e){"php"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(/(?:<\?php|<\?)[\w\W]*?(?:\?>)/gi,function(n){return e.tokenStack.push(n),"{{{PHP"+e.tokenStack.length+"}}}"}))}),Prism.hooks.add("before-insert",function(e){"php"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),Prism.hooks.add("after-highlight",function(e){if("php"===e.language){for(var n,a=0;n=e.tokenStack[a];a++)e.highlightedCode=e.highlightedCode.replace("{{{PHP"+(a+1)+"}}}",Prism.highlight(n,e.grammar,"php"));e.element.innerHTML=e.highlightedCode}}),Prism.hooks.add("wrap",function(e){"php"===e.language&&"markup"===e.type&&(e.content=e.content.replace(/(\{\{\{PHP[0-9]+\}\}\})/g,'<span class="token php">$1</span>'))}),Prism.languages.insertBefore("php","comment",{markup:{pattern:/<[^?]\/?(.*?)>/,inside:Prism.languages.markup},php:/\{\{\{PHP[0-9]+\}\}\}/}));
\ No newline at end of file

From afe78bd992acc6cfe7441ea4157fecb9d77bb230 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 29 Aug 2015 23:17:12 +0200
Subject: [PATCH 265/310] Add tests for PHP

---
 .../languages/markup+php/markup_feature.test  | 37 +++++++++
 tests/languages/php/comment_feature.test      | 18 +++++
 tests/languages/php/constant_feature.test     | 15 ++++
 tests/languages/php/delimiter_feature.test    | 15 ++++
 tests/languages/php/keyword_feature.test      | 76 +++++++++++++++++++
 tests/languages/php/package_feature.test      | 29 +++++++
 tests/languages/php/property_feature.test     | 19 +++++
 .../languages/php/shell-comment_feature.test  | 13 ++++
 tests/languages/php/variable_feature.test     | 15 ++++
 9 files changed, 237 insertions(+)
 create mode 100644 tests/languages/markup+php/markup_feature.test
 create mode 100644 tests/languages/php/comment_feature.test
 create mode 100644 tests/languages/php/constant_feature.test
 create mode 100644 tests/languages/php/delimiter_feature.test
 create mode 100644 tests/languages/php/keyword_feature.test
 create mode 100644 tests/languages/php/package_feature.test
 create mode 100644 tests/languages/php/property_feature.test
 create mode 100644 tests/languages/php/shell-comment_feature.test
 create mode 100644 tests/languages/php/variable_feature.test

diff --git a/tests/languages/markup+php/markup_feature.test b/tests/languages/markup+php/markup_feature.test
new file mode 100644
index 0000000000..b771f46769
--- /dev/null
+++ b/tests/languages/markup+php/markup_feature.test
@@ -0,0 +1,37 @@
+<div class="foo"></div>
+
+----------------------------------------------------
+
+[
+	["markup", [
+		["tag", [
+			["tag", [
+				["punctuation", "<"],
+				"div"
+			]],
+			["attr-name", [
+				"class"
+			]],
+			["attr-value", [
+				["punctuation", "="],
+				["punctuation", "\""],
+				"foo",
+				["punctuation", "\""]
+			]],
+			["punctuation", ">"]
+		]]
+	]],
+	["markup", [
+		["tag", [
+			["tag", [
+				["punctuation", "</"],
+				"div"
+			]],
+			["punctuation", ">"]
+		]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for markup in PHP.
\ No newline at end of file
diff --git a/tests/languages/php/comment_feature.test b/tests/languages/php/comment_feature.test
new file mode 100644
index 0000000000..c728423922
--- /dev/null
+++ b/tests/languages/php/comment_feature.test
@@ -0,0 +1,18 @@
+//
+// foobar
+/**/
+/* foo
+bar */
+
+----------------------------------------------------
+
+[
+	["comment", "//"],
+	["comment", "// foobar"],
+	["comment", "/**/"],
+	["comment", "/* foo\r\nbar */"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.
\ No newline at end of file
diff --git a/tests/languages/php/constant_feature.test b/tests/languages/php/constant_feature.test
new file mode 100644
index 0000000000..c1c533064a
--- /dev/null
+++ b/tests/languages/php/constant_feature.test
@@ -0,0 +1,15 @@
+AZ
+PRISM
+FOOBAR_42
+
+----------------------------------------------------
+
+[
+	["constant", "AZ"],
+	["constant", "PRISM"],
+	["constant", "FOOBAR_42"]
+]
+
+----------------------------------------------------
+
+Checks for constants.
\ No newline at end of file
diff --git a/tests/languages/php/delimiter_feature.test b/tests/languages/php/delimiter_feature.test
new file mode 100644
index 0000000000..697319f26c
--- /dev/null
+++ b/tests/languages/php/delimiter_feature.test
@@ -0,0 +1,15 @@
+<? ?>
+<?php ?>
+
+----------------------------------------------------
+
+[
+	["delimiter", "<?"],
+	["delimiter", "?>"],
+	["delimiter", "<?php"],
+	["delimiter", "?>"]
+]
+
+----------------------------------------------------
+
+Checks for delimiters.
\ No newline at end of file
diff --git a/tests/languages/php/keyword_feature.test b/tests/languages/php/keyword_feature.test
new file mode 100644
index 0000000000..9505114c77
--- /dev/null
+++ b/tests/languages/php/keyword_feature.test
@@ -0,0 +1,76 @@
+and or xor array
+as break case
+cfunction
+class;
+const continue
+declare default
+die do else
+elseif enddeclare
+endfor endforeach
+endif endswitch
+endwhile
+extends;
+for foreach function
+include include_once
+global if
+new;
+return
+static switch
+use;
+require require_once
+var while abstract
+interface;
+public
+implements;
+private
+protected parent
+throw null echo
+print trait;
+namespace;
+final yield goto
+instanceof;
+finally
+try catch
+
+----------------------------------------------------
+
+[
+	["keyword", "and"], ["keyword", "or"], ["keyword", "xor"], ["keyword", "array"],
+	["keyword", "as"], ["keyword", "break"], ["keyword", "case"],
+	["keyword", "cfunction"],
+	["keyword", "class"], ["punctuation", ";"],
+	["keyword", "const"], ["keyword", "continue"],
+	["keyword", "declare"], ["keyword", "default"],
+	["keyword", "die"], ["keyword", "do"], ["keyword", "else"],
+	["keyword", "elseif"], ["keyword", "enddeclare"],
+	["keyword", "endfor"], ["keyword", "endforeach"],
+	["keyword", "endif"], ["keyword", "endswitch"],
+	["keyword", "endwhile"],
+	["keyword", "extends"], ["punctuation", ";"],
+	["keyword", "for"], ["keyword", "foreach"], ["keyword", "function"],
+	["keyword", "include"], ["keyword", "include_once"],
+	["keyword", "global"], ["keyword", "if"],
+	["keyword", "new"], ["punctuation", ";"],
+	["keyword", "return"],
+	["keyword", "static"], ["keyword", "switch"],
+	["keyword", "use"], ["punctuation", ";"],
+	["keyword", "require"], ["keyword", "require_once"],
+	["keyword", "var"], ["keyword", "while"], ["keyword", "abstract"],
+	["keyword", "interface"], ["punctuation", ";"],
+	["keyword", "public"],
+	["keyword", "implements"], ["punctuation", ";"],
+	["keyword", "private"],
+	["keyword", "protected"], ["keyword", "parent"],
+	["keyword", "throw"], ["keyword", "null"], ["keyword", "echo"],
+	["keyword", "print"],
+	["keyword", "trait"], ["punctuation", ";"],
+	["keyword", "namespace"], ["punctuation", ";"],
+	["keyword", "final"], ["keyword", "yield"], ["keyword", "goto"],
+	["keyword", "instanceof"], ["punctuation", ";"],
+	["keyword", "finally"],
+	["keyword", "try"], ["keyword", "catch"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/php/package_feature.test b/tests/languages/php/package_feature.test
new file mode 100644
index 0000000000..e1d3e5f25c
--- /dev/null
+++ b/tests/languages/php/package_feature.test
@@ -0,0 +1,29 @@
+namespace \foo
+namespace \foo\bar\baz
+use \foo
+use \foo\bar\baz
+
+----------------------------------------------------
+
+[
+	["keyword", "namespace"],
+	["package", [["punctuation", "\\"], "foo"]],
+	["keyword", "namespace"],
+	["package", [
+		["punctuation", "\\"], "foo",
+		["punctuation", "\\"], "bar",
+		["punctuation", "\\"], "baz"
+	]],
+	["keyword", "use"],
+	["package", [["punctuation", "\\"], "foo"]],
+	["keyword", "use"],
+	["package", [
+		["punctuation", "\\"], "foo",
+		["punctuation", "\\"], "bar",
+		["punctuation", "\\"], "baz"
+	]]
+]
+
+----------------------------------------------------
+
+Checks for packages.
\ No newline at end of file
diff --git a/tests/languages/php/property_feature.test b/tests/languages/php/property_feature.test
new file mode 100644
index 0000000000..f7790197a5
--- /dev/null
+++ b/tests/languages/php/property_feature.test
@@ -0,0 +1,19 @@
+$variable->property
+$foo->bar->baz
+
+----------------------------------------------------
+
+[
+	["variable", "$variable"],
+	["operator", "-"], ["operator", ">"],
+	["property", "property"],
+	["variable", "$foo"],
+	["operator", "-"], ["operator", ">"],
+	["property", "bar"],
+	["operator", "-"], ["operator", ">"],
+	["property", "baz"]
+]
+
+----------------------------------------------------
+
+Checks for properties.
\ No newline at end of file
diff --git a/tests/languages/php/shell-comment_feature.test b/tests/languages/php/shell-comment_feature.test
new file mode 100644
index 0000000000..a1f077c8c7
--- /dev/null
+++ b/tests/languages/php/shell-comment_feature.test
@@ -0,0 +1,13 @@
+#
+# foobar
+
+----------------------------------------------------
+
+[
+	["shell-comment", "#"],
+	["shell-comment", "# foobar"]
+]
+
+----------------------------------------------------
+
+Checks for shell-like comments.
\ No newline at end of file
diff --git a/tests/languages/php/variable_feature.test b/tests/languages/php/variable_feature.test
new file mode 100644
index 0000000000..a59e67a0a8
--- /dev/null
+++ b/tests/languages/php/variable_feature.test
@@ -0,0 +1,15 @@
+$f
+$foo
+$foobar_42
+
+----------------------------------------------------
+
+[
+	["variable", "$f"],
+	["variable", "$foo"],
+	["variable", "$foobar_42"]
+]
+
+----------------------------------------------------
+
+Checks for variables.
\ No newline at end of file

From 8e5eabf1c6ded63d8c716b491f5ab020241dd973 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 12:42:51 +0200
Subject: [PATCH 266/310] PHP-extras: Fix $this regexp + improve global regexp

---
 components/prism-php-extras.js     | 4 ++--
 components/prism-php-extras.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-php-extras.js b/components/prism-php-extras.js
index 914172ea41..d40161b0d8 100644
--- a/components/prism-php-extras.js
+++ b/components/prism-php-extras.js
@@ -1,6 +1,6 @@
 Prism.languages.insertBefore('php', 'variable', {
-	'this': /\$this/,
-	'global': /\$_?(GLOBALS|SERVER|GET|POST|FILES|REQUEST|SESSION|ENV|COOKIE|HTTP_RAW_POST_DATA|argc|argv|php_errormsg|http_response_header)/,
+	'this': /\$this\b/,
+	'global': /\$(?:_(?:SERVER|GET|POST|FILES|REQUEST|SESSION|ENV|COOKIE)|GLOBALS|HTTP_RAW_POST_DATA|argc|argv|php_errormsg|http_response_header)/,
 	'scope': {
 		pattern: /\b[\w\\]+::/,
 		inside: {
diff --git a/components/prism-php-extras.min.js b/components/prism-php-extras.min.js
index 54ef980f20..2766282854 100644
--- a/components/prism-php-extras.min.js
+++ b/components/prism-php-extras.min.js
@@ -1 +1 @@
-Prism.languages.insertBefore("php","variable",{"this":/\$this/,global:/\$_?(GLOBALS|SERVER|GET|POST|FILES|REQUEST|SESSION|ENV|COOKIE|HTTP_RAW_POST_DATA|argc|argv|php_errormsg|http_response_header)/,scope:{pattern:/\b[\w\\]+::/,inside:{keyword:/(static|self|parent)/,punctuation:/(::|\\)/}}});
\ No newline at end of file
+Prism.languages.insertBefore("php","variable",{"this":/\$this\b/,global:/\$(?:_(?:SERVER|GET|POST|FILES|REQUEST|SESSION|ENV|COOKIE)|GLOBALS|HTTP_RAW_POST_DATA|argc|argv|php_errormsg|http_response_header)/,scope:{pattern:/\b[\w\\]+::/,inside:{keyword:/(static|self|parent)/,punctuation:/(::|\\)/}}});
\ No newline at end of file

From 530f5f00223fd591ba24939dd8fcc168fa59a50b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 13:15:16 +0200
Subject: [PATCH 267/310] Python: Simplified regexps + don't capture where
 unneeded + fixed operators

---
 components/prism-python.js     | 16 ++++++++--------
 components/prism-python.min.js |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/prism-python.js b/components/prism-python.js
index 187a60c7fc..eb97f48eca 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -1,20 +1,20 @@
 Prism.languages.python= {
 	'comment': {
-		pattern: /(^|[^\\])#.*?(\r?\n|$)/,
+		pattern: /(^|[^\\])#.*/,
 		lookbehind: true
 	},
-	'string': /"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,
+	'string': /"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(?:\\?.)*?\1/,
 	'function' : {
-		pattern: /((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,
+		pattern: /((?:^|\s)def[ \t]+)[a-zA-Z_][a-zA-Z0-9_]*(?=\()/g,
 		lookbehind: true
 	},
 	'class-name': {
-		pattern: /(class\s+)[a-z0-9_]+/i,
+		pattern: /(\bclass\s+)[a-z0-9_]+/i,
 		lookbehind: true
 	},
-	'keyword' : /\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
-	'boolean' : /\b(True|False)\b/,
-	'number' : /\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
-	'operator' : /[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,
+	'keyword' : /\b(?:as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,
+	'boolean' : /\b(?:True|False)\b/,
+	'number' : /\b-?(?:0[bo])?(?:(?:\d|0x[\da-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,
+	'operator' : /[-+%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]|\b(?:or|and|not)\b/,
 	'punctuation' : /[{}[\];(),.:]/
 };
diff --git a/components/prism-python.min.js b/components/prism-python.min.js
index 28bfc499af..743aa35f7f 100644
--- a/components/prism-python.min.js
+++ b/components/prism-python.min.js
@@ -1 +1 @@
-Prism.languages.python={comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(\\?.)*?\1/,"function":{pattern:/((^|\s)def[ \t]+)([a-zA-Z_][a-zA-Z0-9_]*(?=\())/g,lookbehind:!0},"class-name":{pattern:/(class\s+)[a-z0-9_]+/i,lookbehind:!0},keyword:/\b(as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(True|False)\b/,number:/\b-?(0[bo])?(?:(\d|0x[a-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+]|<=?|>=?|!|={1,2}|&{1,2}|\|?\||\?|\*|\/|@|~|\^|%|\b(or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.python={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(?:\\?.)*?\1/,"function":{pattern:/((?:^|\s)def[ \t]+)[a-zA-Z_][a-zA-Z0-9_]*(?=\()/g,lookbehind:!0},"class-name":{pattern:/(\bclass\s+)[a-z0-9_]+/i,lookbehind:!0},keyword:/\b(?:as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(?:True|False)\b/,number:/\b-?(?:0[bo])?(?:(?:\d|0x[\da-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]|\b(?:or|and|not)\b/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file

From c20c3ec454c9831c4625f90f2be73b192b2feaa1 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 13:38:32 +0200
Subject: [PATCH 268/310] R: Fixed and simplified patterns

---
 components/prism-r.js     | 8 ++++----
 components/prism-r.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-r.js b/components/prism-r.js
index f6d9e20e66..ea925583c4 100644
--- a/components/prism-r.js
+++ b/components/prism-r.js
@@ -1,19 +1,19 @@
 Prism.languages.r = {
-	'comment': /#.+/,
+	'comment': /#.*/,
 	'string': /(['"])(?:\\?.)*?\1/,
 	'percent-operator': {
 		// Includes user-defined operators
 		// and %%, %*%, %/%, %in%, %o%, %x%
-		pattern: /%[^%]*?%/,
+		pattern: /%[^%\s]*%/,
 		alias: 'operator'
 	},
 	'boolean': /\b(?:TRUE|FALSE)\b/,
 	'ellipsis': /\.\.(?:\.|\d+)/,
 	'number': [
 		/\b(?:NaN|Inf)\b/,
-		/\b(?:0x[\dA-Fa-f]+(?:\.\d*)?|\d*\.?\d+)(?:[EePp][+-]??\d+)?[iL]?\b/
+		/\b(?:0x[\dA-Fa-f]+(?:\.\d*)?|\d*\.?\d+)(?:[EePp][+-]?\d+)?[iL]?\b/
 	],
 	'keyword': /\b(?:if|else|repeat|while|function|for|in|next|break|NULL|NA|NA_integer_|NA_real_|NA_complex_|NA_character_)\b/,
-	'operator': /->>?|<?<-|[<>!=]=?|::?|&&?|\|\|?|[+\-*\/^$@~]/,
+	'operator': /->?>?|<(?:=|<?-)?|[>=!]=?|::?|&&?|\|\|?|[+*\/^$@~]/,
 	'punctuation': /[(){}\[\],;]/
 };
\ No newline at end of file
diff --git a/components/prism-r.min.js b/components/prism-r.min.js
index 6784b40983..53fe1cc6af 100644
--- a/components/prism-r.min.js
+++ b/components/prism-r.min.js
@@ -1 +1 @@
-Prism.languages.r={comment:/#.+/,string:/(['"])(?:\\?.)*?\1/,"percent-operator":{pattern:/%[^%]*?%/,alias:"operator"},"boolean":/\b(?:TRUE|FALSE)\b/,ellipsis:/\.\.(?:\.|\d+)/,number:[/\b(?:NaN|Inf)\b/,/\b(?:0x[\dA-Fa-f]+(?:\.\d*)?|\d*\.?\d+)(?:[EePp][+-]??\d+)?[iL]?\b/],keyword:/\b(?:if|else|repeat|while|function|for|in|next|break|NULL|NA|NA_integer_|NA_real_|NA_complex_|NA_character_)\b/,operator:/->>?|<?<-|[<>!=]=?|::?|&&?|\|\|?|[+\-*\/^$@~]/,punctuation:/[(){}\[\],;]/};
\ No newline at end of file
+Prism.languages.r={comment:/#.*/,string:/(['"])(?:\\?.)*?\1/,"percent-operator":{pattern:/%[^%\s]*%/,alias:"operator"},"boolean":/\b(?:TRUE|FALSE)\b/,ellipsis:/\.\.(?:\.|\d+)/,number:[/\b(?:NaN|Inf)\b/,/\b(?:0x[\dA-Fa-f]+(?:\.\d*)?|\d*\.?\d+)(?:[EePp][+-]?\d+)?[iL]?\b/],keyword:/\b(?:if|else|repeat|while|function|for|in|next|break|NULL|NA|NA_integer_|NA_real_|NA_complex_|NA_character_)\b/,operator:/->?>?|<(?:=|<?-)?|[>=!]=?|::?|&&?|\|\|?|[+*\/^$@~]/,punctuation:/[(){}\[\],;]/};
\ No newline at end of file

From a896f0a6dcd7a8afa3060e85e9f6cf1ce9d5bfaa Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 16:06:37 +0200
Subject: [PATCH 269/310] Drastically increased the number of dashes (from 4 to
 10) required for separations in test files, to prevent conflicts with
 languages syntax.

---
 test-suite.html           | 2 +-
 tests/helper/test-case.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-suite.html b/test-suite.html
index 51d397d627..906fe81a06 100644
--- a/test-suite.html
+++ b/test-suite.html
@@ -79,7 +79,7 @@ <h2>Writing your test</h2>
 ----
 ... the simplified token stream you expect ...</code></pre>
 
-		<p>Your file is built up of two or three sections, separated by four or more dashes <code>-</code>, starting at the begin of the line:</p>
+		<p>Your file is built up of two or three sections, separated by ten or more dashes <code>-</code>, starting at the begin of the line:</p>
 		<ol>
 			<li>Your language snippet. The code you want to compile using Prism. (<strong>required</strong>)</li>
 			<li>The simplified token stream you expect. Needs to be valid JSON. (<strong>required</strong>)</li>
diff --git a/tests/helper/test-case.js b/tests/helper/test-case.js
index cba3117698..80902fe9ce 100644
--- a/tests/helper/test-case.js
+++ b/tests/helper/test-case.js
@@ -120,7 +120,7 @@ module.exports = {
 	 */
 	parseTestCaseFile: function (filePath) {
 		var testCaseSource = fs.readFileSync(filePath, "utf8");
-		var testCaseParts = testCaseSource.split(/^-{4,}\w*$/m);
+		var testCaseParts = testCaseSource.split(/^-{10,}\w*$/m);
 
 		try {
 			var testCase = {

From e6c6b8582b9decca8a7b114aaed885b9d3203241 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 17:32:38 +0200
Subject: [PATCH 270/310] Rest: Simplified some patterns, fixed others,
 prevented blank comments to match, moved list-bullet down to prevent breaking
 quotes

---
 components/prism-rest.js     | 35 ++++++++++++++++++-----------------
 components/prism-rest.min.js |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/components/prism-rest.js b/components/prism-rest.js
index 6693dc9090..f9390ecade 100644
--- a/components/prism-rest.js
+++ b/components/prism-rest.js
@@ -19,7 +19,7 @@ Prism.languages.rest = {
 	// Directive-like patterns
 
 	'substitution-def': {
-		pattern: /(^\s*\.\. )\|(?:[^|\s]|[^|\s][^|]*[^|\s])\| [^:]+::/m,
+		pattern: /(^\s*\.\. )\|(?:[^|\s](?:[^|]*[^|\s])?)\| [^:]+::/m,
 		lookbehind: true,
 		inside: {
 			'substitution': {
@@ -30,7 +30,7 @@ Prism.languages.rest = {
 				}
 			},
 			'directive': {
-				pattern: /( )[^:]+::/,
+				pattern: /( +)[^:]+::/,
 				lookbehind: true,
 				alias: 'function',
 				inside: {
@@ -49,7 +49,7 @@ Prism.languages.rest = {
 			}
 		},
 		{
-			pattern: /(^\s*\.\. )_(?:`[^`]+`|(?:\\:|[^:])+):/m,
+			pattern: /(^\s*\.\. )_(?:`[^`]+`|(?:[^:\\]|\\.)+):/m,
 			lookbehind: true,
 			alias: 'string',
 			inside: {
@@ -66,14 +66,15 @@ Prism.languages.rest = {
 		}
 	},
 	'comment': {
-		pattern: /(^\s*\.\.\s).*(?:(?:\r?\n|\r).*)*?(?=(?:\r?\n|\r){2}|$)/m,
+		// The two alternatives try to prevent highlighting of blank comments
+		pattern: /(^\s*\.\.)(?:(?: .+)?(?:(?:\r?\n|\r).+)+| .+)(?=(?:\r?\n|\r){2}|$)/m,
 		lookbehind: true
 	},
 
 	'title': [
 		// Overlined and underlined
 		{
-			pattern: /^([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]{2,})(?:\r?\n|\r).+(?:\r?\n|\r)\1$/m,
+			pattern: /^(([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])\2+)(?:\r?\n|\r).+(?:\r?\n|\r)\1$/m,
 			inside: {
 				'punctuation': /^[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+|[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+$/,
 				'important': /.+/
@@ -82,7 +83,7 @@ Prism.languages.rest = {
 
 		// Underlined only
 		{
-			pattern: /(^|(?:\r?\n|\r){2}).+(?:\r?\n|\r)[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]{2,}(?=\r?\n|\r|$)/,
+			pattern: /(^|(?:\r?\n|\r){2}).+(?:\r?\n|\r)([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])\2+(?=\r?\n|\r|$)/,
 			lookbehind: true,
 			inside: {
 				'punctuation': /[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+$/,
@@ -91,22 +92,17 @@ Prism.languages.rest = {
 		}
 	],
 	'hr': {
-		pattern: /((?:\r?\n|\r){2})[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]{4,}(?=(?:\r?\n|\r){2})/,
-		lookbehind: true,
-		alias: 'punctuation'
-	},
-	'list-bullet': {
-		pattern: /(^\s*)(?:[*+\-•‣⁃]|\(?(?:\d+|[a-z]|[ivxdclm]+)\)|(?:\d+|[a-z]|[ivxdclm]+)\.)(?= )/im,
+		pattern: /((?:\r?\n|\r){2})([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])\2{3,}(?=(?:\r?\n|\r){2})/,
 		lookbehind: true,
 		alias: 'punctuation'
 	},
 	'field': {
-		pattern: /(^\s*):[^:]+:(?= )/m,
+		pattern: /(^\s*):[^:\r\n]+:(?= )/m,
 		lookbehind: true,
 		alias: 'attr-name'
 	},
 	'command-line-option': {
-		pattern: /(^\s*)(?:[+-][a-z\d]|(?:\-\-|\/)[a-z\d-]+)(?:[ =](?:[a-z][a-z\d_-]*|<[^<>]+>))?(?:, (?:[+-][a-z\d]|(?:\-\-|\/)[a-z\d-]+)(?:[ =](?:[a-z][a-z\d_-]*|<[^<>]+>))?)*(?=(?:\r?\n|\r)? {2,}[\S])/im,
+		pattern: /(^\s*)(?:[+-][a-z\d]|(?:\-\-|\/)[a-z\d-]+)(?:[ =](?:[a-z][a-z\d_-]*|<[^<>]+>))?(?:, (?:[+-][a-z\d]|(?:\-\-|\/)[a-z\d-]+)(?:[ =](?:[a-z][a-z\d_-]*|<[^<>]+>))?)*(?=(?:\r?\n|\r)? {2,}\S)/im,
 		lookbehind: true,
 		alias: 'symbol'
 	},
@@ -123,11 +119,16 @@ Prism.languages.rest = {
 		pattern: /::(?:\r?\n|\r){2}([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]).*(?:(?:\r?\n|\r)\1.*)*/,
 		inside: {
 			'literal-block-punctuation': {
-				pattern: /^(?:::|[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])/m,
+				pattern: /^(?:::|([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])\1*)/m,
 				alias: 'punctuation'
 			}
 		}
 	},
+	'list-bullet': {
+		pattern: /(^\s*)(?:[*+\-•‣⁃]|\(?(?:\d+|[a-z]|[ivxdclm]+)\)|(?:\d+|[a-z]|[ivxdclm]+)\.)(?= )/im,
+		lookbehind: true,
+		alias: 'punctuation'
+	},
 	'doctest-block': {
 		pattern: /(^\s*)>>> .+(?:(?:\r?\n|\r).+)*/m,
 		lookbehind: true,
@@ -185,10 +186,10 @@ Prism.languages.rest = {
 			}
 		},
 		{
-			pattern: /(?:\b[a-z\d](?:[_.:+]?[a-z\d]+)?_?_|`[^`]+`_?_|_`[^`]+`)(?=[\s\-.,:;!?\\\/'")\]}]|$)/i,
+			pattern: /(?:\b[a-z\d](?:[_.:+]?[a-z\d]+)*_?_|`[^`]+`_?_|_`[^`]+`)(?=[\s\-.,:;!?\\\/'")\]}]|$)/i,
 			alias: 'string',
 			inside: {
-				'punctuation': /^_?`|`?_?_$/
+				'punctuation': /^_?`|`$|`?_?_$/
 			}
 		}
 	],
diff --git a/components/prism-rest.min.js b/components/prism-rest.min.js
index 77f3bf8ccf..b18b44b028 100644
--- a/components/prism-rest.min.js
+++ b/components/prism-rest.min.js
@@ -1 +1 @@
-Prism.languages.rest={table:[{pattern:/(\s*)(?:\+[=-]+)+\+(?:\r?\n|\r)(?:\1(?:[+|].+)+[+|](?:\r?\n|\r))+\1(?:\+[=-]+)+\+/,lookbehind:!0,inside:{punctuation:/\||(?:\+[=-]+)+\+/}},{pattern:/(\s*)(?:=+ +)+=+((?:\r?\n|\r)\1.+)+(?:\r?\n|\r)\1(?:=+ +)+=+(?=(?:\r?\n|\r){2}|\s*$)/,lookbehind:!0,inside:{punctuation:/[=-]+/}}],"substitution-def":{pattern:/(^\s*\.\. )\|(?:[^|\s]|[^|\s][^|]*[^|\s])\| [^:]+::/m,lookbehind:!0,inside:{substitution:{pattern:/^\|(?:[^|\s]|[^|\s][^|]*[^|\s])\|/,alias:"attr-value",inside:{punctuation:/^\||\|$/}},directive:{pattern:/( )[^:]+::/,lookbehind:!0,alias:"function",inside:{punctuation:/::$/}}}},"link-target":[{pattern:/(^\s*\.\. )\[[^\]]+\]/m,lookbehind:!0,alias:"string",inside:{punctuation:/^\[|\]$/}},{pattern:/(^\s*\.\. )_(?:`[^`]+`|(?:\\:|[^:])+):/m,lookbehind:!0,alias:"string",inside:{punctuation:/^_|:$/}}],directive:{pattern:/(^\s*\.\. )[^:]+::/m,lookbehind:!0,alias:"function",inside:{punctuation:/::$/}},comment:{pattern:/(^\s*\.\.\s).*(?:(?:\r?\n|\r).*)*?(?=(?:\r?\n|\r){2}|$)/m,lookbehind:!0},title:[{pattern:/^([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]{2,})(?:\r?\n|\r).+(?:\r?\n|\r)\1$/m,inside:{punctuation:/^[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+|[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+$/,important:/.+/}},{pattern:/(^|(?:\r?\n|\r){2}).+(?:\r?\n|\r)[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]{2,}(?=\r?\n|\r|$)/,lookbehind:!0,inside:{punctuation:/[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+$/,important:/.+/}}],hr:{pattern:/((?:\r?\n|\r){2})[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]{4,}(?=(?:\r?\n|\r){2})/,lookbehind:!0,alias:"punctuation"},"list-bullet":{pattern:/(^\s*)(?:[*+\-•‣⁃]|\(?(?:\d+|[a-z]|[ivxdclm]+)\)|(?:\d+|[a-z]|[ivxdclm]+)\.)(?= )/im,lookbehind:!0,alias:"punctuation"},field:{pattern:/(^\s*):[^:]+:(?= )/m,lookbehind:!0,alias:"attr-name"},"command-line-option":{pattern:/(^\s*)(?:[+-][a-z\d]|(?:\-\-|\/)[a-z\d-]+)(?:[ =](?:[a-z][a-z\d_-]*|<[^<>]+>))?(?:, (?:[+-][a-z\d]|(?:\-\-|\/)[a-z\d-]+)(?:[ =](?:[a-z][a-z\d_-]*|<[^<>]+>))?)*(?=(?:\r?\n|\r)? {2,}[\S])/im,lookbehind:!0,alias:"symbol"},"literal-block":{pattern:/::(?:\r?\n|\r){2}([ \t]+).+(?:(?:\r?\n|\r)\1.+)*/,inside:{"literal-block-punctuation":{pattern:/^::/,alias:"punctuation"}}},"quoted-literal-block":{pattern:/::(?:\r?\n|\r){2}([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]).*(?:(?:\r?\n|\r)\1.*)*/,inside:{"literal-block-punctuation":{pattern:/^(?:::|[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])/m,alias:"punctuation"}}},"doctest-block":{pattern:/(^\s*)>>> .+(?:(?:\r?\n|\r).+)*/m,lookbehind:!0,inside:{punctuation:/^>>>/}},inline:[{pattern:/(^|[\s\-:\/'"<(\[{])(?::[^:]+:`.*?`|`.*?`:[^:]+:|(\*\*?|``?|\|)(?!\s).*?[^\s]\2(?=[\s\-.,:;!?\\\/'")\]}]|$))/m,lookbehind:!0,inside:{bold:{pattern:/(^\*\*).+(?=\*\*$)/,lookbehind:!0},italic:{pattern:/(^\*).+(?=\*$)/,lookbehind:!0},"inline-literal":{pattern:/(^``).+(?=``$)/,lookbehind:!0,alias:"symbol"},role:{pattern:/^:[^:]+:|:[^:]+:$/,alias:"function",inside:{punctuation:/^:|:$/}},"interpreted-text":{pattern:/(^`).+(?=`$)/,lookbehind:!0,alias:"attr-value"},substitution:{pattern:/(^\|).+(?=\|$)/,lookbehind:!0,alias:"attr-value"},punctuation:/\*\*?|``?|\|/}}],link:[{pattern:/\[[^\]]+\]_(?=[\s\-.,:;!?\\\/'")\]}]|$)/,alias:"string",inside:{punctuation:/^\[|\]_$/}},{pattern:/(?:\b[a-z\d](?:[_.:+]?[a-z\d]+)?_?_|`[^`]+`_?_|_`[^`]+`)(?=[\s\-.,:;!?\\\/'")\]}]|$)/i,alias:"string",inside:{punctuation:/^_?`|`?_?_$/}}],punctuation:{pattern:/(^\s*)(?:\|(?= |$)|(?:---?|—|\.\.|__)(?= )|\.\.$)/m,lookbehind:!0}};
\ No newline at end of file
+Prism.languages.rest={table:[{pattern:/(\s*)(?:\+[=-]+)+\+(?:\r?\n|\r)(?:\1(?:[+|].+)+[+|](?:\r?\n|\r))+\1(?:\+[=-]+)+\+/,lookbehind:!0,inside:{punctuation:/\||(?:\+[=-]+)+\+/}},{pattern:/(\s*)(?:=+ +)+=+((?:\r?\n|\r)\1.+)+(?:\r?\n|\r)\1(?:=+ +)+=+(?=(?:\r?\n|\r){2}|\s*$)/,lookbehind:!0,inside:{punctuation:/[=-]+/}}],"substitution-def":{pattern:/(^\s*\.\. )\|(?:[^|\s](?:[^|]*[^|\s])?)\| [^:]+::/m,lookbehind:!0,inside:{substitution:{pattern:/^\|(?:[^|\s]|[^|\s][^|]*[^|\s])\|/,alias:"attr-value",inside:{punctuation:/^\||\|$/}},directive:{pattern:/( +)[^:]+::/,lookbehind:!0,alias:"function",inside:{punctuation:/::$/}}}},"link-target":[{pattern:/(^\s*\.\. )\[[^\]]+\]/m,lookbehind:!0,alias:"string",inside:{punctuation:/^\[|\]$/}},{pattern:/(^\s*\.\. )_(?:`[^`]+`|(?:[^:\\]|\\.)+):/m,lookbehind:!0,alias:"string",inside:{punctuation:/^_|:$/}}],directive:{pattern:/(^\s*\.\. )[^:]+::/m,lookbehind:!0,alias:"function",inside:{punctuation:/::$/}},comment:{pattern:/(^\s*\.\.)(?:(?: .+)?(?:(?:\r?\n|\r).+)+| .+)(?=(?:\r?\n|\r){2}|$)/m,lookbehind:!0},title:[{pattern:/^(([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])\2+)(?:\r?\n|\r).+(?:\r?\n|\r)\1$/m,inside:{punctuation:/^[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+|[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+$/,important:/.+/}},{pattern:/(^|(?:\r?\n|\r){2}).+(?:\r?\n|\r)([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])\2+(?=\r?\n|\r|$)/,lookbehind:!0,inside:{punctuation:/[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]+$/,important:/.+/}}],hr:{pattern:/((?:\r?\n|\r){2})([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])\2{3,}(?=(?:\r?\n|\r){2})/,lookbehind:!0,alias:"punctuation"},field:{pattern:/(^\s*):[^:\r\n]+:(?= )/m,lookbehind:!0,alias:"attr-name"},"command-line-option":{pattern:/(^\s*)(?:[+-][a-z\d]|(?:\-\-|\/)[a-z\d-]+)(?:[ =](?:[a-z][a-z\d_-]*|<[^<>]+>))?(?:, (?:[+-][a-z\d]|(?:\-\-|\/)[a-z\d-]+)(?:[ =](?:[a-z][a-z\d_-]*|<[^<>]+>))?)*(?=(?:\r?\n|\r)? {2,}\S)/im,lookbehind:!0,alias:"symbol"},"literal-block":{pattern:/::(?:\r?\n|\r){2}([ \t]+).+(?:(?:\r?\n|\r)\1.+)*/,inside:{"literal-block-punctuation":{pattern:/^::/,alias:"punctuation"}}},"quoted-literal-block":{pattern:/::(?:\r?\n|\r){2}([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~]).*(?:(?:\r?\n|\r)\1.*)*/,inside:{"literal-block-punctuation":{pattern:/^(?:::|([!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~])\1*)/m,alias:"punctuation"}}},"list-bullet":{pattern:/(^\s*)(?:[*+\-•‣⁃]|\(?(?:\d+|[a-z]|[ivxdclm]+)\)|(?:\d+|[a-z]|[ivxdclm]+)\.)(?= )/im,lookbehind:!0,alias:"punctuation"},"doctest-block":{pattern:/(^\s*)>>> .+(?:(?:\r?\n|\r).+)*/m,lookbehind:!0,inside:{punctuation:/^>>>/}},inline:[{pattern:/(^|[\s\-:\/'"<(\[{])(?::[^:]+:`.*?`|`.*?`:[^:]+:|(\*\*?|``?|\|)(?!\s).*?[^\s]\2(?=[\s\-.,:;!?\\\/'")\]}]|$))/m,lookbehind:!0,inside:{bold:{pattern:/(^\*\*).+(?=\*\*$)/,lookbehind:!0},italic:{pattern:/(^\*).+(?=\*$)/,lookbehind:!0},"inline-literal":{pattern:/(^``).+(?=``$)/,lookbehind:!0,alias:"symbol"},role:{pattern:/^:[^:]+:|:[^:]+:$/,alias:"function",inside:{punctuation:/^:|:$/}},"interpreted-text":{pattern:/(^`).+(?=`$)/,lookbehind:!0,alias:"attr-value"},substitution:{pattern:/(^\|).+(?=\|$)/,lookbehind:!0,alias:"attr-value"},punctuation:/\*\*?|``?|\|/}}],link:[{pattern:/\[[^\]]+\]_(?=[\s\-.,:;!?\\\/'")\]}]|$)/,alias:"string",inside:{punctuation:/^\[|\]_$/}},{pattern:/(?:\b[a-z\d](?:[_.:+]?[a-z\d]+)*_?_|`[^`]+`_?_|_`[^`]+`)(?=[\s\-.,:;!?\\\/'")\]}]|$)/i,alias:"string",inside:{punctuation:/^_?`|`$|`?_?_$/}}],punctuation:{pattern:/(^\s*)(?:\|(?= |$)|(?:---?|—|\.\.|__)(?= )|\.\.$)/m,lookbehind:!0}};
\ No newline at end of file

From 1093f7dd780e0e6e3bc6629939363dfe4b2442df Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 18:00:40 +0200
Subject: [PATCH 271/310] Rip: Fixed some regexp + moved down numbers

---
 components/prism-rip.js     | 11 +++++------
 components/prism-rip.min.js |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/prism-rip.js b/components/prism-rip.js
index 0caadb192d..f38da615d3 100644
--- a/components/prism-rip.js
+++ b/components/prism-rip.js
@@ -1,27 +1,26 @@
 Prism.languages.rip = {
-	'comment': /#[^\r\n]*(\r?\n|$)/,
+	'comment': /#.*/,
 
 	'keyword': /(?:=>|->)|\b(?:class|if|else|switch|case|return|exit|try|catch|finally|raise)\b/,
 
-	'builtin': /\b(@|System)\b/,
+	'builtin': /@|\bSystem\b/,
 
-	'boolean': /\b(true|false)\b/,
+	'boolean': /\b(?:true|false)\b/,
 
 	'date': /\b\d{4}-\d{2}-\d{2}\b/,
 	'time': /\b\d{2}:\d{2}:\d{2}\b/,
 	'datetime': /\b\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\b/,
 
-	'number': /[+-]?(?:(?:\d+\.\d+)|(?:\d+))/,
-
 	'character': /\B`[^\s`'",.:;#\/\\()<>\[\]{}]\b/,
 
 	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/(?=\s*($|[\r\n,.;})]))/,
+		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/(?=\s*($|[\r\n,.;})]))/,
 		lookbehind: true
 	},
 
 	'symbol': /:[^\d\s`'",.:;#\/\\()<>\[\]{}][^\s`'",.:;#\/\\()<>\[\]{}]*/,
 	'string': /("|')(\\?.)*?\1/,
+	'number': /[+-]?(?:(?:\d+\.\d+)|(?:\d+))/,
 
 	'punctuation': /(?:\.{2,3})|[`,.:;=\/\\()<>\[\]{}]/,
 
diff --git a/components/prism-rip.min.js b/components/prism-rip.min.js
index 389a5527f9..049282f90a 100644
--- a/components/prism-rip.min.js
+++ b/components/prism-rip.min.js
@@ -1 +1 @@
-Prism.languages.rip={comment:/#[^\r\n]*(\r?\n|$)/,keyword:/(?:=>|->)|\b(?:class|if|else|switch|case|return|exit|try|catch|finally|raise)\b/,builtin:/\b(@|System)\b/,"boolean":/\b(true|false)\b/,date:/\b\d{4}-\d{2}-\d{2}\b/,time:/\b\d{2}:\d{2}:\d{2}\b/,datetime:/\b\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\b/,number:/[+-]?(?:(?:\d+\.\d+)|(?:\d+))/,character:/\B`[^\s`'",.:;#\/\\()<>\[\]{}]\b/,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/(?=\s*($|[\r\n,.;})]))/,lookbehind:!0},symbol:/:[^\d\s`'",.:;#\/\\()<>\[\]{}][^\s`'",.:;#\/\\()<>\[\]{}]*/,string:/("|')(\\?.)*?\1/,punctuation:/(?:\.{2,3})|[`,.:;=\/\\()<>\[\]{}]/,reference:/[^\d\s`'",.:;#\/\\()<>\[\]{}][^\s`'",.:;#\/\\()<>\[\]{}]*/};
\ No newline at end of file
+Prism.languages.rip={comment:/#.*/,keyword:/(?:=>|->)|\b(?:class|if|else|switch|case|return|exit|try|catch|finally|raise)\b/,builtin:/@|\bSystem\b/,"boolean":/\b(?:true|false)\b/,date:/\b\d{4}-\d{2}-\d{2}\b/,time:/\b\d{2}:\d{2}:\d{2}\b/,datetime:/\b\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\b/,character:/\B`[^\s`'",.:;#\/\\()<>\[\]{}]\b/,regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/(?=\s*($|[\r\n,.;})]))/,lookbehind:!0},symbol:/:[^\d\s`'",.:;#\/\\()<>\[\]{}][^\s`'",.:;#\/\\()<>\[\]{}]*/,string:/("|')(\\?.)*?\1/,number:/[+-]?(?:(?:\d+\.\d+)|(?:\d+))/,punctuation:/(?:\.{2,3})|[`,.:;=\/\\()<>\[\]{}]/,reference:/[^\d\s`'",.:;#\/\\()<>\[\]{}][^\s`'",.:;#\/\\()<>\[\]{}]*/};
\ No newline at end of file

From 6c8494fb59591edcd9f8913d77a576d618a4a4ec Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 18:36:54 +0200
Subject: [PATCH 272/310] Rust: Simplified patterns and fixed operators

---
 components/prism-rust.js     | 8 ++++----
 components/prism-rust.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/prism-rust.js b/components/prism-rust.js
index 0c320d21d5..68ef0ace40 100644
--- a/components/prism-rust.js
+++ b/components/prism-rust.js
@@ -12,7 +12,7 @@ Prism.languages.rust = {
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^\\:])\/\/.*?(\r?\n|$)/,
+			pattern: /(^|[^\\:])\/\/.*/,
 			lookbehind: true
 		}
 	],
@@ -38,7 +38,7 @@ Prism.languages.rust = {
 	},
 
 	// Hex, oct, bin, dec numbers with visual separators and type suffix
-	'number': /\b-?(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*|(\d(_?\d)*)?\.?\d(_?\d)*([Ee][+-]?\d+)?)(?:_?(?:[iu](?:8|16|32)?|f32|f64))?\b/,
+	'number': /\b-?(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*|(\d(_?\d)*)?\.?\d(_?\d)*([Ee][+-]?\d+)?)(?:_?(?:[iu](?:8|16|32|64)?|f32|f64))?\b/,
 
 	// Closure params should not be confused with bitwise OR |
 	'closure-params': {
@@ -48,6 +48,6 @@ Prism.languages.rust = {
 			'operator': /[&*]/
 		}
 	},
-	'punctuation': /[{}[\];(),.:]|->/,
-	'operator': /[-+]{1,2}|!=?|<=?|>=?|={1,3}|&&?|\|\|?|\*|\/|\^|%|<<|>>@/
+	'punctuation': /[{}[\];(),:]|\.+|->/,
+	'operator': /[-+*\/%!^=]=?|@|&[&=]?|\|[|=]?|<<?=?|>>?=?/
 };
\ No newline at end of file
diff --git a/components/prism-rust.min.js b/components/prism-rust.min.js
index bf38d4522e..ed273f98b1 100644
--- a/components/prism-rust.min.js
+++ b/components/prism-rust.min.js
@@ -1 +1 @@
-Prism.languages.rust={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*?(\r?\n|$)/,lookbehind:!0}],string:[/b?r(#*)"(?:\\?.)*?"\1/,/b?("|')(?:\\?.)*?\1/],keyword:/\b(?:abstract|alignof|as|be|box|break|const|continue|crate|do|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|match|mod|move|mut|offsetof|once|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,attribute:{pattern:/#!?\[.+?\]/,alias:"attr-name"},"function":[/[a-z0-9_]+(?=\s*\()/i,/[a-z0-9_]+!(?=\s*\(|\[)/i],"macro-rules":{pattern:/[a-z0-9_]+!/i,alias:"function"},number:/\b-?(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*|(\d(_?\d)*)?\.?\d(_?\d)*([Ee][+-]?\d+)?)(?:_?(?:[iu](?:8|16|32)?|f32|f64))?\b/,"closure-params":{pattern:/\|[^|]*\|(?=\s*[{-])/,inside:{punctuation:/[\|:,]/,operator:/[&*]/}},punctuation:/[{}[\];(),.:]|->/,operator:/[-+]{1,2}|!=?|<=?|>=?|={1,3}|&&?|\|\|?|\*|\/|\^|%|<<|>>@/};
\ No newline at end of file
+Prism.languages.rust={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:[/b?r(#*)"(?:\\?.)*?"\1/,/b?("|')(?:\\?.)*?\1/],keyword:/\b(?:abstract|alignof|as|be|box|break|const|continue|crate|do|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|match|mod|move|mut|offsetof|once|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,attribute:{pattern:/#!?\[.+?\]/,alias:"attr-name"},"function":[/[a-z0-9_]+(?=\s*\()/i,/[a-z0-9_]+!(?=\s*\(|\[)/i],"macro-rules":{pattern:/[a-z0-9_]+!/i,alias:"function"},number:/\b-?(?:0x[\dA-Fa-f](?:_?[\dA-Fa-f])*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*|(\d(_?\d)*)?\.?\d(_?\d)*([Ee][+-]?\d+)?)(?:_?(?:[iu](?:8|16|32|64)?|f32|f64))?\b/,"closure-params":{pattern:/\|[^|]*\|(?=\s*[{-])/,inside:{punctuation:/[\|:,]/,operator:/[&*]/}},punctuation:/[{}[\];(),:]|\.+|->/,operator:/[-+*\/%!^=]=?|@|&[&=]?|\|[|=]?|<<?=?|>>?=?/};
\ No newline at end of file

From f08ce340319c77ccd9d3ffcb65ce67e80ca8371c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 18:37:26 +0200
Subject: [PATCH 273/310] Add tests for Rust

---
 tests/languages/rust/attribute_feature.test   | 13 +++++
 .../rust/closure-params_feature.test          | 30 ++++++++++++
 tests/languages/rust/comment_feature.test     | 18 +++++++
 tests/languages/rust/function_feature.test    | 23 +++++++++
 tests/languages/rust/keyword_feature.test     | 39 +++++++++++++++
 tests/languages/rust/macro-rules_feature.test | 15 ++++++
 tests/languages/rust/number_feature.test      | 47 +++++++++++++++++++
 tests/languages/rust/operator_feature.test    | 35 ++++++++++++++
 tests/languages/rust/string_feature.test      | 43 +++++++++++++++++
 9 files changed, 263 insertions(+)
 create mode 100644 tests/languages/rust/attribute_feature.test
 create mode 100644 tests/languages/rust/closure-params_feature.test
 create mode 100644 tests/languages/rust/comment_feature.test
 create mode 100644 tests/languages/rust/function_feature.test
 create mode 100644 tests/languages/rust/keyword_feature.test
 create mode 100644 tests/languages/rust/macro-rules_feature.test
 create mode 100644 tests/languages/rust/number_feature.test
 create mode 100644 tests/languages/rust/operator_feature.test
 create mode 100644 tests/languages/rust/string_feature.test

diff --git a/tests/languages/rust/attribute_feature.test b/tests/languages/rust/attribute_feature.test
new file mode 100644
index 0000000000..a3dac8a871
--- /dev/null
+++ b/tests/languages/rust/attribute_feature.test
@@ -0,0 +1,13 @@
+#[test]
+#![warn(unstable)]
+
+----------------------------------------------------
+
+[
+	["attribute", "#[test]"],
+	["attribute", "#![warn(unstable)]"]
+]
+
+----------------------------------------------------
+
+Checks for attributes.
\ No newline at end of file
diff --git a/tests/languages/rust/closure-params_feature.test b/tests/languages/rust/closure-params_feature.test
new file mode 100644
index 0000000000..83bf90004c
--- /dev/null
+++ b/tests/languages/rust/closure-params_feature.test
@@ -0,0 +1,30 @@
+|x: int, y: int| -> int {}
+|| {}
+
+----------------------------------------------------
+
+[
+	["closure-params", [
+		["punctuation", "|"],
+		"x",
+		["punctuation", ":"],
+		" int",
+		["punctuation", ","],
+		" y",
+		["punctuation", ":"],
+		" int",
+		["punctuation", "|"]
+	]],
+	["punctuation", "->"],
+	" int ", ["punctuation", "{"], ["punctuation", "}"],
+
+	["closure-params", [
+		["punctuation", "|"],
+		["punctuation", "|"]
+	]],
+	["punctuation", "{"], ["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for closure params.
\ No newline at end of file
diff --git a/tests/languages/rust/comment_feature.test b/tests/languages/rust/comment_feature.test
new file mode 100644
index 0000000000..936702840e
--- /dev/null
+++ b/tests/languages/rust/comment_feature.test
@@ -0,0 +1,18 @@
+//
+// foobar
+/**/
+/* foo
+bar */
+
+----------------------------------------------------
+
+[
+	["comment", "//"],
+	["comment", "// foobar"],
+	["comment", "/**/"],
+	["comment", "/* foo\r\nbar */"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/rust/function_feature.test b/tests/languages/rust/function_feature.test
new file mode 100644
index 0000000000..63fcc8b94d
--- /dev/null
+++ b/tests/languages/rust/function_feature.test
@@ -0,0 +1,23 @@
+foo (
+foobar(
+foo_bar_42(
+
+foo! (
+foobar![
+foo_bar_42!(
+
+----------------------------------------------------
+
+[
+	["function", "foo"], ["punctuation", "("],
+	["function", "foobar"], ["punctuation", "("],
+	["function", "foo_bar_42"], ["punctuation", "("],
+
+	["function", "foo!"], ["punctuation", "("],
+	["function", "foobar!"], ["punctuation", "["],
+	["function", "foo_bar_42!"], ["punctuation", "("]
+]
+
+----------------------------------------------------
+
+Checks for functions and macros.
\ No newline at end of file
diff --git a/tests/languages/rust/keyword_feature.test b/tests/languages/rust/keyword_feature.test
new file mode 100644
index 0000000000..06da8844d2
--- /dev/null
+++ b/tests/languages/rust/keyword_feature.test
@@ -0,0 +1,39 @@
+abstract alignof as
+be box break const
+continue crate do
+else enum extern
+false final fn for
+if impl in let loop
+match mod move mut
+offsetof once override
+priv pub pure ref
+return sizeof static
+self struct super
+true trait type typeof
+unsafe unsized use
+virtual where while
+yield
+
+----------------------------------------------------
+
+[
+	["keyword", "abstract"], ["keyword", "alignof"], ["keyword", "as"],
+	["keyword", "be"], ["keyword", "box"], ["keyword", "break"], ["keyword", "const"],
+	["keyword", "continue"], ["keyword", "crate"], ["keyword", "do"],
+	["keyword", "else"], ["keyword", "enum"], ["keyword", "extern"],
+	["keyword", "false"], ["keyword", "final"], ["keyword", "fn"], ["keyword", "for"],
+	["keyword", "if"], ["keyword", "impl"], ["keyword", "in"], ["keyword", "let"], ["keyword", "loop"],
+	["keyword", "match"], ["keyword", "mod"], ["keyword", "move"], ["keyword", "mut"],
+	["keyword", "offsetof"], ["keyword", "once"], ["keyword", "override"],
+	["keyword", "priv"], ["keyword", "pub"], ["keyword", "pure"], ["keyword", "ref"],
+	["keyword", "return"], ["keyword", "sizeof"], ["keyword", "static"],
+	["keyword", "self"], ["keyword", "struct"], ["keyword", "super"],
+	["keyword", "true"], ["keyword", "trait"], ["keyword", "type"], ["keyword", "typeof"],
+	["keyword", "unsafe"], ["keyword", "unsized"], ["keyword", "use"],
+	["keyword", "virtual"], ["keyword", "where"], ["keyword", "while"],
+	["keyword", "yield"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/rust/macro-rules_feature.test b/tests/languages/rust/macro-rules_feature.test
new file mode 100644
index 0000000000..9d30051c3a
--- /dev/null
+++ b/tests/languages/rust/macro-rules_feature.test
@@ -0,0 +1,15 @@
+foo!
+foo_bar!
+foo_bar_42!
+
+----------------------------------------------------
+
+[
+	["macro-rules", "foo!"],
+	["macro-rules", "foo_bar!"],
+	["macro-rules", "foo_bar_42!"]
+]
+
+----------------------------------------------------
+
+Checks for macro rules.
\ No newline at end of file
diff --git a/tests/languages/rust/number_feature.test b/tests/languages/rust/number_feature.test
new file mode 100644
index 0000000000..61d6e8a5e7
--- /dev/null
+++ b/tests/languages/rust/number_feature.test
@@ -0,0 +1,47 @@
+0xBad_Face
+0o741_123
+0b0000_1111
+42_000
+3.14_15_9
+3e4
+3.5E-8
+4.6e+41
+
+0xBad_Faceu8
+0o741_123i8
+0b0000_1111u16
+42_000i16
+3.14_15_9u32
+3e4i32
+3.5E-8u64
+4.6e+41i64
+4.2f32
+4.2f64
+
+----------------------------------------------------
+
+[
+	["number", "0xBad_Face"],
+	["number", "0o741_123"],
+	["number", "0b0000_1111"],
+	["number", "42_000"],
+	["number", "3.14_15_9"],
+	["number", "3e4"],
+	["number", "3.5E-8"],
+	["number", "4.6e+41"],
+
+	["number", "0xBad_Faceu8"],
+	["number", "0o741_123i8"],
+	["number", "0b0000_1111u16"],
+	["number", "42_000i16"],
+	["number", "3.14_15_9u32"],
+	["number", "3e4i32"],
+	["number", "3.5E-8u64"],
+	["number", "4.6e+41i64"],
+	["number", "4.2f32"],
+	["number", "4.2f64"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.
\ No newline at end of file
diff --git a/tests/languages/rust/operator_feature.test b/tests/languages/rust/operator_feature.test
new file mode 100644
index 0000000000..a6e0892c88
--- /dev/null
+++ b/tests/languages/rust/operator_feature.test
@@ -0,0 +1,35 @@
++ +=
+- -=
+* *=
+/ /=
+% %=
+! !=
+^ ^=
+= ==
+& && &=
+| || |=
+< << <= <<=
+> >> >= >>=
+@
+
+----------------------------------------------------
+
+[
+	["operator", "+"], ["operator", "+="],
+	["operator", "-"], ["operator", "-="],
+	["operator", "*"], ["operator", "*="],
+	["operator", "/"], ["operator", "/="],
+	["operator", "%"], ["operator", "%="],
+	["operator", "!"], ["operator", "!="],
+	["operator", "^"], ["operator", "^="],
+	["operator", "="], ["operator", "=="],
+	["operator", "&"], ["operator", "&&"], ["operator", "&="],
+	["operator", "|"], ["operator", "||"], ["operator", "|="],
+	["operator", "<"], ["operator", "<<"], ["operator", "<="], ["operator", "<<="],
+	["operator", ">"], ["operator", ">>"], ["operator", ">="], ["operator", ">>="],
+	["operator", "@"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file
diff --git a/tests/languages/rust/string_feature.test b/tests/languages/rust/string_feature.test
new file mode 100644
index 0000000000..09282528c6
--- /dev/null
+++ b/tests/languages/rust/string_feature.test
@@ -0,0 +1,43 @@
+""
+"fo\"obar"
+''
+'fo\'obar'
+
+b""
+b"fo\"obar"
+b''
+b'fo\'obar'
+
+r#""#
+r#"fo"obar"#
+r###"foo#bar"###
+
+br#""#
+br#"fo"obar"#
+br###"foo#bar"###
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"obar\""],
+	["string", "''"],
+	["string", "'fo\\'obar'"],
+
+	["string", "b\"\""],
+	["string", "b\"fo\\\"obar\""],
+	["string", "b''"],
+	["string", "b'fo\\'obar'"],
+
+	["string", "r#\"\"#"],
+	["string", "r#\"fo\"obar\"#"],
+	["string", "r###\"foo#bar\"###"],
+
+	["string", "br#\"\"#"],
+	["string", "br#\"fo\"obar\"#"],
+	["string", "br###\"foo#bar\"###"]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From 6ebb96f057ab75e777304e95929237fd4fb86de5 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 19:17:20 +0200
Subject: [PATCH 274/310] SAS: Simplified datalines and optimized operator
 patterns

---
 components/prism-sas.js     | 14 +++++---------
 components/prism-sas.min.js |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/components/prism-sas.js b/components/prism-sas.js
index e8696d2dee..ffee46bf45 100644
--- a/components/prism-sas.js
+++ b/components/prism-sas.js
@@ -1,17 +1,13 @@
 Prism.languages.sas = {
 	'datalines': {
-		pattern: /(^|[\r\n])\s*(?:(?:data)?lines|cards);[\s\S]+?[\r\n];/i,
-		lookbehind: true,
+		pattern: /^\s*(?:(?:data)?lines|cards);[\s\S]+?(?:\r?\n|\r);/im,
+		alias: 'string',
 		inside: {
 			'keyword': {
 				pattern: /^(\s*)(?:(?:data)?lines|cards)/i,
 				lookbehind: true
 			},
-			'punctuation': /;/,
-			'data': {
-				pattern: /[\s\S]+/,
-				alias: 'string'
-			}
+			'punctuation': /;/
 		}
 	},
 	'comment': [
@@ -23,13 +19,13 @@ Prism.languages.sas = {
 	],
 	'datetime': {
 		// '1jan2013'd, '9:25:19pm't, '18jan2003:9:27:05am'dt
-		pattern: /'[^']+'(?:d|d?t)\b/i,
+		pattern: /'[^']+'(?:dt?|t)\b/i,
 		alias: 'number'
 	},
 	'string': /(["'])(?:\1\1|(?!\1)[\s\S])*\1/,
 	'keyword': /\b(?:data|else|format|if|input|proc|run|then)\b/i,
 	// Decimal (1.2e23), hexadecimal (0c1x)
 	'number': /(?:\B-|\b)(?:[\da-f]+x|\d+(?:\.\d+)?(?:e[+-]?\d+)?)/i,
-	'operator': /\*\*|\|\||!!|¦¦|<>|><|[~¬^<>]?=|[*\/+\-<>&\|!¦~¬^]|\b(?:eq|ne|gt|lt|ge|le|in|not)\b/i,
+	'operator': /\*\*?|\|\|?|!!?|¦¦?|<[>=]?|>[<=]?|[-+\/=&]|[~¬^]=?|\b(?:eq|ne|gt|lt|ge|le|in|not)\b/i,
 	'punctuation': /[$%@.(){}\[\];,\\]/
 };
\ No newline at end of file
diff --git a/components/prism-sas.min.js b/components/prism-sas.min.js
index edb975ca27..e954fa7e1a 100644
--- a/components/prism-sas.min.js
+++ b/components/prism-sas.min.js
@@ -1 +1 @@
-Prism.languages.sas={datalines:{pattern:/(^|[\r\n])\s*(?:(?:data)?lines|cards);[\s\S]+?[\r\n];/i,lookbehind:!0,inside:{keyword:{pattern:/^(\s*)(?:(?:data)?lines|cards)/i,lookbehind:!0},punctuation:/;/,data:{pattern:/[\s\S]+/,alias:"string"}}},comment:[{pattern:/(^\s*|;\s*)\*.*;/m,lookbehind:!0},/\/\*[\s\S]+?\*\//],datetime:{pattern:/'[^']+'(?:d|d?t)\b/i,alias:"number"},string:/(["'])(?:\1\1|(?!\1)[\s\S])*\1/,keyword:/\b(?:data|else|format|if|input|proc|run|then)\b/i,number:/(?:\B-|\b)(?:[\da-f]+x|\d+(?:\.\d+)?(?:e[+-]?\d+)?)/i,operator:/\*\*|\|\||!!|¦¦|<>|><|[~¬^<>]?=|[*\/+\-<>&\|!¦~¬^]|\b(?:eq|ne|gt|lt|ge|le|in|not)\b/i,punctuation:/[$%@.(){}\[\];,\\]/};
\ No newline at end of file
+Prism.languages.sas={datalines:{pattern:/^\s*(?:(?:data)?lines|cards);[\s\S]+?(?:\r?\n|\r);/im,alias:"string",inside:{keyword:{pattern:/^(\s*)(?:(?:data)?lines|cards)/i,lookbehind:!0},punctuation:/;/}},comment:[{pattern:/(^\s*|;\s*)\*.*;/m,lookbehind:!0},/\/\*[\s\S]+?\*\//],datetime:{pattern:/'[^']+'(?:dt?|t)\b/i,alias:"number"},string:/(["'])(?:\1\1|(?!\1)[\s\S])*\1/,keyword:/\b(?:data|else|format|if|input|proc|run|then)\b/i,number:/(?:\B-|\b)(?:[\da-f]+x|\d+(?:\.\d+)?(?:e[+-]?\d+)?)/i,operator:/\*\*?|\|\|?|!!?|¦¦?|<[>=]?|>[<=]?|[-+\/=&]|[~¬^]=?|\b(?:eq|ne|gt|lt|ge|le|in|not)\b/i,punctuation:/[$%@.(){}\[\];,\\]/};
\ No newline at end of file

From 35b8c5001d06619e0db5440ab64c70ff641a23bb Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 19:34:33 +0200
Subject: [PATCH 275/310] Sass: Add missing require in components

---
 components.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components.js b/components.js
index b9ce823bbf..4bc114685b 100644
--- a/components.js
+++ b/components.js
@@ -290,6 +290,7 @@ var components = {
 		},
 		"sass": {
 			"title": "Sass (Sass)",
+			"require": "css",
 			"owner": "Golmote"
 		},
 		"scss": {

From 28759d0d5429e73ee5232845707ee5dcbd91157a Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 20:19:58 +0200
Subject: [PATCH 276/310] Sass: Fix comments, operators and selectors and
 simplified patterns

---
 components/prism-sass.js     | 17 +++++++++--------
 components/prism-sass.min.js |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/components/prism-sass.js b/components/prism-sass.js
index 9115684fa3..4609ac0ab3 100644
--- a/components/prism-sass.js
+++ b/components/prism-sass.js
@@ -1,7 +1,10 @@
 (function(Prism) {
 	Prism.languages.sass = Prism.languages.extend('css', {
 		// Sass comments don't need to be closed, only indented
-		'comment': /^([ \t]*)\/[\/*].*(?:(?:\r?\n|\r)\1[ \t]+.+)*/m
+		'comment': {
+			pattern: /^([ \t]*)\/[\/*].*(?:(?:\r?\n|\r)\1[ \t]+.+)*/m,
+			lookbehind: true
+		}
 	});
 
 	Prism.languages.insertBefore('sass', 'atrule', {
@@ -10,7 +13,7 @@
 			// Includes support for = and + shortcuts
 			pattern: /^(?:[ \t]*)[@+=].+/m,
 			inside: {
-				'atrule': /^(?:[ \t]*)(?:@[\w-]+|[+=])/m
+				'atrule': /(?:@[\w-]+|[+=])/m
 			}
 		}
 	});
@@ -18,13 +21,12 @@
 
 
 	var variable = /((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i;
-	var operator = /[-+]{1,2}|==?|!=|\|?\||\?|\*|\/|%/;
+	var operator = /[-+*\/%]|[=!]=|<=?|>=?|\b(?:and|or|not)\b/;
 
 	Prism.languages.insertBefore('sass', 'property', {
 		// We want to consume the whole line
 		'variable-line': {
-			pattern: /(^|(?:\r?\n|\r))[ \t]*\$.+/,
-			lookbehind: true,
+			pattern: /^[ \t]*\$.+/m,
 			inside: {
 				'punctuation': /:/,
 				'variable': variable,
@@ -33,8 +35,7 @@
 		},
 		// We want to consume the whole line
 		'property-line': {
-			pattern: /(^|(?:\r?\n|\r))[ \t]*(?:[^:\s]+[ ]*:.*|:[^:\s]+.*)/i,
-			lookbehind: true,
+			pattern: /^[ \t]*(?:[^:\s]+ *:.*|:[^:\s]+.*)/m,
 			inside: {
 				'property': [
 					/[^:\s]+(?=\s*:)/,
@@ -58,7 +59,7 @@
 	delete Prism.languages.sass.selector;
 	Prism.languages.insertBefore('sass', 'punctuation', {
 		'selector': {
-			pattern: /([ \t]*).+(?:,(?:\r?\n|\r)\1[ \t]+.+)*/,
+			pattern: /([ \t]*)\S(?:,?[^,\r\n]+)*(?:,(?:\r?\n|\r)\1[ \t]+\S(?:,?[^,\r\n]+)*)*/,
 			lookbehind: true
 		}
 	});
diff --git a/components/prism-sass.min.js b/components/prism-sass.min.js
index 8b4ea94203..085ead833a 100644
--- a/components/prism-sass.min.js
+++ b/components/prism-sass.min.js
@@ -1 +1 @@
-!function(e){e.languages.sass=e.languages.extend("css",{comment:/^([ \t]*)\/[\/*].*(?:(?:\r?\n|\r)\1[ \t]+.+)*/m}),e.languages.insertBefore("sass","atrule",{"atrule-line":{pattern:/^(?:[ \t]*)[@+=].+/m,inside:{atrule:/^(?:[ \t]*)(?:@[\w-]+|[+=])/m}}}),delete e.languages.sass.atrule;var a=/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i,s=/[-+]{1,2}|==?|!=|\|?\||\?|\*|\/|%/;e.languages.insertBefore("sass","property",{"variable-line":{pattern:/(^|(?:\r?\n|\r))[ \t]*\$.+/,lookbehind:!0,inside:{punctuation:/:/,variable:a,operator:s}},"property-line":{pattern:/(^|(?:\r?\n|\r))[ \t]*(?:[^:\s]+[ ]*:.*|:[^:\s]+.*)/i,lookbehind:!0,inside:{property:[/[^:\s]+(?=\s*:)/,{pattern:/(:)[^:\s]+/,lookbehind:!0}],punctuation:/:/,variable:a,operator:s,important:e.languages.sass.important}}}),delete e.languages.sass.property,delete e.languages.sass.important,delete e.languages.sass.selector,e.languages.insertBefore("sass","punctuation",{selector:{pattern:/([ \t]*).+(?:,(?:\r?\n|\r)\1[ \t]+.+)*/,lookbehind:!0}})}(Prism);
\ No newline at end of file
+!function(e){e.languages.sass=e.languages.extend("css",{comment:{pattern:/^([ \t]*)\/[\/*].*(?:(?:\r?\n|\r)\1[ \t]+.+)*/m,lookbehind:!0}}),e.languages.insertBefore("sass","atrule",{"atrule-line":{pattern:/^(?:[ \t]*)[@+=].+/m,inside:{atrule:/(?:@[\w-]+|[+=])/m}}}),delete e.languages.sass.atrule;var a=/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i,t=/[-+*\/%]|[=!]=|<=?|>=?|\b(?:and|or|not)\b/;e.languages.insertBefore("sass","property",{"variable-line":{pattern:/^[ \t]*\$.+/m,inside:{punctuation:/:/,variable:a,operator:t}},"property-line":{pattern:/^[ \t]*(?:[^:\s]+ *:.*|:[^:\s]+.*)/m,inside:{property:[/[^:\s]+(?=\s*:)/,{pattern:/(:)[^:\s]+/,lookbehind:!0}],punctuation:/:/,variable:a,operator:t,important:e.languages.sass.important}}}),delete e.languages.sass.property,delete e.languages.sass.important,delete e.languages.sass.selector,e.languages.insertBefore("sass","punctuation",{selector:{pattern:/([ \t]*)\S(?:,?[^,\r\n]+)*(?:,(?:\r?\n|\r)\1[ \t]+\S(?:,?[^,\r\n]+)*)*/,lookbehind:!0}})}(Prism);
\ No newline at end of file

From 672c167a90fbd16544d77bc0678bbd2fbc0b244a Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 22:52:00 +0200
Subject: [PATCH 277/310] Scss: Simplified patterns + fixed operators + don't
 match empty selectors

---
 components/prism-scss.js                      | 38 ++++++++++++-------
 components/prism-scss.min.js                  |  2 +-
 tests/languages/scss+haml/scss_inclusion.test |  4 +-
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/components/prism-scss.js b/components/prism-scss.js
index b7a872ac1e..837844f7d9 100644
--- a/components/prism-scss.js
+++ b/components/prism-scss.js
@@ -1,50 +1,60 @@
 Prism.languages.scss = Prism.languages.extend('css', {
 	'comment': {
-		pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,
+		pattern: /(^|[^\\])(?:\/\*[\w\W]*?\*\/|\/\/.*)/,
 		lookbehind: true
 	},
 	'atrule': {
-		pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,
+		pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+[{;])/,
 		inside: {
 			'rule': /@[\w-]+/
 			// See rest below
 		}
 	},
 	// url, compassified
-	'url': /([-a-z]+-)*url(?=\()/i,
+	'url': /(?:[-a-z]+-)*url(?=\()/i,
 	// CSS selector regex is not appropriate for Sass
 	// since there can be lot more things (var, @ directive, nesting..)
 	// a selector must start at the end of a property or after a brace (end of other rules or nesting)
-	// it can contain some caracters that aren't used for defining rules or end of selector, & (parent selector), or interpolated variable
+	// it can contain some characters that aren't used for defining rules or end of selector, & (parent selector), or interpolated variable
 	// the end of a selector is found when there is no rules in it ( {} or {\s}) or if there is a property (because an interpolated var
 	// can "pass" as a selector- e.g: proper#{$erty})
-	// this one was ard to do, so please be careful if you edit this one :)
+	// this one was hard to do, so please be careful if you edit this one :)
 	'selector': {
-		pattern: /([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m,
+		// Initial look-ahead is used to prevent matching of blank selectors
+		pattern: /(?=\S)[^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m,
 		inside: {
-			'placeholder': /%[-_\w]+/i
+			'placeholder': /%[-_\w]+/
 		}
 	}
 });
 
 Prism.languages.insertBefore('scss', 'atrule', {
-	'keyword': /@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i
+	'keyword': [
+		/@(?:if|else(?: if)?|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)/i,
+		{
+			pattern: /( +)(?:from|through)(?= )/,
+			lookbehind: true
+		}
+	]
 });
 
 Prism.languages.insertBefore('scss', 'property', {
 	// var and interpolated vars
-	'variable': /((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i
+	'variable': /\$[-_\w]+|#\{\$[-_\w]+\}/
 });
 
 Prism.languages.insertBefore('scss', 'function', {
 	'placeholder': {
-		pattern: /%[-_\w]+/i,
+		pattern: /%[-_\w]+/,
 		alias: 'selector'
 	},
-	'statement': /\B!(default|optional)\b/i,
-	'boolean': /\b(true|false)\b/,
-	'null': /\b(null)\b/,
-	'operator': /\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/
+	'statement': /\B!(?:default|optional)\b/i,
+	'boolean': /\b(?:true|false)\b/,
+	'null': /\bnull\b/,
+	'operator': {
+		pattern: /(\s)(?:[-+*\/%]|[=!]=|<=?|>=?|and|or|not)(?=\s)/,
+		lookbehind: true
+	}
 });
 
 Prism.languages.scss['atrule'].inside.rest = Prism.util.clone(Prism.languages.scss);
\ No newline at end of file
diff --git a/components/prism-scss.min.js b/components/prism-scss.min.js
index d8837a441e..7cf5ad407b 100644
--- a/components/prism-scss.min.js
+++ b/components/prism-scss.min.js
@@ -1 +1 @@
-Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,inside:{rule:/@[\w-]+/}},url:/([-a-z]+-)*url(?=\()/i,selector:{pattern:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m,inside:{placeholder:/%[-_\w]+/i}}}),Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)|(?=@for\s+\$[-_\w]+\s)+from/i}),Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i}),Prism.languages.insertBefore("scss","function",{placeholder:{pattern:/%[-_\w]+/i,alias:"selector"},statement:/\B!(default|optional)\b/i,"boolean":/\b(true|false)\b/,"null":/\b(null)\b/,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|%)\s+/}),Prism.languages.scss.atrule.inside.rest=Prism.util.clone(Prism.languages.scss);
\ No newline at end of file
+Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(?:\/\*[\w\W]*?\*\/|\/\/.*)/,lookbehind:!0},atrule:{pattern:/@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+[{;])/,inside:{rule:/@[\w-]+/}},url:/(?:[-a-z]+-)*url(?=\()/i,selector:{pattern:/(?=\S)[^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m,inside:{placeholder:/%[-_\w]+/}}}),Prism.languages.insertBefore("scss","atrule",{keyword:[/@(?:if|else(?: if)?|for|each|while|import|extend|debug|warn|mixin|include|function|return|content)/i,{pattern:/( +)(?:from|through)(?= )/,lookbehind:!0}]}),Prism.languages.insertBefore("scss","property",{variable:/\$[-_\w]+|#\{\$[-_\w]+\}/}),Prism.languages.insertBefore("scss","function",{placeholder:{pattern:/%[-_\w]+/,alias:"selector"},statement:/\B!(?:default|optional)\b/i,"boolean":/\b(?:true|false)\b/,"null":/\bnull\b/,operator:{pattern:/(\s)(?:[-+*\/%]|[=!]=|<=?|>=?|and|or|not)(?=\s)/,lookbehind:!0}}),Prism.languages.scss.atrule.inside.rest=Prism.util.clone(Prism.languages.scss);
\ No newline at end of file
diff --git a/tests/languages/scss+haml/scss_inclusion.test b/tests/languages/scss+haml/scss_inclusion.test
index 0fe4f2582a..3f52393c64 100644
--- a/tests/languages/scss+haml/scss_inclusion.test
+++ b/tests/languages/scss+haml/scss_inclusion.test
@@ -14,7 +14,7 @@
 [
 	["filter-scss", [
 		["filter-name", ":scss"],
-		["selector", ["\r\n\t#main "]],
+		["selector", ["#main "]],
 		["punctuation", "{"],
 		["property", "width"],
 		["punctuation", ":"],
@@ -25,7 +25,7 @@
 	["punctuation", "~"],
 	["filter-scss", [
 		["filter-name", ":scss"],
-		["selector", ["\r\n\t  #main "]],
+		["selector", ["#main "]],
 		["punctuation", "{"],
 		["property", "width"],
 		["punctuation", ":"],

From d49fec0af625ee1a1112a713dcfc51759a56a7be Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sun, 30 Aug 2015 23:50:04 +0200
Subject: [PATCH 278/310] SQL: Simplified regexp + fixed keywords and operators
 + add CHARSET keyword

---
 components/prism-sql.js     | 12 ++++++------
 components/prism-sql.min.js |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/prism-sql.js b/components/prism-sql.js
index 2b34ce1435..43a9a8bb52 100644
--- a/components/prism-sql.js
+++ b/components/prism-sql.js
@@ -1,17 +1,17 @@
 Prism.languages.sql= { 
 	'comment': {
-		pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|((--)|(\/\/)|#).*?(\r?\n|$))/,
+		pattern: /(^|[^\\])(?:\/\*[\w\W]*?\*\/|(?:--|\/\/|#).*)/,
 		lookbehind: true
 	},
 	'string' : {
-		pattern: /(^|[^@])("|')(\\?[\s\S])*?\2/,
+		pattern: /(^|[^@\\])("|')(?:\\?[\s\S])*?\2/,
 		lookbehind: true
 	},
-	'variable': /@[\w.$]+|@("|'|`)(\\?[\s\S])+?\1/,
+	'variable': /@[\w.$]+|@("|'|`)(?:\\?[\s\S])+?\1/,
 	'function': /\b(?:COUNT|SUM|AVG|MIN|MAX|FIRST|LAST|UCASE|LCASE|MID|LEN|ROUND|NOW|FORMAT)(?=\s*\()/i, // Should we highlight user defined functions too?
-	'keyword': /\b(?:ACTION|ADD|AFTER|ALGORITHM|ALTER|ANALYZE|APPLY|AS|ASC|AUTHORIZATION|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADE|CASCADED|CASE|CHAIN|CHAR VARYING|CHARACTER VARYING|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLUMN|COLUMNS|COMMENT|COMMIT|COMMITTED|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURSOR|DATA|DATABASE|DATABASES|DATETIME|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE|DOUBLE PRECISION|DROP|DUMMY|DUMP|DUMPFILE|DUPLICATE KEY|ELSE|ENABLE|ENCLOSED BY|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPE|ESCAPED BY|EXCEPT|EXEC|EXECUTE|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR|FOR EACH ROW|FORCE|FOREIGN|FREETEXT|FREETEXTTABLE|FROM|FULL|FUNCTION|GEOMETRY|GEOMETRYCOLLECTION|GLOBAL|GOTO|GRANT|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|IDENTITY|IDENTITY_INSERT|IDENTITYCOL|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTO|INVOKER|ISOLATION LEVEL|JOIN|KEY|KEYS|KILL|LANGUAGE SQL|LAST|LEFT|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONGBLOB|LONGTEXT|MATCH|MATCHED|MEDIUMBLOB|MEDIUMINT|MEDIUMTEXT|MERGE|MIDDLEINT|MODIFIES SQL DATA|MODIFY|MULTILINESTRING|MULTIPOINT|MULTIPOLYGON|NATIONAL|NATIONAL CHAR VARYING|NATIONAL CHARACTER|NATIONAL CHARACTER VARYING|NATIONAL VARCHAR|NATURAL|NCHAR|NCHAR VARCHAR|NEXT|NO|NO SQL|NOCHECK|NOCYCLE|NONCLUSTERED|NULLIF|NUMERIC|OF|OFF|OFFSETS|ON|OPEN|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPTIMIZE|OPTION|OPTIONALLY|ORDER|OUT|OUTER|OUTFILE|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREV|PRIMARY|PRINT|PRIVILEGES|PROC|PROCEDURE|PUBLIC|PURGE|QUICK|RAISERROR|READ|READS SQL DATA|READTEXT|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEATABLE|REPLICATION|REQUIRE|RESTORE|RESTRICT|RETURN|RETURNS|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROWCOUNT|ROWGUIDCOL|ROWS?|RTREE|RULE|SAVE|SAVEPOINT|SCHEMA|SELECT|SERIAL|SERIALIZABLE|SESSION|SESSION_USER|SET|SETUSER|SHARE MODE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|START|STARTING BY|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLE|TABLES|TABLESPACE|TEMP(?:ORARY)?|TEMPTABLE|TERMINATED BY|TEXT|TEXTSIZE|THEN|TIMESTAMP|TINYBLOB|TINYINT|TINYTEXT|TO|TOP|TRAN|TRANSACTION|TRANSACTIONS|TRIGGER|TRUNCATE|TSEQUAL|TYPE|TYPES|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNPIVOT|UPDATE|UPDATETEXT|USAGE|USE|USER|USING|VALUE|VALUES|VARBINARY|VARCHAR|VARCHARACTER|VARYING|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH|WITH ROLLUP|WITHIN|WORK|WRITE|WRITETEXT)\b/i,
+	'keyword': /\b(?:ACTION|ADD|AFTER|ALGORITHM|ALL|ALTER|ANALYZE|ANY|APPLY|AS|ASC|AUTHORIZATION|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADED?|CASE|CHAIN|CHAR VARYING|CHARACTER (?:SET|VARYING)|CHARSET|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMN|COLUMNS|COMMENT|COMMIT|COMMITTED|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT(?:_DATE|_TIME|_TIMESTAMP|_USER)?|CURSOR|DATA(?:BASES?)?|DATETIME|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE(?: PRECISION)?|DROP|DUMMY|DUMP(?:FILE)?|DUPLICATE KEY|ELSE|ENABLE|ENCLOSED BY|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPE(?:D BY)?|EXCEPT|EXEC(?:UTE)?|EXISTS|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR(?: EACH ROW)?|FORCE|FOREIGN|FREETEXT(?:TABLE)?|FROM|FULL|FUNCTION|GEOMETRY(?:COLLECTION)?|GLOBAL|GOTO|GRANT|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|IDENTITY(?:_INSERT|COL)?|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTO|INVOKER|ISOLATION LEVEL|JOIN|KEYS?|KILL|LANGUAGE SQL|LAST|LEFT|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONG(?:BLOB|TEXT)|MATCH(?:ED)?|MEDIUM(?:BLOB|INT|TEXT)|MERGE|MIDDLEINT|MODIFIES SQL DATA|MODIFY|MULTI(?:LINESTRING|POINT|POLYGON)|NATIONAL(?: CHAR VARYING| CHARACTER(?: VARYING)?| VARCHAR)?|NATURAL|NCHAR(?: VARCHAR)?|NEXT|NO(?: SQL|CHECK|CYCLE)?|NONCLUSTERED|NULLIF|NUMERIC|OFF?|OFFSETS?|ON|OPEN(?:DATASOURCE|QUERY|ROWSET)?|OPTIMIZE|OPTION(?:ALLY)?|ORDER|OUT(?:ER|FILE)?|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREV|PRIMARY|PRINT|PRIVILEGES|PROC(?:EDURE)?|PUBLIC|PURGE|QUICK|RAISERROR|READ(?:S SQL DATA|TEXT)?|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEATABLE|REPLICATION|REQUIRE|RESTORE|RESTRICT|RETURNS?|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROW(?:COUNT|GUIDCOL|S)?|RTREE|RULE|SAVE(?:POINT)?|SCHEMA|SELECT|SERIAL(?:IZABLE)?|SESSION(?:_USER)?|SET(?:USER)?|SHARE MODE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|START(?:ING BY)?|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLES?|TABLESPACE|TEMP(?:ORARY|TABLE)?|TERMINATED BY|TEXT(?:SIZE)?|THEN|TIMESTAMP|TINY(?:BLOB|INT|TEXT)|TOP?|TRAN(?:SACTIONS?)?|TRIGGER|TRUNCATE|TSEQUAL|TYPES?|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNIQUE|UNPIVOT|UPDATE(?:TEXT)?|USAGE|USE|USER|USING|VALUES?|VAR(?:BINARY|CHAR|CHARACTER|YING)|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH(?: ROLLUP|IN)?|WORK|WRITE(?:TEXT)?)\b/i,
 	'boolean': /\b(?:TRUE|FALSE|NULL)\b/i,
-	'number': /\b-?(0x)?\d*\.?[\da-f]+\b/,
-	'operator': /\b(?:ALL|AND|ANY|BETWEEN|EXISTS|IN|LIKE|NOT|OR|IS|UNIQUE|CHARACTER SET|COLLATE|DIV|OFFSET|REGEXP|RLIKE|SOUNDS LIKE|XOR)\b|[-+]|!|[=<>]{1,2}|(&){1,2}|\|?\||\?|\*|\//i,
+	'number': /\b-?(?:0x)?\d*\.?[\da-f]+\b/,
+	'operator': /[-+*\/=%^~]|&&?|\|?\||!=?|<(?:=>?|<|>)?|>[>=]?|\b(?:AND|BETWEEN|IN|LIKE|NOT|OR|IS|DIV|REGEXP|RLIKE|SOUNDS LIKE|XOR)\b/i,
 	'punctuation': /[;[\]()`,.]/
 };
\ No newline at end of file
diff --git a/components/prism-sql.min.js b/components/prism-sql.min.js
index 79723f0082..f0cddb0acb 100644
--- a/components/prism-sql.min.js
+++ b/components/prism-sql.min.js
@@ -1 +1 @@
-Prism.languages.sql={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|((--)|(\/\/)|#).*?(\r?\n|$))/,lookbehind:!0},string:{pattern:/(^|[^@])("|')(\\?[\s\S])*?\2/,lookbehind:!0},variable:/@[\w.$]+|@("|'|`)(\\?[\s\S])+?\1/,"function":/\b(?:COUNT|SUM|AVG|MIN|MAX|FIRST|LAST|UCASE|LCASE|MID|LEN|ROUND|NOW|FORMAT)(?=\s*\()/i,keyword:/\b(?:ACTION|ADD|AFTER|ALGORITHM|ALTER|ANALYZE|APPLY|AS|ASC|AUTHORIZATION|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADE|CASCADED|CASE|CHAIN|CHAR VARYING|CHARACTER VARYING|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLUMN|COLUMNS|COMMENT|COMMIT|COMMITTED|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURSOR|DATA|DATABASE|DATABASES|DATETIME|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE|DOUBLE PRECISION|DROP|DUMMY|DUMP|DUMPFILE|DUPLICATE KEY|ELSE|ENABLE|ENCLOSED BY|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPE|ESCAPED BY|EXCEPT|EXEC|EXECUTE|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR|FOR EACH ROW|FORCE|FOREIGN|FREETEXT|FREETEXTTABLE|FROM|FULL|FUNCTION|GEOMETRY|GEOMETRYCOLLECTION|GLOBAL|GOTO|GRANT|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|IDENTITY|IDENTITY_INSERT|IDENTITYCOL|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTO|INVOKER|ISOLATION LEVEL|JOIN|KEY|KEYS|KILL|LANGUAGE SQL|LAST|LEFT|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONGBLOB|LONGTEXT|MATCH|MATCHED|MEDIUMBLOB|MEDIUMINT|MEDIUMTEXT|MERGE|MIDDLEINT|MODIFIES SQL DATA|MODIFY|MULTILINESTRING|MULTIPOINT|MULTIPOLYGON|NATIONAL|NATIONAL CHAR VARYING|NATIONAL CHARACTER|NATIONAL CHARACTER VARYING|NATIONAL VARCHAR|NATURAL|NCHAR|NCHAR VARCHAR|NEXT|NO|NO SQL|NOCHECK|NOCYCLE|NONCLUSTERED|NULLIF|NUMERIC|OF|OFF|OFFSETS|ON|OPEN|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPTIMIZE|OPTION|OPTIONALLY|ORDER|OUT|OUTER|OUTFILE|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREV|PRIMARY|PRINT|PRIVILEGES|PROC|PROCEDURE|PUBLIC|PURGE|QUICK|RAISERROR|READ|READS SQL DATA|READTEXT|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEATABLE|REPLICATION|REQUIRE|RESTORE|RESTRICT|RETURN|RETURNS|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROWCOUNT|ROWGUIDCOL|ROWS?|RTREE|RULE|SAVE|SAVEPOINT|SCHEMA|SELECT|SERIAL|SERIALIZABLE|SESSION|SESSION_USER|SET|SETUSER|SHARE MODE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|START|STARTING BY|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLE|TABLES|TABLESPACE|TEMP(?:ORARY)?|TEMPTABLE|TERMINATED BY|TEXT|TEXTSIZE|THEN|TIMESTAMP|TINYBLOB|TINYINT|TINYTEXT|TO|TOP|TRAN|TRANSACTION|TRANSACTIONS|TRIGGER|TRUNCATE|TSEQUAL|TYPE|TYPES|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNPIVOT|UPDATE|UPDATETEXT|USAGE|USE|USER|USING|VALUE|VALUES|VARBINARY|VARCHAR|VARCHARACTER|VARYING|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH|WITH ROLLUP|WITHIN|WORK|WRITE|WRITETEXT)\b/i,"boolean":/\b(?:TRUE|FALSE|NULL)\b/i,number:/\b-?(0x)?\d*\.?[\da-f]+\b/,operator:/\b(?:ALL|AND|ANY|BETWEEN|EXISTS|IN|LIKE|NOT|OR|IS|UNIQUE|CHARACTER SET|COLLATE|DIV|OFFSET|REGEXP|RLIKE|SOUNDS LIKE|XOR)\b|[-+]|!|[=<>]{1,2}|(&){1,2}|\|?\||\?|\*|\//i,punctuation:/[;[\]()`,.]/};
\ No newline at end of file
+Prism.languages.sql={comment:{pattern:/(^|[^\\])(?:\/\*[\w\W]*?\*\/|(?:--|\/\/|#).*)/,lookbehind:!0},string:{pattern:/(^|[^@\\])("|')(?:\\?[\s\S])*?\2/,lookbehind:!0},variable:/@[\w.$]+|@("|'|`)(?:\\?[\s\S])+?\1/,"function":/\b(?:COUNT|SUM|AVG|MIN|MAX|FIRST|LAST|UCASE|LCASE|MID|LEN|ROUND|NOW|FORMAT)(?=\s*\()/i,keyword:/\b(?:ACTION|ADD|AFTER|ALGORITHM|ALL|ALTER|ANALYZE|ANY|APPLY|AS|ASC|AUTHORIZATION|BACKUP|BDB|BEGIN|BERKELEYDB|BIGINT|BINARY|BIT|BLOB|BOOL|BOOLEAN|BREAK|BROWSE|BTREE|BULK|BY|CALL|CASCADED?|CASE|CHAIN|CHAR VARYING|CHARACTER (?:SET|VARYING)|CHARSET|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMN|COLUMNS|COMMENT|COMMIT|COMMITTED|COMPUTE|CONNECT|CONSISTENT|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT(?:_DATE|_TIME|_TIMESTAMP|_USER)?|CURSOR|DATA(?:BASES?)?|DATETIME|DBCC|DEALLOCATE|DEC|DECIMAL|DECLARE|DEFAULT|DEFINER|DELAYED|DELETE|DENY|DESC|DESCRIBE|DETERMINISTIC|DISABLE|DISCARD|DISK|DISTINCT|DISTINCTROW|DISTRIBUTED|DO|DOUBLE(?: PRECISION)?|DROP|DUMMY|DUMP(?:FILE)?|DUPLICATE KEY|ELSE|ENABLE|ENCLOSED BY|END|ENGINE|ENUM|ERRLVL|ERRORS|ESCAPE(?:D BY)?|EXCEPT|EXEC(?:UTE)?|EXISTS|EXIT|EXPLAIN|EXTENDED|FETCH|FIELDS|FILE|FILLFACTOR|FIRST|FIXED|FLOAT|FOLLOWING|FOR(?: EACH ROW)?|FORCE|FOREIGN|FREETEXT(?:TABLE)?|FROM|FULL|FUNCTION|GEOMETRY(?:COLLECTION)?|GLOBAL|GOTO|GRANT|GROUP|HANDLER|HASH|HAVING|HOLDLOCK|IDENTITY(?:_INSERT|COL)?|IF|IGNORE|IMPORT|INDEX|INFILE|INNER|INNODB|INOUT|INSERT|INT|INTEGER|INTERSECT|INTO|INVOKER|ISOLATION LEVEL|JOIN|KEYS?|KILL|LANGUAGE SQL|LAST|LEFT|LIMIT|LINENO|LINES|LINESTRING|LOAD|LOCAL|LOCK|LONG(?:BLOB|TEXT)|MATCH(?:ED)?|MEDIUM(?:BLOB|INT|TEXT)|MERGE|MIDDLEINT|MODIFIES SQL DATA|MODIFY|MULTI(?:LINESTRING|POINT|POLYGON)|NATIONAL(?: CHAR VARYING| CHARACTER(?: VARYING)?| VARCHAR)?|NATURAL|NCHAR(?: VARCHAR)?|NEXT|NO(?: SQL|CHECK|CYCLE)?|NONCLUSTERED|NULLIF|NUMERIC|OFF?|OFFSETS?|ON|OPEN(?:DATASOURCE|QUERY|ROWSET)?|OPTIMIZE|OPTION(?:ALLY)?|ORDER|OUT(?:ER|FILE)?|OVER|PARTIAL|PARTITION|PERCENT|PIVOT|PLAN|POINT|POLYGON|PRECEDING|PRECISION|PREV|PRIMARY|PRINT|PRIVILEGES|PROC(?:EDURE)?|PUBLIC|PURGE|QUICK|RAISERROR|READ(?:S SQL DATA|TEXT)?|REAL|RECONFIGURE|REFERENCES|RELEASE|RENAME|REPEATABLE|REPLICATION|REQUIRE|RESTORE|RESTRICT|RETURNS?|REVOKE|RIGHT|ROLLBACK|ROUTINE|ROW(?:COUNT|GUIDCOL|S)?|RTREE|RULE|SAVE(?:POINT)?|SCHEMA|SELECT|SERIAL(?:IZABLE)?|SESSION(?:_USER)?|SET(?:USER)?|SHARE MODE|SHOW|SHUTDOWN|SIMPLE|SMALLINT|SNAPSHOT|SOME|SONAME|START(?:ING BY)?|STATISTICS|STATUS|STRIPED|SYSTEM_USER|TABLES?|TABLESPACE|TEMP(?:ORARY|TABLE)?|TERMINATED BY|TEXT(?:SIZE)?|THEN|TIMESTAMP|TINY(?:BLOB|INT|TEXT)|TOP?|TRAN(?:SACTIONS?)?|TRIGGER|TRUNCATE|TSEQUAL|TYPES?|UNBOUNDED|UNCOMMITTED|UNDEFINED|UNION|UNIQUE|UNPIVOT|UPDATE(?:TEXT)?|USAGE|USE|USER|USING|VALUES?|VAR(?:BINARY|CHAR|CHARACTER|YING)|VIEW|WAITFOR|WARNINGS|WHEN|WHERE|WHILE|WITH(?: ROLLUP|IN)?|WORK|WRITE(?:TEXT)?)\b/i,"boolean":/\b(?:TRUE|FALSE|NULL)\b/i,number:/\b-?(?:0x)?\d*\.?[\da-f]+\b/,operator:/[-+*\/=%^~]|&&?|\|?\||!=?|<(?:=>?|<|>)?|>[>=]?|\b(?:AND|BETWEEN|IN|LIKE|NOT|OR|IS|DIV|REGEXP|RLIKE|SOUNDS LIKE|XOR)\b/i,punctuation:/[;[\]()`,.]/};
\ No newline at end of file

From daf2597a68cda641af3c66b751ff20babbfb97a3 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 31 Aug 2015 08:27:53 +0200
Subject: [PATCH 279/310] Scala: Simplified patterns

---
 components/prism-scala.js     | 10 +++++-----
 components/prism-scala.min.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/prism-scala.js b/components/prism-scala.js
index 62070a2fb8..8d021b7dbb 100644
--- a/components/prism-scala.js
+++ b/components/prism-scala.js
@@ -1,9 +1,9 @@
 Prism.languages.scala = Prism.languages.extend('java', {
-	'keyword': /(<-|=>)|\b(abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|null|object|override|package|private|protected|return|sealed|self|super|this|throw|trait|try|type|val|var|while|with|yield)\b/,
-	'builtin': /\b(String|Int|Long|Short|Byte|Boolean|Double|Float|Char|Any|AnyRef|AnyVal|Unit|Nothing)\b/,
-	'number': /\b0x[\da-f]*\.?[\da-f\-]+\b|\b\d*\.?\d+[e]?[\d]*[dfl]?\b/i,
-	'symbol': /'([^\d\s]\w*)/,
-	'string': /(""")[\W\w]*?\1|("|\/)[\W\w]*?\2|('.')/
+	'keyword': /<-|=>|\b(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|null|object|override|package|private|protected|return|sealed|self|super|this|throw|trait|try|type|val|var|while|with|yield)\b/,
+	'string': /"""[\W\w]*?"""|"(?:[^"\\\r\n]|\\.)*"|'(?:[^\\\r\n']|\\.[^\\']*)'/,
+	'builtin': /\b(?:String|Int|Long|Short|Byte|Boolean|Double|Float|Char|Any|AnyRef|AnyVal|Unit|Nothing)\b/,
+	'number': /\b(?:0x[\da-f]*\.?[\da-f]+|\d*\.?\d+e?\d*[dfl]?)\b/i,
+	'symbol': /'[^\d\s\\]\w*/
 });
 delete Prism.languages.scala['class-name'];
 delete Prism.languages.scala['function'];
diff --git a/components/prism-scala.min.js b/components/prism-scala.min.js
index 014c793db5..a8acb0aff8 100644
--- a/components/prism-scala.min.js
+++ b/components/prism-scala.min.js
@@ -1 +1 @@
-Prism.languages.scala=Prism.languages.extend("java",{keyword:/(<-|=>)|\b(abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|null|object|override|package|private|protected|return|sealed|self|super|this|throw|trait|try|type|val|var|while|with|yield)\b/,builtin:/\b(String|Int|Long|Short|Byte|Boolean|Double|Float|Char|Any|AnyRef|AnyVal|Unit|Nothing)\b/,number:/\b0x[\da-f]*\.?[\da-f\-]+\b|\b\d*\.?\d+[e]?[\d]*[dfl]?\b/i,symbol:/'([^\d\s]\w*)/,string:/(""")[\W\w]*?\1|("|\/)[\W\w]*?\2|('.')/}),delete Prism.languages.scala["class-name"],delete Prism.languages.scala["function"];
\ No newline at end of file
+Prism.languages.scala=Prism.languages.extend("java",{keyword:/<-|=>|\b(?:abstract|case|catch|class|def|do|else|extends|final|finally|for|forSome|if|implicit|import|lazy|match|new|null|object|override|package|private|protected|return|sealed|self|super|this|throw|trait|try|type|val|var|while|with|yield)\b/,string:/"""[\W\w]*?"""|"(?:[^"\\\r\n]|\\.)*"|'(?:[^\\\r\n']|\\.[^\\']*)'/,builtin:/\b(?:String|Int|Long|Short|Byte|Boolean|Double|Float|Char|Any|AnyRef|AnyVal|Unit|Nothing)\b/,number:/\b(?:0x[\da-f]*\.?[\da-f]+|\d*\.?\d+e?\d*[dfl]?)\b/i,symbol:/'[^\d\s\\]\w*/}),delete Prism.languages.scala["class-name"],delete Prism.languages.scala["function"];
\ No newline at end of file

From 068704a2f69d409bf8f26b62988998a60080f3ad Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 31 Aug 2015 09:06:27 +0200
Subject: [PATCH 280/310] Scheme: Fixes and simplifications

---
 components/prism-scheme.js     | 17 ++++++++++-------
 components/prism-scheme.min.js |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/components/prism-scheme.js b/components/prism-scheme.js
index 7966e543b4..9541d3cf78 100644
--- a/components/prism-scheme.js
+++ b/components/prism-scheme.js
@@ -1,22 +1,25 @@
 Prism.languages.scheme = {
-	'boolean' : /#(t|f){1}/,
 	'comment' : /;.*/,
+	'string' :  /"(?:[^"\\\r\n]|\\.)*?"|'[^'\s]+/, //thanks http://stackoverflow.com/questions/171480/regex-grabbing-values-between-quotation-marks
 	'keyword' : {
-		pattern : /([(])(define(-syntax|-library|-values)?|(case-)?lambda|let(-values|(rec)?(\*)?)?|else|if|cond|begin|delay|delay-force|parameterize|guard|set!|(quasi-)?quote|syntax-rules)/,
+		pattern : /(\()(?:define(?:-syntax|-library|-values)?|(?:case-)?lambda|let(?:\*|rec)?(?:-values)?|else|if|cond|begin|delay(?:-force)?|parameterize|guard|set!|(?:quasi-)?quote|syntax-rules)/,
 		lookbehind : true
 	},
 	'builtin' : {
-		pattern :  /([(])(cons|car|cdr|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b/,
+		pattern :  /(\()(?:(?:cons|car|cdr|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?)/,
 		lookbehind : true
 	},
-	'string' :  /(["])(?:(?=(\\?))\2.)*?\1|'[^('|\s)]+/, //thanks http://stackoverflow.com/questions/171480/regex-grabbing-values-between-quotation-marks
 	'number' : {
-		pattern: /(\s|\))[-+]?[0-9]*\.?[0-9]+((\s*)[-+]{1}(\s*)[0-9]*\.?[0-9]+i)?/,
+		pattern: /(\s|\))[-+]?[0-9]*\.?[0-9]+(?:\s*[-+]\s*[0-9]*\.?[0-9]+i)?\b/,
+		lookbehind: true
+	},
+	'boolean' : /#[tf]/,
+	'operator': {
+		pattern: /(\()(?:[-+*%\/]|[<>]=?|=>?)/,
 		lookbehind: true
 	},
-	'operator': /(\*|\+|\-|%|\/|<=|=>|>=|<|=|>)/,
 	'function' : {
-		pattern : /([(])[^(\s|\))]*\s/,
+		pattern : /(\()[^\s()]*(?=\s)/,
 		lookbehind : true
 	},
 	'punctuation' : /[()]/
diff --git a/components/prism-scheme.min.js b/components/prism-scheme.min.js
index 131ec36e2b..fb53cdaee7 100644
--- a/components/prism-scheme.min.js
+++ b/components/prism-scheme.min.js
@@ -1 +1 @@
-Prism.languages.scheme={"boolean":/#(t|f){1}/,comment:/;.*/,keyword:{pattern:/([(])(define(-syntax|-library|-values)?|(case-)?lambda|let(-values|(rec)?(\*)?)?|else|if|cond|begin|delay|delay-force|parameterize|guard|set!|(quasi-)?quote|syntax-rules)/,lookbehind:!0},builtin:{pattern:/([(])(cons|car|cdr|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b/,lookbehind:!0},string:/(["])(?:(?=(\\?))\2.)*?\1|'[^('|\s)]+/,number:{pattern:/(\s|\))[-+]?[0-9]*\.?[0-9]+((\s*)[-+]{1}(\s*)[0-9]*\.?[0-9]+i)?/,lookbehind:!0},operator:/(\*|\+|\-|%|\/|<=|=>|>=|<|=|>)/,"function":{pattern:/([(])[^(\s|\))]*\s/,lookbehind:!0},punctuation:/[()]/};
\ No newline at end of file
+Prism.languages.scheme={comment:/;.*/,string:/"(?:[^"\\\r\n]|\\.)*?"|'[^'\s]+/,keyword:{pattern:/(\()(?:define(?:-syntax|-library|-values)?|(?:case-)?lambda|let(?:\*|rec)?(?:-values)?|else|if|cond|begin|delay(?:-force)?|parameterize|guard|set!|(?:quasi-)?quote|syntax-rules)/,lookbehind:!0},builtin:{pattern:/(\()(?:(?:cons|car|cdr|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?)/,lookbehind:!0},number:{pattern:/(\s|\))[-+]?[0-9]*\.?[0-9]+(?:\s*[-+]\s*[0-9]*\.?[0-9]+i)?\b/,lookbehind:!0},"boolean":/#[tf]/,operator:{pattern:/(\()(?:[-+*%\/]|[<>]=?|=>?)/,lookbehind:!0},"function":{pattern:/(\()[^\s()]*(?=\s)/,lookbehind:!0},punctuation:/[()]/};
\ No newline at end of file

From fa7df0864c936949a130b61f16b2064df7407166 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 31 Aug 2015 09:12:32 +0200
Subject: [PATCH 281/310] Scheme: Don't match content of symbols starting with
 a parenthesis

---
 components/prism-scheme.js     | 2 +-
 components/prism-scheme.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/prism-scheme.js b/components/prism-scheme.js
index 9541d3cf78..4cdbd0b90a 100644
--- a/components/prism-scheme.js
+++ b/components/prism-scheme.js
@@ -1,6 +1,6 @@
 Prism.languages.scheme = {
 	'comment' : /;.*/,
-	'string' :  /"(?:[^"\\\r\n]|\\.)*?"|'[^'\s]+/, //thanks http://stackoverflow.com/questions/171480/regex-grabbing-values-between-quotation-marks
+	'string' :  /"(?:[^"\\\r\n]|\\.)*?"|'[^('\s]*/,
 	'keyword' : {
 		pattern : /(\()(?:define(?:-syntax|-library|-values)?|(?:case-)?lambda|let(?:\*|rec)?(?:-values)?|else|if|cond|begin|delay(?:-force)?|parameterize|guard|set!|(?:quasi-)?quote|syntax-rules)/,
 		lookbehind : true
diff --git a/components/prism-scheme.min.js b/components/prism-scheme.min.js
index fb53cdaee7..00fada1aac 100644
--- a/components/prism-scheme.min.js
+++ b/components/prism-scheme.min.js
@@ -1 +1 @@
-Prism.languages.scheme={comment:/;.*/,string:/"(?:[^"\\\r\n]|\\.)*?"|'[^'\s]+/,keyword:{pattern:/(\()(?:define(?:-syntax|-library|-values)?|(?:case-)?lambda|let(?:\*|rec)?(?:-values)?|else|if|cond|begin|delay(?:-force)?|parameterize|guard|set!|(?:quasi-)?quote|syntax-rules)/,lookbehind:!0},builtin:{pattern:/(\()(?:(?:cons|car|cdr|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?)/,lookbehind:!0},number:{pattern:/(\s|\))[-+]?[0-9]*\.?[0-9]+(?:\s*[-+]\s*[0-9]*\.?[0-9]+i)?\b/,lookbehind:!0},"boolean":/#[tf]/,operator:{pattern:/(\()(?:[-+*%\/]|[<>]=?|=>?)/,lookbehind:!0},"function":{pattern:/(\()[^\s()]*(?=\s)/,lookbehind:!0},punctuation:/[()]/};
\ No newline at end of file
+Prism.languages.scheme={comment:/;.*/,string:/"(?:[^"\\\r\n]|\\.)*?"|'[^('\s]*/,keyword:{pattern:/(\()(?:define(?:-syntax|-library|-values)?|(?:case-)?lambda|let(?:\*|rec)?(?:-values)?|else|if|cond|begin|delay(?:-force)?|parameterize|guard|set!|(?:quasi-)?quote|syntax-rules)/,lookbehind:!0},builtin:{pattern:/(\()(?:(?:cons|car|cdr|list|call-with-current-continuation|call\/cc|append|abs|apply|eval)\b|null\?|pair\?|boolean\?|eof-object\?|char\?|procedure\?|number\?|port\?|string\?|vector\?|symbol\?|bytevector\?)/,lookbehind:!0},number:{pattern:/(\s|\))[-+]?[0-9]*\.?[0-9]+(?:\s*[-+]\s*[0-9]*\.?[0-9]+i)?\b/,lookbehind:!0},"boolean":/#[tf]/,operator:{pattern:/(\()(?:[-+*%\/]|[<>]=?|=>?)/,lookbehind:!0},"function":{pattern:/(\()[^\s()]*(?=\s)/,lookbehind:!0},punctuation:/[()]/};
\ No newline at end of file

From d8966223ab4054c133eddca173c98f83ae074a84 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 31 Aug 2015 19:57:12 +0200
Subject: [PATCH 282/310] Smalltalk: Simplified patterns

---
 components/prism-smalltalk.js     | 4 ++--
 components/prism-smalltalk.min.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-smalltalk.js b/components/prism-smalltalk.js
index 0ffc59d20f..029ad93f31 100644
--- a/components/prism-smalltalk.js
+++ b/components/prism-smalltalk.js
@@ -3,7 +3,7 @@ Prism.languages.smalltalk = {
 	'string': /'(?:''|[^'])+'/,
 	'symbol': /#[\da-z]+|#(?:-|([+\/\\*~<>=@%|&?!])\1?)|#(?=\()/i,
 	'block-arguments': {
-		pattern: /(\[\s*)(?=:)[^\[|]+?\|/,
+		pattern: /(\[\s*):[^\[|]*?\|/,
 		lookbehind: true,
 		inside: {
 			'variable': /:[\da-z]+/i,
@@ -26,6 +26,6 @@ Prism.languages.smalltalk = {
 		/\d+r-?[\dA-Z]+(?:\.[\dA-Z]+)?(?:e-?\d+)?/,
 		/(?:\B-|\b)\d+(?:\.\d+)?(?:e-?\d+)?/
 	],
-	'operator': /[:=~<>]=|~~|\/\/|\\\\|>>|[!^=<>+\-*\/&|,@]/,
+	'operator': /[<=]=?|:=|~[~=]|\/\/?|\\\\|>[>=]?|[!^+\-*&|,@]/,
 	'punctuation': /[.;:?\[\](){}]/
 };
\ No newline at end of file
diff --git a/components/prism-smalltalk.min.js b/components/prism-smalltalk.min.js
index 505460cf2f..e57d55a370 100644
--- a/components/prism-smalltalk.min.js
+++ b/components/prism-smalltalk.min.js
@@ -1 +1 @@
-Prism.languages.smalltalk={comment:/"(?:""|[^"])+"/,string:/'(?:''|[^'])+'/,symbol:/#[\da-z]+|#(?:-|([+\/\\*~<>=@%|&?!])\1?)|#(?=\()/i,"block-arguments":{pattern:/(\[\s*)(?=:)[^\[|]+?\|/,lookbehind:!0,inside:{variable:/:[\da-z]+/i,punctuation:/\|/}},"temporary-variables":{pattern:/\|[^|]+\|/,inside:{variable:/[\da-z]+/i,punctuation:/\|/}},keyword:/\b(?:nil|true|false|self|super|new)\b/,character:{pattern:/\$./,alias:"string"},number:[/\d+r-?[\dA-Z]+(?:\.[\dA-Z]+)?(?:e-?\d+)?/,/(?:\B-|\b)\d+(?:\.\d+)?(?:e-?\d+)?/],operator:/[:=~<>]=|~~|\/\/|\\\\|>>|[!^=<>+\-*\/&|,@]/,punctuation:/[.;:?\[\](){}]/};
\ No newline at end of file
+Prism.languages.smalltalk={comment:/"(?:""|[^"])+"/,string:/'(?:''|[^'])+'/,symbol:/#[\da-z]+|#(?:-|([+\/\\*~<>=@%|&?!])\1?)|#(?=\()/i,"block-arguments":{pattern:/(\[\s*):[^\[|]*?\|/,lookbehind:!0,inside:{variable:/:[\da-z]+/i,punctuation:/\|/}},"temporary-variables":{pattern:/\|[^|]+\|/,inside:{variable:/[\da-z]+/i,punctuation:/\|/}},keyword:/\b(?:nil|true|false|self|super|new)\b/,character:{pattern:/\$./,alias:"string"},number:[/\d+r-?[\dA-Z]+(?:\.[\dA-Z]+)?(?:e-?\d+)?/,/(?:\B-|\b)\d+(?:\.\d+)?(?:e-?\d+)?/],operator:/[<=]=?|:=|~[~=]|\/\/?|\\\\|>[>=]?|[!^+\-*&|,@]/,punctuation:/[.;:?\[\](){}]/};
\ No newline at end of file

From 85d8a55634eeb124345c4cff934439612225b5f2 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 31 Aug 2015 20:55:52 +0200
Subject: [PATCH 283/310] Markup: Don't allow = to appear in tag name

---
 components/prism-markup.js     | 2 +-
 components/prism-markup.min.js | 2 +-
 prism.js                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/prism-markup.js b/components/prism-markup.js
index f3abdf28b5..81f66fcc97 100644
--- a/components/prism-markup.js
+++ b/components/prism-markup.js
@@ -4,7 +4,7 @@ Prism.languages.markup = {
 	'doctype': /<!DOCTYPE[\w\W]+?>/,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
-		pattern: /<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+		pattern: /<\/?[^\s>\/=]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,
diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
index 6a17f5eb13..1a7281ae0e 100644
--- a/components/prism-markup.min.js
+++ b/components/prism-markup.min.js
@@ -1 +1 @@
-Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?[\w\W]+?\?>/,doctype:/<!DOCTYPE[\w\W]+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
+Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?[\w\W]+?\?>/,doctype:/<!DOCTYPE[\w\W]+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/=]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index fe17031325..cac5a6165e 100644
--- a/prism.js
+++ b/prism.js
@@ -439,7 +439,7 @@ Prism.languages.markup = {
 	'doctype': /<!DOCTYPE[\w\W]+?>/,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
-		pattern: /<\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+		pattern: /<\/?[^\s>\/=]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,

From 14467005884c1052f70871627ae14c392fc341f5 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Mon, 31 Aug 2015 20:56:26 +0200
Subject: [PATCH 284/310] Smarty: Optimized regexps + fixed punctuation and
 operators

---
 components/prism-smarty.js     | 12 +++++++-----
 components/prism-smarty.min.js |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/prism-smarty.js b/components/prism-smarty.js
index a38049cc9b..40209cee48 100644
--- a/components/prism-smarty.js
+++ b/components/prism-smarty.js
@@ -18,8 +18,8 @@
 					pattern: /^\{|\}$/i,
 					alias: 'punctuation'
 				},
-				'string': /(["'])(\\?.)*?\1/,
-				'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
+				'string': /(["'])(?:\\?.)*?\1/,
+				'number': /\b-?(?:0x[\dA-Fa-f]+|\d*\.?\d+(?:[Ee][-+]?\d+)?)\b/,
 				'variable': [
 					/\$(?!\d)\w+/,
 					/#(?!\d)\w+#/,
@@ -48,12 +48,14 @@
 							pattern: /(=\s*)(?!\d)\w+/,
 							lookbehind: true
 						},
-						"punctuation": /=/
+						"operator": /=/
 					}
 				},
-				'punctuation': /[\[\]().,=\|:`]|\->/,
+				'punctuation': [
+					/[\[\]().,:`]|\->/
+				],
 				'operator': [
-					/[+\-*\/%]|===?|[!<>]=?|&&|\|\|/,
+					/[+\-*\/%]|==?=?|[!<>]=?|&&|\|\|?/,
 					/\bis\s+(?:not\s+)?(?:div|even|odd)(?:\s+by)?\b/,
 					/\b(?:eq|neq?|gt|lt|gt?e|lt?e|not|mod|or|and)\b/
 				],
diff --git a/components/prism-smarty.min.js b/components/prism-smarty.min.js
index 6d09e8d5f3..defe855d0f 100644
--- a/components/prism-smarty.min.js
+++ b/components/prism-smarty.min.js
@@ -1 +1 @@
-!function(e){var t=/\{\*[\w\W]+?\*\}|\{[\w\W]+?\}/g,a="{literal}",n="{/literal}",o=!1;e.languages.smarty=e.languages.extend("markup",{smarty:{pattern:t,inside:{delimiter:{pattern:/^\{|\}$/i,alias:"punctuation"},string:/(["'])(\\?.)*?\1/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,variable:[/\$(?!\d)\w+/,/#(?!\d)\w+#/,{pattern:/(\.|->)(?!\d)\w+/,lookbehind:!0},{pattern:/(\[)(?!\d)\w+(?=\])/,lookbehind:!0}],"function":[{pattern:/(\|\s*)@?(?!\d)\w+/,lookbehind:!0},/^\/?(?!\d)\w+/,/(?!\d)\w+(?=\()/],"attr-name":{pattern:/\w+\s*=\s*(?:(?!\d)\w+)?/,inside:{variable:{pattern:/(=\s*)(?!\d)\w+/,lookbehind:!0},punctuation:/=/}},punctuation:/[\[\]().,=\|:`]|\->/,operator:[/[+\-*\/%]|===?|[!<>]=?|&&|\|\|/,/\bis\s+(?:not\s+)?(?:div|even|odd)(?:\s+by)?\b/,/\b(?:eq|neq?|gt|lt|gt?e|lt?e|not|mod|or|and)\b/],keyword:/\b(?:false|off|on|no|true|yes)\b/}}}),e.languages.insertBefore("smarty","tag",{"smarty-comment":{pattern:/\{\*[\w\W]*?\*\}/,alias:["smarty","comment"]}}),e.hooks.add("before-highlight",function(e){"smarty"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(t,function(t){return t===n&&(o=!1),o?t:(t===a&&(o=!0),e.tokenStack.push(t),"___SMARTY"+e.tokenStack.length+"___")}))}),e.hooks.add("before-insert",function(e){"smarty"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),e.hooks.add("after-highlight",function(t){if("smarty"===t.language){for(var a,n=0;a=t.tokenStack[n];n++)t.highlightedCode=t.highlightedCode.replace("___SMARTY"+(n+1)+"___",e.highlight(a,t.grammar,"smarty"));t.element.innerHTML=t.highlightedCode}})}(Prism);
\ No newline at end of file
+!function(e){var t=/\{\*[\w\W]+?\*\}|\{[\w\W]+?\}/g,a="{literal}",n="{/literal}",o=!1;e.languages.smarty=e.languages.extend("markup",{smarty:{pattern:t,inside:{delimiter:{pattern:/^\{|\}$/i,alias:"punctuation"},string:/(["'])(?:\\?.)*?\1/,number:/\b-?(?:0x[\dA-Fa-f]+|\d*\.?\d+(?:[Ee][-+]?\d+)?)\b/,variable:[/\$(?!\d)\w+/,/#(?!\d)\w+#/,{pattern:/(\.|->)(?!\d)\w+/,lookbehind:!0},{pattern:/(\[)(?!\d)\w+(?=\])/,lookbehind:!0}],"function":[{pattern:/(\|\s*)@?(?!\d)\w+/,lookbehind:!0},/^\/?(?!\d)\w+/,/(?!\d)\w+(?=\()/],"attr-name":{pattern:/\w+\s*=\s*(?:(?!\d)\w+)?/,inside:{variable:{pattern:/(=\s*)(?!\d)\w+/,lookbehind:!0},operator:/=/}},punctuation:[/[\[\]().,:`]|\->/],operator:[/[+\-*\/%]|==?=?|[!<>]=?|&&|\|\|?/,/\bis\s+(?:not\s+)?(?:div|even|odd)(?:\s+by)?\b/,/\b(?:eq|neq?|gt|lt|gt?e|lt?e|not|mod|or|and)\b/],keyword:/\b(?:false|off|on|no|true|yes)\b/}}}),e.languages.insertBefore("smarty","tag",{"smarty-comment":{pattern:/\{\*[\w\W]*?\*\}/,alias:["smarty","comment"]}}),e.hooks.add("before-highlight",function(e){"smarty"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(t,function(t){return t===n&&(o=!1),o?t:(t===a&&(o=!0),e.tokenStack.push(t),"___SMARTY"+e.tokenStack.length+"___")}))}),e.hooks.add("before-insert",function(e){"smarty"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),e.hooks.add("after-highlight",function(t){if("smarty"===t.language){for(var a,n=0;a=t.tokenStack[n];n++)t.highlightedCode=t.highlightedCode.replace("___SMARTY"+(n+1)+"___",e.highlight(a,t.grammar,"smarty"));t.element.innerHTML=t.highlightedCode}})}(Prism);
\ No newline at end of file

From 77297288da8ced0eea15d940a4e9b630108d82c0 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 2 Sep 2015 00:47:09 +0200
Subject: [PATCH 285/310] Stylus: Rewrote the component entirely

---
 components/prism-stylus.js                    | 153 +++++++++++-------
 components/prism-stylus.min.js                |   2 +-
 examples/prism-stylus.html                    |  10 +-
 .../stylus+jade/stylus_inclusion.test         |  10 +-
 4 files changed, 107 insertions(+), 68 deletions(-)

diff --git a/components/prism-stylus.js b/components/prism-stylus.js
index fd04d786cd..c80a0e48e3 100644
--- a/components/prism-stylus.js
+++ b/components/prism-stylus.js
@@ -1,61 +1,102 @@
-Prism.languages.stylus = {
-	'comment': {
-		pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,
-		lookbehind: true
-	},
-	'keyword': /(px|r?em|ex|ch|vw|vh|vmin|vmax|deg|grad|rad|turn|m?s|k?Hz|dpi|dppx|dpcm)\b|\b(is|defined|not|isnt|and|or|unless|for|in)\b/g,
-	'atrule': /@[\w-]+(?=\s+\S+)/gi,
-	'url': /url\((["']?).*?\1\)/gi,
-	'variable': /^\s*([\w-]+)(?=\s*[+-\\]?=)/gm,
-	'string': /("|')(\\\n|\\?.)*?\1/g,
-	'important': /\B!important\b/gi,
-	'hexcode': /#[\da-f]{3,6}/gi,
-	'entity': /\\[\da-f]{1,8}/gi,
-	'number': /\d+\.?\d*%?/g,
-	'selector': [
-		{
-			pattern: /::?(after|before|first-letter|first-line|selection)/g,
-			alias: 'pseudo-element'
-		},{
-			pattern: /:(?:active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|in-range|invalid|lang|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-of-type|only-child|optional|out-of-range|read-only|read-write|required|root|target|valid|visited)(?:\(.*\))?/g,
-			alias:'pseudo-class'
-		},{
-			pattern: /\[[\w-]+?\s*[*~$^|=]?(?:=\s*\S+)?\]/g,
+(function (Prism) {
+	var inside = {
+		'url': /url\((["']?).*?\1\)/i,
+		'string': /("|')(?:[^\\\r\n]|\\(?:\r\n|[\s\S]))*?\1/,
+		'interpolation': null, // See below
+		'func': null, // See below
+		'important': /\B!(?:important|optional)\b/i,
+		'keyword': {
+			pattern: /(^|\s+)(?:(?:if|else|for|return|unless)(?=\s+|$)|@[\w-]+)/,
+			lookbehind: true
+		},
+		'hexcode': /#[\da-f]{3,6}/i,
+		'number': /\b\d+(?:\.\d+)?%?/,
+		'boolean': /\b(?:true|false)\b/,
+		'operator': [
+			// We want non-word chars around "-" because it is
+			// accepted in property names.
+			/~|[+!\/%<>?=]=?|[-:]=|\*[*=]?|\.+|&&|\|\||\B-\B|\b(?:and|in|is(?: a| defined| not|nt)?|not|or)\b/
+		],
+		'punctuation': /[{}()\[\];:,]/
+	};
+
+	inside['interpolation'] = {
+		pattern: /\{[^\r\n}:]+\}/,
+		alias: 'variable',
+		inside: Prism.util.clone(inside)
+	};
+	inside['func'] = {
+		pattern: /[\w-]+\([^)]*\).*/,
+		inside: {
+			'function': /^[^(]+/,
+			rest: Prism.util.clone(inside)
+		}
+	};
+
+	Prism.languages.stylus = {
+		'comment': {
+			pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*)/,
+			lookbehind: true
+		},
+		'atrule-declaration': {
+			pattern: /(^\s*)@.+/m,
+			lookbehind: true,
 			inside: {
-				"attr-name":
-				{
-					pattern: /(\[)([\w-]+)(?=\s*[*~$^|=]{0,2})/g,
-					lookbehind: true
-				},
-				"punctuation": /\[|\]/g,
-				"operator": /[*~$^|=]/g,
-				"attr-value": {
-					pattern: /\S+/
-				},
-			},
-			alias: 'attr'
+				'atrule': /^@[\w-]+/,
+				rest: inside
+			}
 		},
-		{
-			pattern: /\.[a-z-]+/i,
-			alias: 'class'
+		'variable-declaration': {
+			pattern: /(^[ \t]*)[\w$-]+\s*.?=[ \t]*(?:(?:\{[^}]*\}|.+)|$)/m,
+			lookbehind: true,
+			inside: {
+				'variable': /^\S+/,
+				rest: inside
+			}
 		},
-		{
-			pattern: /#[a-z-]+/i,
-			alias: 'id'
+
+		'statement': {
+			pattern: /(^[ \t]*)(?:if|else|for|return|unless)[ \t]+.+/m,
+			lookbehind: true,
+			inside: {
+				keyword: /^\S+/,
+				rest: inside
+			}
 		},
-		{
-			pattern: /\b(html|head|title|base|link|meta|style|script|noscript|template|body|section|nav|article|aside|h[1-6]|header|footer|address|main|p|hr|pre|blockquote|ol|ul|li|dl|dt|dd|figure|figcaption|div|a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|dbo|span|br|wbr|ins|del|image|iframe|embed|object|param|video|audio|source|track|canvas|map|area|sv|math|table|caption|colgroup|col|tbody|thead|tfoot|tr|td|th|form|fieldset|legeng|label|input|button|select|datalist|optgroup|option|textarea|keygen|output|progress|meter|details|summary|menuitem|menu)\b/g,
-			alias: 'tag'
+
+		// A property/value pair cannot end with a comma or a brace
+		// It cannot have indented content unless it ended with a semicolon
+		'property-declaration': {
+			pattern: /((?:^|\{)([ \t]*))(?:[\w-]|\{[^}\r\n]+\})+(?:\s*:\s*|[ \t]+)[^{\r\n]*(?:;|[^{\r\n,](?=$)(?!(\r?\n|\r)(?:\{|\2[ \t]+)))/m,
+			lookbehind: true,
+			inside: {
+				'property': {
+					pattern: /^[^\s:]+/,
+					inside: {
+						'interpolation': inside.interpolation
+					}
+				},
+				rest: inside
+			}
 		},
-	],
-	'property': [
-		/^\s*([a-z-]+)(?=\s+[\w\W]+|\s*:)(?!\s*\{|\r?\n)/mig,
-		{
-			pattern: /(\(\s*)([a-z-]+)(?=\s*:)/ig,
-			lookbehind: true
-		}
-	],
-	'function': /[-a-z0-9]+(?=\()/ig,
-	'punctuation': /[\{\};:]/g,
-	'operator': /[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/g
-}
+
+
+
+		// A selector can contain parentheses only as part of a pseudo-element
+		// It can span multiple lines.
+		// It must end with a comma or an accolade or have indented content.
+		'selector': {
+			pattern: /(^[ \t]*)(?:(?=\S)(?:[^{}\r\n:()]|::?[\w-]+(?:\([^)\r\n]*\))?|\{[^}\r\n]+\})+)(?:(?:\r?\n|\r)(?:\1(?:(?=\S)(?:[^{}\r\n:()]|::?[\w-]+(?:\([^)\r\n]*\))?|\{[^}\r\n]+\})+)))*(?:,$|\{|(?=(?:\r?\n|\r)(?:\{|\1[ \t]+)))/m,
+			lookbehind: true,
+			inside: {
+				'interpolation': inside.interpolation,
+				'punctuation': /[{},]/
+			}
+		},
+
+		'func': inside.func,
+		'string': inside.string,
+		'interpolation': inside.interpolation,
+		'punctuation': /[{}()\[\];:.]/
+	};
+}(Prism));
\ No newline at end of file
diff --git a/components/prism-stylus.min.js b/components/prism-stylus.min.js
index ed5c27ace8..e9088e2cbb 100644
--- a/components/prism-stylus.min.js
+++ b/components/prism-stylus.min.js
@@ -1 +1 @@
-Prism.languages.stylus={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},keyword:/(px|r?em|ex|ch|vw|vh|vmin|vmax|deg|grad|rad|turn|m?s|k?Hz|dpi|dppx|dpcm)\b|\b(is|defined|not|isnt|and|or|unless|for|in)\b/g,atrule:/@[\w-]+(?=\s+\S+)/gi,url:/url\((["']?).*?\1\)/gi,variable:/^\s*([\w-]+)(?=\s*[+-\\]?=)/gm,string:/("|')(\\\n|\\?.)*?\1/g,important:/\B!important\b/gi,hexcode:/#[\da-f]{3,6}/gi,entity:/\\[\da-f]{1,8}/gi,number:/\d+\.?\d*%?/g,selector:[{pattern:/::?(after|before|first-letter|first-line|selection)/g,alias:"pseudo-element"},{pattern:/:(?:active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|in-range|invalid|lang|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-of-type|only-child|optional|out-of-range|read-only|read-write|required|root|target|valid|visited)(?:\(.*\))?/g,alias:"pseudo-class"},{pattern:/\[[\w-]+?\s*[*~$^|=]?(?:=\s*\S+)?\]/g,inside:{"attr-name":{pattern:/(\[)([\w-]+)(?=\s*[*~$^|=]{0,2})/g,lookbehind:!0},punctuation:/\[|\]/g,operator:/[*~$^|=]/g,"attr-value":{pattern:/\S+/}},alias:"attr"},{pattern:/\.[a-z-]+/i,alias:"class"},{pattern:/#[a-z-]+/i,alias:"id"},{pattern:/\b(html|head|title|base|link|meta|style|script|noscript|template|body|section|nav|article|aside|h[1-6]|header|footer|address|main|p|hr|pre|blockquote|ol|ul|li|dl|dt|dd|figure|figcaption|div|a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|dbo|span|br|wbr|ins|del|image|iframe|embed|object|param|video|audio|source|track|canvas|map|area|sv|math|table|caption|colgroup|col|tbody|thead|tfoot|tr|td|th|form|fieldset|legeng|label|input|button|select|datalist|optgroup|option|textarea|keygen|output|progress|meter|details|summary|menuitem|menu)\b/g,alias:"tag"}],property:[/^\s*([a-z-]+)(?=\s+[\w\W]+|\s*:)(?!\s*\{|\r?\n)/gim,{pattern:/(\(\s*)([a-z-]+)(?=\s*:)/gi,lookbehind:!0}],"function":/[-a-z0-9]+(?=\()/gi,punctuation:/[\{\};:]/g,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|&{1,2}|\|?\||\?|\*|\/|~|\^|%/g};
\ No newline at end of file
+!function(n){var t={url:/url\((["']?).*?\1\)/i,string:/("|')(?:[^\\\r\n]|\\(?:\r\n|[\s\S]))*?\1/,interpolation:null,func:null,important:/\B!(?:important|optional)\b/i,keyword:{pattern:/(^|\s+)(?:(?:if|else|for|return|unless)(?=\s+|$)|@[\w-]+)/,lookbehind:!0},hexcode:/#[\da-f]{3,6}/i,number:/\b\d+(?:\.\d+)?%?/,"boolean":/\b(?:true|false)\b/,operator:[/~|[+!\/%<>?=]=?|[-:]=|\*[*=]?|\.+|&&|\|\||\B-\B|\b(?:and|in|is(?: a| defined| not|nt)?|not|or)\b/],punctuation:/[{}()\[\];:,]/};t.interpolation={pattern:/\{[^\r\n}:]+\}/,alias:"variable",inside:n.util.clone(t)},t.func={pattern:/[\w-]+\([^)]*\).*/,inside:{"function":/^[^(]+/,rest:n.util.clone(t)}},n.languages.stylus={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*)/,lookbehind:!0},"atrule-declaration":{pattern:/(^\s*)@.+/m,lookbehind:!0,inside:{atrule:/^@[\w-]+/,rest:t}},"variable-declaration":{pattern:/(^[ \t]*)[\w$-]+\s*.?=[ \t]*(?:(?:\{[^}]*\}|.+)|$)/m,lookbehind:!0,inside:{variable:/^\S+/,rest:t}},statement:{pattern:/(^[ \t]*)(?:if|else|for|return|unless)[ \t]+.+/m,lookbehind:!0,inside:{keyword:/^\S+/,rest:t}},"property-declaration":{pattern:/((?:^|\{)([ \t]*))(?:[\w-]|\{[^}\r\n]+\})+(?:\s*:\s*|[ \t]+)[^{\r\n]*(?:;|[^{\r\n,](?=$)(?!(\r?\n|\r)(?:\{|\2[ \t]+)))/m,lookbehind:!0,inside:{property:{pattern:/^[^\s:]+/,inside:{interpolation:t.interpolation}},rest:t}},selector:{pattern:/(^[ \t]*)(?:(?=\S)(?:[^{}\r\n:()]|::?[\w-]+(?:\([^)\r\n]*\))?|\{[^}\r\n]+\})+)(?:(?:\r?\n|\r)(?:\1(?:(?=\S)(?:[^{}\r\n:()]|::?[\w-]+(?:\([^)\r\n]*\))?|\{[^}\r\n]+\})+)))*(?:,$|\{|(?=(?:\r?\n|\r)(?:\{|\1[ \t]+)))/m,lookbehind:!0,inside:{interpolation:t.interpolation,punctuation:/[{},]/}},func:t.func,string:t.string,interpolation:t.interpolation,punctuation:/[{}()\[\];:.]/}}(Prism);
\ No newline at end of file
diff --git a/examples/prism-stylus.html b/examples/prism-stylus.html
index f910de0f3a..eb5e22c515 100644
--- a/examples/prism-stylus.html
+++ b/examples/prism-stylus.html
@@ -29,7 +29,7 @@ <h2>Full Example</h2>
 body
 	font: 12px Helvetica, Arial, sans-serif
 
-a.link > button#test, input[type=button], a:after()
+a.link > button#test, input[type=button], a:after
 	-webkit-border-radius: 5px
 	-moz-border-radius: 5px
 	border-radius: 5px
@@ -81,9 +81,5 @@ <h2>Known failures</h2>
 	If a failure is listed here, it doesn’t mean it will never be fixed. This is more of a “known bugs” list, just with a certain type of bug.
 </p>
 
-<h3>Incorrect highlighting when tags like literals are used inside a string</h3>
-<pre><code>add(a, b)
-	if a is a 'unit' and b is a 'unit'
-		a + b
-	else
-		(error 'a and b must be units!')</code></pre>
+<h3>Comment-like substrings</h3>
+<pre><code>"foo // bar";</code></pre>
diff --git a/tests/languages/stylus+jade/stylus_inclusion.test b/tests/languages/stylus+jade/stylus_inclusion.test
index 08e4af83a0..3c7c8d2574 100644
--- a/tests/languages/stylus+jade/stylus_inclusion.test
+++ b/tests/languages/stylus+jade/stylus_inclusion.test
@@ -6,10 +6,12 @@
 [
 	["filter-stylus", [
 		["filter-name", ":stylus"],
-		["variable", "\r\n  font-size"],
-		["operator", "="],
-		["number", "14"],
-		["keyword", "px"]
+		["variable-declaration", [
+			["variable", "font-size"],
+			["operator", "="],
+			["number", "14"],
+			"px"
+		]]
 	]]
 ]
 

From 936e429369eb25a632317c99d9016bc11dc91a03 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 2 Sep 2015 08:01:07 +0200
Subject: [PATCH 286/310] Swift: optimized keywords lists and removed
 duplicates

---
 components/prism-swift.js     | 6 +++---
 components/prism-swift.min.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/prism-swift.js b/components/prism-swift.js
index 953b7177cd..dbe4b72967 100644
--- a/components/prism-swift.js
+++ b/components/prism-swift.js
@@ -1,8 +1,8 @@
 // issues: nested multiline comments, highlighting inside string interpolations
 Prism.languages.swift = Prism.languages.extend('clike', {
-	'keyword': /\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic|dynamicType|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__COLUMN__|__FILE__|__FUNCTION__|__LINE__)\b/,
+	'keyword': /\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic(?:Type)?|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__(?:COLUMN__|FILE__|FUNCTION__|LINE__))\b/,
 	'number': /\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,
 	'constant': /\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,
-	'atrule': /@\b(IBOutlet|IBDesignable|IBAction|IBInspectable|class_protocol|exported|noreturn|NSCopying|NSManaged|objc|UIApplicationMain|auto_closure)\b/,
-	'builtin': /\b([A-Z]\S+|abs|advance|alignof|alignofValue|assert|contains|count|countElements|debugPrint|debugPrintln|distance|dropFirst|dropLast|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lazy|lexicographicalCompare|map|max|maxElement|min|minElement|numericCast|overlaps|partition|prefix|print|println|reduce|reflect|reverse|sizeof|sizeofValue|sort|sorted|split|startsWith|stride|strideof|strideofValue|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|withExtendedLifetime|withUnsafeMutablePointer|withUnsafeMutablePointers|withUnsafePointer|withUnsafePointers|withVaList)\b/
+	'atrule': /@\b(IB(?:Outlet|Designable|Action|Inspectable)|class_protocol|exported|noreturn|NS(?:Copying|Managed)|objc|UIApplicationMain|auto_closure)\b/,
+	'builtin': /\b([A-Z]\S+|abs|advance|alignof(?:Value)?|assert|contains|count(?:Elements)?|debugPrint(?:ln)?|distance|drop(?:First|Last)|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lexicographicalCompare|map|max(?:Element)?|min(?:Element)?|numericCast|overlaps|partition|print(?:ln)?|reduce|reflect|reverse|sizeof(?:Value)?|sort(?:ed)?|split|startsWith|stride(?:of(?:Value)?)?|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|with(?:ExtendedLifetime|Unsafe(?:MutablePointers?|Pointers?)|VaList))\b/
 });
diff --git a/components/prism-swift.min.js b/components/prism-swift.min.js
index 863366b193..84106e4876 100644
--- a/components/prism-swift.min.js
+++ b/components/prism-swift.min.js
@@ -1 +1 @@
-Prism.languages.swift=Prism.languages.extend("clike",{keyword:/\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic|dynamicType|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__COLUMN__|__FILE__|__FUNCTION__|__LINE__)\b/,number:/\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,constant:/\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,atrule:/@\b(IBOutlet|IBDesignable|IBAction|IBInspectable|class_protocol|exported|noreturn|NSCopying|NSManaged|objc|UIApplicationMain|auto_closure)\b/,builtin:/\b([A-Z]\S+|abs|advance|alignof|alignofValue|assert|contains|count|countElements|debugPrint|debugPrintln|distance|dropFirst|dropLast|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lazy|lexicographicalCompare|map|max|maxElement|min|minElement|numericCast|overlaps|partition|prefix|print|println|reduce|reflect|reverse|sizeof|sizeofValue|sort|sorted|split|startsWith|stride|strideof|strideofValue|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|withExtendedLifetime|withUnsafeMutablePointer|withUnsafeMutablePointers|withUnsafePointer|withUnsafePointers|withVaList)\b/});
\ No newline at end of file
+Prism.languages.swift=Prism.languages.extend("clike",{keyword:/\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic(?:Type)?|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__(?:COLUMN__|FILE__|FUNCTION__|LINE__))\b/,number:/\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,constant:/\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,atrule:/@\b(IB(?:Outlet|Designable|Action|Inspectable)|class_protocol|exported|noreturn|NS(?:Copying|Managed)|objc|UIApplicationMain|auto_closure)\b/,builtin:/\b([A-Z]\S+|abs|advance|alignof(?:Value)?|assert|contains|count(?:Elements)?|debugPrint(?:ln)?|distance|drop(?:First|Last)|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lexicographicalCompare|map|max(?:Element)?|min(?:Element)?|numericCast|overlaps|partition|print(?:ln)?|reduce|reflect|reverse|sizeof(?:Value)?|sort(?:ed)?|split|startsWith|stride(?:of(?:Value)?)?|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|with(?:ExtendedLifetime|Unsafe(?:MutablePointers?|Pointers?)|VaList))\b/});
\ No newline at end of file

From 2d8271fdc55af085fb9c580453dbd782faf0bece Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 2 Sep 2015 08:54:31 +0200
Subject: [PATCH 287/310] Twig: optimized regexps + fixed operators + added
 missing operators/keywords

---
 components/prism-twig.js     | 35 +++++++++++++++++------------------
 components/prism-twig.min.js |  2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/components/prism-twig.js b/components/prism-twig.js
index 7a8baccaa2..09208b7c5c 100644
--- a/components/prism-twig.js
+++ b/components/prism-twig.js
@@ -1,40 +1,39 @@
 Prism.languages.twig = {
 	'comment': /\{#[\s\S]*?#\}/,
 	'tag': {
-		pattern: /(\{\{[\s\S]*?\}\}|\{%[\s\S]*?%\})/,
+		pattern: /\{\{[\s\S]*?\}\}|\{%[\s\S]*?%\}/,
 		inside: {
 			'ld': {
-				pattern: /^(\{\{\-?|\{%\-?\s*\w+)/,
+				pattern: /^(?:\{\{\-?|\{%\-?\s*\w+)/,
 				inside: {
-					'punctuation': /^(\{\{|\{%)\-?/,
+					'punctuation': /^(?:\{\{|\{%)\-?/,
 					'keyword': /\w+/
 				}
 			},
 			'rd': {
-				pattern: /\-?(%\}|\}\})$/,
+				pattern: /\-?(?:%\}|\}\})$/,
 				inside: {
 					'punctuation': /.*/
 				}
 			},
 			'string': {
-				pattern: /("|')(\\?.)*?\1/,
+				pattern: /("|')(?:\\?.)*?\1/,
 				inside: {
-					'punctuation': /^('|")|('|")$/
-				}
-			},
-			'keyword': /\b(if)\b/,
-			'boolean': /\b(true|false|null)\b/,
-			'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
-			'operator': /==|=|!=|<|>|>=|<=|\+|\-|~|\*|\/|\/\/|%|\*\*|\|/,
-			'space-operator': {
-				pattern: /(\s)(\b(not|b\-and|b\-xor|b\-or|and|or|in|matches|starts with|ends with|is)\b|\?|:|\?:)(?=\s)/,
-				lookbehind: true,
-				inside: {
-					'operator': /.*/
+					'punctuation': /^['"]|['"]$/
 				}
 			},
+			'keyword': /\b(?:even|if|odd)\b/,
+			'boolean': /\b(?:true|false|null)\b/,
+			'number': /\b-?(?:0x[\dA-Fa-f]+|\d*\.?\d+([Ee][-+]?\d+)?)\b/,
+			'operator': [
+				{
+					pattern: /(\s)(?:and|b\-and|b\-xor|b\-or|ends with|in|is|matches|not|or|same as|starts with)(?=\s)/,
+					lookbehind: true
+				},
+				/[=<>]=?|!=|\*\*?|\/\/?|\?:?|[-+~%|]/
+			],
 			'property': /\b[a-zA-Z_][a-zA-Z0-9_]*\b/,
-			'punctuation': /\(|\)|\[\]|\[|\]|\{|\}|:|\.|,/
+			'punctuation': /[()\[\]{}:.,]/
 		}
 	},
 
diff --git a/components/prism-twig.min.js b/components/prism-twig.min.js
index 0cea17fa93..6bd5bae518 100644
--- a/components/prism-twig.min.js
+++ b/components/prism-twig.min.js
@@ -1 +1 @@
-Prism.languages.twig={comment:/\{#[\s\S]*?#\}/,tag:{pattern:/(\{\{[\s\S]*?\}\}|\{%[\s\S]*?%\})/,inside:{ld:{pattern:/^(\{\{\-?|\{%\-?\s*\w+)/,inside:{punctuation:/^(\{\{|\{%)\-?/,keyword:/\w+/}},rd:{pattern:/\-?(%\}|\}\})$/,inside:{punctuation:/.*/}},string:{pattern:/("|')(\\?.)*?\1/,inside:{punctuation:/^('|")|('|")$/}},keyword:/\b(if)\b/,"boolean":/\b(true|false|null)\b/,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,operator:/==|=|!=|<|>|>=|<=|\+|\-|~|\*|\/|\/\/|%|\*\*|\|/,"space-operator":{pattern:/(\s)(\b(not|b\-and|b\-xor|b\-or|and|or|in|matches|starts with|ends with|is)\b|\?|:|\?:)(?=\s)/,lookbehind:!0,inside:{operator:/.*/}},property:/\b[a-zA-Z_][a-zA-Z0-9_]*\b/,punctuation:/\(|\)|\[\]|\[|\]|\{|\}|:|\.|,/}},other:{pattern:/\S(?:[\s\S]*\S)?/,inside:Prism.languages.markup}};
\ No newline at end of file
+Prism.languages.twig={comment:/\{#[\s\S]*?#\}/,tag:{pattern:/\{\{[\s\S]*?\}\}|\{%[\s\S]*?%\}/,inside:{ld:{pattern:/^(?:\{\{\-?|\{%\-?\s*\w+)/,inside:{punctuation:/^(?:\{\{|\{%)\-?/,keyword:/\w+/}},rd:{pattern:/\-?(?:%\}|\}\})$/,inside:{punctuation:/.*/}},string:{pattern:/("|')(?:\\?.)*?\1/,inside:{punctuation:/^['"]|['"]$/}},keyword:/\b(?:even|if|odd)\b/,"boolean":/\b(?:true|false|null)\b/,number:/\b-?(?:0x[\dA-Fa-f]+|\d*\.?\d+([Ee][-+]?\d+)?)\b/,operator:[{pattern:/(\s)(?:and|b\-and|b\-xor|b\-or|ends with|in|is|matches|not|or|same as|starts with)(?=\s)/,lookbehind:!0},/[=<>]=?|!=|\*\*?|\/\/?|\?:?|[-+~%|]/],property:/\b[a-zA-Z_][a-zA-Z0-9_]*\b/,punctuation:/[()\[\]{}:.,]/}},other:{pattern:/\S(?:[\s\S]*\S)?/,inside:Prism.languages.markup}};
\ No newline at end of file

From 4533f17d0f08e0e93650c7cadb138e3e94f7098d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Wed, 2 Sep 2015 22:48:22 +0200
Subject: [PATCH 288/310] VHDL: Move operator overloading before strings, don't
 capture if not needed, handle \r\n and \r, fix numbers

---
 components/prism-vhdl.js     | 25 ++++++++++++-------------
 components/prism-vhdl.min.js |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/components/prism-vhdl.js b/components/prism-vhdl.js
index bed5ffece6..c638e55603 100644
--- a/components/prism-vhdl.js
+++ b/components/prism-vhdl.js
@@ -5,20 +5,19 @@ Prism.languages.vhdl = {
 		'pattern': /\b[oxb]"[\da-f_]+"|"[01uxzwlh-]+"/i,
 		'alias': 'number'
 	},
-	'string': /"(\\\n|\\?.)*?"/,
-	'constant': /\b(use|library)\b/i,
-	// support for predefined attributes included
-	'keyword': /\b('active|'ascending|'base|'delayed|'driving|'driving_value|'event|'high|'image|'instance_name|'last_active|'last_event|'last_value|'left|'leftof|'length|'low|'path_name|'pos|'pred|'quiet|'range|'reverse_range|'right|'rightof|'simple_name|'stable|'succ|'transaction|'val|'value|access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|shared|signal|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with)\b/i,
-	'boolean': /\b(true|false)\b/i,
-	'function': {
-		// support for operator overloading included
-		pattern: /([a-z0-9_]+|"\S+")\(/i,
-		inside: {
-			punctuation: /\(/
-		}
+	// support for operator overloading included
+	'quoted-function': {
+		pattern: /"\S+?"(?=\()/,
+		alias: 'function'
 	},
+	'string': /"(?:[^\\\r\n]|\\?(?:\r\n|[\s\S]))*?"/,
+	'constant': /\b(?:use|library)\b/i,
+	// support for predefined attributes included
+	'keyword': /\b(?:'active|'ascending|'base|'delayed|'driving|'driving_value|'event|'high|'image|'instance_name|'last_active|'last_event|'last_value|'left|'leftof|'length|'low|'path_name|'pos|'pred|'quiet|'range|'reverse_range|'right|'rightof|'simple_name|'stable|'succ|'transaction|'val|'value|access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|shared|signal|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with)\b/i,
+	'boolean': /\b(?:true|false)\b/i,
+	'function': /[a-z0-9_]+(?=\()/i,
 	// decimal, based, physical, and exponential numbers supported
-	'number': /'[01uxzwlh-]'|\b\d+[_.]*(#[\da-f_.]+#)?(e[-+]?\d+)?/i,
-	'operator': /<=?|>=?|:=|[-+*/&=]|\b(abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,
+	'number': /'[01uxzwlh-]'|\b(?:\d+#[\da-f_.]+#|\d[\d_.]*)(?:e[-+]?\d+)?/i,
+	'operator': /[<>]=?|:=|[-+*/&=]|\b(?:abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,
 	'punctuation': /[{}[\];(),.:]/
 };
diff --git a/components/prism-vhdl.min.js b/components/prism-vhdl.min.js
index 3680f052e9..d6da696d7a 100644
--- a/components/prism-vhdl.min.js
+++ b/components/prism-vhdl.min.js
@@ -1 +1 @@
-Prism.languages.vhdl={comment:/--.+/,"vhdl-vectors":{pattern:/\b[oxb]"[\da-f_]+"|"[01uxzwlh-]+"/i,alias:"number"},string:/"(\\\n|\\?.)*?"/,constant:/\b(use|library)\b/i,keyword:/\b('active|'ascending|'base|'delayed|'driving|'driving_value|'event|'high|'image|'instance_name|'last_active|'last_event|'last_value|'left|'leftof|'length|'low|'path_name|'pos|'pred|'quiet|'range|'reverse_range|'right|'rightof|'simple_name|'stable|'succ|'transaction|'val|'value|access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|shared|signal|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with)\b/i,"boolean":/\b(true|false)\b/i,"function":{pattern:/([a-z0-9_]+|"\S+")\(/i,inside:{punctuation:/\(/}},number:/'[01uxzwlh-]'|\b\d+[_.]*(#[\da-f_.]+#)?(e[-+]?\d+)?/i,operator:/<=?|>=?|:=|[-+*/&=]|\b(abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.vhdl={comment:/--.+/,"vhdl-vectors":{pattern:/\b[oxb]"[\da-f_]+"|"[01uxzwlh-]+"/i,alias:"number"},"quoted-function":{pattern:/"\S+?"(?=\()/,alias:"function"},string:/"(?:[^\\\r\n]|\\?(?:\r\n|[\s\S]))*?"/,constant:/\b(?:use|library)\b/i,keyword:/\b(?:'active|'ascending|'base|'delayed|'driving|'driving_value|'event|'high|'image|'instance_name|'last_active|'last_event|'last_value|'left|'leftof|'length|'low|'path_name|'pos|'pred|'quiet|'range|'reverse_range|'right|'rightof|'simple_name|'stable|'succ|'transaction|'val|'value|access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|shared|signal|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with)\b/i,"boolean":/\b(?:true|false)\b/i,"function":/[a-z0-9_]+(?=\()/i,number:/'[01uxzwlh-]'|\b(?:\d+#[\da-f_.]+#|\d[\d_.]*)(?:e[-+]?\d+)?/i,operator:/[<>]=?|:=|[-+*/&=]|\b(?:abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file

From 8cf9e6a07425bdc7355757d37297ee35ef51a8ad Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 3 Sep 2015 08:27:37 +0200
Subject: [PATCH 289/310] Wiki markup: fixed emphasis + merged some url
 patterns + added TODOs

---
 components/prism-wiki.js     | 17 +++++++++--------
 components/prism-wiki.min.js |  2 +-
 examples/prism-wiki.html     |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/prism-wiki.js b/components/prism-wiki.js
index 5ee978769a..4a5f128142 100644
--- a/components/prism-wiki.js
+++ b/components/prism-wiki.js
@@ -12,18 +12,19 @@ Prism.languages.wiki = Prism.languages.extend('markup', {
 		}
 	},
 	'emphasis': {
-		pattern: /('{2,4}).+?\1/,
+		// TODO Multi-line
+		pattern: /('{2,5}).+?\1/,
 		inside: {
 			'bold italic': {
-				pattern: /('''').+?(?=\1)/,
+				pattern: /(''''').+?(?=\1)/,
 				lookbehind: true
 			},
 			'bold': {
-				pattern: /(''').+?(?=\1)/,
+				pattern: /(''')[^'](?:.*?[^'])?(?=\1)/,
 				lookbehind: true
 			},
 			'italic': {
-				pattern: /('').+?(?=\1)/,
+				pattern: /('')[^'](?:.*?[^'])?(?=\1)/,
 				lookbehind: true
 			},
 			'punctuation': /^''+|''+$/
@@ -34,13 +35,13 @@ Prism.languages.wiki = Prism.languages.extend('markup', {
 		alias: 'punctuation'
 	},
 	'url': [
-		/ISBN +(?:97[89][ -]?)?(?:\d[ -]?){9}[\dx]\b/i,
-		/(?:RFC|PMID) +\d+/,
-		/\[\[.+?\]\]/,
-		/\[.+?\]/
+		/ISBN +(?:97[89][ -]?)?(?:\d[ -]?){9}[\dx]\b|(?:RFC|PMID) +\d+/i,
+		/\[\[.+?\]\]|\[.+?\]/
 	],
 	'variable': [
 		/__[A-Z]+__/,
+		// FIXME Nested structures should be handled
+		// {{formatnum:{{#expr:{{{3}}}}}}}
 		/\{{3}.+?\}{3}/,
 		/\{\{.+?}}/
 	],
diff --git a/components/prism-wiki.min.js b/components/prism-wiki.min.js
index 3f1bf263c7..0e7e8cccd1 100644
--- a/components/prism-wiki.min.js
+++ b/components/prism-wiki.min.js
@@ -1 +1 @@
-Prism.languages.wiki=Prism.languages.extend("markup",{"block-comment":{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0,alias:"comment"},heading:{pattern:/^(=+).+?\1/m,inside:{punctuation:/^=+|=+$/,important:/.+/}},emphasis:{pattern:/('{2,4}).+?\1/,inside:{"bold italic":{pattern:/('''').+?(?=\1)/,lookbehind:!0},bold:{pattern:/(''').+?(?=\1)/,lookbehind:!0},italic:{pattern:/('').+?(?=\1)/,lookbehind:!0},punctuation:/^''+|''+$/}},hr:{pattern:/^-{4,}/m,alias:"punctuation"},url:[/ISBN +(?:97[89][ -]?)?(?:\d[ -]?){9}[\dx]\b/i,/(?:RFC|PMID) +\d+/,/\[\[.+?\]\]/,/\[.+?\]/],variable:[/__[A-Z]+__/,/\{{3}.+?\}{3}/,/\{\{.+?}}/],symbol:[/^#redirect/im,/~{3,5}/],"table-tag":{pattern:/((?:^|[|!])[|!])[^|\r\n]+\|(?!\|)/m,lookbehind:!0,inside:{"table-bar":{pattern:/\|$/,alias:"punctuation"},rest:Prism.languages.markup.tag.inside}},punctuation:/^(?:\{\||\|\}|\|-|[*#:;!|])|\|\||!!/m}),Prism.languages.insertBefore("wiki","tag",{nowiki:{pattern:/<(nowiki|pre|source)\b[\w\W]*?>[\w\W]*?<\/\1>/i,inside:{tag:{pattern:/<(?:nowiki|pre|source)\b[\w\W]*?>|<\/(?:nowiki|pre|source)>/i,inside:Prism.languages.markup.tag.inside}}}});
\ No newline at end of file
+Prism.languages.wiki=Prism.languages.extend("markup",{"block-comment":{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0,alias:"comment"},heading:{pattern:/^(=+).+?\1/m,inside:{punctuation:/^=+|=+$/,important:/.+/}},emphasis:{pattern:/('{2,5}).+?\1/,inside:{"bold italic":{pattern:/(''''').+?(?=\1)/,lookbehind:!0},bold:{pattern:/(''')[^'](?:.*?[^'])?(?=\1)/,lookbehind:!0},italic:{pattern:/('')[^'](?:.*?[^'])?(?=\1)/,lookbehind:!0},punctuation:/^''+|''+$/}},hr:{pattern:/^-{4,}/m,alias:"punctuation"},url:[/ISBN +(?:97[89][ -]?)?(?:\d[ -]?){9}[\dx]\b|(?:RFC|PMID) +\d+/i,/\[\[.+?\]\]|\[.+?\]/],variable:[/__[A-Z]+__/,/\{{3}.+?\}{3}/,/\{\{.+?}}/],symbol:[/^#redirect/im,/~{3,5}/],"table-tag":{pattern:/((?:^|[|!])[|!])[^|\r\n]+\|(?!\|)/m,lookbehind:!0,inside:{"table-bar":{pattern:/\|$/,alias:"punctuation"},rest:Prism.languages.markup.tag.inside}},punctuation:/^(?:\{\||\|\}|\|-|[*#:;!|])|\|\||!!/m}),Prism.languages.insertBefore("wiki","tag",{nowiki:{pattern:/<(nowiki|pre|source)\b[\w\W]*?>[\w\W]*?<\/\1>/i,inside:{tag:{pattern:/<(?:nowiki|pre|source)\b[\w\W]*?>|<\/(?:nowiki|pre|source)>/i,inside:Prism.languages.markup.tag.inside}}}});
\ No newline at end of file
diff --git a/examples/prism-wiki.html b/examples/prism-wiki.html
index 1ac9b17460..6cded5ef98 100644
--- a/examples/prism-wiki.html
+++ b/examples/prism-wiki.html
@@ -14,7 +14,7 @@ <h2>Headings</h2>
 ====== Header 6 ======</code></pre>
 
 <h2>Bold and italic</h2>
-<pre><code>''''Both bold and italic''''
+<pre><code>'''''Both bold and italic'''''
 '''Only bold'''
 ''Only italic''</code></pre>
 

From 9f5c93c62d609f6c3b84344268622ca0d5733aad Mon Sep 17 00:00:00 2001
From: Dmitriy Shekhovtsov <valorkin@gmail.com>
Date: Thu, 3 Sep 2015 13:45:26 +0300
Subject: [PATCH 290/310] Fix: node.js hacks for components and prism.js

---
 components/prism-core.js                       | 5 +++++
 plugins/file-highlight/prism-file-highlight.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/prism-core.js b/components/prism-core.js
index 6b5799350b..d59b09e5a7 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -426,3 +426,8 @@ return _self.Prism;
 if (typeof module !== 'undefined' && module.exports) {
 	module.exports = Prism;
 }
+
+// hack for components to work correctly in node.js
+if (typeof global !== 'undefined') {
+	global.Prism = Prism;
+}
diff --git a/plugins/file-highlight/prism-file-highlight.js b/plugins/file-highlight/prism-file-highlight.js
index 1a49254f27..6a2a540635 100644
--- a/plugins/file-highlight/prism-file-highlight.js
+++ b/plugins/file-highlight/prism-file-highlight.js
@@ -1,5 +1,5 @@
 (function () {
-	if (!self.Prism || !self.document || !document.querySelector) {
+	if (typeof self === 'undefined' || !self.Prism || !self.document || !document.querySelector) {
 		return;
 	}
 

From c8f83b20132dbf686c1a138a1ae2ceb499c03bcc Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 3 Sep 2015 18:43:33 +0200
Subject: [PATCH 291/310] Run gulp task

---
 components/prism-core.min.js                       | 2 +-
 plugins/file-highlight/prism-file-highlight.min.js | 2 +-
 prism.js                                           | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/prism-core.min.js b/components/prism-core.min.js
index 9499c01cf6..093a0cf7a9 100644
--- a/components/prism-core.min.js
+++ b/components/prism-core.min.js
@@ -1 +1 @@
-var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism);
\ No newline at end of file
+var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
\ No newline at end of file
diff --git a/plugins/file-highlight/prism-file-highlight.min.js b/plugins/file-highlight/prism-file-highlight.min.js
index 2d75007f66..fbf04b93c4 100644
--- a/plugins/file-highlight/prism-file-highlight.min.js
+++ b/plugins/file-highlight/prism-file-highlight.min.js
@@ -1 +1 @@
-!function(){self.Prism&&self.document&&document.querySelector&&(self.Prism.fileHighlight=function(){var e={js:"javascript",html:"markup",svg:"markup",xml:"markup",py:"python",rb:"ruby",ps1:"powershell",psm1:"powershell"};Array.prototype.forEach&&Array.prototype.slice.call(document.querySelectorAll("pre[data-src]")).forEach(function(t){for(var r,a=t.getAttribute("data-src"),s=t,n=/\blang(?:uage)?-(?!\*)(\w+)\b/i;s&&!n.test(s.className);)s=s.parentNode;if(s&&(r=(t.className.match(n)||[,""])[1]),!r){var o=(a.match(/\.(\w+)$/)||[,""])[1];r=e[o]||o}var l=document.createElement("code");l.className="language-"+r,t.textContent="",l.textContent="Loading…",t.appendChild(l);var i=new XMLHttpRequest;i.open("GET",a,!0),i.onreadystatechange=function(){4==i.readyState&&(i.status<400&&i.responseText?(l.textContent=i.responseText,Prism.highlightElement(l)):l.textContent=i.status>=400?"✖ Error "+i.status+" while fetching file: "+i.statusText:"✖ Error: File does not exist or is empty")},i.send(null)})},self.Prism.fileHighlight())}();
\ No newline at end of file
+!function(){"undefined"!=typeof self&&self.Prism&&self.document&&document.querySelector&&(self.Prism.fileHighlight=function(){var e={js:"javascript",html:"markup",svg:"markup",xml:"markup",py:"python",rb:"ruby",ps1:"powershell",psm1:"powershell"};Array.prototype.forEach&&Array.prototype.slice.call(document.querySelectorAll("pre[data-src]")).forEach(function(t){for(var r,a=t.getAttribute("data-src"),s=t,n=/\blang(?:uage)?-(?!\*)(\w+)\b/i;s&&!n.test(s.className);)s=s.parentNode;if(s&&(r=(t.className.match(n)||[,""])[1]),!r){var o=(a.match(/\.(\w+)$/)||[,""])[1];r=e[o]||o}var l=document.createElement("code");l.className="language-"+r,t.textContent="",l.textContent="Loading…",t.appendChild(l);var i=new XMLHttpRequest;i.open("GET",a,!0),i.onreadystatechange=function(){4==i.readyState&&(i.status<400&&i.responseText?(l.textContent=i.responseText,Prism.highlightElement(l)):l.textContent=i.status>=400?"✖ Error "+i.status+" while fetching file: "+i.statusText:"✖ Error: File does not exist or is empty")},i.send(null)})},self.Prism.fileHighlight())}();
\ No newline at end of file
diff --git a/prism.js b/prism.js
index cac5a6165e..345e877d35 100644
--- a/prism.js
+++ b/prism.js
@@ -428,6 +428,11 @@ if (typeof module !== 'undefined' && module.exports) {
 	module.exports = Prism;
 }
 
+// hack for components to work correctly in node.js
+if (typeof global !== 'undefined') {
+	global.Prism = Prism;
+}
+
 
 /* **********************************************
      Begin prism-markup.js
@@ -624,7 +629,7 @@ if (Prism.languages.markup) {
 ********************************************** */
 
 (function () {
-	if (!self.Prism || !self.document || !document.querySelector) {
+	if (typeof self === 'undefined' || !self.Prism || !self.document || !document.querySelector) {
 		return;
 	}
 

From 0356c58c369dca940a17bbf0f9af767d676eefd0 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 3 Sep 2015 19:09:48 +0200
Subject: [PATCH 292/310] Apply changes from #754 to all plugins so that none
 of them throw errors in node. Autolinker, Show invisibles and WPD can now be
 used with node. Removed unused minified CSS file. Also added missing space
 between attributes during wrapping.

---
 components/prism-core.js                      |  2 +-
 components/prism-core.min.js                  |  2 +-
 plugins/autolinker/prism-autolinker.js        |  5 ++++-
 plugins/autolinker/prism-autolinker.min.js    |  2 +-
 .../prism-highlight-keywords.js               |  5 ++++-
 .../prism-highlight-keywords.min.js           |  2 +-
 .../line-highlight/prism-line-highlight.js    |  2 +-
 .../prism-line-highlight.min.js               |  2 +-
 plugins/line-numbers/prism-line-numbers.js    | 14 ++++++++++---
 .../line-numbers/prism-line-numbers.min.js    |  2 +-
 .../prism-remove-initial-line-feed.js         | 12 +++++++++--
 .../prism-remove-initial-line-feed.min.js     |  2 +-
 .../show-invisibles/prism-show-invisibles.js  |  5 ++++-
 .../prism-show-invisibles.min.js              |  2 +-
 plugins/show-language/prism-show-language.js  |  2 +-
 .../show-language/prism-show-language.min.css |  1 -
 .../show-language/prism-show-language.min.js  |  2 +-
 plugins/wpd/prism-wpd.js                      | 21 +++++++++++--------
 plugins/wpd/prism-wpd.min.js                  |  2 +-
 prism.js                                      |  2 +-
 20 files changed, 58 insertions(+), 31 deletions(-)
 delete mode 100644 plugins/show-language/prism-show-language.min.css

diff --git a/components/prism-core.js b/components/prism-core.js
index d8e8253c20..b23219dc53 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -377,7 +377,7 @@ Token.stringify = function(o, language, parent) {
 	var attributes = '';
 
 	for (var name in env.attributes) {
-		attributes += name + '="' + (env.attributes[name] || '') + '"';
+		attributes += (attributes ? ' ' : '') + name + '="' + (env.attributes[name] || '') + '"';
 	}
 
 	return '<' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + '</' + env.tag + '>';
diff --git a/components/prism-core.min.js b/components/prism-core.min.js
index 093a0cf7a9..9f83a7641c 100644
--- a/components/prism-core.min.js
+++ b/components/prism-core.min.js
@@ -1 +1 @@
-var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
\ No newline at end of file
+var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=(o?" ":"")+s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
\ No newline at end of file
diff --git a/plugins/autolinker/prism-autolinker.js b/plugins/autolinker/prism-autolinker.js
index a26b263047..ae407e06d9 100644
--- a/plugins/autolinker/prism-autolinker.js
+++ b/plugins/autolinker/prism-autolinker.js
@@ -1,6 +1,9 @@
 (function(){
 
-if (!self.Prism) {
+if (
+	typeof self !== 'undefined' && !self.Prism ||
+	typeof global !== 'undefined' && !global.Prism
+) {
 	return;
 }
 
diff --git a/plugins/autolinker/prism-autolinker.min.js b/plugins/autolinker/prism-autolinker.min.js
index 2b985be3ac..7869057c2b 100644
--- a/plugins/autolinker/prism-autolinker.min.js
+++ b/plugins/autolinker/prism-autolinker.min.js
@@ -1 +1 @@
-!function(){if(self.Prism){var i=/\b([a-z]{3,7}:\/\/|tel:)[\w\-+%~/.:#=?&amp;]+/,n=/\b\S+@[\w.]+[a-z]{2}/,t=/\[([^\]]+)]\(([^)]+)\)/,e=["comment","url","attr-value","string"];for(var a in Prism.languages){var r=Prism.languages[a];Prism.languages.DFS(r,function(a,r,l){e.indexOf(l)>-1&&"Array"!==Prism.util.type(r)&&(r.pattern||(r=this[a]={pattern:r}),r.inside=r.inside||{},"comment"==l&&(r.inside["md-link"]=t),"attr-value"==l?Prism.languages.insertBefore("inside","punctuation",{"url-link":i},r):r.inside["url-link"]=i,r.inside["email-link"]=n)}),r["url-link"]=i,r["email-link"]=n}Prism.hooks.add("wrap",function(i){if(/-link$/.test(i.type)){i.tag="a";var n=i.content;if("email-link"==i.type&&0!=n.indexOf("mailto:"))n="mailto:"+n;else if("md-link"==i.type){var e=i.content.match(t);n=e[2],i.content=e[1]}i.attributes.href=n}})}}();
\ No newline at end of file
+!function(){if(("undefined"==typeof self||self.Prism)&&("undefined"==typeof global||global.Prism)){var i=/\b([a-z]{3,7}:\/\/|tel:)[\w\-+%~/.:#=?&amp;]+/,n=/\b\S+@[\w.]+[a-z]{2}/,e=/\[([^\]]+)]\(([^)]+)\)/,t=["comment","url","attr-value","string"];for(var a in Prism.languages){var l=Prism.languages[a];Prism.languages.DFS(l,function(a,l,r){t.indexOf(r)>-1&&"Array"!==Prism.util.type(l)&&(l.pattern||(l=this[a]={pattern:l}),l.inside=l.inside||{},"comment"==r&&(l.inside["md-link"]=e),"attr-value"==r?Prism.languages.insertBefore("inside","punctuation",{"url-link":i},l):l.inside["url-link"]=i,l.inside["email-link"]=n)}),l["url-link"]=i,l["email-link"]=n}Prism.hooks.add("wrap",function(i){if(/-link$/.test(i.type)){i.tag="a";var n=i.content;if("email-link"==i.type&&0!=n.indexOf("mailto:"))n="mailto:"+n;else if("md-link"==i.type){var t=i.content.match(e);n=t[2],i.content=t[1]}i.attributes.href=n}})}}();
\ No newline at end of file
diff --git a/plugins/highlight-keywords/prism-highlight-keywords.js b/plugins/highlight-keywords/prism-highlight-keywords.js
index 58c9ad93ba..32b2812273 100644
--- a/plugins/highlight-keywords/prism-highlight-keywords.js
+++ b/plugins/highlight-keywords/prism-highlight-keywords.js
@@ -1,6 +1,9 @@
 (function(){
 
-if (!self.Prism) {
+if (
+	typeof self !== 'undefined' && !self.Prism ||
+	typeof global !== 'undefined' && !global.Prism
+) {
 	return;
 }
 
diff --git a/plugins/highlight-keywords/prism-highlight-keywords.min.js b/plugins/highlight-keywords/prism-highlight-keywords.min.js
index 3e6a3820a8..c4326feadb 100644
--- a/plugins/highlight-keywords/prism-highlight-keywords.min.js
+++ b/plugins/highlight-keywords/prism-highlight-keywords.min.js
@@ -1 +1 @@
-!function(){self.Prism&&Prism.hooks.add("wrap",function(s){"keyword"===s.type&&s.classes.push("keyword-"+s.content)})}();
\ No newline at end of file
+!function(){"undefined"!=typeof self&&!self.Prism||"undefined"!=typeof global&&!global.Prism||Prism.hooks.add("wrap",function(e){"keyword"===e.type&&e.classes.push("keyword-"+e.content)})}();
\ No newline at end of file
diff --git a/plugins/line-highlight/prism-line-highlight.js b/plugins/line-highlight/prism-line-highlight.js
index a0bd34bae3..975357ead9 100644
--- a/plugins/line-highlight/prism-line-highlight.js
+++ b/plugins/line-highlight/prism-line-highlight.js
@@ -1,6 +1,6 @@
 (function(){
 
-if(!window.Prism) {
+if (typeof self === 'undefined' || !self.Prism || !self.document || !document.querySelector) {
 	return;
 }
 
diff --git a/plugins/line-highlight/prism-line-highlight.min.js b/plugins/line-highlight/prism-line-highlight.min.js
index 1018af46bd..f850cf9fd1 100644
--- a/plugins/line-highlight/prism-line-highlight.min.js
+++ b/plugins/line-highlight/prism-line-highlight.min.js
@@ -1 +1 @@
-!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,i){for(var a,o=n.replace(/\s+/g,"").split(","),l=+e.getAttribute("data-line-offset")||0,d=r()?parseInt:parseFloat,c=d(getComputedStyle(e).lineHeight),s=0;a=o[s++];){a=a.split("-");var u=+a[0],h=+a[1]||u,m=document.createElement("div");m.textContent=Array(h-u+2).join(" \n"),m.className=(i||"")+" line-highlight",t(e,"line-numbers")||(m.setAttribute("data-start",u),h>u&&m.setAttribute("data-end",h)),m.style.top=(u-l-1)*c+"px",t(e,"line-numbers")?e.appendChild(m):(e.querySelector("code")||e).appendChild(m)}}function i(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var i=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(i&&!document.getElementById(t)){var r=t.slice(0,t.lastIndexOf(".")),a=document.getElementById(r);a&&(a.hasAttribute("data-line")||a.setAttribute("data-line",""),n(a,i,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if(window.Prism){var r=function(){var e;return function(){if("undefined"==typeof e){var t=document.createElement("div");t.style.fontSize="13px",t.style.lineHeight="1.5",t.style.padding=0,t.style.border=0,t.innerHTML="&nbsp;<br />&nbsp;",document.body.appendChild(t),e=38===t.offsetHeight,document.body.removeChild(t)}return e}}(),a=0;Prism.hooks.add("complete",function(t){var r=t.element.parentNode,o=r&&r.getAttribute("data-line");r&&o&&/pre/i.test(r.nodeName)&&(clearTimeout(a),e(".line-highlight",r).forEach(function(e){e.parentNode.removeChild(e)}),n(r,o),a=setTimeout(i,1))}),addEventListener("hashchange",i)}}();
\ No newline at end of file
+!function(){function e(e,t){return Array.prototype.slice.call((t||document).querySelectorAll(e))}function t(e,t){return t=" "+t+" ",(" "+e.className+" ").replace(/[\n\t]/g," ").indexOf(t)>-1}function n(e,n,i){for(var o,l=n.replace(/\s+/g,"").split(","),a=+e.getAttribute("data-line-offset")||0,d=r()?parseInt:parseFloat,c=d(getComputedStyle(e).lineHeight),s=0;o=l[s++];){o=o.split("-");var u=+o[0],m=+o[1]||u,h=document.createElement("div");h.textContent=Array(m-u+2).join(" \n"),h.className=(i||"")+" line-highlight",t(e,"line-numbers")||(h.setAttribute("data-start",u),m>u&&h.setAttribute("data-end",m)),h.style.top=(u-a-1)*c+"px",t(e,"line-numbers")?e.appendChild(h):(e.querySelector("code")||e).appendChild(h)}}function i(){var t=location.hash.slice(1);e(".temporary.line-highlight").forEach(function(e){e.parentNode.removeChild(e)});var i=(t.match(/\.([\d,-]+)$/)||[,""])[1];if(i&&!document.getElementById(t)){var r=t.slice(0,t.lastIndexOf(".")),o=document.getElementById(r);o&&(o.hasAttribute("data-line")||o.setAttribute("data-line",""),n(o,i,"temporary "),document.querySelector(".temporary.line-highlight").scrollIntoView())}}if("undefined"!=typeof self&&self.Prism&&self.document&&document.querySelector){var r=function(){var e;return function(){if("undefined"==typeof e){var t=document.createElement("div");t.style.fontSize="13px",t.style.lineHeight="1.5",t.style.padding=0,t.style.border=0,t.innerHTML="&nbsp;<br />&nbsp;",document.body.appendChild(t),e=38===t.offsetHeight,document.body.removeChild(t)}return e}}(),o=0;Prism.hooks.add("complete",function(t){var r=t.element.parentNode,l=r&&r.getAttribute("data-line");r&&l&&/pre/i.test(r.nodeName)&&(clearTimeout(o),e(".line-highlight",r).forEach(function(e){e.parentNode.removeChild(e)}),n(r,l),o=setTimeout(i,1))}),addEventListener("hashchange",i)}}();
\ No newline at end of file
diff --git a/plugins/line-numbers/prism-line-numbers.js b/plugins/line-numbers/prism-line-numbers.js
index d8a25bf71a..8323a43b13 100644
--- a/plugins/line-numbers/prism-line-numbers.js
+++ b/plugins/line-numbers/prism-line-numbers.js
@@ -1,3 +1,9 @@
+(function() {
+
+if (typeof self === 'undefined' || !self.Prism || !self.document) {
+	return;
+}
+
 Prism.hooks.add('complete', function (env) {
 	if (!env.code) {
 		return;
@@ -8,13 +14,13 @@ Prism.hooks.add('complete', function (env) {
 	var clsReg = /\s*\bline-numbers\b\s*/;
 	if (
 		!pre || !/pre/i.test(pre.nodeName) ||
-		// Abort only if nor the <pre> nor the <code> have the class
+			// Abort only if nor the <pre> nor the <code> have the class
 		(!clsReg.test(pre.className) && !clsReg.test(env.element.className))
 	) {
 		return;
 	}
 
-	if ( env.element.querySelector(".line-numbers-rows") ) {
+	if (env.element.querySelector(".line-numbers-rows")) {
 		// Abort if line numbers already exists
 		return;
 	}
@@ -45,4 +51,6 @@ Prism.hooks.add('complete', function (env) {
 
 	env.element.appendChild(lineNumbersWrapper);
 
-});
\ No newline at end of file
+});
+
+}());
\ No newline at end of file
diff --git a/plugins/line-numbers/prism-line-numbers.min.js b/plugins/line-numbers/prism-line-numbers.min.js
index 6cd713b3f9..7fea32560c 100644
--- a/plugins/line-numbers/prism-line-numbers.min.js
+++ b/plugins/line-numbers/prism-line-numbers.min.js
@@ -1 +1 @@
-Prism.hooks.add("complete",function(e){if(e.code){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var a,n=e.code.match(/\n(?!$)/g),l=n?n.length+1:1,m=new Array(l+1);m=m.join("<span></span>"),a=document.createElement("span"),a.className="line-numbers-rows",a.innerHTML=m,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(a)}}});
\ No newline at end of file
+!function(){"undefined"!=typeof self&&self.Prism&&self.document&&Prism.hooks.add("complete",function(e){if(e.code){var t=e.element.parentNode,s=/\s*\bline-numbers\b\s*/;if(t&&/pre/i.test(t.nodeName)&&(s.test(t.className)||s.test(e.element.className))&&!e.element.querySelector(".line-numbers-rows")){s.test(e.element.className)&&(e.element.className=e.element.className.replace(s,"")),s.test(t.className)||(t.className+=" line-numbers");var n,a=e.code.match(/\n(?!$)/g),l=a?a.length+1:1,m=new Array(l+1);m=m.join("<span></span>"),n=document.createElement("span"),n.className="line-numbers-rows",n.innerHTML=m,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(n)}}})}();
\ No newline at end of file
diff --git a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
index 0b24fb5cc2..4d9a66933d 100644
--- a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
+++ b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
@@ -1,4 +1,10 @@
-Prism.hooks.add('before-highlight', function(env) {
+(function() {
+
+if (typeof self === 'undefined' || !self.Prism || !self.document) {
+	return;
+}
+
+Prism.hooks.add('before-highlight', function (env) {
 	if (env.code) {
 		var pre = env.element.parentNode;
 		var clsReg = /\s*\bkeep-initial-line-feed\b\s*/;
@@ -10,4 +16,6 @@ Prism.hooks.add('before-highlight', function(env) {
 			env.code = env.code.replace(/^(?:\r?\n|\r)/, '');
 		}
 	}
-});
\ No newline at end of file
+});
+
+}());
\ No newline at end of file
diff --git a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js
index a8930b631e..2cca50e7cb 100644
--- a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js
+++ b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js
@@ -1 +1 @@
-Prism.hooks.add("before-highlight",function(e){if(e.code){var a=e.element.parentNode,o=/\s*\bkeep-initial-line-feed\b\s*/;!a||"pre"!==a.nodeName.toLowerCase()||o.test(a.className)||o.test(e.element.className)||(e.code=e.code.replace(/^(?:\r?\n|\r)/,""))}});
\ No newline at end of file
+!function(){"undefined"!=typeof self&&self.Prism&&self.document&&Prism.hooks.add("before-highlight",function(e){if(e.code){var s=e.element.parentNode,n=/\s*\bkeep-initial-line-feed\b\s*/;!s||"pre"!==s.nodeName.toLowerCase()||n.test(s.className)||n.test(e.element.className)||(e.code=e.code.replace(/^(?:\r?\n|\r)/,""))}})}();
\ No newline at end of file
diff --git a/plugins/show-invisibles/prism-show-invisibles.js b/plugins/show-invisibles/prism-show-invisibles.js
index 0fbe25e2bd..5d9692b4df 100644
--- a/plugins/show-invisibles/prism-show-invisibles.js
+++ b/plugins/show-invisibles/prism-show-invisibles.js
@@ -1,6 +1,9 @@
 (function(){
 
-if(!window.Prism) {
+if (
+	typeof self !== 'undefined' && !self.Prism ||
+	typeof global !== 'undefined' && !global.Prism
+) {
 	return;
 }
 
diff --git a/plugins/show-invisibles/prism-show-invisibles.min.js b/plugins/show-invisibles/prism-show-invisibles.min.js
index bf68c7cd96..4575758f50 100644
--- a/plugins/show-invisibles/prism-show-invisibles.min.js
+++ b/plugins/show-invisibles/prism-show-invisibles.min.js
@@ -1 +1 @@
-!function(){if(window.Prism)for(var r in Prism.languages){var g=Prism.languages[r];g.tab=/\t/g,g.crlf=/\r\n/g,g.lf=/\n/g,g.cr=/\r/g}}();
\ No newline at end of file
+!function(){if(("undefined"==typeof self||self.Prism)&&("undefined"==typeof global||global.Prism))for(var f in Prism.languages){var n=Prism.languages[f];n.tab=/\t/g,n.crlf=/\r\n/g,n.lf=/\n/g,n.cr=/\r/g}}();
\ No newline at end of file
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
index ac43bd6675..8d84523907 100644
--- a/plugins/show-language/prism-show-language.js
+++ b/plugins/show-language/prism-show-language.js
@@ -1,6 +1,6 @@
 (function(){
 
-if (!self.Prism) {
+if (typeof self === 'undefined' || !self.Prism || !self.document) {
 	return;
 }
 
diff --git a/plugins/show-language/prism-show-language.min.css b/plugins/show-language/prism-show-language.min.css
deleted file mode 100644
index 16a7f46830..0000000000
--- a/plugins/show-language/prism-show-language.min.css
+++ /dev/null
@@ -1 +0,0 @@
-pre[class*=language-]{position:relative}pre[class*=language-][data-language]::before{content:attr(data-language);color:#000;background-color:#CFCFCF;display:inline-block;position:absolute;top:0;right:0;font-size:.9em;border-radius:0 0 0 5px;padding:0 .5em;text-shadow:none}
\ No newline at end of file
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
index 849fc6d14a..3e2f5abf7d 100644
--- a/plugins/show-language/prism-show-language.min.js
+++ b/plugins/show-language/prism-show-language.min.js
@@ -1 +1 @@
-!function(){if(self.Prism){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file
diff --git a/plugins/wpd/prism-wpd.js b/plugins/wpd/prism-wpd.js
index 9c2c3075ed..f02996731d 100644
--- a/plugins/wpd/prism-wpd.js
+++ b/plugins/wpd/prism-wpd.js
@@ -1,6 +1,9 @@
 (function(){
 
-if (!self.Prism) {
+if (
+	typeof self !== 'undefined' && !self.Prism ||
+	typeof global !== 'undefined' && !global.Prism
+) {
 	return;
 }
 
@@ -41,9 +44,9 @@ if (Prism.languages.markup) {
 			'feFuncR': 1, 'feFuncG': 1, 'feFuncB': 1, 'feFuncA': 1, 'feComposite': 1, 'feConvolveMatrix': 1, 'feDiffuseLighting': 1, 'feDisplacementMap': 1, 
 			'feFlood': 1, 'feGaussianBlur': 1, 'feImage': 1, 'feMerge': 1, 'feMergeNode': 1, 'feMorphology': 1, 'feOffset': 1, 'feSpecularLighting': 1, 
 			'feTile': 1, 'feTurbulence': 1, 'feDistantLight': 1, 'fePointLight': 1, 'feSpotLight': 1, 'linearGradient': 1, 'radialGradient': 1, 'altGlyph': 1, 
-			'textPath': 1, 'tref': 1, 'altglyph': 1, 'textpath': 1, 'tref': 1, 'altglyphdef': 1, 'altglyphitem': 1, 'clipPath': 1, 'color-profile': 1, 'cursor': 1, 
-			'font-face': 1, 'font-face-format': 1, 'font-face-name': 1, 'font-face-src': 1, 'font-face-uri': 1, 'foreignObject': 1, 'glyph': 1, 'glyphRef': 1, 
-			'hkern': 1, 'vkern': 1, 
+			'textPath': 1, 'tref': 1, 'altglyph': 1, 'textpath': 1, 'altglyphdef': 1, 'altglyphitem': 1, 'clipPath': 1, 'color-profile': 1, 'cursor': 1,
+			'font-face': 1, 'font-face-format': 1, 'font-face-name': 1, 'font-face-src': 1, 'font-face-uri': 1, 'foreignObject': 1, 'glyphRef': 1,
+			'hkern': 1, 'vkern': 1
 		},
 		MathML: {}
 	}
@@ -52,7 +55,7 @@ if (Prism.languages.markup) {
 var language;
 
 Prism.hooks.add('wrap', function(env) {
-	if ((['tag-id'].indexOf(env.type) > -1
+	if ((env.type == 'tag-id'
 		|| (env.type == 'property' && env.content.indexOf('-') != 0)
 		|| (env.type == 'atrule-id'&& env.content.indexOf('@-') != 0)
 		|| (env.type == 'pseudo-class'&& env.content.indexOf(':-') != 0) 
@@ -61,13 +64,13 @@ Prism.hooks.add('wrap', function(env) {
 	    ) && env.content.indexOf('<') === -1
 	) {
 		var searchURL = 'w/index.php?fulltext&search=';
-		
+
 		env.tag = 'a';
 		
 		var href = 'http://docs.webplatform.org/';
 		
 		if (env.language == 'css') {
-			href += 'wiki/css/'
+			href += 'wiki/css/';
 			
 			if (env.type == 'property') {
 				href += 'properties/';
@@ -125,7 +128,7 @@ function getLanguage(tag) {
 	}
 	
 	// Not in dictionary, perform check
-	if (Tags.HTML[tagL] !== 0) {
+	if (Tags.HTML[tagL] !== 0 && typeof document !== 'undefined') {
 		var htmlInterface = (document.createElement(tag).toString().match(/\[object HTML(.+)Element\]/) || [])[1];
 		
 		if (htmlInterface && htmlInterface != 'Unknown') {
@@ -136,7 +139,7 @@ function getLanguage(tag) {
 	
 	Tags.HTML[tagL] = 0;
 	
-	if (Tags.SVG[tag] !== 0) {
+	if (Tags.SVG[tag] !== 0 && typeof document !== 'undefined') {
 		var svgInterface = (document.createElementNS('http://www.w3.org/2000/svg', tag).toString().match(/\[object SVG(.+)Element\]/) || [])[1];
 		
 		if (svgInterface && svgInterface != 'Unknown') {
diff --git a/plugins/wpd/prism-wpd.min.js b/plugins/wpd/prism-wpd.min.js
index 8b3eeaaf0d..1d0ed3c37c 100644
--- a/plugins/wpd/prism-wpd.min.js
+++ b/plugins/wpd/prism-wpd.min.js
@@ -1 +1 @@
-!function(){function e(e){var a=e.toLowerCase();if(t.HTML[a])return"html";if(t.SVG[e])return"svg";if(t.MathML[e])return"mathml";if(0!==t.HTML[a]){var n=(document.createElement(e).toString().match(/\[object HTML(.+)Element\]/)||[])[1];if(n&&"Unknown"!=n)return t.HTML[a]=1,"html"}if(t.HTML[a]=0,0!==t.SVG[e]){var r=(document.createElementNS("http://www.w3.org/2000/svg",e).toString().match(/\[object SVG(.+)Element\]/)||[])[1];if(r&&"Unknown"!=r)return t.SVG[e]=1,"svg"}return t.SVG[e]=0,0!==t.MathML[e]&&0===e.indexOf("m")?(t.MathML[e]=1,"mathml"):(t.MathML[e]=0,null)}if(self.Prism){if(Prism.languages.css&&(Prism.languages.css.atrule.inside["atrule-id"]=/^@[\w-]+/,Prism.languages.css.selector.pattern?(Prism.languages.css.selector.inside["pseudo-class"]=/:[\w-]+/,Prism.languages.css.selector.inside["pseudo-element"]=/::[\w-]+/):Prism.languages.css.selector={pattern:Prism.languages.css.selector,inside:{"pseudo-class":/:[\w-]+/,"pseudo-element":/::[\w-]+/}}),Prism.languages.markup){Prism.languages.markup.tag.inside.tag.inside["tag-id"]=/[\w-]+/;var t={HTML:{a:1,abbr:1,acronym:1,b:1,basefont:1,bdo:1,big:1,blink:1,cite:1,code:1,dfn:1,em:1,kbd:1,i:1,rp:1,rt:1,ruby:1,s:1,samp:1,small:1,spacer:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1,wbr:1,noframes:1,summary:1,command:1,dt:1,dd:1,figure:1,figcaption:1,center:1,section:1,nav:1,article:1,aside:1,hgroup:1,header:1,footer:1,address:1,noscript:1,isIndex:1,main:1,mark:1,marquee:1,meter:1,menu:1},SVG:{animateColor:1,animateMotion:1,animateTransform:1,glyph:1,feBlend:1,feColorMatrix:1,feComponentTransfer:1,feFuncR:1,feFuncG:1,feFuncB:1,feFuncA:1,feComposite:1,feConvolveMatrix:1,feDiffuseLighting:1,feDisplacementMap:1,feFlood:1,feGaussianBlur:1,feImage:1,feMerge:1,feMergeNode:1,feMorphology:1,feOffset:1,feSpecularLighting:1,feTile:1,feTurbulence:1,feDistantLight:1,fePointLight:1,feSpotLight:1,linearGradient:1,radialGradient:1,altGlyph:1,textPath:1,tref:1,altglyph:1,textpath:1,tref:1,altglyphdef:1,altglyphitem:1,clipPath:1,"color-profile":1,cursor:1,"font-face":1,"font-face-format":1,"font-face-name":1,"font-face-src":1,"font-face-uri":1,foreignObject:1,glyph:1,glyphRef:1,hkern:1,vkern:1},MathML:{}}}var a;Prism.hooks.add("wrap",function(t){if((["tag-id"].indexOf(t.type)>-1||"property"==t.type&&0!=t.content.indexOf("-")||"atrule-id"==t.type&&0!=t.content.indexOf("@-")||"pseudo-class"==t.type&&0!=t.content.indexOf(":-")||"pseudo-element"==t.type&&0!=t.content.indexOf("::-")||"attr-name"==t.type&&0!=t.content.indexOf("data-"))&&-1===t.content.indexOf("<")){var n="w/index.php?fulltext&search=";t.tag="a";var r="http://docs.webplatform.org/";"css"==t.language?(r+="wiki/css/","property"==t.type?r+="properties/":"atrule-id"==t.type?r+="atrules/":"pseudo-class"==t.type?r+="selectors/pseudo-classes/":"pseudo-element"==t.type&&(r+="selectors/pseudo-elements/")):"markup"==t.language&&("tag-id"==t.type?(a=e(t.content)||a,r+=a?"wiki/"+a+"/elements/":n):"attr-name"==t.type&&(r+=a?"wiki/"+a+"/attributes/":n)),r+=t.content,t.attributes.href=r,t.attributes.target="_blank"}})}}();
\ No newline at end of file
+!function(){function e(e){var n=e.toLowerCase();if(t.HTML[n])return"html";if(t.SVG[e])return"svg";if(t.MathML[e])return"mathml";if(0!==t.HTML[n]&&"undefined"!=typeof document){var a=(document.createElement(e).toString().match(/\[object HTML(.+)Element\]/)||[])[1];if(a&&"Unknown"!=a)return t.HTML[n]=1,"html"}if(t.HTML[n]=0,0!==t.SVG[e]&&"undefined"!=typeof document){var r=(document.createElementNS("http://www.w3.org/2000/svg",e).toString().match(/\[object SVG(.+)Element\]/)||[])[1];if(r&&"Unknown"!=r)return t.SVG[e]=1,"svg"}return t.SVG[e]=0,0!==t.MathML[e]&&0===e.indexOf("m")?(t.MathML[e]=1,"mathml"):(t.MathML[e]=0,null)}if(("undefined"==typeof self||self.Prism)&&("undefined"==typeof global||global.Prism)){if(Prism.languages.css&&(Prism.languages.css.atrule.inside["atrule-id"]=/^@[\w-]+/,Prism.languages.css.selector.pattern?(Prism.languages.css.selector.inside["pseudo-class"]=/:[\w-]+/,Prism.languages.css.selector.inside["pseudo-element"]=/::[\w-]+/):Prism.languages.css.selector={pattern:Prism.languages.css.selector,inside:{"pseudo-class":/:[\w-]+/,"pseudo-element":/::[\w-]+/}}),Prism.languages.markup){Prism.languages.markup.tag.inside.tag.inside["tag-id"]=/[\w-]+/;var t={HTML:{a:1,abbr:1,acronym:1,b:1,basefont:1,bdo:1,big:1,blink:1,cite:1,code:1,dfn:1,em:1,kbd:1,i:1,rp:1,rt:1,ruby:1,s:1,samp:1,small:1,spacer:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1,wbr:1,noframes:1,summary:1,command:1,dt:1,dd:1,figure:1,figcaption:1,center:1,section:1,nav:1,article:1,aside:1,hgroup:1,header:1,footer:1,address:1,noscript:1,isIndex:1,main:1,mark:1,marquee:1,meter:1,menu:1},SVG:{animateColor:1,animateMotion:1,animateTransform:1,glyph:1,feBlend:1,feColorMatrix:1,feComponentTransfer:1,feFuncR:1,feFuncG:1,feFuncB:1,feFuncA:1,feComposite:1,feConvolveMatrix:1,feDiffuseLighting:1,feDisplacementMap:1,feFlood:1,feGaussianBlur:1,feImage:1,feMerge:1,feMergeNode:1,feMorphology:1,feOffset:1,feSpecularLighting:1,feTile:1,feTurbulence:1,feDistantLight:1,fePointLight:1,feSpotLight:1,linearGradient:1,radialGradient:1,altGlyph:1,textPath:1,tref:1,altglyph:1,textpath:1,altglyphdef:1,altglyphitem:1,clipPath:1,"color-profile":1,cursor:1,"font-face":1,"font-face-format":1,"font-face-name":1,"font-face-src":1,"font-face-uri":1,foreignObject:1,glyphRef:1,hkern:1,vkern:1},MathML:{}}}var n;Prism.hooks.add("wrap",function(t){if(("tag-id"==t.type||"property"==t.type&&0!=t.content.indexOf("-")||"atrule-id"==t.type&&0!=t.content.indexOf("@-")||"pseudo-class"==t.type&&0!=t.content.indexOf(":-")||"pseudo-element"==t.type&&0!=t.content.indexOf("::-")||"attr-name"==t.type&&0!=t.content.indexOf("data-"))&&-1===t.content.indexOf("<")){var a="w/index.php?fulltext&search=";t.tag="a";var r="http://docs.webplatform.org/";"css"==t.language?(r+="wiki/css/","property"==t.type?r+="properties/":"atrule-id"==t.type?r+="atrules/":"pseudo-class"==t.type?r+="selectors/pseudo-classes/":"pseudo-element"==t.type&&(r+="selectors/pseudo-elements/")):"markup"==t.language&&("tag-id"==t.type?(n=e(t.content)||n,r+=n?"wiki/"+n+"/elements/":a):"attr-name"==t.type&&(r+=n?"wiki/"+n+"/attributes/":a)),r+=t.content,t.attributes.href=r,t.attributes.target="_blank"}})}}();
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 345e877d35..9e1c8994bf 100644
--- a/prism.js
+++ b/prism.js
@@ -382,7 +382,7 @@ Token.stringify = function(o, language, parent) {
 	var attributes = '';
 
 	for (var name in env.attributes) {
-		attributes += name + '="' + (env.attributes[name] || '') + '"';
+		attributes += (attributes ? ' ' : '') + name + '="' + (env.attributes[name] || '') + '"';
 	}
 
 	return '<' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + '</' + env.tag + '>';

From 9e33e0a8d5e9285441abebf5396a59e0227d7609 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 3 Sep 2015 20:17:28 +0200
Subject: [PATCH 293/310] YAML: Handled \r\n and \r, simplified some patterns,
 fixed "---"

---
 components/prism-yaml.js     | 20 ++++++++++----------
 components/prism-yaml.min.js |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/prism-yaml.js b/components/prism-yaml.js
index 6b45e8af3f..ce8f0836a6 100644
--- a/components/prism-yaml.js
+++ b/components/prism-yaml.js
@@ -1,44 +1,44 @@
 Prism.languages.yaml = {
 	'scalar': {
-		pattern: /([\-:]\s*(![^\s]+)?[ \t]*[|>])[ \t]*(?:(\n[ \t]+)[^\r\n]+(?:\3[^\r\n]+)*)/,
+		pattern: /([\-:]\s*(![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\3[^\r\n]+)*)/,
 		lookbehind: true,
 		alias: 'string'
 	},
-	'comment': /#[^\n]+/,
+	'comment': /#.*/,
 	'key': {
-		pattern: /(\s*[:\-,[{\n?][ \t]*(![^\s]+)?[ \t]*)[^\n{[\]},#]+?(?=\s*:\s)/,
+		pattern: /(\s*[:\-,[{\r\n?][ \t]*(![^\s]+)?[ \t]*)[^\r\n{[\]},#]+?(?=\s*:\s)/,
 		lookbehind: true,
 		alias: 'atrule'
 	},
 	'directive': {
-		pattern: /((^|\n)[ \t]*)%[^\n]+/,
+		pattern: /(^[ \t]*)%.+/m,
 		lookbehind: true,
 		alias: 'important'
 	},
 	'datetime': {
-		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(\d{4}-\d\d?-\d\d?([tT]|[ \t]+)\d\d?:\d{2}:\d{2}(\.\d*)?[ \t]*(Z|[-+]\d\d?(:\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(:\d{2}(\.\d*)?)?)(?=[ \t]*(\n|$|,|]|}))/,
+		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(\d{4}-\d\d?-\d\d?([tT]|[ \t]+)\d\d?:\d{2}:\d{2}(\.\d*)?[ \t]*(Z|[-+]\d\d?(:\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(:\d{2}(\.\d*)?)?)(?=[ \t]*($|,|]|}))/m,
 		lookbehind: true,
 		alias: 'number'
 	},
 	'boolean': {
-		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(true|false)[ \t]*(?=\n|$|,|]|})/i,
+		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(true|false)[ \t]*(?=$|,|]|})/im,
 		lookbehind: true,
 		alias: 'important'
 	},
 	'null': {
-		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(null|~)[ \t]*(?=\n|$|,|]|})/i,
+		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(null|~)[ \t]*(?=$|,|]|})/im,
 		lookbehind: true,
 		alias: 'important'
 	},
 	'string': {
-		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*')(?=[ \t]*(\n|$|,|]|}))/,
+		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')(?=[ \t]*($|,|]|}))/m,
 		lookbehind: true
 	},
 	'number': {
-		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)[+\-]?(0x[\dA-Fa-f]+|0o[0-7]+|(\d+\.?\d*|\.?\d+)(e[\+\-]?\d+)?|\.inf|\.nan)[ \t]*(?=\n|$|,|]|})/i,
+		pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)[+\-]?(0x[\da-f]+|0o[0-7]+|(\d+\.?\d*|\.?\d+)(e[\+\-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,
 		lookbehind: true
 	},
 	'tag': /![^\s]+/,
 	'important': /[&*][\w]+/,
-	'punctuation': /([:[\]{}\-,|>?]|---|\.\.\.)/
+	'punctuation': /---|[:[\]{}\-,|>?]|\.\.\./
 };
diff --git a/components/prism-yaml.min.js b/components/prism-yaml.min.js
index 2fd09f768f..0eaeac4a3b 100644
--- a/components/prism-yaml.min.js
+++ b/components/prism-yaml.min.js
@@ -1 +1 @@
-Prism.languages.yaml={scalar:{pattern:/([\-:]\s*(![^\s]+)?[ \t]*[|>])[ \t]*(?:(\n[ \t]+)[^\r\n]+(?:\3[^\r\n]+)*)/,lookbehind:!0,alias:"string"},comment:/#[^\n]+/,key:{pattern:/(\s*[:\-,[{\n?][ \t]*(![^\s]+)?[ \t]*)[^\n{[\]},#]+?(?=\s*:\s)/,lookbehind:!0,alias:"atrule"},directive:{pattern:/((^|\n)[ \t]*)%[^\n]+/,lookbehind:!0,alias:"important"},datetime:{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)(\d{4}-\d\d?-\d\d?([tT]|[ \t]+)\d\d?:\d{2}:\d{2}(\.\d*)?[ \t]*(Z|[-+]\d\d?(:\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(:\d{2}(\.\d*)?)?)(?=[ \t]*(\n|$|,|]|}))/,lookbehind:!0,alias:"number"},"boolean":{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)(true|false)[ \t]*(?=\n|$|,|]|})/i,lookbehind:!0,alias:"important"},"null":{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)(null|~)[ \t]*(?=\n|$|,|]|})/i,lookbehind:!0,alias:"important"},string:{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*')(?=[ \t]*(\n|$|,|]|}))/,lookbehind:!0},number:{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)[+\-]?(0x[\dA-Fa-f]+|0o[0-7]+|(\d+\.?\d*|\.?\d+)(e[\+\-]?\d+)?|\.inf|\.nan)[ \t]*(?=\n|$|,|]|})/i,lookbehind:!0},tag:/![^\s]+/,important:/[&*][\w]+/,punctuation:/([:[\]{}\-,|>?]|---|\.\.\.)/};
\ No newline at end of file
+Prism.languages.yaml={scalar:{pattern:/([\-:]\s*(![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\3[^\r\n]+)*)/,lookbehind:!0,alias:"string"},comment:/#.*/,key:{pattern:/(\s*[:\-,[{\r\n?][ \t]*(![^\s]+)?[ \t]*)[^\r\n{[\]},#]+?(?=\s*:\s)/,lookbehind:!0,alias:"atrule"},directive:{pattern:/(^[ \t]*)%.+/m,lookbehind:!0,alias:"important"},datetime:{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)(\d{4}-\d\d?-\d\d?([tT]|[ \t]+)\d\d?:\d{2}:\d{2}(\.\d*)?[ \t]*(Z|[-+]\d\d?(:\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(:\d{2}(\.\d*)?)?)(?=[ \t]*($|,|]|}))/m,lookbehind:!0,alias:"number"},"boolean":{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)(true|false)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},"null":{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)(null|~)[ \t]*(?=$|,|]|})/im,lookbehind:!0,alias:"important"},string:{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')(?=[ \t]*($|,|]|}))/m,lookbehind:!0},number:{pattern:/([:\-,[{]\s*(![^\s]+)?[ \t]*)[+\-]?(0x[\da-f]+|0o[0-7]+|(\d+\.?\d*|\.?\d+)(e[\+\-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,lookbehind:!0},tag:/![^\s]+/,important:/[&*][\w]+/,punctuation:/---|[:[\]{}\-,|>?]|\.\.\./};
\ No newline at end of file

From 2d37800819505ffb778183d72597a56a82fdfc1d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 3 Sep 2015 22:16:03 +0200
Subject: [PATCH 294/310] Ruby: Add % notations for strings and regexps. Fix
 #590

---
 components/prism-ruby.js                 | 126 ++++++++---
 components/prism-ruby.min.js             |   2 +-
 tests/languages/ruby/regex_feature.test  |  32 ++-
 tests/languages/ruby/string_feature.test | 261 ++++++++++++++++++++++-
 4 files changed, 381 insertions(+), 40 deletions(-)

diff --git a/components/prism-ruby.js b/components/prism-ruby.js
index e8e220b504..10e8b5002d 100644
--- a/components/prism-ruby.js
+++ b/components/prism-ruby.js
@@ -4,37 +4,107 @@
  * Adds the following new token classes:
  * 		constant, builtin, variable, symbol, regex
  */
-Prism.languages.ruby = Prism.languages.extend('clike', {
-	'comment': /#(?!\{[^\r\n]*?\}).*/,
-	'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/
-});
+(function(Prism) {
+	Prism.languages.ruby = Prism.languages.extend('clike', {
+		'comment': /#(?!\{[^\r\n]*?\}).*/,
+		'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/
+	});
 
-Prism.languages.insertBefore('ruby', 'keyword', {
-	'regex': {
-		pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
-		lookbehind: true
-	},
-	'variable': /[@$]+[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/,
-	'symbol': /:[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/
-});
+	var interpolation = {
+		pattern: /#\{[^}]+\}/,
+		inside: {
+			'delimiter': {
+				pattern: /^#\{|\}$/,
+				alias: 'tag'
+			},
+			rest: Prism.util.clone(Prism.languages.ruby)
+		}
+	};
+
+	Prism.languages.insertBefore('ruby', 'keyword', {
+		'regex': [
+			{
+				pattern: /%r([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1[gim]{0,3}/,
+				inside: {
+					'interpolation': interpolation
+				}
+			},
+			{
+				pattern: /%r\((?:[^()\\]|\\[\s\S])*\)[gim]{0,3}/,
+				inside: {
+					'interpolation': interpolation
+				}
+			},
+			{
+				// Here we need to specifically allow interpolation
+				pattern: /%r\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}[gim]{0,3}/,
+				inside: {
+					'interpolation': interpolation
+				}
+			},
+			{
+				pattern: /%r\[(?:[^\[\]\\]|\\[\s\S])*\][gim]{0,3}/,
+				inside: {
+					'interpolation': interpolation
+				}
+			},
+			{
+				pattern: /%r<(?:[^<>\\]|\\[\s\S])*>[gim]{0,3}/,
+				inside: {
+					'interpolation': interpolation
+				}
+			},
+			{
+				pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,
+				lookbehind: true
+			}
+		],
+		'variable': /[@$]+[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/,
+		'symbol': /:[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/
+	});
 
-Prism.languages.insertBefore('ruby', 'number', {
-	'builtin': /\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
-	'constant': /\b[A-Z][a-zA-Z_0-9]*(?:[?!]|\b)/
-});
+	Prism.languages.insertBefore('ruby', 'number', {
+		'builtin': /\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
+		'constant': /\b[A-Z][a-zA-Z_0-9]*(?:[?!]|\b)/
+	});
 
-Prism.languages.ruby.string = {
-	pattern: /("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,
-	inside: {
-		'interpolation': {
-			pattern: /#\{[^}]+\}/,
+	Prism.languages.ruby.string = [
+		{
+			pattern: /%[qQiIwWxs]?([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1/,
+			inside: {
+				'interpolation': interpolation
+			}
+		},
+		{
+			pattern: /%[qQiIwWxs]?\((?:[^()\\]|\\[\s\S])*\)/,
+			inside: {
+				'interpolation': interpolation
+			}
+		},
+		{
+			// Here we need to specifically allow interpolation
+			pattern: /%[qQiIwWxs]?\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}/,
+			inside: {
+				'interpolation': interpolation
+			}
+		},
+		{
+			pattern: /%[qQiIwWxs]?\[(?:[^\[\]\\]|\\[\s\S])*\]/,
+			inside: {
+				'interpolation': interpolation
+			}
+		},
+		{
+			pattern: /%[qQiIwWxs]?<(?:[^<>\\]|\\[\s\S])*>/,
+			inside: {
+				'interpolation': interpolation
+			}
+		},
+		{
+			pattern: /("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,
 			inside: {
-				'delimiter': {
-					pattern: /^#\{|\}$/,
-					alias: 'tag'
-				},
-				rest: Prism.util.clone(Prism.languages.ruby)
+				'interpolation': interpolation
 			}
 		}
-	}
-};
+	];
+}(Prism));
\ No newline at end of file
diff --git a/components/prism-ruby.min.js b/components/prism-ruby.min.js
index 675a76c3d6..637187c854 100644
--- a/components/prism-ruby.min.js
+++ b/components/prism-ruby.min.js
@@ -1 +1 @@
-Prism.languages.ruby=Prism.languages.extend("clike",{comment:/#(?!\{[^\r\n]*?\}).*/,keyword:/\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/}),Prism.languages.insertBefore("ruby","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0},variable:/[@$]+[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/,symbol:/:[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/}),Prism.languages.insertBefore("ruby","number",{builtin:/\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,constant:/\b[A-Z][a-zA-Z_0-9]*(?:[?!]|\b)/}),Prism.languages.ruby.string={pattern:/("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,inside:{interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"tag"},rest:Prism.util.clone(Prism.languages.ruby)}}}};
\ No newline at end of file
+!function(e){e.languages.ruby=e.languages.extend("clike",{comment:/#(?!\{[^\r\n]*?\}).*/,keyword:/\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/});var n={pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"tag"},rest:e.util.clone(e.languages.ruby)}};e.languages.insertBefore("ruby","keyword",{regex:[{pattern:/%r([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1[gim]{0,3}/,inside:{interpolation:n}},{pattern:/%r\((?:[^()\\]|\\[\s\S])*\)[gim]{0,3}/,inside:{interpolation:n}},{pattern:/%r\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}[gim]{0,3}/,inside:{interpolation:n}},{pattern:/%r\[(?:[^\[\]\\]|\\[\s\S])*\][gim]{0,3}/,inside:{interpolation:n}},{pattern:/%r<(?:[^<>\\]|\\[\s\S])*>[gim]{0,3}/,inside:{interpolation:n}},{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}],variable:/[@$]+[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/,symbol:/:[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/}),e.languages.insertBefore("ruby","number",{builtin:/\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,constant:/\b[A-Z][a-zA-Z_0-9]*(?:[?!]|\b)/}),e.languages.ruby.string=[{pattern:/%[qQiIwWxs]?([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1/,inside:{interpolation:n}},{pattern:/%[qQiIwWxs]?\((?:[^()\\]|\\[\s\S])*\)/,inside:{interpolation:n}},{pattern:/%[qQiIwWxs]?\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}/,inside:{interpolation:n}},{pattern:/%[qQiIwWxs]?\[(?:[^\[\]\\]|\\[\s\S])*\]/,inside:{interpolation:n}},{pattern:/%[qQiIwWxs]?<(?:[^<>\\]|\\[\s\S])*>/,inside:{interpolation:n}},{pattern:/("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,inside:{interpolation:n}}]}(Prism);
\ No newline at end of file
diff --git a/tests/languages/ruby/regex_feature.test b/tests/languages/ruby/regex_feature.test
index da20fe2930..0dee02d34d 100644
--- a/tests/languages/ruby/regex_feature.test
+++ b/tests/languages/ruby/regex_feature.test
@@ -1,13 +1,43 @@
 /[foo]\/bar/gim
 /[bar]/,
 /./i;
+%r!foo?bar#{39+3}!
+%r(foo?bar#{39+3})
+%r{foo?bar#{39+3}}
+%r[foo?bar#{39+3}]
+%r<foo?bar#{39+3}>
 
 ----------------------------------------------------
 
 [
 	["regex", "/[foo]\\/bar/gim"],
 	["regex", "/[bar]/"], ["punctuation", ","],
-	["regex", "/./i"], ["punctuation", ";"]
+	["regex", "/./i"], ["punctuation", ";"],
+	["regex", ["%r!foo?bar", ["interpolation", [
+		["delimiter", "#{"],
+		["number", "39"], ["operator", "+"], ["number", "3"],
+		["delimiter", "}"]
+	]], "!"]],
+	["regex", ["%r(foo?bar", ["interpolation", [
+		["delimiter", "#{"],
+		["number", "39"], ["operator", "+"], ["number", "3"],
+		["delimiter", "}"]
+	]], ")"]],
+	["regex", ["%r{foo?bar", ["interpolation", [
+		["delimiter", "#{"],
+		["number", "39"], ["operator", "+"], ["number", "3"],
+		["delimiter", "}"]
+	]], "}"]],
+	["regex", ["%r[foo?bar", ["interpolation", [
+		["delimiter", "#{"],
+		["number", "39"], ["operator", "+"], ["number", "3"],
+		["delimiter", "}"]
+	]], "]"]],
+	["regex", ["%r<foo?bar", ["interpolation", [
+		["delimiter", "#{"],
+		["number", "39"], ["operator", "+"], ["number", "3"],
+		["delimiter", "}"]
+	]], ">"]]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/ruby/string_feature.test b/tests/languages/ruby/string_feature.test
index 889ab14e91..810a844798 100644
--- a/tests/languages/ruby/string_feature.test
+++ b/tests/languages/ruby/string_feature.test
@@ -7,9 +7,34 @@ bar'
 "foo\
 bar"
 
-'foo #{42} bar'
 "foo #{ 42 } bar"
 
+%!foo #{ 42 }!
+%(foo #{ 42 })
+%{foo #{ 42 }}
+%[foo #{ 42 }]
+%<foo #{ 42 }>
+%Q!foo #{ 42 }!
+%Q(foo #{ 42 })
+%Q{foo #{ 42 }}
+%Q[foo #{ 42 }]
+%Q<foo #{ 42 }>
+%I!foo #{ 42 }!
+%I(foo #{ 42 })
+%I{foo #{ 42 }}
+%I[foo #{ 42 }]
+%I<foo #{ 42 }>
+%W!foo #{ 42 }!
+%W(foo #{ 42 })
+%W{foo #{ 42 }}
+%W[foo #{ 42 }]
+%W<foo #{ 42 }>
+%x!foo #{ 42 }!
+%x(foo #{ 42 })
+%x{foo #{ 42 }}
+%x[foo #{ 42 }]
+%x<foo #{ 42 }>
+
 ----------------------------------------------------
 
 [
@@ -19,15 +44,6 @@ bar"
 	["string", ["\"foo\""]],
 	["string", ["'foo\\\r\nbar'"]],
 	["string", ["\"foo\\\r\nbar\""]],
-	["string", [
-		"'foo ",
-		["interpolation", [
-			["delimiter", "#{"],
-			["number", "42"],
-			["delimiter", "}"]
-		]],
-		" bar'"
-	]],
 	["string", [
         "\"foo ",
         ["interpolation", [
@@ -36,6 +52,231 @@ bar"
             ["delimiter", "}"]
         ]],
         " bar\""
+    ]],
+    ["string", [
+        "%!foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "!"
+    ]],
+    ["string", [
+        "%(foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ")"
+    ]],
+    ["string", [
+        "%{foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "}"
+    ]],
+    ["string", [
+        "%[foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "]"
+    ]],
+    ["string", [
+        "%<foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ">"
+    ]],
+    ["string", [
+        "%Q!foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "!"
+    ]],
+    ["string", [
+        "%Q(foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ")"
+    ]],
+    ["string", [
+        "%Q{foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "}"
+    ]],
+    ["string", [
+        "%Q[foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "]"
+    ]],
+    ["string", [
+        "%Q<foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ">"
+    ]],
+    ["string", [
+        "%I!foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "!"
+    ]],
+    ["string", [
+        "%I(foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ")"
+    ]],
+    ["string", [
+        "%I{foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "}"
+    ]],
+    ["string", [
+        "%I[foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "]"
+    ]],
+    ["string", [
+        "%I<foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ">"
+    ]],
+    ["string", [
+        "%W!foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "!"
+    ]],
+    ["string", [
+        "%W(foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ")"
+    ]],
+    ["string", [
+        "%W{foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "}"
+    ]],
+    ["string", [
+        "%W[foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "]"
+    ]],
+    ["string", [
+        "%W<foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ">"
+    ]],
+    ["string", [
+        "%x!foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "!"
+    ]],
+    ["string", [
+        "%x(foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ")"
+    ]],
+    ["string", [
+        "%x{foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "}"
+    ]],
+    ["string", [
+        "%x[foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        "]"
+    ]],
+    ["string", [
+        "%x<foo ",
+        ["interpolation", [
+            ["delimiter", "#{"],
+            ["number", "42"],
+            ["delimiter", "}"]
+        ]],
+        ">"
     ]]
 ]
 

From e42a228911e0bd219f6d01cb6e6484a2e67598d3 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 3 Sep 2015 22:47:50 +0200
Subject: [PATCH 295/310] Explicitly make the Worker close itself after
 highlighting, so that users have control on this behaviour when directly
 using Prism inside a Worker. Fix #492

---
 components/prism-core.js     | 10 +++++++---
 components/prism-core.min.js |  2 +-
 prism.js                     | 10 +++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/components/prism-core.js b/components/prism-core.js
index b23219dc53..8ee4050e83 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -205,7 +205,8 @@ var _ = _self.Prism = {
 
 			worker.postMessage(JSON.stringify({
 				language: env.language,
-				code: env.code
+				code: env.code,
+				immediateClose: true
 			}));
 		}
 		else {
@@ -393,10 +394,13 @@ if (!_self.document) {
 	_self.addEventListener('message', function(evt) {
 		var message = JSON.parse(evt.data),
 		    lang = message.language,
-		    code = message.code;
+		    code = message.code,
+			immediateClose = message.immediateClose;
 
 		_self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang]))));
-		_self.close();
+		if (immediateClose) {
+			_self.close();
+		}
 	}, false);
 
 	return _self.Prism;
diff --git a/components/prism-core.min.js b/components/prism-core.min.js
index 9f83a7641c..d97d828467 100644
--- a/components/prism-core.min.js
+++ b/components/prism-core.min.js
@@ -1 +1 @@
-var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=(o?" ":"")+s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
\ No newline at end of file
+var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code,immediateClose:!0}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=(o?" ":"")+s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code,i=n.immediateClose;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),i&&_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 9e1c8994bf..c81742946b 100644
--- a/prism.js
+++ b/prism.js
@@ -210,7 +210,8 @@ var _ = _self.Prism = {
 
 			worker.postMessage(JSON.stringify({
 				language: env.language,
-				code: env.code
+				code: env.code,
+				immediateClose: true
 			}));
 		}
 		else {
@@ -398,10 +399,13 @@ if (!_self.document) {
 	_self.addEventListener('message', function(evt) {
 		var message = JSON.parse(evt.data),
 		    lang = message.language,
-		    code = message.code;
+		    code = message.code,
+			immediateClose = message.immediateClose;
 
 		_self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang]))));
-		_self.close();
+		if (immediateClose) {
+			_self.close();
+		}
 	}, false);
 
 	return _self.Prism;

From 29e26dc379dc2a79fc986794c68ff5a34dd7b728 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 3 Sep 2015 23:14:19 +0200
Subject: [PATCH 296/310] JavaScript: Allow for all non-ASCII characters in
 function names. Fix #400

---
 components/prism-javascript.js                   | 3 ++-
 components/prism-javascript.min.js               | 2 +-
 prism.js                                         | 3 ++-
 tests/languages/javascript/function_feature.test | 9 ++++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index d4f1025dbf..a0eeb3c62f 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -1,7 +1,8 @@
 Prism.languages.javascript = Prism.languages.extend('clike', {
 	'keyword': /\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
 	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
-	'function': /(?!\d)[a-z0-9_$]+(?=\()/i
+	// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
+	'function': /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i
 });
 
 Prism.languages.insertBefore('javascript', 'keyword', {
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index a3a4a002ab..f141001f70 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/(?!\d)[a-z0-9_$]+(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index c81742946b..90744ba909 100644
--- a/prism.js
+++ b/prism.js
@@ -582,7 +582,8 @@ Prism.languages.clike = {
 Prism.languages.javascript = Prism.languages.extend('clike', {
 	'keyword': /\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,
 	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
-	'function': /(?!\d)[a-z0-9_$]+(?=\()/i
+	// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
+	'function': /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i
 });
 
 Prism.languages.insertBefore('javascript', 'keyword', {
diff --git a/tests/languages/javascript/function_feature.test b/tests/languages/javascript/function_feature.test
index fca4a30048..e805e87df3 100644
--- a/tests/languages/javascript/function_feature.test
+++ b/tests/languages/javascript/function_feature.test
@@ -3,6 +3,8 @@ foo_bar()
 f42()
 _()
 $()
+ಠ_ಠ()
+Ƞȡ_҇()
 
 ----------------------------------------------------
 
@@ -11,10 +13,11 @@ $()
 	["function", "foo_bar"], ["punctuation", "("], ["punctuation", ")"],
 	["function", "f42"], ["punctuation", "("], ["punctuation", ")"],
 	["function", "_"], ["punctuation", "("], ["punctuation", ")"],
-	["function", "$"], ["punctuation", "("], ["punctuation", ")"]
+	["function", "$"], ["punctuation", "("], ["punctuation", ")"],
+	["function", "ಠ_ಠ"], ["punctuation", "("], ["punctuation", ")"],
+	["function", "Ƞȡ_҇"], ["punctuation", "("], ["punctuation", ")"]
 ]
 
 ----------------------------------------------------
 
-Checks for functions.
-Also checks that function starting with a number are not highlighted.
\ No newline at end of file
+Checks for functions. Also checks for unicode characters in identifiers.

From 2f9fe1efb80e4744092cfd1e0ad245df18e59c0d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Thu, 3 Sep 2015 23:39:16 +0200
Subject: [PATCH 297/310] Added some language aliases.

---
 components/prism-javascript.js     | 2 ++
 components/prism-javascript.min.js | 2 +-
 components/prism-markup.js         | 5 +++++
 components/prism-markup.min.js     | 2 +-
 examples.html                      | 4 +++-
 examples/prism-javascript.html     | 6 +++++-
 examples/prism-markup.html         | 9 ++++++++-
 prism.js                           | 6 ++++++
 8 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index a0eeb3c62f..0d81394aed 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -46,3 +46,5 @@ if (Prism.languages.markup) {
 		}
 	});
 }
+
+Prism.languages.js = Prism.languages.javascript;
\ No newline at end of file
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index f141001f70..617a028901 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}});
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}}),Prism.languages.js=Prism.languages.javascript;
\ No newline at end of file
diff --git a/components/prism-markup.js b/components/prism-markup.js
index 81f66fcc97..6056353ed0 100644
--- a/components/prism-markup.js
+++ b/components/prism-markup.js
@@ -39,3 +39,8 @@ Prism.hooks.add('wrap', function(env) {
 		env.attributes['title'] = env.content.replace(/&amp;/, '&');
 	}
 });
+
+Prism.languages.xml = Prism.languages.markup;
+Prism.languages.html = Prism.languages.markup;
+Prism.languages.mathml = Prism.languages.markup;
+Prism.languages.svg = Prism.languages.markup;
diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
index 1a7281ae0e..0a3ba73e92 100644
--- a/components/prism-markup.min.js
+++ b/components/prism-markup.min.js
@@ -1 +1 @@
-Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?[\w\W]+?\?>/,doctype:/<!DOCTYPE[\w\W]+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/=]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(t){"entity"===t.type&&(t.attributes.title=t.content.replace(/&amp;/,"&"))});
\ No newline at end of file
+Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?[\w\W]+?\?>/,doctype:/<!DOCTYPE[\w\W]+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/=]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(a){"entity"===a.type&&(a.attributes.title=a.content.replace(/&amp;/,"&"))}),Prism.languages.xml=Prism.languages.markup,Prism.languages.html=Prism.languages.markup,Prism.languages.mathml=Prism.languages.markup,Prism.languages.svg=Prism.languages.markup;
\ No newline at end of file
diff --git a/examples.html b/examples.html
index 6138097b35..600e8e9574 100644
--- a/examples.html
+++ b/examples.html
@@ -39,7 +39,9 @@
 	#examples h3 {
 		margin: 1em 0 0.3em;
 	}
-
+ul {
+	padding-left: 40px;
+}
 </style>
 <script src="prefixfree.min.js"></script>
 
diff --git a/examples/prism-javascript.html b/examples/prism-javascript.html
index 77a63d0f40..80ea29d64f 100644
--- a/examples/prism-javascript.html
+++ b/examples/prism-javascript.html
@@ -1,5 +1,9 @@
 <h1>JavaScript</h1>
-<p>To use this language, use the class "language-javascript".</p>
+<p>To use this language, use one of the following classes:</p>
+<ul>
+	<li>"language-javascript"</li>
+	<li>"language-js"</li>
+</ul>
 
 <h2>Variable assignment</h2>
 <pre><code>var foo = "bar", baz = 5;</code></pre>
diff --git a/examples/prism-markup.html b/examples/prism-markup.html
index 7709c025fd..c1f9d33861 100644
--- a/examples/prism-markup.html
+++ b/examples/prism-markup.html
@@ -1,5 +1,12 @@
 <h1>Markup</h1>
-<p>To use this language, use the class "language-markup".</p>
+<p>To use this language, use one of the following classes:</p>
+<ul>
+	<li>"language-markup"</li>
+	<li>"language-xml"</li>
+	<li>"language-html"</li>
+	<li>"language-mathml"</li>
+	<li>"language-svg"</li>
+</ul>
 
 <h2>Empty tag</h2>
 <pre><code>&lt;p>&lt;/p></code></pre>
diff --git a/prism.js b/prism.js
index 90744ba909..b2e3c47a8d 100644
--- a/prism.js
+++ b/prism.js
@@ -484,6 +484,11 @@ Prism.hooks.add('wrap', function(env) {
 	}
 });
 
+Prism.languages.xml = Prism.languages.markup;
+Prism.languages.html = Prism.languages.markup;
+Prism.languages.mathml = Prism.languages.markup;
+Prism.languages.svg = Prism.languages.markup;
+
 
 /* **********************************************
      Begin prism-css.js
@@ -628,6 +633,7 @@ if (Prism.languages.markup) {
 	});
 }
 
+Prism.languages.js = Prism.languages.javascript;
 
 /* **********************************************
      Begin prism-file-highlight.js

From 071c3ddf767d3d30bc17e4ee0b27f3543eca7a15 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 4 Sep 2015 00:13:37 +0200
Subject: [PATCH 298/310] Merge branch 'c-fixes' of
 https://github.com/rygorous/prism into gh-pages

Conflicts:
	components/prism-c.js
	components/prism-c.min.js
	components/prism-clike.js
	components/prism-clike.min.js

+ added tests
---
 components/prism-c.js                     |  2 +-
 components/prism-c.min.js                 |  2 +-
 components/prism-clike.js                 |  2 +-
 components/prism-clike.min.js             |  2 +-
 prism.js                                  |  2 +-
 tests/languages/c/number_feature.test     | 35 +++++++++++++++++++++++
 tests/languages/clike/number_feature.test |  2 ++
 7 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/components/prism-c.js b/components/prism-c.js
index f65e54fd1d..de4e13f145 100644
--- a/components/prism-c.js
+++ b/components/prism-c.js
@@ -1,7 +1,7 @@
 Prism.languages.c = Prism.languages.extend('clike', {
 	'keyword': /\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,
 	'operator': /\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/,
-	'number': /\b-?(0x[\da-f]+|\d*\.?\d+(e[+-]?\d+)?)[fFuUlL]*\b/i
+	'number': /\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)[ful]*\b/i
 });
 
 Prism.languages.insertBefore('c', 'string', {
diff --git a/components/prism-c.min.js b/components/prism-c.min.js
index b621206cb3..4392c5cfbc 100644
--- a/components/prism-c.min.js
+++ b/components/prism-c.min.js
@@ -1 +1 @@
-Prism.languages.c=Prism.languages.extend("clike",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,operator:/\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/,number:/\b-?(0x[\da-f]+|\d*\.?\d+(e[+-]?\d+)?)[fFuUlL]*\b/i}),Prism.languages.insertBefore("c","string",{macro:{pattern:/(^\s*)#\s*[a-z]+([^\r\n\\]|\\.|\\(?:\r\n?|\n))*/im,lookbehind:!0,alias:"property",inside:{string:{pattern:/(#\s*include\s*)(<.+?>|("|')(\\?.)+?\3)/,lookbehind:!0}}}}),delete Prism.languages.c["class-name"],delete Prism.languages.c["boolean"];
\ No newline at end of file
+Prism.languages.c=Prism.languages.extend("clike",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,operator:/\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/,number:/\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)[ful]*\b/i}),Prism.languages.insertBefore("c","string",{macro:{pattern:/(^\s*)#\s*[a-z]+([^\r\n\\]|\\.|\\(?:\r\n?|\n))*/im,lookbehind:!0,alias:"property",inside:{string:{pattern:/(#\s*include\s*)(<.+?>|("|')(\\?.)+?\3)/,lookbehind:!0}}}}),delete Prism.languages.c["class-name"],delete Prism.languages.c["boolean"];
\ No newline at end of file
diff --git a/components/prism-clike.js b/components/prism-clike.js
index 052089e3d5..5745341f7d 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -20,7 +20,7 @@ Prism.languages.clike = {
 	'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
 	'boolean': /\b(true|false)\b/,
 	'function': /[a-z0-9_]+(?=\()/i,
-	'number': /\b-?(0x[\da-f]+|\d*\.?\d+(e[+-]?\d+)?)\b/i,
+	'number': /\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)\b/i,
 	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
 	'punctuation': /[{}[\];(),.:]/
 };
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index 828c6e7694..b437bab33b 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(0x[\da-f]+|\d*\.?\d+(e[+-]?\d+)?)\b/i,operator:/--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/("|')(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)\b/i,operator:/--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index b2e3c47a8d..c5b3de6177 100644
--- a/prism.js
+++ b/prism.js
@@ -574,7 +574,7 @@ Prism.languages.clike = {
 	'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
 	'boolean': /\b(true|false)\b/,
 	'function': /[a-z0-9_]+(?=\()/i,
-	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
+	'number': /\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)\b/i,
 	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
 	'punctuation': /[{}[\];(),.:]/
 };
diff --git a/tests/languages/c/number_feature.test b/tests/languages/c/number_feature.test
index e69de29bb2..0542683404 100644
--- a/tests/languages/c/number_feature.test
+++ b/tests/languages/c/number_feature.test
@@ -0,0 +1,35 @@
+42
+3.14159
+4e10
+2.1e-10
+0.4e+2
+0xbabe
+0xBABE
+42f
+42F
+42u
+42U
+42l
+42L
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "4e10"],
+	["number", "2.1e-10"],
+	["number", "0.4e+2"],
+	["number", "0xbabe"],
+	["number", "0xBABE"],
+	["number", "42f"],
+	["number", "42F"],
+	["number", "42u"],
+	["number", "42U"],
+	["number", "42l"],
+	["number", "42L"]
+]
+
+----------------------------------------------------
+
+Checks for decimal numbers and hexadecimal numbers.
\ No newline at end of file
diff --git a/tests/languages/clike/number_feature.test b/tests/languages/clike/number_feature.test
index 002a5c92c2..f6bcc0b662 100644
--- a/tests/languages/clike/number_feature.test
+++ b/tests/languages/clike/number_feature.test
@@ -2,6 +2,7 @@
 3.14159
 4e10
 2.1e-10
+0.4e+2
 0xbabe
 0xBABE
 
@@ -12,6 +13,7 @@
 	["number", "3.14159"],
 	["number", "4e10"],
 	["number", "2.1e-10"],
+	["number", "0.4e+2"],
 	["number", "0xbabe"],
 	["number", "0xBABE"]
 ]

From b2f14d961e6e1c355f040a7a0932f58b06198863 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 4 Sep 2015 08:19:21 +0200
Subject: [PATCH 299/310] Merge branch 'plugin-jsonp' of
 https://github.com/nauzilus/prism into gh-pages

Conflicts:
	components/prism-core.min.js
---
 components.js                                 |   5 +
 components/prism-core.js                      |   3 +-
 components/prism-core.min.js                  |   2 +-
 plugins/jsonp-highlight/index.html            | 174 ++++++++++++++++++
 .../jsonp-highlight/prism-jsonp-highlight.js  | 151 +++++++++++++++
 .../prism-jsonp-highlight.min.js              |   1 +
 prism.js                                      |   3 +-
 7 files changed, 336 insertions(+), 3 deletions(-)
 create mode 100644 plugins/jsonp-highlight/index.html
 create mode 100644 plugins/jsonp-highlight/prism-jsonp-highlight.js
 create mode 100644 plugins/jsonp-highlight/prism-jsonp-highlight.min.js

diff --git a/components.js b/components.js
index 01fd5f9f4a..43f1536061 100644
--- a/components.js
+++ b/components.js
@@ -375,6 +375,11 @@ var components = {
 			"title": "Show Language",
 			"owner": "nauzilus"
 		},
+		"jsonp-highlight": {
+			"title": "JSONP Highlight",
+			"noCSS": true,
+			"owner": "nauzilus"
+		},
 		"highlight-keywords": {
 			"title": "Highlight Keywords",
 			"owner": "vkbansal",
diff --git a/components/prism-core.js b/components/prism-core.js
index 8ee4050e83..3ab918da47 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -140,7 +140,8 @@ var _ = _self.Prism = {
 			}
 		}
 	},
-
+	plugins: {},
+	
 	highlightAll: function(async, callback) {
 		var elements = document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');
 
diff --git a/components/prism-core.min.js b/components/prism-core.min.js
index d97d828467..842973b98f 100644
--- a/components/prism-core.min.js
+++ b/components/prism-core.min.js
@@ -1 +1 @@
-var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code,immediateClose:!0}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=(o?" ":"")+s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code,i=n.immediateClose;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),i&&_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
\ No newline at end of file
+var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var i=r[e];if(2==arguments.length){a=arguments[1];for(var l in a)a.hasOwnProperty(l)&&(i[l]=a[l]);return i}var o={};for(var s in i)if(i.hasOwnProperty(s)){if(s==n)for(var l in a)a.hasOwnProperty(l)&&(o[l]=a[l]);o[s]=i[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},plugins:{},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),i=0;a=r[i++];)t.highlightElement(a,e===!0,n)},highlightElement:function(a,r,i){for(var l,o,s=a;s&&!e.test(s.className);)s=s.parentNode;s&&(l=(s.className.match(e)||[,""])[1],o=t.languages[l]),a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,s=a.parentNode,/pre/i.test(s.nodeName)&&(s.className=s.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var u=a.textContent,g={element:a,language:l,grammar:o,code:u};if(!u||!o)return t.hooks.run("complete",g),void 0;if(t.hooks.run("before-highlight",g),r&&_self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){g.highlightedCode=n.stringify(JSON.parse(e.data),l),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(g.element),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},c.postMessage(JSON.stringify({language:g.language,code:g.code,immediateClose:!0}))}else g.highlightedCode=t.highlight(g.code,g.grammar,g.language),t.hooks.run("before-insert",g),g.element.innerHTML=g.highlightedCode,i&&i.call(a),t.hooks.run("after-highlight",g),t.hooks.run("complete",g)},highlight:function(e,a,r){var i=t.tokenize(e,a);return n.stringify(t.util.encode(i),r)},tokenize:function(e,n){var a=t.Token,r=[e],i=n.rest;if(i){for(var l in i)n[l]=i[l];delete n.rest}e:for(var l in n)if(n.hasOwnProperty(l)&&n[l]){var o=n[l];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),N=[p,1];b&&N.push(b);var O=new a(l,g?t.tokenize(m,g):m,h);N.push(O),w&&N.push(w),Array.prototype.splice.apply(r,N)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,i=0;r=a[i++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var i={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==i.type&&(i.attributes.spellcheck="true"),e.alias){var l="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(i.classes,l)}t.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=(o?" ":"")+s+'="'+(i.attributes[s]||"")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'" '+o+">"+i.content+"</"+i.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code,i=n.immediateClose;_self.postMessage(JSON.stringify(t.util.encode(t.tokenize(r,t.languages[a])))),i&&_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
\ No newline at end of file
diff --git a/plugins/jsonp-highlight/index.html b/plugins/jsonp-highlight/index.html
new file mode 100644
index 0000000000..d70d375e80
--- /dev/null
+++ b/plugins/jsonp-highlight/index.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+<meta charset="utf-8" />
+<link rel="shortcut icon" href="favicon.png" />
+<title>JSONP Highlight ▲ Prism plugins</title>
+<base href="../.." />
+<link rel="stylesheet" href="style.css" />
+<link rel="stylesheet" href="themes/prism.css" data-noprefix />
+<script src="prefixfree.min.js"></script>
+
+<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
+<script src="http://www.google-analytics.com/ga.js" async></script>
+</head>
+<body>
+
+<header>
+	<div class="intro" data-src="templates/header-plugins.html" data-type="text/html"></div>
+
+	<h2>JSONP Highlight</h2>
+	<p>Fetch content with JSONP and highlight some interesting content (e.g. GitHub/Gists or Bitbucket API).</p>
+</header>
+
+<section class="language-markup">
+	<h1>How to use</h1>
+	
+	<p>Use the <code>data-jsonp</code> attribute on <code>&lt;pre></code> elements, like so:</p>
+	
+	<pre><code>&lt;pre
+  class="language-javascript"
+  data-jsonp="https://api.github.com/repos/leaverou/prism/contents/prism.js">
+&lt;/pre></code></pre>
+	
+	<p>
+		Don't specifiy the <code>callback</code> query parameter in the URL; this will be added
+		automatically. If the API expects a different callback parameter name however, use the
+		<code>data-callback</code> parameter to specify the name:
+	</p>
+	
+	<pre><code>&lt;pre class="&hellip;" data-jsonp="&hellip;" data-callback="cb">&lt;/pre></code></pre>
+
+	<p>
+		The next trick is of course actually extracting something from the JSONP response worth
+		highlighting, which means processing the response to extract the interesting data.
+	</p>	
+
+	<p>The following JSONP APIs are automatically detected and parsed:</p>
+
+	<ul>
+		<li><a href="https://developer.github.com/v3/repos/contents/#get-contents">GitHub</a></li>
+		<li><a href="https://developer.github.com/v3/gists/#get-a-single-gist">GitHub Gists</a></li>
+		<li><a href="https://confluence.atlassian.com/display/BITBUCKET/src+Resources#srcResources-GETrawcontentofanindividualfile">Bitbucket</a></li>
+	</ul>
+
+	<p>If you need to do your own parsing, you can hook your your own data adapters in two ways:</p>
+	<ol>
+		<li>
+			Supply the <code>data-adapter</code> parameter on the <code>&lt;pre></code> element.
+			This must be the name of a globally defined function.
+			The plugin will use <em>only</em> this adapter to parse the response.
+		</li>
+		<li>
+			Register your adapter function by calling
+			<code>Prism.plugins.jsonphighlight.registerAdapter(function(rsp) { &hellip; })</code>.
+			It will be added to the list of inbuilt adapters and used if no other registered
+			adapater (e.g. GitHub/Bitbucket) can parse the response.
+		</li>
+	</ol>
+	
+	<p>
+		In either case, the function must accept at least a single parameter (the JSONP response) and
+		returns a string of the content to highlight. If your adapter cannot parse the response, you
+		must return <code>null</code>. The DOM node that will contain the highlighted code will also
+		be passed in as the second argument, incase you need to use it to query any extra information
+		(maybe you wish to inspect the <code>class</code> or <code>data-jsonp</code> attributes to
+		assist in parsing the response).
+	</p>
+
+	<p>
+		The following example demonstrates both methods of using a custom adapter, to simply return
+		the stringyfied JSONP response (i.e highlight the entire JSONP data):
+	</p>
+
+	<pre><code>&lt;!-- perhaps this is in a .js file elsewhere -->
+&lt;script>
+	function dump_json(rsp) {
+		return "using dump_json: " + JSON.stringify(rsp,null,2);
+	}
+&lt;/script>
+
+&lt;!-- &hellip; include prism.js &hellip; -->
+&lt;script>
+	Prism.plugins.jsonphighlight.registerAdapter(function(rsp) {
+		return "using registerAdapter: " + JSON.stringify(rsp,null,2);
+	})
+&lt;/script>
+</code></pre>
+
+	<p>And later in your HTML:</p>
+
+	<pre><code>&lt;!-- using the data-adapter attribute -->
+&lt;pre class="language-javascript" data-jsonp="&hellip;" data-adapter="dump_json">&lt;/pre>
+
+&lt;!-- using whatever data adapters are available -->
+&lt;pre class="language-javascript" data-jsonp="&hellip;">&lt;/pre>
+</code></pre>
+
+	<p>
+		Finally, unlike like the <a href="/plugins/file-highlight/index.html">File Highlight</a>
+		plugin, you <em>do</em> need to supply the appropriate <code>class</code> with the language
+		to highlight. This could have been auto-detected, but since you're not actually linking to
+		a file it's not always possible (see below in the example using GitHub status).
+		Furthermore, if you're linking to files with a <code>.xaml</code> extension for example,
+		this plugin then needs to somehow map that to highlight as <code>markup</code>, which just
+		means more bloat. You know what you're trying to highlight, just say so :)
+	</p>
+
+	<h2>Caveat for Gists</h2>
+
+	<p>
+		There's a bit of a catch with gists, as they can actually contain multiple files.
+		There are two options to handle this:
+	</p>
+
+	<ol>
+		<li>
+			If your gist only contains one file, you don't need to to anything; the one and only
+			file will automatically be chosen and highlighted
+		</li>
+		<li>
+			If your file contains multiple files, the first one will be chosen by default.
+			However, you can supply the filename in the <code>data-filename</code> attribute, and
+			this file will be highlighted instead:
+			<pre><code>&lt;pre class="&hellip;" data-jsonp="&hellip;" data-filename="mydemo.js">&lt;/pre></code></pre>
+		</li>
+	</ol>
+</section>
+
+<section>
+	<h1>Examples</h1>
+	
+	<p>The plugin’s JS code (from GitHub):</p>
+ 	<pre class="lang-javascript" data-jsonp="https://api.github.com/repos/PrismJS/prism/contents/plugins/jsonp-highlight/prism-jsonp-highlight.js"></pre>
+
+	<p>GitHub Gist (gist contains a single file, automatically selected):</p>
+ 	<pre class="lang-javascript" data-jsonp="https://api.github.com/gists/599a04c05a22f48a292d"></pre>
+
+	<p>GitHub Gist (gist contains a multiple files, file to load specified):</p>
+ 	<pre class="lang-markup" data-jsonp="https://api.github.com/gists/599a04c05a22f48a292d" data-filename="dabblet.html"></pre>
+
+ 	<p>Bitbucket API:</p>
+	<pre class="lang-css" data-jsonp="https://bitbucket.org/!api/1.0/repositories/nauzilus/stylish/src/master/whirlpool/style.css"></pre>
+ 	
+ 	<p>Custom adapter (JSON.stringify showing GitHub <a href="https://status.github.com/api/status.json">status</a>):</p>
+	<pre class="lang-javascript" data-jsonp="https://status.github.com/api/status.json" data-adapter="dump_json"></pre>
+
+	<p>Registered adapter (as above, but without explicitly declaring the <code>data-adapter</code> attribute):</p>
+	<pre class="lang-javascript" data-jsonp="https://status.github.com/api/status.json"></pre>
+</section>
+
+<footer data-src="templates/footer.html" data-type="text/html"></footer>
+
+<script>function dump_json(x) { return "using dump_json: " + JSON.stringify(x,null,2); }</script>
+<script src="prism.js"></script>
+<script src="plugins/jsonp-highlight/prism-jsonp-highlight.js"></script>
+<script>Prism.plugins.jsonphighlight.registerAdapter(function (x) { return "using registerAdapter: " + JSON.stringify(x,null,2); })</script>
+<script src="utopia.js"></script>
+<script src="components.js"></script>
+<script src="code.js"></script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/jsonp-highlight/prism-jsonp-highlight.js b/plugins/jsonp-highlight/prism-jsonp-highlight.js
new file mode 100644
index 0000000000..06a9e68c09
--- /dev/null
+++ b/plugins/jsonp-highlight/prism-jsonp-highlight.js
@@ -0,0 +1,151 @@
+(function() {
+	if ( !self.Prism || !self.document || !document.querySelectorAll ) return;
+
+	var adapters = [];
+	function registerAdapter(adapter) {
+		if (typeof adapter === "function" && !getAdapter(adapter)) {
+			adapters.push(adapter);
+		}
+	}
+	function getAdapter(adapter) {
+		if (typeof adapter === "function") {
+			return adapters.filter(function(fn) { return fn.valueOf() === adapter.valueOf()})[0];
+		}
+		else if (typeof adapter === "string" && adapter.length > 0) {
+			return adapters.filter(function(fn) { return fn.name === adapter})[0];
+		}
+		return null;
+	}
+	function removeAdapter(adapter) {
+		if (typeof adapter === "string")
+			adapter = getAdapter(adapter);
+		if (typeof adapter === "function") {
+			var index = adapters.indexOf(adapter);
+			if (index >=0) {
+				adapters.splice(index,1);
+			}
+		}
+	}
+
+	Prism.plugins.jsonphighlight = {
+		registerAdapter: registerAdapter,
+		removeAdapter: removeAdapter,
+		highlight: highlight
+	};
+	registerAdapter(function github(rsp, el) {
+		if ( rsp && rsp.meta && rsp.data ) {
+			if ( rsp.meta.status && rsp.meta.status >= 400 ) {
+				return "Error: " + ( rsp.data.message || rsp.meta.status );
+			}
+			else if ( typeof(rsp.data.content) === "string" ) {
+				return typeof(atob) === "function"
+					? atob(rsp.data.content.replace(/\s/g, ""))
+					: "Your browser cannot decode base64";
+			}
+		}
+		return null;
+	});
+	registerAdapter(function gist(rsp, el) {
+		if ( rsp && rsp.meta && rsp.data && rsp.data.files ) {
+			if ( rsp.meta.status && rsp.meta.status >= 400 ) {
+				return "Error: " + ( rsp.data.message || rsp.meta.status );
+			}
+			else {
+				var filename = el.getAttribute("data-filename");
+				if (filename == null) {
+					// Maybe in the future we can somehow render all files
+					// But the standard <script> include for gists does that nicely already,
+					// so that might be getting beyond the scope of this plugin
+					for (var key in rsp.data.files) {
+						if (rsp.data.files.hasOwnProperty(key)) {
+							filename = key;
+							break;
+						}
+					}
+				}
+				if (rsp.data.files[filename] !== undefined) {
+					return rsp.data.files[filename].content;
+				}
+				else {
+					return "Error: unknown or missing gist file " + filename;
+				}
+			}
+		}
+		return null;
+	});
+	registerAdapter(function bitbucket(rsp, el) {
+		return rsp && rsp.node && typeof(rsp.data) === "string"
+			? rsp.data
+			: null;
+	});
+
+	var jsonpcb = 0,
+	    loadstr = "Loading…";
+
+	function highlight() {
+		Array.prototype.slice.call(document.querySelectorAll("pre[data-jsonp]")).forEach(function(pre) {
+			pre.textContent = "";
+
+			var code = document.createElement("code");
+			code.textContent = loadstr;
+			pre.appendChild(code);
+
+			var adapterfn = pre.getAttribute("data-adapter");
+			var adapter = null;
+			if ( adapterfn ) {
+				if ( typeof(window[adapterfn]) === "function" ) {
+					adapter = window[adapterfn];
+				}
+				else {
+					code.textContent = "JSONP adapter function '" + adapterfn + "' doesn't exist";
+					return;
+				}
+			}
+
+			var cb = "prismjsonp" + ( jsonpcb++ );
+			
+			var uri = document.createElement("a");
+			var src = uri.href = pre.getAttribute("data-jsonp");
+			uri.href += ( uri.search ? "&" : "?" ) + ( pre.getAttribute("data-callback") || "callback" ) + "=" + cb;
+
+			var timeout = setTimeout(function() {
+				// we could clean up window[cb], but if the request finally succeeds, keeping it around is a good thing
+				if ( code.textContent === loadstr )
+					code.textContent = "Timeout loading '" + src + "'";
+			}, 5000);
+			
+			var script = document.createElement("script");
+			script.src = uri.href;
+
+			window[cb] = function(rsp) {
+				document.head.removeChild(script);
+				clearTimeout(timeout);
+				delete window[cb];
+
+				var data = "";
+				
+				if ( adapter ) {
+					data = adapter(rsp, pre);
+				}
+				else {
+					for ( var p in adapters ) {
+						data = adapters[p](rsp, pre);
+						if ( data !== null ) break;
+					}
+				}
+
+				if (data === null) {
+					code.textContent = "Cannot parse response (perhaps you need an adapter function?)";
+				}
+				else {
+					code.textContent = data;
+					Prism.highlightElement(code);
+				}
+			};
+
+			document.head.appendChild(script);
+		});
+	}
+
+	highlight();
+})();
\ No newline at end of file
diff --git a/plugins/jsonp-highlight/prism-jsonp-highlight.min.js b/plugins/jsonp-highlight/prism-jsonp-highlight.min.js
new file mode 100644
index 0000000000..3954db5cdf
--- /dev/null
+++ b/plugins/jsonp-highlight/prism-jsonp-highlight.min.js
@@ -0,0 +1 @@
+!function(){function t(t){"function"!=typeof t||e(t)||r.push(t)}function e(t){return"function"==typeof t?r.filter(function(e){return e.valueOf()===t.valueOf()})[0]:"string"==typeof t&&t.length>0?r.filter(function(e){return e.name===t})[0]:null}function n(t){if("string"==typeof t&&(t=e(t)),"function"==typeof t){var n=r.indexOf(t);n>=0&&r.splice(n,1)}}function a(){Array.prototype.slice.call(document.querySelectorAll("pre[data-jsonp]")).forEach(function(t){t.textContent="";var e=document.createElement("code");e.textContent=i,t.appendChild(e);var n=t.getAttribute("data-adapter"),a=null;if(n){if("function"!=typeof window[n])return e.textContent="JSONP adapter function '"+n+"' doesn't exist",void 0;a=window[n]}var u="prismjsonp"+o++,f=document.createElement("a"),l=f.href=t.getAttribute("data-jsonp");f.href+=(f.search?"&":"?")+(t.getAttribute("data-callback")||"callback")+"="+u;var s=setTimeout(function(){e.textContent===i&&(e.textContent="Timeout loading '"+l+"'")},5e3),d=document.createElement("script");d.src=f.href,window[u]=function(n){document.head.removeChild(d),clearTimeout(s),delete window[u];var o="";if(a)o=a(n,t);else for(var i in r)if(o=r[i](n,t),null!==o)break;null===o?e.textContent="Cannot parse response (perhaps you need an adapter function?)":(e.textContent=o,Prism.highlightElement(e))},document.head.appendChild(d)})}if(self.Prism&&self.document&&document.querySelectorAll){var r=[];Prism.plugins.jsonphighlight={registerAdapter:t,removeAdapter:n,highlight:a},t(function(t){if(t&&t.meta&&t.data){if(t.meta.status&&t.meta.status>=400)return"Error: "+(t.data.message||t.meta.status);if("string"==typeof t.data.content)return"function"==typeof atob?atob(t.data.content.replace(/\s/g,"")):"Your browser cannot decode base64"}return null}),t(function(t,e){if(t&&t.meta&&t.data&&t.data.files){if(t.meta.status&&t.meta.status>=400)return"Error: "+(t.data.message||t.meta.status);var n=e.getAttribute("data-filename");if(null==n)for(var a in t.data.files)if(t.data.files.hasOwnProperty(a)){n=a;break}return void 0!==t.data.files[n]?t.data.files[n].content:"Error: unknown or missing gist file "+n}return null}),t(function(t){return t&&t.node&&"string"==typeof t.data?t.data:null});var o=0,i="Loading…";a()}}();
\ No newline at end of file
diff --git a/prism.js b/prism.js
index c5b3de6177..90e7df26b1 100644
--- a/prism.js
+++ b/prism.js
@@ -145,7 +145,8 @@ var _ = _self.Prism = {
 			}
 		}
 	},
-
+	plugins: {},
+	
 	highlightAll: function(async, callback) {
 		var elements = document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');
 

From 1f45942c86a3cb441323e41dbb690774e02ab38b Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Fri, 4 Sep 2015 08:58:16 +0200
Subject: [PATCH 300/310] Add support for APL. Closes #308

---
 components.js                                 |  4 ++
 components/prism-apl.js                       | 29 +++++++++++++
 components/prism-apl.min.js                   |  1 +
 plugins/show-language/prism-show-language.js  |  2 +-
 .../show-language/prism-show-language.min.js  |  2 +-
 tests/languages/apl/assignment_feature.test   | 13 ++++++
 tests/languages/apl/comment_feature.test      | 15 +++++++
 tests/languages/apl/constant_feature.test     | 19 +++++++++
 tests/languages/apl/dfn_feature.test          | 23 +++++++++++
 .../apl/dyadic-operator_feature.test          | 13 ++++++
 tests/languages/apl/function_feature.test     | 41 +++++++++++++++++++
 .../apl/monadic-operator_feature.test         | 15 +++++++
 tests/languages/apl/number_feature.test       | 27 ++++++++++++
 tests/languages/apl/statement_feature.test    | 13 ++++++
 tests/languages/apl/string_feature.test       | 15 +++++++
 .../apl/system-function_feature.test          | 17 ++++++++
 16 files changed, 247 insertions(+), 2 deletions(-)
 create mode 100644 components/prism-apl.js
 create mode 100644 components/prism-apl.min.js
 create mode 100644 tests/languages/apl/assignment_feature.test
 create mode 100644 tests/languages/apl/comment_feature.test
 create mode 100644 tests/languages/apl/constant_feature.test
 create mode 100644 tests/languages/apl/dfn_feature.test
 create mode 100644 tests/languages/apl/dyadic-operator_feature.test
 create mode 100644 tests/languages/apl/function_feature.test
 create mode 100644 tests/languages/apl/monadic-operator_feature.test
 create mode 100644 tests/languages/apl/number_feature.test
 create mode 100644 tests/languages/apl/statement_feature.test
 create mode 100644 tests/languages/apl/string_feature.test
 create mode 100644 tests/languages/apl/system-function_feature.test

diff --git a/components.js b/components.js
index 43f1536061..9130d4f607 100644
--- a/components.js
+++ b/components.js
@@ -67,6 +67,10 @@ var components = {
 			"title": "Apache Configuration",
 			"owner": "GuiTeK"
 		},
+		"apl": {
+			"title": "APL",
+			"owner": "ngn"
+		},
 		"applescript": {
 			"title": "AppleScript",
 			"owner": "Golmote"
diff --git a/components/prism-apl.js b/components/prism-apl.js
new file mode 100644
index 0000000000..9218331b36
--- /dev/null
+++ b/components/prism-apl.js
@@ -0,0 +1,29 @@
+Prism.languages.apl = {
+	'comment': /(?:⍝|#[! ]).*$/m,
+	'string': /'(?:[^'\r\n]|'')*'/,
+	'number': /¯?(?:\d*\.?\d+(?:e[+¯]?\d+)?|¯|∞)(?:j¯?(?:\d*\.?\d+(?:e[\+¯]?\d+)?|¯|∞))?/i,
+	'statement': /:[A-Z][a-z][A-Za-z]*\b/,
+	'system-function': {
+		pattern: /⎕[A-Z]+/i,
+		alias: 'function'
+	},
+	'constant': /[⍬⌾#⎕⍞]/,
+	'function': /[-+×÷⌈⌊∣|⍳?*⍟○!⌹<≤=>≥≠≡≢∊⍷∪∩~∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢⍁⍂≈⍯↗¤→]/,
+	'monadic-operator': {
+		pattern: /[\\\/⌿⍀¨⍨⌶&∥]/,
+		alias: 'operator'
+	},
+	'dyadic-operator': {
+		pattern: /[.⍣⍠⍤∘⌸]/,
+		alias: 'operator'
+	},
+	'assignment': {
+		pattern: /←/,
+		alias: 'keyword'
+	},
+	'punctuation': /[\[;\]()◇⋄]/,
+	'dfn': {
+		pattern: /[{}⍺⍵⍶⍹∇⍫:]/,
+		alias: 'builtin'
+	}
+};
\ No newline at end of file
diff --git a/components/prism-apl.min.js b/components/prism-apl.min.js
new file mode 100644
index 0000000000..bfd9dc3680
--- /dev/null
+++ b/components/prism-apl.min.js
@@ -0,0 +1 @@
+Prism.languages.apl={comment:/(?:⍝|#[! ]).*$/m,string:/'(?:[^'\r\n]|'')*'/,number:/¯?(?:\d*\.?\d+(?:e[+¯]?\d+)?|¯|∞)(?:j¯?(?:\d*\.?\d+(?:e[\+¯]?\d+)?|¯|∞))?/i,statement:/:[A-Z][a-z][A-Za-z]*\b/,"system-function":{pattern:/⎕[A-Z]+/i,alias:"function"},constant:/[⍬⌾#⎕⍞]/,"function":/[-+×÷⌈⌊∣|⍳?*⍟○!⌹<≤=>≥≠≡≢∊⍷∪∩~∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢⍁⍂≈⍯↗¤→]/,"monadic-operator":{pattern:/[\\\/⌿⍀¨⍨⌶&∥]/,alias:"operator"},"dyadic-operator":{pattern:/[.⍣⍠⍤∘⌸]/,alias:"operator"},assignment:{pattern:/←/,alias:"keyword"},punctuation:/[\[;\]()◇⋄]/,dfn:{pattern:/[{}⍺⍵⍶⍹∇⍫:]/,alias:"builtin"}};
\ No newline at end of file
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
index 8d84523907..449c9e046b 100644
--- a/plugins/show-language/prism-show-language.js
+++ b/plugins/show-language/prism-show-language.js
@@ -5,7 +5,7 @@ if (typeof self === 'undefined' || !self.Prism || !self.document) {
 }
 
 // The languages map is built automatically with gulp
-var Languages = /*languages_placeholder[*/{"css":"CSS","clike":"C-like","javascript":"JavaScript","actionscript":"ActionScript","apacheconf":"Apache Configuration","applescript":"AppleScript","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","css-extras":"CSS Extras","fsharp":"F#","http":"HTTP","latex":"LaTeX","lolcode":"LOLCODE","matlab":"MATLAB","nasm":"NASM","nsis":"NSIS","objectivec":"Objective-C","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","jsx":"React JSX","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vhdl":"VHDL","wiki":"Wiki markup","yaml":"YAML"}/*]*/;
+var Languages = /*languages_placeholder[*/{"css":"CSS","clike":"C-like","javascript":"JavaScript","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","css-extras":"CSS Extras","fsharp":"F#","http":"HTTP","latex":"LaTeX","lolcode":"LOLCODE","matlab":"MATLAB","nasm":"NASM","nsis":"NSIS","objectivec":"Objective-C","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","jsx":"React JSX","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vhdl":"VHDL","wiki":"Wiki markup","yaml":"YAML"}/*]*/;
 Prism.hooks.add('before-highlight', function(env) {
 	var pre = env.element.parentNode;
 	if (!pre || !/pre/i.test(pre.nodeName)) {
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
index 3e2f5abf7d..3b12881eb1 100644
--- a/plugins/show-language/prism-show-language.min.js
+++ b/plugins/show-language/prism-show-language.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file
diff --git a/tests/languages/apl/assignment_feature.test b/tests/languages/apl/assignment_feature.test
new file mode 100644
index 0000000000..b06cb39b2b
--- /dev/null
+++ b/tests/languages/apl/assignment_feature.test
@@ -0,0 +1,13 @@
+a←1 2 3
+
+----------------------------------------------------
+
+[
+	"a",
+	["assignment", "←"],
+	["number", "1"], ["number", "2"], ["number", "3"]
+]
+
+----------------------------------------------------
+
+Checks for assignment.
\ No newline at end of file
diff --git a/tests/languages/apl/comment_feature.test b/tests/languages/apl/comment_feature.test
new file mode 100644
index 0000000000..a308451082
--- /dev/null
+++ b/tests/languages/apl/comment_feature.test
@@ -0,0 +1,15 @@
+⍝
+⍝ Foobar
+#!/usr/bin/env runapl
+
+----------------------------------------------------
+
+[
+	["comment", "⍝"],
+	["comment", "⍝ Foobar"],
+	["comment", "#!/usr/bin/env runapl"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/apl/constant_feature.test b/tests/languages/apl/constant_feature.test
new file mode 100644
index 0000000000..9f63162626
--- /dev/null
+++ b/tests/languages/apl/constant_feature.test
@@ -0,0 +1,19 @@
+⍬
+⌾
+#
+⎕
+⍞
+
+----------------------------------------------------
+
+[
+	["constant", "⍬"],
+	["constant", "⌾"],
+	["constant", "#"],
+	["constant", "⎕"],
+	["constant", "⍞"]
+]
+
+----------------------------------------------------
+
+Checks for constants.
\ No newline at end of file
diff --git a/tests/languages/apl/dfn_feature.test b/tests/languages/apl/dfn_feature.test
new file mode 100644
index 0000000000..ef4be35c77
--- /dev/null
+++ b/tests/languages/apl/dfn_feature.test
@@ -0,0 +1,23 @@
+{0=⍴⍴⍺:'hello' ⋄ ∇¨⍵}
+
+----------------------------------------------------
+
+[
+	["dfn", "{"],
+	["number", "0"],
+	["function", "="],
+	["function", "⍴"],
+	["function", "⍴"],
+	["dfn", "⍺"],
+	["dfn", ":"],
+	["string", "'hello'"],
+	["punctuation", "⋄"],
+	["dfn", "∇"],
+	["monadic-operator", "¨"],
+	["dfn", "⍵"],
+	["dfn", "}"]
+]
+
+----------------------------------------------------
+
+Checks for Dfns.
\ No newline at end of file
diff --git a/tests/languages/apl/dyadic-operator_feature.test b/tests/languages/apl/dyadic-operator_feature.test
new file mode 100644
index 0000000000..8d7424cdd5
--- /dev/null
+++ b/tests/languages/apl/dyadic-operator_feature.test
@@ -0,0 +1,13 @@
+. ⍣ ⍠
+⍤ ∘ ⌸
+
+----------------------------------------------------
+
+[
+	["dyadic-operator", "."], ["dyadic-operator", "⍣"], ["dyadic-operator", "⍠"],
+	["dyadic-operator", "⍤"], ["dyadic-operator", "∘"], ["dyadic-operator", "⌸"]
+]
+
+----------------------------------------------------
+
+Checks for dyadic operators.
\ No newline at end of file
diff --git a/tests/languages/apl/function_feature.test b/tests/languages/apl/function_feature.test
new file mode 100644
index 0000000000..d663f0ed7a
--- /dev/null
+++ b/tests/languages/apl/function_feature.test
@@ -0,0 +1,41 @@
+- + × ÷
+⌈ ⌊ ∣ |
+⍳ ? *
+⍟ ○ ! ⌹
+< ≤ = >
+≥ ≠ ≡ ≢
+∊ ⍷ ∪ ∩
+~ ∨ ∧ ⍱
+⍲ ⍴ , ⍪
+⌽ ⊖ ⍉
+↑ ↓ ⊂ ⊃
+⌷ ⍋ ⍒
+⊤ ⊥ ⍕ ⍎
+⊣ ⊢ ⍁ ⍂
+≈ ⍯
+↗ ¤ →
+
+----------------------------------------------------
+
+[
+	["function", "-"], ["function", "+"], ["function", "×"], ["function", "÷"],
+	["function", "⌈"], ["function", "⌊"], ["function", "∣"], ["function", "|"],
+	["function", "⍳"], ["function", "?"], ["function", "*"],
+	["function", "⍟"], ["function", "○"], ["function", "!"], ["function", "⌹"],
+	["function", "<"], ["function", "≤"], ["function", "="], ["function", ">"],
+	["function", "≥"], ["function", "≠"], ["function", "≡"], ["function", "≢"],
+	["function", "∊"], ["function", "⍷"], ["function", "∪"], ["function", "∩"],
+	["function", "~"], ["function", "∨"], ["function", "∧"], ["function", "⍱"],
+	["function", "⍲"], ["function", "⍴"], ["function", ","], ["function", "⍪"],
+	["function", "⌽"], ["function", "⊖"], ["function", "⍉"],
+	["function", "↑"], ["function", "↓"], ["function", "⊂"], ["function", "⊃"],
+	["function", "⌷"], ["function", "⍋"], ["function", "⍒"],
+	["function", "⊤"], ["function", "⊥"], ["function", "⍕"], ["function", "⍎"],
+	["function", "⊣"], ["function", "⊢"], ["function", "⍁"], ["function", "⍂"],
+	["function", "≈"], ["function", "⍯"],
+	["function", "↗"], ["function", "¤"], ["function", "→"]
+]
+
+----------------------------------------------------
+
+Checks for functions.
\ No newline at end of file
diff --git a/tests/languages/apl/monadic-operator_feature.test b/tests/languages/apl/monadic-operator_feature.test
new file mode 100644
index 0000000000..0dcc9b088c
--- /dev/null
+++ b/tests/languages/apl/monadic-operator_feature.test
@@ -0,0 +1,15 @@
+\ / ⌿ ⍀
+¨ ⍨ ⌶
+& ∥
+
+----------------------------------------------------
+
+[
+	["monadic-operator", "\\"], ["monadic-operator", "/"], ["monadic-operator", "⌿"], ["monadic-operator", "⍀"],
+	["monadic-operator", "¨"], ["monadic-operator", "⍨"], ["monadic-operator", "⌶"],
+	["monadic-operator", "&"], ["monadic-operator", "∥"]
+]
+
+----------------------------------------------------
+
+Checks for monadic operators.
\ No newline at end of file
diff --git a/tests/languages/apl/number_feature.test b/tests/languages/apl/number_feature.test
new file mode 100644
index 0000000000..815d1ca8b0
--- /dev/null
+++ b/tests/languages/apl/number_feature.test
@@ -0,0 +1,27 @@
+42
+3.14159
+¯2
+∞
+3E12
+2.8e¯4
+0.1e+7
+2j3
+¯4.3e2J1.9e¯4
+
+----------------------------------------------------
+
+[
+	["number", "42"],
+	["number", "3.14159"],
+	["number", "¯2"],
+	["number", "∞"],
+	["number", "3E12"],
+	["number", "2.8e¯4"],
+	["number", "0.1e+7"],
+	["number", "2j3"],
+	["number", "¯4.3e2J1.9e¯4"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.
\ No newline at end of file
diff --git a/tests/languages/apl/statement_feature.test b/tests/languages/apl/statement_feature.test
new file mode 100644
index 0000000000..24c68744e1
--- /dev/null
+++ b/tests/languages/apl/statement_feature.test
@@ -0,0 +1,13 @@
+:Ab
+:FooBar
+
+----------------------------------------------------
+
+[
+	["statement", ":Ab"],
+	["statement", ":FooBar"]
+]
+
+----------------------------------------------------
+
+Checks for statements.
\ No newline at end of file
diff --git a/tests/languages/apl/string_feature.test b/tests/languages/apl/string_feature.test
new file mode 100644
index 0000000000..8bc8dd1bbf
--- /dev/null
+++ b/tests/languages/apl/string_feature.test
@@ -0,0 +1,15 @@
+''
+'foobar'
+'fo''obar'
+
+----------------------------------------------------
+
+[
+	["string", "''"],
+	["string", "'foobar'"],
+	["string", "'fo''obar'"]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file
diff --git a/tests/languages/apl/system-function_feature.test b/tests/languages/apl/system-function_feature.test
new file mode 100644
index 0000000000..81cbcaa111
--- /dev/null
+++ b/tests/languages/apl/system-function_feature.test
@@ -0,0 +1,17 @@
+⎕IO
+⎕WA
+⎕CR
+⎕TCNL
+
+----------------------------------------------------
+
+[
+	["system-function", "⎕IO"],
+	["system-function", "⎕WA"],
+	["system-function", "⎕CR"],
+	["system-function", "⎕TCNL"]
+]
+
+----------------------------------------------------
+
+Checks for system functions.
\ No newline at end of file

From 801769cc93ca60b85e50334990d82fd0e227de92 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 09:42:40 +0200
Subject: [PATCH 301/310] Elixir: Merged heredoc with strings, fixed capture,
 optimized operators and keywords.

---
 components/prism-elixir.js                     | 18 ++++++++++--------
 components/prism-elixir.min.js                 |  2 +-
 examples/prism-elixir.html                     |  2 +-
 plugins/show-language/prism-show-language.js   |  2 +-
 .../show-language/prism-show-language.min.js   |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/components/prism-elixir.js b/components/prism-elixir.js
index a8c52b8740..66268d3818 100644
--- a/components/prism-elixir.js
+++ b/components/prism-elixir.js
@@ -1,8 +1,4 @@
 Prism.languages.elixir = {
-	'heredoc': {
-		pattern: /(?:~[csw])?("""|''')[\s\S]*?\1/i,
-		alias: 'string'
-	},
 	// Negative look-ahead is needed for string interpolation
 	'comment': /#(?!\{).*/,
 	// ~r"""foo""", ~r'''foo''', ~r/foo/, ~r|foo|, ~r"foo", ~r'foo', ~r(foo), ~r[foo], ~r{foo}, ~r<foo>
@@ -10,7 +6,13 @@ Prism.languages.elixir = {
 	'string': [
 		{
 			// ~s"""foo""", ~s'''foo''', ~s/foo/, ~s|foo|, ~s"foo", ~s'foo', ~s(foo), ~s[foo], ~s{foo}, ~s<foo>
-			pattern: /~[cCsSwW](?:([\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[csa]?/,
+			pattern: /~[cCsSwW](?:("""|'''|[\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|#\{[^}]+\}|[^}])+\}|<(?:\\>|[^>])+>)[csa]?/,
+			inside: {
+				// See interpolation below
+			}
+		},
+		{
+			pattern: /("""|''')[\s\S]*?\1/,
 			inside: {
 				// See interpolation below
 			}
@@ -33,7 +35,7 @@ Prism.languages.elixir = {
 	'attr-name': /\w+:(?!:)/,
 	'capture': {
 		// Look-behind prevents bad highlighting of the && operator
-		pattern: /(^|[^&])&(?:[^&\s\d()][^()]*|(?=\())/,
+		pattern: /(^|[^&])&(?:[^&\s\d()][^\s()]*|(?=\())/,
 		lookbehind: true,
 		alias: 'function'
 	},
@@ -48,10 +50,10 @@ Prism.languages.elixir = {
 		alias: 'variable'
 	},
 	'number': /\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,
-	'keyword': /\b(?:after|alias|and|case|catch|cond|def|defcallback|defexception|defimpl|defmodule|defp|defprotocol|defstruct|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,
+	'keyword': /\b(?:after|alias|and|case|catch|cond|def(?:callback|exception|impl|module|p|protocol|struct)?|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,
 	'boolean': /\b(?:true|false|nil)\b/,
 	'operator': [
-		/\bin\b|\|>|\\\\|::|\.\.\.?|\+\+|--|&&|\|\||<>|[!=]==?|[<>]=|->|=>|<-|=~|\B!|[+\-*\/=|^&]/,
+		/\bin\b|&&?|\|[|>]?|\\\\|::|\.\.\.?|\+\+?|-[->]?|<[-=>]|>=|!==?|\B!|=(?:==?|[>~])?|[*\/^]/,
 		{
 			// We don't want to match <<
 			pattern: /([^<])<(?!<)/,
diff --git a/components/prism-elixir.min.js b/components/prism-elixir.min.js
index d412babad6..4773981ce1 100644
--- a/components/prism-elixir.min.js
+++ b/components/prism-elixir.min.js
@@ -1 +1 @@
-Prism.languages.elixir={heredoc:{pattern:/(?:~[csw])?("""|''')[\s\S]*?\1/i,alias:"string"},comment:/#(?!\{).*/,regex:/~[rR](?:("""|'''|[\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[uismxfr]*/,string:[{pattern:/~[cCsSwW](?:([\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[csa]?/,inside:{}},{pattern:/("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/,inside:{}}],atom:{pattern:/(^|[^:]):\w+/,lookbehind:!0,alias:"symbol"},"attr-name":/\w+:(?!:)/,capture:{pattern:/(^|[^&])&(?:[^&\s\d()][^()]*|(?=\())/,lookbehind:!0,alias:"function"},argument:{pattern:/(^|[^&])&\d+/,lookbehind:!0,alias:"variable"},attribute:{pattern:/@[\S]+/,alias:"variable"},number:/\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,keyword:/\b(?:after|alias|and|case|catch|cond|def|defcallback|defexception|defimpl|defmodule|defp|defprotocol|defstruct|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,"boolean":/\b(?:true|false|nil)\b/,operator:[/\bin\b|\|>|\\\\|::|\.\.\.?|\+\+|--|&&|\|\||<>|[!=]==?|[<>]=|->|=>|<-|=~|\B!|[+\-*\/=|^&]/,{pattern:/([^<])<(?!<)/,lookbehind:!0},{pattern:/([^>])>(?!>)/,lookbehind:!0}],punctuation:/<<|>>|[.,%\[\]{}()]/},Prism.languages.elixir.string.forEach(function(e){e.inside={interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"},rest:Prism.util.clone(Prism.languages.elixir)}}}});
\ No newline at end of file
+Prism.languages.elixir={comment:/#(?!\{).*/,regex:/~[rR](?:("""|'''|[\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|[^}])+\}|<(?:\\>|[^>])+>)[uismxfr]*/,string:[{pattern:/~[cCsSwW](?:("""|'''|[\/|"'])(?:\\.|(?!\1)[^\\])+\1|\((?:\\\)|[^)])+\)|\[(?:\\\]|[^\]])+\]|\{(?:\\\}|#\{[^}]+\}|[^}])+\}|<(?:\\>|[^>])+>)[csa]?/,inside:{}},{pattern:/("""|''')[\s\S]*?\1/,inside:{}},{pattern:/("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/,inside:{}}],atom:{pattern:/(^|[^:]):\w+/,lookbehind:!0,alias:"symbol"},"attr-name":/\w+:(?!:)/,capture:{pattern:/(^|[^&])&(?:[^&\s\d()][^\s()]*|(?=\())/,lookbehind:!0,alias:"function"},argument:{pattern:/(^|[^&])&\d+/,lookbehind:!0,alias:"variable"},attribute:{pattern:/@[\S]+/,alias:"variable"},number:/\b(?:0[box][a-f\d_]+|\d[\d_]*)(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?\b/i,keyword:/\b(?:after|alias|and|case|catch|cond|def(?:callback|exception|impl|module|p|protocol|struct)?|do|else|end|fn|for|if|import|not|or|require|rescue|try|unless|use|when)\b/,"boolean":/\b(?:true|false|nil)\b/,operator:[/\bin\b|&&?|\|[|>]?|\\\\|::|\.\.\.?|\+\+?|-[->]?|<[-=>]|>=|!==?|\B!|=(?:==?|[>~])?|[*\/^]/,{pattern:/([^<])<(?!<)/,lookbehind:!0},{pattern:/([^>])>(?!>)/,lookbehind:!0}],punctuation:/<<|>>|[.,%\[\]{}()]/},Prism.languages.elixir.string.forEach(function(e){e.inside={interpolation:{pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"},rest:Prism.util.clone(Prism.languages.elixir)}}}});
\ No newline at end of file
diff --git a/examples/prism-elixir.html b/examples/prism-elixir.html
index 09b3631429..08c4f7a6b6 100644
--- a/examples/prism-elixir.html
+++ b/examples/prism-elixir.html
@@ -23,7 +23,7 @@ <h2>Strings and heredoc</h2>
 "Multi-line
 strings are supported"
 """ "Heredoc" strings are
-also supported. # This is not a comment
+also supported.
 """</code></pre>
 
 <h2>Sigils</h2>
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
index 449c9e046b..3cf13406a5 100644
--- a/plugins/show-language/prism-show-language.js
+++ b/plugins/show-language/prism-show-language.js
@@ -5,7 +5,7 @@ if (typeof self === 'undefined' || !self.Prism || !self.document) {
 }
 
 // The languages map is built automatically with gulp
-var Languages = /*languages_placeholder[*/{"css":"CSS","clike":"C-like","javascript":"JavaScript","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","css-extras":"CSS Extras","fsharp":"F#","http":"HTTP","latex":"LaTeX","lolcode":"LOLCODE","matlab":"MATLAB","nasm":"NASM","nsis":"NSIS","objectivec":"Objective-C","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","jsx":"React JSX","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vhdl":"VHDL","wiki":"Wiki markup","yaml":"YAML"}/*]*/;
+var Languages = /*languages_placeholder[*/{"css":"CSS","clike":"C-like","javascript":"JavaScript","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","css-extras":"CSS Extras","elixir":"elixir","fsharp":"F#","http":"HTTP","latex":"LaTeX","lolcode":"LOLCODE","matlab":"MATLAB","nasm":"NASM","nsis":"NSIS","objectivec":"Objective-C","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","jsx":"React JSX","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vhdl":"VHDL","wiki":"Wiki markup","yaml":"YAML"}/*]*/;
 Prism.hooks.add('before-highlight', function(env) {
 	var pre = env.element.parentNode;
 	if (!pre || !/pre/i.test(pre.nodeName)) {
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
index 3b12881eb1..0acf80d673 100644
--- a/plugins/show-language/prism-show-language.min.js
+++ b/plugins/show-language/prism-show-language.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",elixir:"elixir",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file

From 8a99c97501570da974c5a8287f8a32cfd8cab38d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 09:42:51 +0200
Subject: [PATCH 302/310] Add tests for Elixir

---
 tests/languages/elixir/atom_feature.test      |  15 +++
 tests/languages/elixir/attr-name_feature.test |  24 ++++
 tests/languages/elixir/attribute_feature.test |  19 +++
 tests/languages/elixir/boolean_feature.test   |  15 +++
 tests/languages/elixir/capture_feature.test   |  28 +++++
 tests/languages/elixir/comment_feature.test   |  13 ++
 tests/languages/elixir/keyword_feature.test   |  31 +++++
 tests/languages/elixir/number_feature.test    |  27 ++++
 tests/languages/elixir/operator_feature.test  |  41 +++++++
 tests/languages/elixir/regex_feature.test     |  29 +++++
 tests/languages/elixir/string_feature.test    | 115 ++++++++++++++++++
 11 files changed, 357 insertions(+)
 create mode 100644 tests/languages/elixir/atom_feature.test
 create mode 100644 tests/languages/elixir/attr-name_feature.test
 create mode 100644 tests/languages/elixir/attribute_feature.test
 create mode 100644 tests/languages/elixir/boolean_feature.test
 create mode 100644 tests/languages/elixir/capture_feature.test
 create mode 100644 tests/languages/elixir/comment_feature.test
 create mode 100644 tests/languages/elixir/keyword_feature.test
 create mode 100644 tests/languages/elixir/number_feature.test
 create mode 100644 tests/languages/elixir/operator_feature.test
 create mode 100644 tests/languages/elixir/regex_feature.test
 create mode 100644 tests/languages/elixir/string_feature.test

diff --git a/tests/languages/elixir/atom_feature.test b/tests/languages/elixir/atom_feature.test
new file mode 100644
index 0000000000..5b1c47d2f1
--- /dev/null
+++ b/tests/languages/elixir/atom_feature.test
@@ -0,0 +1,15 @@
+:true
+:false
+:FooBar42
+
+----------------------------------------------------
+
+[
+	["atom", ":true"],
+	["atom", ":false"],
+	["atom", ":FooBar42"]
+]
+
+----------------------------------------------------
+
+Checks for atoms.
\ No newline at end of file
diff --git a/tests/languages/elixir/attr-name_feature.test b/tests/languages/elixir/attr-name_feature.test
new file mode 100644
index 0000000000..de7cadc898
--- /dev/null
+++ b/tests/languages/elixir/attr-name_feature.test
@@ -0,0 +1,24 @@
+[a: 1, b: 2]
+do: :this, else: :that
+where: foo,
+select: bar
+
+----------------------------------------------------
+
+[
+	["punctuation", "["],
+	["attr-name", "a:"],
+	["number", "1"], ["punctuation", ","],
+	["attr-name", "b:"],
+	["number", "2"], ["punctuation", "]"],
+
+	["attr-name", "do:"], ["atom", ":this"],
+	["punctuation", ","],
+	["attr-name", "else:"], ["atom", ":that"],
+	["attr-name", "where:"], " foo", ["punctuation", ","],
+	["attr-name", "select:"], " bar"
+]
+
+----------------------------------------------------
+
+Checks for keyword list keys.
\ No newline at end of file
diff --git a/tests/languages/elixir/attribute_feature.test b/tests/languages/elixir/attribute_feature.test
new file mode 100644
index 0000000000..273c2a402f
--- /dev/null
+++ b/tests/languages/elixir/attribute_feature.test
@@ -0,0 +1,19 @@
+@vsn 2
+@moduledoc """
+foobar
+"""
+@tag :external
+
+----------------------------------------------------
+
+[
+	["attribute", "@vsn"], ["number", "2"],
+	["attribute", "@moduledoc"], ["string", [
+		"\"\"\"\r\nfoobar\r\n\"\"\""
+	]],
+	["attribute", "@tag"], ["atom", ":external"]
+]
+
+----------------------------------------------------
+
+Checks for module attributes.
\ No newline at end of file
diff --git a/tests/languages/elixir/boolean_feature.test b/tests/languages/elixir/boolean_feature.test
new file mode 100644
index 0000000000..aa949797d2
--- /dev/null
+++ b/tests/languages/elixir/boolean_feature.test
@@ -0,0 +1,15 @@
+true
+false
+nil
+
+----------------------------------------------------
+
+[
+	["boolean", "true"],
+	["boolean", "false"],
+	["boolean", "nil"]
+]
+
+----------------------------------------------------
+
+Checks for booleans and nil.
\ No newline at end of file
diff --git a/tests/languages/elixir/capture_feature.test b/tests/languages/elixir/capture_feature.test
new file mode 100644
index 0000000000..8a64b66154
--- /dev/null
+++ b/tests/languages/elixir/capture_feature.test
@@ -0,0 +1,28 @@
+fun = &Math.zero?/1
+(&is_function/1).(fun)
+fun = &(&1 + 1)
+&List.flatten(&1, &2)
+
+----------------------------------------------------
+
+[
+	"fun ", ["operator", "="],
+	["capture", "&Math.zero?/1"],
+	["punctuation", "("],
+	["capture", "&is_function/1"],
+	["punctuation", ")"],
+	["punctuation", "."],
+	["punctuation", "("], "fun", ["punctuation", ")"],
+	"\r\nfun ", ["operator", "="],
+	["capture", "&"],
+	["punctuation", "("], ["argument", "&1"],
+	["operator", "+"], ["number", "1"], ["punctuation", ")"],
+	["capture", "&List.flatten"],
+	["punctuation", "("], ["argument", "&1"],
+	["punctuation", ","], ["argument", "&2"],
+	["punctuation", ")"]
+]
+
+----------------------------------------------------
+
+Checks for function capturing and arguments.
\ No newline at end of file
diff --git a/tests/languages/elixir/comment_feature.test b/tests/languages/elixir/comment_feature.test
new file mode 100644
index 0000000000..09493ab581
--- /dev/null
+++ b/tests/languages/elixir/comment_feature.test
@@ -0,0 +1,13 @@
+#
+# Foobar
+
+----------------------------------------------------
+
+[
+	["comment", "#"],
+	["comment", "# Foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/elixir/keyword_feature.test b/tests/languages/elixir/keyword_feature.test
new file mode 100644
index 0000000000..e1b02a1ae3
--- /dev/null
+++ b/tests/languages/elixir/keyword_feature.test
@@ -0,0 +1,31 @@
+after alias and case
+catch cond def
+defcallback
+defexception
+defimpl defmodule
+defp defprotocol
+defstruct do else
+end fn for if
+import not or
+require rescue try
+unless use when
+
+----------------------------------------------------
+
+[
+	["keyword", "after"], ["keyword", "alias"], ["keyword", "and"], ["keyword", "case"],
+	["keyword", "catch"], ["keyword", "cond"], ["keyword", "def"],
+	["keyword", "defcallback"],
+	["keyword", "defexception"],
+	["keyword", "defimpl"], ["keyword", "defmodule"],
+	["keyword", "defp"], ["keyword", "defprotocol"],
+	["keyword", "defstruct"], ["keyword", "do"], ["keyword", "else"],
+	["keyword", "end"], ["keyword", "fn"], ["keyword", "for"], ["keyword", "if"],
+	["keyword", "import"], ["keyword", "not"], ["keyword", "or"],
+	["keyword", "require"], ["keyword", "rescue"], ["keyword", "try"],
+	["keyword", "unless"], ["keyword", "use"], ["keyword", "when"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/elixir/number_feature.test b/tests/languages/elixir/number_feature.test
new file mode 100644
index 0000000000..ae06684b3e
--- /dev/null
+++ b/tests/languages/elixir/number_feature.test
@@ -0,0 +1,27 @@
+0b1111_0000
+0o754_123
+0xBadFace
+42
+42_000
+3.14159
+2e6
+3.241_753E-7
+0.7e+15
+
+----------------------------------------------------
+
+[
+	["number", "0b1111_0000"],
+	["number", "0o754_123"],
+	["number", "0xBadFace"],
+	["number", "42"],
+	["number", "42_000"],
+	["number", "3.14159"],
+	["number", "2e6"],
+	["number", "3.241_753E-7"],
+	["number", "0.7e+15"]
+]
+
+----------------------------------------------------
+
+Checks for binary, octal, hexadecimal and decimal numbers.
\ No newline at end of file
diff --git a/tests/languages/elixir/operator_feature.test b/tests/languages/elixir/operator_feature.test
new file mode 100644
index 0000000000..c97dcce5ef
--- /dev/null
+++ b/tests/languages/elixir/operator_feature.test
@@ -0,0 +1,41 @@
+in
+\\
+::
+..
+...
++ ++
+- -- ->
+*
+/
+^
+& &&
+| || |>
+< <= <> <-
+> >=
+! != !==
+= =~ == === =>
+
+----------------------------------------------------
+
+[
+	["operator", "in"],
+	["operator", "\\\\"],
+	["operator", "::"],
+	["operator", ".."],
+	["operator", "..."],
+	["operator", "+"], ["operator", "++"],
+	["operator", "-"], ["operator", "--"], ["operator", "->"],
+	["operator", "*"],
+	["operator", "/"],
+	["operator", "^"],
+	["operator", "&"], ["operator", "&&"],
+	["operator", "|"], ["operator", "||"], ["operator", "|>"],
+	["operator", "<"], ["operator", "<="], ["operator", "<>"], ["operator", "<-"],
+	["operator", ">"], ["operator", ">="],
+	["operator", "!"], ["operator", "!="], ["operator", "!=="],
+	["operator", "="], ["operator", "=~"], ["operator", "=="], ["operator", "==="], ["operator", "=>"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
diff --git a/tests/languages/elixir/regex_feature.test b/tests/languages/elixir/regex_feature.test
new file mode 100644
index 0000000000..81eb31a651
--- /dev/null
+++ b/tests/languages/elixir/regex_feature.test
@@ -0,0 +1,29 @@
+~r"""foobar"""im
+~R'''foobar'''ux
+~r/fo\/obar/smfr
+~R|fo\|obar|uismxfr
+~r"fo\"obar"x
+~R'fo\'obar's
+~r(fo\)obar)
+~R[fo\]obar]
+~r{fo\}obar}
+~R<fo\>obar>
+
+----------------------------------------------------
+
+[
+	["regex", "~r\"\"\"foobar\"\"\"im"],
+	["regex", "~R'''foobar'''ux"],
+	["regex", "~r/fo\\/obar/smfr"],
+	["regex", "~R|fo\\|obar|uismxfr"],
+	["regex", "~r\"fo\\\"obar\"x"],
+	["regex", "~R'fo\\'obar's"],
+	["regex", "~r(fo\\)obar)"],
+	["regex", "~R[fo\\]obar]"],
+	["regex", "~r{fo\\}obar}"],
+	["regex", "~R<fo\\>obar>"]
+]
+
+----------------------------------------------------
+
+Checks for regexes.
\ No newline at end of file
diff --git a/tests/languages/elixir/string_feature.test b/tests/languages/elixir/string_feature.test
new file mode 100644
index 0000000000..ca54f4be82
--- /dev/null
+++ b/tests/languages/elixir/string_feature.test
@@ -0,0 +1,115 @@
+~s/foobar/
+~s/foo#{42}bar/
+~S|foobar|
+~c"foobar"
+~c"foo#{42}bar"
+~C'foobar'
+~w(foobar)c
+~w(foo#{42}bar)s
+~W[foobar]a
+~s{foobar}
+~s{foo#{42}bar}
+~S<foobar>
+
+"""
+Foo bar
+"""
+
+'''
+Foo bar
+'''
+
+~S"""
+Foo bar
+"""
+
+~c"""
+Foo bar
+"""
+
+~w"""
+Foo bar
+"""
+
+""
+"foo"
+"fo\"o\
+#{42}bar"
+''
+'foo'
+'fo\'o\
+bar'
+
+----------------------------------------------------
+
+[
+	["string", ["~s/foobar/"]],
+	["string", [
+		"~s/foo",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "42"],
+			["delimiter", "}"]
+		]],
+		"bar/"
+	]],
+	["string", ["~S|foobar|"]],
+	["string", ["~c\"foobar\""]],
+	["string", [
+		"~c\"foo",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "42"],
+			["delimiter", "}"]
+		]],
+		"bar\""
+	]],
+	["string", ["~C'foobar'"]],
+	["string", ["~w(foobar)c"]],
+	["string", [
+		"~w(foo",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "42"],
+			["delimiter", "}"]
+		]],
+		"bar)s"
+	]],
+	["string", ["~W[foobar]a"]],
+	["string", ["~s{foobar}"]],
+	["string", [
+		"~s{foo",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "42"],
+			["delimiter", "}"]
+		]],
+		"bar}"
+	]],
+	["string", ["~S<foobar>"]],
+
+	["string", ["\"\"\"\r\nFoo bar\r\n\"\"\""]],
+	["string", ["'''\r\nFoo bar\r\n'''"]],
+	["string", ["~S\"\"\"\r\nFoo bar\r\n\"\"\""]],
+	["string", ["~c\"\"\"\r\nFoo bar\r\n\"\"\""]],
+	["string", ["~w\"\"\"\r\nFoo bar\r\n\"\"\""]],
+
+	["string", ["\"\""]],
+	["string", ["\"foo\""]],
+	["string", [
+		"\"fo\\\"o\\\r\n",
+		["interpolation", [
+			["delimiter", "#{"],
+			["number", "42"],
+			["delimiter", "}"]
+		]],
+		"bar\""
+	]],
+	["string", ["''"]],
+	["string", ["'foo'"]],
+	["string", ["'fo\\'o\\\r\nbar'"]]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From ea49b6608b98aa9dab87285d7a7a31b2f7f90153 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 09:45:11 +0200
Subject: [PATCH 303/310] Elixir is capitalized

---
 examples/prism-elixir.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/prism-elixir.html b/examples/prism-elixir.html
index 08c4f7a6b6..7868f02ed8 100644
--- a/examples/prism-elixir.html
+++ b/examples/prism-elixir.html
@@ -1,4 +1,4 @@
-<h1>elixir</h1>
+<h1>Elixir</h1>
 <p>To use this language, use the class "language-elixir".</p>
 
 <h2>Comments</h2>

From c4516114662218d30613ad52db1840247af60463 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 09:48:50 +0200
Subject: [PATCH 304/310] Elixir is capitalized (2) + fixed example

---
 components.js                                    | 2 +-
 examples/prism-elixir.html                       | 2 --
 plugins/show-language/prism-show-language.js     | 2 +-
 plugins/show-language/prism-show-language.min.js | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/components.js b/components.js
index b35762e2a4..af6f2c91b3 100644
--- a/components.js
+++ b/components.js
@@ -128,7 +128,7 @@ var components = {
 			"owner": "Conaclos"
 		},
 		"elixir": {
-			"title": "elixir",
+			"title": "Elixir",
 			"owner": "Golmote"
 		},
 		"erlang": {
diff --git a/examples/prism-elixir.html b/examples/prism-elixir.html
index 7868f02ed8..55c43498c2 100644
--- a/examples/prism-elixir.html
+++ b/examples/prism-elixir.html
@@ -55,8 +55,6 @@ <h2>Module attributes</h2>
   @moduledoc """
   Provides math-related functions.
 
-  ## Examples
-
       iex> Math.sum(1, 2)
       3
 
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
index 3cf13406a5..449c9e046b 100644
--- a/plugins/show-language/prism-show-language.js
+++ b/plugins/show-language/prism-show-language.js
@@ -5,7 +5,7 @@ if (typeof self === 'undefined' || !self.Prism || !self.document) {
 }
 
 // The languages map is built automatically with gulp
-var Languages = /*languages_placeholder[*/{"css":"CSS","clike":"C-like","javascript":"JavaScript","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","css-extras":"CSS Extras","elixir":"elixir","fsharp":"F#","http":"HTTP","latex":"LaTeX","lolcode":"LOLCODE","matlab":"MATLAB","nasm":"NASM","nsis":"NSIS","objectivec":"Objective-C","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","jsx":"React JSX","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vhdl":"VHDL","wiki":"Wiki markup","yaml":"YAML"}/*]*/;
+var Languages = /*languages_placeholder[*/{"css":"CSS","clike":"C-like","javascript":"JavaScript","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","csharp":"C#","cpp":"C++","coffeescript":"CoffeeScript","css-extras":"CSS Extras","fsharp":"F#","http":"HTTP","latex":"LaTeX","lolcode":"LOLCODE","matlab":"MATLAB","nasm":"NASM","nsis":"NSIS","objectivec":"Objective-C","php":"PHP","php-extras":"PHP Extras","powershell":"PowerShell","jsx":"React JSX","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","typescript":"TypeScript","vhdl":"VHDL","wiki":"Wiki markup","yaml":"YAML"}/*]*/;
 Prism.hooks.add('before-highlight', function(env) {
 	var pre = env.element.parentNode;
 	if (!pre || !/pre/i.test(pre.nodeName)) {
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
index 0acf80d673..3b12881eb1 100644
--- a/plugins/show-language/prism-show-language.min.js
+++ b/plugins/show-language/prism-show-language.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",elixir:"elixir",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var e={css:"CSS",clike:"C-like",javascript:"JavaScript",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",csharp:"C#",cpp:"C++",coffeescript:"CoffeeScript","css-extras":"CSS Extras",fsharp:"F#",http:"HTTP",latex:"LaTeX",lolcode:"LOLCODE",matlab:"MATLAB",nasm:"NASM",nsis:"NSIS",objectivec:"Objective-C",php:"PHP","php-extras":"PHP Extras",powershell:"PowerShell",jsx:"React JSX",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",typescript:"TypeScript",vhdl:"VHDL",wiki:"Wiki markup",yaml:"YAML"};Prism.hooks.add("before-highlight",function(s){var t=s.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var a=e[s.language]||s.language.substring(0,1).toUpperCase()+s.language.substring(1);t.setAttribute("data-language",a)}})}}();
\ No newline at end of file

From 11ff829f74fc9004757d853f4eb05cffd2fd0bf0 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 11:35:00 +0200
Subject: [PATCH 305/310] Tcl: Add operators and punctuation + add examples

---
 components/prism-tcl.js                   |  4 +-
 components/prism-tcl.min.js               |  2 +-
 examples/prism-tcl.html                   | 39 ++++++++++++++++++++
 tests/languages/tcl/operator_feature.test | 45 +++++++++++++++++++++++
 4 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 examples/prism-tcl.html
 create mode 100644 tests/languages/tcl/operator_feature.test

diff --git a/components/prism-tcl.js b/components/prism-tcl.js
index 48b53dc1fa..b9e2206d6c 100644
--- a/components/prism-tcl.js
+++ b/components/prism-tcl.js
@@ -37,5 +37,7 @@ Prism.languages.tcl = {
 	'keyword': {
 		pattern: /(^\s*|\[)(after|append|apply|array|auto_(?:execok|import|load|mkindex|qualify|reset)|automkindex_old|bgerror|binary|catch|cd|chan|clock|close|concat|dde|dict|encoding|eof|exec|expr|fblocked|fconfigure|fcopy|file(?:event|name)?|flush|gets|glob|history|http|incr|info|interp|join|lappend|lassign|lindex|linsert|list|llength|load|lrange|lrepeat|lreplace|lreverse|lsearch|lset|lsort|math(?:func|op)|memory|msgcat|namespace|open|package|parray|pid|pkg_mkIndex|platform|puts|pwd|re_syntax|read|refchan|regexp|registry|regsub|rename|Safe_Base|scan|seek|set|socket|source|split|string|subst|Tcl|tcl(?:_endOfWord|_findLibrary|startOf(?:Next|Previous)Word|wordBreak(?:After|Before)|test|vars)|tell|time|tm|trace|unknown|unload|unset|update|uplevel|vwait)\b/m,
 		lookbehind: true
-	}
+	},
+	'operator': /!=?|\*\*?|==|&&?|\|\|?|<[=<]?|>[=>]?|[-+~\/%?^]|\b(?:eq|ne|in|ni)\b/,
+	'punctuation': /[{}()\[\]]/
 };
diff --git a/components/prism-tcl.min.js b/components/prism-tcl.min.js
index 0b786e4826..84a6cfe7d1 100644
--- a/components/prism-tcl.min.js
+++ b/components/prism-tcl.min.js
@@ -1 +1 @@
-Prism.languages.tcl={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0},string:/"(?:[^"\\\r\n]|\\(?:\r\n|[\s\S]))*"/,variable:[{pattern:/(\$)(?:::)?(?:[a-zA-Z0-9]+::)*[a-zA-Z0-9_]+/,lookbehind:!0},{pattern:/(\$){[^}]+}/,lookbehind:!0},{pattern:/(^\s*set[ \t]+)(?:::)?(?:[a-zA-Z0-9]+::)*[a-zA-Z0-9_]+/m,lookbehind:!0}],"function":{pattern:/(^\s*proc[ \t]+)[^\s]+/m,lookbehind:!0},builtin:[{pattern:/(^\s*)(?:proc|return|class|error|eval|exit|for|foreach|if|switch|while|break|continue)\b/m,lookbehind:!0},/\b(elseif|else)\b/],scope:{pattern:/(^\s*)(global|upvar|variable)\b/m,lookbehind:!0,alias:"constant"},keyword:{pattern:/(^\s*|\[)(after|append|apply|array|auto_(?:execok|import|load|mkindex|qualify|reset)|automkindex_old|bgerror|binary|catch|cd|chan|clock|close|concat|dde|dict|encoding|eof|exec|expr|fblocked|fconfigure|fcopy|file(?:event|name)?|flush|gets|glob|history|http|incr|info|interp|join|lappend|lassign|lindex|linsert|list|llength|load|lrange|lrepeat|lreplace|lreverse|lsearch|lset|lsort|math(?:func|op)|memory|msgcat|namespace|open|package|parray|pid|pkg_mkIndex|platform|puts|pwd|re_syntax|read|refchan|regexp|registry|regsub|rename|Safe_Base|scan|seek|set|socket|source|split|string|subst|Tcl|tcl(?:_endOfWord|_findLibrary|startOf(?:Next|Previous)Word|wordBreak(?:After|Before)|test|vars)|tell|time|tm|trace|unknown|unload|unset|update|uplevel|vwait)\b/m,lookbehind:!0}};
\ No newline at end of file
+Prism.languages.tcl={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0},string:/"(?:[^"\\\r\n]|\\(?:\r\n|[\s\S]))*"/,variable:[{pattern:/(\$)(?:::)?(?:[a-zA-Z0-9]+::)*[a-zA-Z0-9_]+/,lookbehind:!0},{pattern:/(\$){[^}]+}/,lookbehind:!0},{pattern:/(^\s*set[ \t]+)(?:::)?(?:[a-zA-Z0-9]+::)*[a-zA-Z0-9_]+/m,lookbehind:!0}],"function":{pattern:/(^\s*proc[ \t]+)[^\s]+/m,lookbehind:!0},builtin:[{pattern:/(^\s*)(?:proc|return|class|error|eval|exit|for|foreach|if|switch|while|break|continue)\b/m,lookbehind:!0},/\b(elseif|else)\b/],scope:{pattern:/(^\s*)(global|upvar|variable)\b/m,lookbehind:!0,alias:"constant"},keyword:{pattern:/(^\s*|\[)(after|append|apply|array|auto_(?:execok|import|load|mkindex|qualify|reset)|automkindex_old|bgerror|binary|catch|cd|chan|clock|close|concat|dde|dict|encoding|eof|exec|expr|fblocked|fconfigure|fcopy|file(?:event|name)?|flush|gets|glob|history|http|incr|info|interp|join|lappend|lassign|lindex|linsert|list|llength|load|lrange|lrepeat|lreplace|lreverse|lsearch|lset|lsort|math(?:func|op)|memory|msgcat|namespace|open|package|parray|pid|pkg_mkIndex|platform|puts|pwd|re_syntax|read|refchan|regexp|registry|regsub|rename|Safe_Base|scan|seek|set|socket|source|split|string|subst|Tcl|tcl(?:_endOfWord|_findLibrary|startOf(?:Next|Previous)Word|wordBreak(?:After|Before)|test|vars)|tell|time|tm|trace|unknown|unload|unset|update|uplevel|vwait)\b/m,lookbehind:!0},operator:/!=?|\*\*?|==|&&?|\|\|?|<[=<]?|>[=>]?|[-+~\/%?^]|\b(?:eq|ne|in|ni)\b/,punctuation:/[{}()\[\]]/};
\ No newline at end of file
diff --git a/examples/prism-tcl.html b/examples/prism-tcl.html
new file mode 100644
index 0000000000..9489724d46
--- /dev/null
+++ b/examples/prism-tcl.html
@@ -0,0 +1,39 @@
+<h1>Tcl</h1>
+<p>To use this language, use the class "language-tcl".</p>
+
+<h2>Comments</h2>
+<pre><code># This is a comment</code></pre>
+
+<h2>Strings</h2>
+<pre><code>"foo \"bar\" baz"
+"foo\
+bar\
+baz"</code></pre>
+
+<h2>Variables</h2>
+<pre><code>$foo
+$foo::bar_42
+$::baz
+${foobar}
+set foo::bar "baz"</code></pre>
+
+<h2>Functions</h2>
+<pre><code>proc foobar {baz} {
+	puts $baz
+}
+
+proc RESTORE/post/:post_id/comment/:comment_id {post_id comment_id} {
+    #| Restore a comment handler
+    comment_restore $comment_id
+    qc::actions redirect [url "/post/$post_id" show_deleted_comment_ids $comment_id]
+}</code></pre>
+
+<h2>Known failures</h2>
+<p>There are certain edge cases where Prism will fail.
+	There are always such cases in every regex-based syntax highlighter.
+	However, Prism dares to be open and honest about them.
+	If a failure is listed here, it doesn’t mean it will never be fixed. This is more of a “known bugs” list, just with a certain type of bug.
+</p>
+
+<h3>Comment-like substrings</h3>
+<pre><code>"This string is #broken"</code></pre>
\ No newline at end of file
diff --git a/tests/languages/tcl/operator_feature.test b/tests/languages/tcl/operator_feature.test
new file mode 100644
index 0000000000..84426a0a84
--- /dev/null
+++ b/tests/languages/tcl/operator_feature.test
@@ -0,0 +1,45 @@
++
+-
+~
+! !=
+* **
+/
+%
+< <= <<
+> >= >>
+==
+& &&
+| ||
+?
+^
+eq
+ne
+in
+ni
+
+----------------------------------------------------
+
+[
+	["operator", "+"],
+	["operator", "-"],
+	["operator", "~"],
+	["operator", "!"], ["operator", "!="],
+	["operator", "*"], ["operator", "**"],
+	["operator", "/"],
+	["operator", "%"],
+	["operator", "<"], ["operator", "<="], ["operator", "<<"],
+	["operator", ">"], ["operator", ">="], ["operator", ">>"],
+	["operator", "=="],
+	["operator", "&"], ["operator", "&&"],
+	["operator", "|"], ["operator", "||"],
+	["operator", "?"],
+	["operator", "^"],
+	["operator", "eq"],
+	["operator", "ne"],
+	["operator", "in"],
+	["operator", "ni"]
+]
+
+----------------------------------------------------
+
+Checks for all operators.
\ No newline at end of file

From 33a295fdbf1e2666a92c3d840819dcc8680b733c Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 11:52:28 +0200
Subject: [PATCH 306/310] APL: Add examples

---
 examples/prism-apl.html | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 examples/prism-apl.html

diff --git a/examples/prism-apl.html b/examples/prism-apl.html
new file mode 100644
index 0000000000..979926994f
--- /dev/null
+++ b/examples/prism-apl.html
@@ -0,0 +1,39 @@
+<h1>APL</h1>
+<p>To use this language, use the class "language-apl".</p>
+
+<h2>Comments</h2>
+<pre><code>#!/usr/bin/env runapl
+a←1 2 3 ⍝ this is a comment</code></pre>
+
+<h2>Strings</h2>
+<pre><code>''
+'foobar'
+'foo''bar''baz'</code></pre>
+
+<h2>Numbers</h2>
+<pre><code>42
+3.14159
+¯2
+∞
+2.8e¯4
+2j3
+¯4.3e2J1.9e¯4</code></pre>
+
+<h2>Primitive functions</h2>
+<pre><code>a+b×c⍴⍳10</code></pre>
+
+<h2>Operators</h2>
+<pre><code>+/ f⍣2</code></pre>
+
+<h2>Dfns</h2>
+<pre><code>{0=⍴⍴⍺:'hello' ⋄ ∇¨⍵}</code></pre>
+
+<h2>Known failures</h2>
+<p>There are certain edge cases where Prism will fail.
+	There are always such cases in every regex-based syntax highlighter.
+	However, Prism dares to be open and honest about them.
+	If a failure is listed here, it doesn’t mean it will never be fixed. This is more of a “known bugs” list, just with a certain type of bug.
+</p>
+
+<h3>Comment-like substrings</h3>
+<pre><code>'This string is ⍝ broken'</code></pre>
\ No newline at end of file

From 89cd5d01f73868c86b03eb902582a1bcd710f30a Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 16:27:38 +0200
Subject: [PATCH 307/310] Swift: Add support for string interpolation. Fix #448

---
 components/prism-swift.js     | 18 +++++++++++++++++-
 components/prism-swift.min.js |  2 +-
 examples/prism-swift.html     |  5 ++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/components/prism-swift.js b/components/prism-swift.js
index dbe4b72967..9078f7721e 100644
--- a/components/prism-swift.js
+++ b/components/prism-swift.js
@@ -1,8 +1,24 @@
-// issues: nested multiline comments, highlighting inside string interpolations
+// issues: nested multiline comments
 Prism.languages.swift = Prism.languages.extend('clike', {
+	'string': {
+		pattern: /("|')(\\(?:\((?:[^()]|\([^)]+\))+\)|\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
+		inside: {
+			'interpolation': {
+				pattern: /\\\((?:[^()]|\([^)]+\))+\)/,
+				inside: {
+					delimiter: {
+						pattern: /^\\\(|\)$/,
+						alias: 'variable'
+					}
+					// See rest below
+				}
+			}
+		}
+	},
 	'keyword': /\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic(?:Type)?|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__(?:COLUMN__|FILE__|FUNCTION__|LINE__))\b/,
 	'number': /\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,
 	'constant': /\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,
 	'atrule': /@\b(IB(?:Outlet|Designable|Action|Inspectable)|class_protocol|exported|noreturn|NS(?:Copying|Managed)|objc|UIApplicationMain|auto_closure)\b/,
 	'builtin': /\b([A-Z]\S+|abs|advance|alignof(?:Value)?|assert|contains|count(?:Elements)?|debugPrint(?:ln)?|distance|drop(?:First|Last)|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lexicographicalCompare|map|max(?:Element)?|min(?:Element)?|numericCast|overlaps|partition|print(?:ln)?|reduce|reflect|reverse|sizeof(?:Value)?|sort(?:ed)?|split|startsWith|stride(?:of(?:Value)?)?|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|with(?:ExtendedLifetime|Unsafe(?:MutablePointers?|Pointers?)|VaList))\b/
 });
+Prism.languages.swift['string'].inside['interpolation'].inside.rest = Prism.util.clone(Prism.languages.swift);
\ No newline at end of file
diff --git a/components/prism-swift.min.js b/components/prism-swift.min.js
index 84106e4876..60da43d79e 100644
--- a/components/prism-swift.min.js
+++ b/components/prism-swift.min.js
@@ -1 +1 @@
-Prism.languages.swift=Prism.languages.extend("clike",{keyword:/\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic(?:Type)?|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__(?:COLUMN__|FILE__|FUNCTION__|LINE__))\b/,number:/\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,constant:/\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,atrule:/@\b(IB(?:Outlet|Designable|Action|Inspectable)|class_protocol|exported|noreturn|NS(?:Copying|Managed)|objc|UIApplicationMain|auto_closure)\b/,builtin:/\b([A-Z]\S+|abs|advance|alignof(?:Value)?|assert|contains|count(?:Elements)?|debugPrint(?:ln)?|distance|drop(?:First|Last)|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lexicographicalCompare|map|max(?:Element)?|min(?:Element)?|numericCast|overlaps|partition|print(?:ln)?|reduce|reflect|reverse|sizeof(?:Value)?|sort(?:ed)?|split|startsWith|stride(?:of(?:Value)?)?|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|with(?:ExtendedLifetime|Unsafe(?:MutablePointers?|Pointers?)|VaList))\b/});
\ No newline at end of file
+Prism.languages.swift=Prism.languages.extend("clike",{string:{pattern:/("|')(\\(?:\((?:[^()]|\([^)]+\))+\)|\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,inside:{interpolation:{pattern:/\\\((?:[^()]|\([^)]+\))+\)/,inside:{delimiter:{pattern:/^\\\(|\)$/,alias:"variable"}}}}},keyword:/\b(as|associativity|break|case|catch|class|continue|convenience|default|defer|deinit|didSet|do|dynamic(?:Type)?|else|enum|extension|fallthrough|final|for|func|get|guard|if|import|in|infix|init|inout|internal|is|lazy|left|let|mutating|new|none|nonmutating|operator|optional|override|postfix|precedence|prefix|private|Protocol|public|repeat|required|rethrows|return|right|safe|self|Self|set|static|struct|subscript|super|switch|throws?|try|Type|typealias|unowned|unsafe|var|weak|where|while|willSet|__(?:COLUMN__|FILE__|FUNCTION__|LINE__))\b/,number:/\b([\d_]+(\.[\de_]+)?|0x[a-f0-9_]+(\.[a-f0-9p_]+)?|0b[01_]+|0o[0-7_]+)\b/i,constant:/\b(nil|[A-Z_]{2,}|k[A-Z][A-Za-z_]+)\b/,atrule:/@\b(IB(?:Outlet|Designable|Action|Inspectable)|class_protocol|exported|noreturn|NS(?:Copying|Managed)|objc|UIApplicationMain|auto_closure)\b/,builtin:/\b([A-Z]\S+|abs|advance|alignof(?:Value)?|assert|contains|count(?:Elements)?|debugPrint(?:ln)?|distance|drop(?:First|Last)|dump|enumerate|equal|filter|find|first|getVaList|indices|isEmpty|join|last|lexicographicalCompare|map|max(?:Element)?|min(?:Element)?|numericCast|overlaps|partition|print(?:ln)?|reduce|reflect|reverse|sizeof(?:Value)?|sort(?:ed)?|split|startsWith|stride(?:of(?:Value)?)?|suffix|swap|toDebugString|toString|transcode|underestimateCount|unsafeBitCast|with(?:ExtendedLifetime|Unsafe(?:MutablePointers?|Pointers?)|VaList))\b/}),Prism.languages.swift.string.inside.interpolation.inside.rest=Prism.util.clone(Prism.languages.swift);
\ No newline at end of file
diff --git a/examples/prism-swift.html b/examples/prism-swift.html
index 5bc1633a5c..21c6a16ca6 100644
--- a/examples/prism-swift.html
+++ b/examples/prism-swift.html
@@ -20,7 +20,10 @@ <h2>Numbers</h2>
 
 <h2>Strings</h2>
 <pre><code>let someString = "Some string literal value"
-var emptyString = ""</code></pre>
+var emptyString = ""
+// String interpolation
+let multiplier = 3
+"\(multiplier) times 2.5 is \(Double(multiplier) * 2.5)"</code></pre>
 
 <h2>Control flow</h2>
 <pre><code>for index in 1...5 {

From c4fe72bdd1570fddd9e1e54e25623347b3738345 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 16:45:31 +0200
Subject: [PATCH 308/310] Run gulp task

---
 components/prism-docker.min.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 components/prism-docker.min.js

diff --git a/components/prism-docker.min.js b/components/prism-docker.min.js
new file mode 100644
index 0000000000..4aa3257741
--- /dev/null
+++ b/components/prism-docker.min.js
@@ -0,0 +1 @@
+Prism.languages.docker={keyword:{pattern:/(^\s*)(?:ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|LABEL|ENTRYPOINT)(?=\s)/im,lookbehind:!0},string:/("|')(\\\n|\\?.)*?\1/,comment:/#.*/,punctuation:/([:[\]{}\-,|>?]|---|\.\.\.)/};
\ No newline at end of file

From e49f7cfdd9e7c7f39f9f4c13566e0e4b8d12482d Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 17:00:41 +0200
Subject: [PATCH 309/310] Add tests for Docker + optimized strings + fixed
 punctuation

---
 components/prism-docker.js                  |  6 ++--
 components/prism-docker.min.js              |  2 +-
 tests/languages/docker/comment_feature.test | 13 ++++++++
 tests/languages/docker/keyword_feature.test | 37 +++++++++++++++++++++
 tests/languages/docker/string_feature.test  | 23 +++++++++++++
 5 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 tests/languages/docker/comment_feature.test
 create mode 100644 tests/languages/docker/keyword_feature.test
 create mode 100644 tests/languages/docker/string_feature.test

diff --git a/components/prism-docker.js b/components/prism-docker.js
index ddf909e2f6..80a96ddbb7 100644
--- a/components/prism-docker.js
+++ b/components/prism-docker.js
@@ -3,7 +3,7 @@ Prism.languages.docker = {
 		pattern: /(^\s*)(?:ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|LABEL|ENTRYPOINT)(?=\s)/mi,
 		lookbehind: true
 	},
-	'string': /("|')(\\\n|\\?.)*?\1/,
+	'string': /("|')(?:(?!\1)[^\\\r\n]|\\(?:\r\n|[\s\S]))*?\1/,
 	'comment': /#.*/,
-	'punctuation': /([:[\]{}\-,|>?]|---|\.\.\.)/
-};
+	'punctuation': /---|\.\.\.|[:[\]{}\-,|>?]/
+};
\ No newline at end of file
diff --git a/components/prism-docker.min.js b/components/prism-docker.min.js
index 4aa3257741..8c9c723621 100644
--- a/components/prism-docker.min.js
+++ b/components/prism-docker.min.js
@@ -1 +1 @@
-Prism.languages.docker={keyword:{pattern:/(^\s*)(?:ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|LABEL|ENTRYPOINT)(?=\s)/im,lookbehind:!0},string:/("|')(\\\n|\\?.)*?\1/,comment:/#.*/,punctuation:/([:[\]{}\-,|>?]|---|\.\.\.)/};
\ No newline at end of file
+Prism.languages.docker={keyword:{pattern:/(^\s*)(?:ONBUILD|FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|COPY|VOLUME|USER|WORKDIR|CMD|LABEL|ENTRYPOINT)(?=\s)/im,lookbehind:!0},string:/("|')(?:(?!\1)[^\\\r\n]|\\(?:\r\n|[\s\S]))*?\1/,comment:/#.*/,punctuation:/---|\.\.\.|[:[\]{}\-,|>?]/};
\ No newline at end of file
diff --git a/tests/languages/docker/comment_feature.test b/tests/languages/docker/comment_feature.test
new file mode 100644
index 0000000000..054d6023d1
--- /dev/null
+++ b/tests/languages/docker/comment_feature.test
@@ -0,0 +1,13 @@
+#
+# foobar
+
+----------------------------------------------------
+
+[
+	["comment", "#"],
+	["comment", "# foobar"]
+]
+
+----------------------------------------------------
+
+Checks for comments.
\ No newline at end of file
diff --git a/tests/languages/docker/keyword_feature.test b/tests/languages/docker/keyword_feature.test
new file mode 100644
index 0000000000..8b39af9355
--- /dev/null
+++ b/tests/languages/docker/keyword_feature.test
@@ -0,0 +1,37 @@
+ONBUILD ADD . /app/src
+FROM ubuntu
+MAINTAINER SvenDowideit@home.org.au
+RUN cd /tmp
+EXPOSE 5900
+ENV myName John Doe
+COPY hom* /mydir/
+VOLUME /myvol
+USER daemon
+WORKDIR /a
+CMD echo "foo"
+LABEL version="1.0"
+ENTRYPOINT ["top", "-b"]
+
+----------------------------------------------------
+
+[
+	["keyword", "ONBUILD"], ["keyword", "ADD"], " . /app/src\r\n",
+	["keyword", "FROM"], " ubuntu\r\n",
+	["keyword", "MAINTAINER"], " SvenDowideit@home.org.au\r\n",
+	["keyword", "RUN"], " cd /tmp\r\n",
+	["keyword", "EXPOSE"], " 5900\r\n",
+	["keyword", "ENV"], " myName John Doe\r\n",
+	["keyword", "COPY"], " hom* /mydir/\r\n",
+	["keyword", "VOLUME"], " /myvol\r\n",
+	["keyword", "USER"], " daemon\r\n",
+	["keyword", "WORKDIR"], " /a\r\n",
+	["keyword", "CMD"], " echo ", ["string", "\"foo\""],
+	["keyword", "LABEL"], " version=", ["string", "\"1.0\""],
+	["keyword", "ENTRYPOINT"],
+	["punctuation", "["], ["string", "\"top\""], ["punctuation", ","],
+	["string", "\"-b\""], ["punctuation", "]"]
+]
+
+----------------------------------------------------
+
+Checks for keywords.
\ No newline at end of file
diff --git a/tests/languages/docker/string_feature.test b/tests/languages/docker/string_feature.test
new file mode 100644
index 0000000000..e131f02136
--- /dev/null
+++ b/tests/languages/docker/string_feature.test
@@ -0,0 +1,23 @@
+""
+"fo\"obar"
+"foo\
+bar"
+''
+'fo\'obar'
+'foo\
+bar'
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"fo\\\"obar\""],
+	["string", "\"foo\\\r\nbar\""],
+	["string", "''"],
+	["string", "'fo\\'obar'"],
+	["string", "'foo\\\r\nbar'"]
+]
+
+----------------------------------------------------
+
+Checks for strings.
\ No newline at end of file

From 5a5eec510bceb3509c099927fb2f1d93e9681be5 Mon Sep 17 00:00:00 2001
From: Golmote <golmote@hotmail.com>
Date: Sat, 5 Sep 2015 17:14:03 +0200
Subject: [PATCH 310/310] Download page: don't add semicolon unless needed in
 generated code. Fix #273

---
 download.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download.js b/download.js
index e56e58710c..1a1da4007e 100644
--- a/download.js
+++ b/download.js
@@ -448,7 +448,7 @@ function buildCode(promises) {
 		if(i < l) {
 			var p = promises[i];
 			p.contentsPromise.then(function(contents) {
-				code[p.type] += contents + (p.type === 'js'? ';' : '') + '\n';
+				code[p.type] += contents + (p.type === 'js' && !/;\s*$/.test(contents) ? ';' : '') + '\n';
 				i++;
 				f(resolve);
 			});