Merge pull request #3 from zaborek/patch-2

Patch 2

.editorconfig

@@ -4,6 +4,7 @@ root = true
 insert_final_newline = false
 charset = utf-8
 indent_style = tab
+indent_size = 4
 
 [tests/languages/**.test]
 end_of_line = crlf

.travis.yml

@@ -1,9 +1,9 @@
 language: node_js
 node_js:
-- '4'
 - '6'
 - '8'
-- '9'
+- '10'
+- 'node'
 # Build all branches
 branches:
   only:

CHANGELOG.md

@@ -4,61 +4,61 @@
 
 ### New components
 
-* __Template Tookit 2__ (#1418) [`e063992b`]
-* __XQuery__ (#1411) [`e326cb03`]
-* __TAP__ [`8c2b71f1`]
+* __Template Tookit 2__ ([#1418](https://github.com/PrismJS/prism/issues/1418)) [[`e063992`](https://github.com/PrismJS/prism/commit/e063992)]
+* __XQuery__ ([#1411](https://github.com/PrismJS/prism/issues/1411)) [[`e326cb0`](https://github.com/PrismJS/prism/commit/e326cb0)]
+* __TAP__ ([#1430](https://github.com/PrismJS/prism/issues/1430)) [[`8c2b71f`](https://github.com/PrismJS/prism/commit/8c2b71f)]
 
 ### Updated components
 
 * __HTTP__
-	* Absolute path is a valid request uri (#1388) [`f6e81cb4`]
+	* Absolute path is a valid request uri ([#1388](https://github.com/PrismJS/prism/issues/1388)) [[`f6e81cb`](https://github.com/PrismJS/prism/commit/f6e81cb)]
 * __Kotlin__
-	* Add keywords of Kotlin and modify it's number pattern. (#1389) [`1bf73b0b`]
-	* Add `typealias` keyword [`a21fdee6`]
-* __JavaScript
-	* Improve Regexp pattern [`5b043cf8`]
-	* Add support for one level of nesting inside template strings. Fix #1397 [`db2d0ebb`]
+	* Add keywords of Kotlin and modify it's number pattern. ([#1389](https://github.com/PrismJS/prism/issues/1389)) [[`1bf73b0`](https://github.com/PrismJS/prism/commit/1bf73b0)]
+	* Add `typealias` keyword ([#1437](https://github.com/PrismJS/prism/issues/1437)) [[`a21fdee`](https://github.com/PrismJS/prism/commit/a21fdee)]
+* __JavaScript__
+	* Improve Regexp pattern [[`5b043cf`](https://github.com/PrismJS/prism/commit/5b043cf)]
+	* Add support for one level of nesting inside template strings. Fix [#1397](https://github.com/PrismJS/prism/issues/1397) [[`db2d0eb`](https://github.com/PrismJS/prism/commit/db2d0eb)]
 * __Elixir__
-	* Elixir: Fix attributes consuming punctuation. Fix #1392 [`dac0485e`]
+	* Elixir: Fix attributes consuming punctuation. Fix [#1392](https://github.com/PrismJS/prism/issues/1392) [[`dac0485`](https://github.com/PrismJS/prism/commit/dac0485)]
 * __Bash__
-	* Change reserved keyword reference (#1396) [`b94f01f1`]
+	* Change reserved keyword reference ([#1396](https://github.com/PrismJS/prism/issues/1396)) [[`b94f01f`](https://github.com/PrismJS/prism/commit/b94f01f)]
 * __PowerShell__
-	* Allow for one level of nesting in expressions inside strings. Fix #1407 [`9272d6f4`]
+	* Allow for one level of nesting in expressions inside strings. Fix [#1407](https://github.com/PrismJS/prism/issues/1407) [[`9272d6f`](https://github.com/PrismJS/prism/commit/9272d6f)]
 * __JSX__
-	* Allow for two levels of nesting inside JSX tags. Fix #1408 [`f1cd7c56`]
-	* Add support for fragments short syntax. Fix #1421 [`38ce1213`]
+	* Allow for two levels of nesting inside JSX tags. Fix [#1408](https://github.com/PrismJS/prism/issues/1408) [[`f1cd7c5`](https://github.com/PrismJS/prism/commit/f1cd7c5)]
+	* Add support for fragments short syntax. Fix [#1421](https://github.com/PrismJS/prism/issues/1421) [[`38ce121`](https://github.com/PrismJS/prism/commit/38ce121)]
 * __Pascal__
-	* Add `objectpascal` as an alias to `pascal` (#1426) [`a0bfc84d`]
+	* Add `objectpascal` as an alias to `pascal` ([#1426](https://github.com/PrismJS/prism/issues/1426)) [[`a0bfc84`](https://github.com/PrismJS/prism/commit/a0bfc84)]
 * __Swift__
-	* Fix Swift 'protocol' keyword [`081e318c`]
+	* Fix Swift 'protocol' keyword ([#1440](https://github.com/PrismJS/prism/issues/1440)) [[`081e318`](https://github.com/PrismJS/prism/commit/081e318)]
 
 ### Updated plugins
 
 * __File Highlight__
-	* Fix issue causing the Download button to show up on every code blocks. [`cd22499c`]
-	* Simplify lang regex on File Highlight plugin (#1399) [`7bc9a4a1`]
+	* Fix issue causing the Download button to show up on every code blocks. [[`cd22499`](https://github.com/PrismJS/prism/commit/cd22499)]
+	* Simplify lang regex on File Highlight plugin ([#1399](https://github.com/PrismJS/prism/issues/1399)) [[`7bc9a4a`](https://github.com/PrismJS/prism/commit/7bc9a4a)]
 * __Show Language__
-	* Don't process language if block language not set [`c1118692`]
+	* Don't process language if block language not set ([#1410](https://github.com/PrismJS/prism/issues/1410)) [[`c111869`](https://github.com/PrismJS/prism/commit/c111869)]
 * __Autoloader__
-	* ASP.NET should require C# [`fa328bb1`]
+	* ASP.NET should require C# [[`fa328bb`](https://github.com/PrismJS/prism/commit/fa328bb)]
 * __Line Numbers__
-	* Make line-numbers styles more specific [`9ee4f547`]
+	* Make line-numbers styles more specific ([#1434](https://github.com/PrismJS/prism/issues/1434), [#1435](https://github.com/PrismJS/prism/issues/1435)) [[`9ee4f54`](https://github.com/PrismJS/prism/commit/9ee4f54)]
 
 ### Updated themes
 
-* Add .token.class-name to rest of themes (#1360) [`f356dfe7`]
+* Add .token.class-name to rest of themes ([#1360](https://github.com/PrismJS/prism/issues/1360)) [[`f356dfe`](https://github.com/PrismJS/prism/commit/f356dfe)]
 
 ### Other changes
 
 * __Website__
 	* Site now loads over HTTPS!
-	* Use HTTPS / canonical URLs (#1390) [`95146c8f`]
-	* Added Angular tutorial link - `c436a7c7`
-	* Use rel="icon" instead of rel="shortcut icon" (#1398) [`d95f8fb4`]
-	* Fix Download page not handling multiple dependencies when from Redownload URL [`c2ff2482`]
-	* Update documentation for node & webpack usage [`1e99e961`]
-* Handle optional dependencies in `loadLanguages()` (#1417) [`84935acd`]
-* Add Chinese translation [`f2b19644`]
+	* Use HTTPS / canonical URLs ([#1390](https://github.com/PrismJS/prism/issues/1390)) [[`95146c8`](https://github.com/PrismJS/prism/commit/95146c8)]
+	* Added Angular tutorial link [[`c436a7c`](https://github.com/PrismJS/prism/commit/c436a7c)]
+	* Use rel="icon" instead of rel="shortcut icon" ([#1398](https://github.com/PrismJS/prism/issues/1398)) [[`d95f8fb`](https://github.com/PrismJS/prism/commit/d95f8fb)]
+	* Fix Download page not handling multiple dependencies when from Redownload URL [[`c2ff248`](https://github.com/PrismJS/prism/commit/c2ff248)]
+	* Update documentation for node & webpack usage [[`1e99e96`](https://github.com/PrismJS/prism/commit/1e99e96)]
+* Handle optional dependencies in `loadLanguages()` ([#1417](https://github.com/PrismJS/prism/issues/1417)) [[`84935ac`](https://github.com/PrismJS/prism/commit/84935ac)]
+* Add Chinese translation [[`f2b1964`](https://github.com/PrismJS/prism/commit/f2b1964)]
 
 ## 1.14.0 (2018-04-11)
 
@@ -313,7 +313,7 @@
 ### Updated components
 
 * __ABAP__:
-	* Regexp optimisation [[`7547f83`](https://github.com/PrismJS/prism/commit/7547f83)]
+	* Regexp optimisation [[`e7b411e`](https://github.com/PrismJS/prism/commit/e7b411e)]
 * __ActionScript__:
 	* Fix XML regex + optimise [[`75d00d7`](https://github.com/PrismJS/prism/commit/75d00d7)]
 * __Ada__:
@@ -363,7 +363,7 @@
 * __Elixir__:
 	* Regexp optimisation + uniform behavior between ~r and ~s [[`5d12e80`](https://github.com/PrismJS/prism/commit/5d12e80)]
 * __Erlang__:
-	* Regexp optimisation [[`e7b411e`](https://github.com/PrismJS/prism/commit/e7b411e)]
+	* Regexp optimisation [[`7547f83`](https://github.com/PrismJS/prism/commit/7547f83)]
 * __F#__:
 	* Regexp optimisation + don't use captures if not needed [[`7753fc4`](https://github.com/PrismJS/prism/commit/7753fc4)]
 * __Gherkin__:
@@ -686,13 +686,13 @@
 	* Make CSS strings greedy. Fix [#1013](https://github.com/PrismJS/prism/issues/1013). [[`e57e26d`](https://github.com/PrismJS/prism/commit/e57e26d)]
 * __CSS Extras__:
 	* Match attribute inside selectors [[`13fed76`](https://github.com/PrismJS/prism/commit/13fed76)]
-* _Groovy__:
+* __Groovy__:
 	* Fix order of decoding entities in groovy. Fixes [#1049](https://github.com/PrismJS/prism/issues/1049) ([#1050](https://github.com/PrismJS/prism/issues/1050)) [[`d75da8e`](https://github.com/PrismJS/prism/commit/d75da8e)]
 * __Ini__:
 	* Remove important token in ini definition ([#1047](https://github.com/PrismJS/prism/issues/1047)) [[`fe8ad8b`](https://github.com/PrismJS/prism/commit/fe8ad8b)]
 * __JavaScript__:
 	* Add exponentiation & spread/rest operator ([#991](https://github.com/PrismJS/prism/issues/991)) [[`b2de65a`](https://github.com/PrismJS/prism/commit/b2de65a), [`268d01e`](https://github.com/PrismJS/prism/commit/268d01e)]
-* __JSON_:
+* __JSON__:
 	* JSON: Fixed issues with properties and strings + added tests. Fix [#1025](https://github.com/PrismJS/prism/issues/1025) [[`25a541d`](https://github.com/PrismJS/prism/commit/25a541d)]
 * __Markup__:
 	* Allow for dots in Markup tag names, but not in HTML tags included in Textile. Fixes [#888](https://github.com/PrismJS/prism/issues/888). [[`31ea66b`](https://github.com/PrismJS/prism/commit/31ea66b)]

README.md

@@ -1,11 +1,15 @@
 # [Prism](http://prismjs.com/)
 
+[![Build Status](https://travis-ci.org/PrismJS/prism.svg?branch=master)](https://travis-ci.org/PrismJS/prism)
+
 Prism is a lightweight, robust, elegant syntax highlighting library. It's a spin-off project from [Dabblet](http://dabblet.com/).
 
 You can learn more on http://prismjs.com/.
 
 Why another syntax highlighter?: http://lea.verou.me/2012/07/introducing-prism-an-awesome-new-syntax-highlighter/#more-1841
 
+More themes for Prism: https://github.com/PrismJS/prism-themes
+
 ## Contribute to Prism!
 
 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:
@@ -17,7 +21,7 @@ Prism depends on community contributions to expand and cover a wider array of us
 - 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.
-- 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.
+- If you add a new language definition, theme or plugin, you need to add it to `components.json` as well and rebuild Prism by running `gulp`, so that it becomes available to the download build page.
 
 Thank you so much for contributing!!