fixed conflicts

.travis.yml

@@ -1,10 +1,5 @@
-language: python
-python:
-  - "3.3"
-before_install:
-  - "python tools/build.py -t node"
-  - npm config set python python2.7
-install:
-  - npm install
+language: node_js
+node_js:
+  - "0.10"
 script:
-  - npm test
+  - "node tools/build.js -t node && npm test"

AUTHORS.en.txt

@@ -136,4 +136,10 @@ Contributors:
 - Luke Holder <[email protected]>
 - David Mohundro <[email protected]>
 - Nicholas Blumhardt <[email protected]>
+- Christophe de Dinechin <[email protected]>
+- Taneli Vatanen <[email protected]>
+- Jen Evers-Corvina <[email protected]>
+- Kassio Borges <[email protected]>
+- Cedric Sohrauer <[email protected]>
+- Mickael Delahaye <[email protected]>
 - Hakan Özler <[email protected]>

AUTHORS.ru.txt

@@ -136,3 +136,9 @@ URL:   https://highlightjs.org/
 - Люк Холдер <[email protected]>
 - Дэвид Мохундро <[email protected]>
 - Николас Блумхардт <[email protected]>
+- Кристоф де Денишен <[email protected]>
+- Танели Ватанен <[email protected]>
+- Джен Эверс-Корвина <[email protected]>
+- Кассио Борхес <[email protected]>
+- Седрик Зорауер <[email protected]>
+- Микаэль Делахэй <[email protected]>

CHANGES.md

@@ -1,6 +1,21 @@
-## master
+## Version 8.3
 
-New languages:
+We streamlined our tool chain, it is now based entirely on node.js instead of
+being a mix of node.js, Python and Java. The build script options and arguments
+remained the same, and we've noted all the changes in the [documentation][b].
+Apart from reducing complexity, the new build script is also faster from not
+having to start Java machine repeatedly. The credits for the work go to [Jeremy
+Hull][].
+
+Some notable fixes:
+
+- PHP and JavaScript mixed in HTML now live happily with each other.
+- JavaScript regexes now understand ES6 flags "u" and "y".
+- `throw` keyword is no longer detected as a method name in Java.
+- Fixed parsing of numbers and symbols in Clojure thanks to [input from Ivan
+  Kleshnin][ik].
+
+New languages in this release:
 
 - *Less* by [Max Mikhailov][]
 - *Stylus* by [Bryant Williams][]
@@ -10,8 +25,14 @@ New languages:
 - *Twig* templates by [Luke Holder][]
 - *PowerShell* by [David Mohundro][], based on [the work of Nicholas
   Blumhardt][ps]
+- *XL* by [Christophe de Dinechin][]
+- *LiveScript* by [Taneli Vatanen][] and [Jen Evers-Corvina][]
+- *ERB* (Ruby in HTML) by [Lucas Mazza][]
 - *AspectJ* by [Hakan Özler][]
 
+[b]: http://highlightjs.readthedocs.org/en/latest/building-testing.html
+[Jeremy Hull]: https://github.com/sourrust
+[ik]: https://twitter.com/IvanKleshnin/status/514041599484231680
 [Max Mikhailov]: https://github.com/seven-phases-max
 [Bryant Williams]: https://github.com/scien
 [Radek Liska]: https://github.com/Nindaleth
@@ -20,6 +41,11 @@ New languages:
 [Luke Holder]: https://github.com/lukeholder
 [David Mohundro]: https://github.com/drmohundro
 [ps]: https://github.com/OctopusDeploy/Library/blob/master/app/shared/presentation/highlighting/powershell.js
+[Christophe de Dinechin]: https://github.com/c3d
+[Taneli Vatanen]: https://github.com/Daiz-
+[Jen Evers-Corvina]: https://github.com/sevvie
+[Lucas Mazza]: https://github.com/lucasmazza
+[Hakan Özler]: https://github.com/ozlerhakan
 
 ## Version 8.2
 
@@ -146,6 +172,7 @@ Other improvements:
 [Jeremy Hull]: https://github.com/sourrust
 [Matt Diephouse]: https://github.com/mdiep
 
+
 ## Version 8.0
 
 This new major release is quite a big overhaul bringing both new features and

docs/building-testing.rst

@@ -8,23 +8,26 @@ where you're going to run it: a browser, the node.js server, etc.
 Building
 --------
 
-The build tool is written in Python, 3.x version. It also can use
-YUICompressor for the in-browser builds so make sure you have Java installed
-for that too.
+The build tool is written in JavaScript using node.js. Before running the
+script, make sure to have node installed and run ``npm install`` to get the
+dependencies.
 
-The tool is located in ``tools/build.py``. A few useful examples:
+The tool is located in ``tools/build.js``. A few useful examples:
 
 * Build for a browser using only common languages::
 
