Require brackets to do maths

bin/lessc

@@ -18,7 +18,8 @@ var options = {
     color: true,
     strictImports: false,
     rootpath: '',
-    relativeUrls: false
+    relativeUrls: false,
+    strictMaths: true
 };
 var continueProcessing = true,
     currentErrorcode;
@@ -103,6 +104,14 @@ args = args.filter(function (arg) {
         case "relative-urls":
             options.relativeUrls = true;
             break;
+        case "sm":
+        case "strict-maths-off":
+            options.strictMaths = false;
+            break;
+        case "su":
+        case "strict-units-off":
+            options.strictUnits = false;
+            break;
     }
 });
 
@@ -161,7 +170,9 @@ var parseLessFile = function (e, data) {
             try {
                 var css = tree.toCSS({
                     compress: options.compress,
-                    yuicompress: options.yuicompress
+                    yuicompress: options.yuicompress,
+                    strictMaths: options.strictMaths,
+                    strictUnits: options.strictUnits
                 });
                 if (output) {
                     ensureDirectory(output);

lib/less/browser.js

@@ -55,7 +55,7 @@ function initRunningMode(){
 			if (less.watchMode) {
 				loadStyleSheets(function (e, root, _, sheet, env) {
 					if (root) {
-						createCSS(root.toCSS(), sheet, env.lastModified);
+						createCSS(root.toCSS(less), sheet, env.lastModified);
 					}
 				});
 			}
@@ -104,7 +104,7 @@ less.modifyVars = function(record) {
                 ((record[name].slice(-1) === ';')? record[name] : record[name] +';');
     }
     new(less.Parser)(new less.tree.parseEnv(less)).parse(str, function (e, root) {
-        createCSS(root.toCSS(), less.sheets[less.sheets.length - 1]);
+        createCSS(root.toCSS(less), less.sheets[less.sheets.length - 1]);
     });
 };
 
@@ -117,7 +117,7 @@ less.refresh = function (reload) {
             log("loading " + sheet.href + " from cache.");
         } else {
             log("parsed " + sheet.href + " successfully.");
-            createCSS(root.toCSS(), sheet, env.lastModified);
+            createCSS(root.toCSS(less), sheet, env.lastModified);
         }
         log("css for " + sheet.href + " generated in " + (new(Date) - endTime) + 'ms');
         (env.remaining === 0) && log("css generated in " + (new(Date) - startTime) + 'ms');
@@ -138,7 +138,7 @@ function loadStyles() {
             env.filename = document.location.href.replace(/#.*$/, '');
 
             new(less.Parser)(env).parse(styles[i].innerHTML || '', function (e, cssAST) {
-                var css = cssAST.toCSS();
+                var css = cssAST.toCSS(less);
                 var style = styles[i];
                 style.type = 'text/css';
                 if (style.styleSheet) {

lib/less/env.js

@@ -31,10 +31,34 @@
         return env;
     };
 
-    //todo - do the same for the eval env and the toCSS env
-    //tree.evalEnv = function(options) {
-    //};
+    var evalCopyProperties = [
+        'compress',    // whether to compress
+        'strictMaths', // whether maths has to be within parenthesis
+        'strictUnits'  // whether units need to evaluate correctly
+        ];
+
+    tree.evalEnv = function(options, frames) {
+        copyFromOriginal(options, this, evalCopyProperties);
+
+        this.frames = frames || [];
+    };
+
+    tree.evalEnv.prototype.inParenthesis = function () {
+        if (!this.parensStack) {
+            this.parensStack = [];
+        }
+        this.parensStack.push(true);
+    };
+
+    tree.evalEnv.prototype.outOfParenthesis = function () {
+        this.parensStack.pop();
+    };
+
+    tree.evalEnv.prototype.isMathsOn = function () {
+        return this.strictMaths === false ? true : (this.parensStack && this.parensStack.length);
+    };
 
+    //todo - do the same for the toCSS env
     //tree.toCSSEnv = function (options) {
     //};
 

lib/less/index.js

@@ -91,7 +91,7 @@ var less = {
  'call',       'url',        'alpha',              'import',
  'mixin',      'comment',    'anonymous',          'value',
  'javascript', 'assignment', 'condition',          'paren',
- 'media',      'ratio',      'unicode-descriptor', 'extend'
+ 'media',      'unicode-descriptor', 'negative',   'extend'
 ].forEach(function (n) {
     require('./tree/' + n);
 });

lib/less/lessc_helper.js

@@ -51,6 +51,12 @@ var lessc_helper = {
         sys.puts("  -rp, --rootpath         Set rootpath for url rewriting in relative imports and urls.");
         sys.puts("                          Works with or withour the relative-urls option.");
         sys.puts("  -ru, --relative-urls    re-write relative urls to the base less file.");
+        sys.puts("  -sm, --strict-maths-off Make maths not require brackets, which is similar behaviour");
+        sys.puts("                          to before 1.4. This option is for compatability and may be");
+        sys.puts("                          removed in the future.");
+        sys.puts("  -su, --strict-units-off Allow mixed units, e.g. 1px+1em or 1px*1px which have units");
+        sys.puts("                          that cannot be represented. This option is for compatability");
+        sys.puts("                          and may be removed in the future.");
         sys.puts("");
         sys.puts("Report bugs to: http://github.com/cloudhead/less.js/issues");
         sys.puts("Home page: <http://lesscss.org/>");