Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## `0.11.2`
+
+### Fixed
+- PaperScript: Fix a parsing error in math operations without white-space
+  (#1314).
+
 ## `0.11.1`
 
 ### Fixed

dist/paper-core.js

@@ -1,5 +1,5 @@
 /*!
- * Paper.js v0.11.1 - The Swiss Army Knife of Vector Graphics Scripting.
+ * Paper.js v0.11.2 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
  *
  * Copyright (c) 2011 - 2016, Juerg Lehni & Jonathan Puckey
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  *
- * Date: Thu Apr 20 18:16:21 2017 +0200
+ * Date: Thu Apr 20 19:14:30 2017 +0200
  *
  ***
  *
@@ -769,7 +769,7 @@ var PaperScope = Base.extend({
 		}
 	},
 
-	version: "0.11.1",
+	version: "0.11.2",
 
 	getView: function() {
 		var project = this.project;

dist/paper-full.js

@@ -1,5 +1,5 @@
 /*!
- * Paper.js v0.11.1 - The Swiss Army Knife of Vector Graphics Scripting.
+ * Paper.js v0.11.2 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
  *
  * Copyright (c) 2011 - 2016, Juerg Lehni & Jonathan Puckey
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  *
- * Date: Thu Apr 20 18:16:21 2017 +0200
+ * Date: Thu Apr 20 19:14:30 2017 +0200
  *
  ***
  *
@@ -769,7 +769,7 @@ var PaperScope = Base.extend({
 		}
 	},
 
-	version: "0.11.1",
+	version: "0.11.2",
 
 	getView: function() {
 		var project = this.project;
@@ -16122,7 +16122,7 @@ Base.exports.PaperScript = function() {
 
 		function getBetween(left, right) {
 			return code.substring(getOffset(left.range[1]),
-					getOffset(right.range[0]) - 1);
+					getOffset(right.range[0]));
 		}
 
 		function replaceCode(node, str) {

gulp/tasks/publish.js

@@ -39,9 +39,9 @@ gulp.task('publish', function() {
     return run(
         'publish:json',
         'publish:dist',
+        'publish:packages',
         'publish:commit',
         'publish:release',
-        'publish:packages',
         'publish:website',
         'publish:load'
     );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paper",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "The Swiss Army Knife of Vector Graphics Scripting",
   "license": "MIT",
   "homepage": "http://paperjs.org",

packages/paper-jsdom

@@ -1 +1 @@
-Subproject commit 5dea0850de4560ef5db932d7cbfbd02ac1b31b0e
+Subproject commit bab27f25fed8d78f072d8f9a9f68da61e7d1e975

packages/paper-jsdom-canvas

@@ -1 +1 @@
-Subproject commit a2de585e79c4259b9e25a94c8ee688ba424181ff
+Subproject commit 2e257a436e1cfec74ca6ffe4828a761ec058b42f

src/core/PaperScript.js

@@ -168,7 +168,7 @@ Base.exports.PaperScript = function() {
         // Returns the code between two nodes, e.g. an operator and white-space.
         function getBetween(left, right) {
             return code.substring(getOffset(left.range[1]),
-                    getOffset(right.range[0]) - 1);
+                    getOffset(right.range[0]));
         }
 
         // Replaces the node's code with a new version and keeps insertions

src/options.js

@@ -17,7 +17,7 @@
 // The paper.js version.
 // NOTE: Adjust value here before calling `gulp publish`, which then updates and
 // publishes the various JSON package files automatically.
-var version = '0.11.1';
+var version = '0.11.2';
 
 // If this file is loaded in the browser, we're in load.js mode.
 var load = typeof window === 'object';