-    python3 tools/build.py :common
+    node tools/build.js :common
 
 * Build for node.js including all available languages::
 
-    python3 tools/build.py -t node
+    node tools/build.js -t node
 
 * Build two specific languages for debugging, skipping compression in this case::
 
-    python3 tools/build.py -n python ruby
+    node tools/build.js -n python ruby
+
+On some systems the node binary is named ``nodejs``; simply replace ``node``
+with ``nodejs`` in the examples above if that is the case.
 
 The full option reference is available with the usual ``--help`` option.
 
@@ -34,7 +37,7 @@ The build result will be in the ``build/`` directory.
 Testing
 -------
 
-Testing is done using `mocha <https://visionmedia.github.io/mocha/>` and the
+Testing is done using `mocha <https://visionmedia.github.io/mocha/>`_ and the
 files are found in the ``test/`` directory. You can use the node build to
 run the tests in the command line with ``npm test`` after installing the
 dependencies with ``npm install``.

docs/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '8.2'
+version = '8.3'
 # The full version, including alpha/beta/rc tags.
-release = '8.2'
+release = '8.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/css-classes-reference.rst

@@ -411,6 +411,23 @@ Dart ("dart")
 * ``class``:            class header from "class" till "{"
 * ``title``:            class name
 
+LiveScript ("livescript", "ls")
+-------------------------------
+
+* ``keyword``:          keyword
+* ``comment``:          comment
+* ``number``:           number
+* ``literal``:          special literal: "true", "false" and "null"
+* ``built_in``:         built-in objects and functions ("window", "console", "require", etc...)
+* ``string``:           string
+* ``subst``:            #{ ... } interpolation in double-quoted strings
+* ``regexp``:           regular expression
+* ``function``:         header of a function
+* ``class``:            header of a class
+* ``title``:            name of a function variable inside a header
+* ``params``:           parentheses and everything inside them in a function's header
+* ``property``:         @-property within class and functions
+
 ActionScript ("actionscript", "as")
 -----------------------------------
 
@@ -637,12 +654,15 @@ OCaml ("ocaml", "ml")
 ---------------------
 
 * ``keywords``:         keyword
+* ``literal``:          true false etc.
 * ``number``:           number
 * ``string``:           string
+* ``char``:             character
 * ``comment``:          comment
-* ``class``:            any custom OCaml type
-* ``title``:            the name of a custom OCaml type
-* ``annotation``:       any attribute
+* ``built_in``:         built-in type (int, list etc.)
+* ``type``:             variant constructor, module name
+* ``tag``:              polymorphic variant tag
+* ``symbol``:           type variable
 
 D ("d")
 -------
@@ -1220,6 +1240,23 @@ Puppet ("puppet", "pp")
 * ``keyword``:          classes and types
 * ``constant``:         dependencies
 
+XL ("xl", "tao")
+-----------
+
+* ``keyword``:          keywords defined in the default syntax file
+* ``literal``:          names entered in the compiler (true, false, nil)
+* ``type``:             basic types (integer, real, text, name, etc)
+* ``built_in``:         built-in functions (sin, exp, mod, etc)
+* ``module``:           names of frequently used Tao modules
+* ``id``:               names of frequently used Tao functions
+* ``constant``:         all-uppercase names such as HELLO
+* ``variable``:         Mixed-case names such as Hello (style convention)
+* ``id``:               Lower-case names such as hello
+* ``string``:           Text between single or double quote, long text << >>
+* ``number``:           Number values
+* ``function``:         Function or variable definition
+* ``import``:           Import clause
+
 AspectJ ("aspectj")
 -------------
 
@@ -1233,4 +1270,4 @@ AspectJ ("aspectj")
 * ``aspect``:           aspect header from "aspect" till "{"
 * ``params``:           everything in parentheses inside an aspect header
 * ``inheritance``:      keywords "extends" and "implements" inside an aspect header
-* ``title``:            aspect, method name or pointcut name inside an aspect header
+* ``title``:            aspect, method name or pointcut name inside an aspect header

docs/language-guide.rst

@@ -242,4 +242,4 @@ at the end under "Common regexps" and "Common modes" titles. Use them when possi
 Contributing
 ------------
 
-Follow the :doc:`contributor checklist </contribution>`.
+Follow the :doc:`contributor checklist </language-contribution>`.

package.json

@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "author": {
     "name": "Ivan Sagalaev",
     "email": "[email protected]"
@@ -33,8 +33,13 @@
     "node": "*"
   },
   "devDependencies": {
+    "commander": "^2.3.0",
+    "del": "^0.1.2",
+    "gear": "^0.9.4",
+    "gear-lib": "^0.9.1",
     "glob": "^4.0.5",
     "jsdom": "^0.11.1",
+    "lodash": "^2.4.1",
     "mocha": "^1.21.4",
     "should": "^4.0.4"
   }