less 3.7.0 → 3.9.0

package/test/browser/less.js

@@ -1,5 +1,5 @@
 /*!
- * Less - Leaner CSS v3.6.0
+ * Less - Leaner CSS v3.9.0
  * http://lesscss.org
  *
  * Copyright (c) 2009-2018, Alexis Sellier <self@cloudhead.net>
@@ -55,6 +55,10 @@ module.exports = function(window, options) {
     if (options.onReady === undefined) {
         options.onReady = true;
     }
+
+    if (options.relativeUrls) {
+        options.rewriteUrls = 'all';
+    }
 };
 
 },{"./browser":3,"./utils":11}],2:[function(require,module,exports){
@@ -126,7 +130,7 @@ if (options.onReady) {
     less.pageLoadFinished = less.refresh(less.env === 'development').then(resolveOrReject, resolveOrReject);
 }
 
-},{"../less/default-options":16,"./add-default-options":1,"./index":8,"promise/polyfill":103}],3:[function(require,module,exports){
+},{"../less/default-options":17,"./add-default-options":1,"./index":8,"promise/polyfill":104}],3:[function(require,module,exports){
 var utils = require('./utils');
 module.exports = {
     createCSS: function (document, styles, sheet) {
@@ -522,7 +526,7 @@ module.exports = function(options, logger) {
     return FileManager;
 };
 
-},{"../less/environment/abstract-file-manager.js":17}],7:[function(require,module,exports){
+},{"../less/environment/abstract-file-manager.js":18}],7:[function(require,module,exports){
 module.exports = function() {
 
     var functionRegistry = require('./../less/functions/function-registry');
@@ -552,7 +556,7 @@ module.exports = function() {
     functionRegistry.addMultiple(imageFunctions);
 };
 
-},{"./../less/functions/function-registry":26}],8:[function(require,module,exports){
+},{"./../less/functions/function-registry":27}],8:[function(require,module,exports){
 //
 // index.js
 // Should expose the additional browser functions on to the less object
@@ -585,7 +589,13 @@ module.exports = function(window, options) {
     var typePattern = /^text\/(x-)?less$/;
 
     function clone(obj) {
-        return JSON.parse(JSON.stringify(obj || {}));
+        var cloned = {};
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop)) {
+                cloned[prop] = obj[prop];
+            }
+        }
+        return cloned;
     }
 
     // only really needed for phantom
@@ -648,7 +658,8 @@ module.exports = function(window, options) {
                 currentDirectory: fileManager.getPath(path),
                 filename: path,
                 rootFilename: path,
-                relativeUrls: instanceOptions.relativeUrls};
+                rewriteUrls: instanceOptions.rewriteUrls
+            };
 
             newFileInfo.entryPath = newFileInfo.currentDirectory;
             newFileInfo.rootpath = instanceOptions.rootpath || newFileInfo.currentDirectory;
@@ -827,7 +838,7 @@ module.exports = function(window, options) {
     return less;
 };
 
-},{"../less":36,"./browser":3,"./cache":4,"./error-reporting":5,"./file-manager":6,"./image-size":7,"./log-listener":9,"./plugin-loader":10,"./utils":11}],9:[function(require,module,exports){
+},{"../less":37,"./browser":3,"./cache":4,"./error-reporting":5,"./file-manager":6,"./image-size":7,"./log-listener":9,"./plugin-loader":10,"./utils":11}],9:[function(require,module,exports){
 module.exports = function(less, options) {
 
     var logLevel_debug = 4,
@@ -898,7 +909,7 @@ PluginLoader.prototype.loadPlugin = function(filename, basePath, context, enviro
 module.exports = PluginLoader;
 
 
-},{"../less/environment/abstract-plugin-loader.js":18}],11:[function(require,module,exports){
+},{"../less/environment/abstract-plugin-loader.js":19}],11:[function(require,module,exports){
 module.exports = {
     extractId: function(href) {
         return href.replace(/^[a-z-]+:\/+?[^\/]+/, '')  // Remove protocol & domain
@@ -925,9 +936,23 @@ module.exports = {
 };
 
 },{}],12:[function(require,module,exports){
+module.exports = {
+    Math: {
+        ALWAYS: 0,
+        PARENS_DIVISION: 1,
+        PARENS: 2,
+        STRICT_LEGACY: 3
+    },
+    RewriteUrls: {
+        OFF: 0,
+        LOCAL: 1,
+        ALL: 2
+    }
+};
+},{}],13:[function(require,module,exports){
 var contexts = {};
 module.exports = contexts;
-var MATH = require('./math-constants');
+var Constants = require('./constants');
 
 var copyFromOriginal = function copyFromOriginal(original, destination, propertiesToCopy) {
     if (!original) { return; }
@@ -945,7 +970,7 @@ var copyFromOriginal = function copyFromOriginal(original, destination, properti
 var parseCopyProperties = [
     // options
     'paths',            // option - unmodified - paths to search for imports on
-    'relativeUrls',     // option - whether to adjust URL's to be relative
+    'rewriteUrls',      // option - whether to adjust URL's to be relative
     'rootpath',         // option - rootpath to append to URL's
     'strictImports',    // option -
     'insecure',         // option - whether to allow imports from insecure ssl hosts
@@ -978,7 +1003,8 @@ var evalCopyProperties = [
     'urlArgs',           // whether to add args into url tokens
     'javascriptEnabled', // option - whether Inline JavaScript is enabled. if undefined, defaults to false
     'pluginManager',     // Used as the plugin manager for the session
-    'importantScope'     // used to bubble up !important statements
+    'importantScope',    // used to bubble up !important statements
+    'rewriteUrls'        // option - whether to adjust URL's to be relative
 ];
 
 contexts.Eval = function(options, frames) {
@@ -1022,26 +1048,45 @@ contexts.Eval.prototype.isMathOn = function (op) {
     if (!this.mathOn) {
         return false;
     }
-    if (op === '/' && this.math !== MATH.ALWAYS && (!this.parensStack || !this.parensStack.length)) {
+    if (op === '/' && this.math !== Constants.Math.ALWAYS && (!this.parensStack || !this.parensStack.length)) {
         return false;
     }
-    if (this.math > MATH.PARENS_DIVISION) {
+    if (this.math > Constants.Math.PARENS_DIVISION) {
         return this.parensStack && this.parensStack.length;
     }
     return true;
 };
 
-contexts.Eval.prototype.isPathRelative = function (path) {
-    return !/^(?:[a-z-]+:|\/|#)/i.test(path);
+contexts.Eval.prototype.pathRequiresRewrite = function (path) {
+    var isRelative = this.rewriteUrls === Constants.RewriteUrls.LOCAL ? isPathLocalRelative : isPathRelative;
+
+    return isRelative(path);
+};
+
+contexts.Eval.prototype.rewritePath = function (path, rootpath) {
+    var newPath;
+
+    rootpath = rootpath || '';
+    newPath = this.normalizePath(rootpath + path);
+
+    // If a path was explicit relative and the rootpath was not an absolute path
+    // we must ensure that the new path is also explicit relative.
+    if (isPathLocalRelative(path) &&
+        isPathRelative(rootpath) &&
+        isPathLocalRelative(newPath) === false) {
+        newPath = './' + newPath;
+    }
+
+    return newPath;
 };
 
-contexts.Eval.prototype.normalizePath = function( path ) {
+contexts.Eval.prototype.normalizePath = function (path) {
     var
         segments = path.split('/').reverse(),
         segment;
 
     path = [];
-    while (segments.length !== 0 ) {
+    while (segments.length !== 0) {
         segment = segments.pop();
         switch ( segment ) {
             case '.':
@@ -1054,7 +1099,7 @@ contexts.Eval.prototype.normalizePath = function( path ) {
                 }
                 break;
             default:
-                path.push( segment );
+                path.push(segment);
                 break;
         }
     }
@@ -1062,9 +1107,17 @@ contexts.Eval.prototype.normalizePath = function( path ) {
     return path.join('/');
 };
 
+function isPathRelative(path) {
+    return !/^(?:[a-z-]+:|\/|#)/i.test(path);
+}
+
+function isPathLocalRelative(path) {
+    return path.charAt(0) === '.';
+}
+
 // todo - do the same for the toCSS ?
 
-},{"./math-constants":39}],13:[function(require,module,exports){
+},{"./constants":12}],14:[function(require,module,exports){
 module.exports = {
     'aliceblue':'#f0f8ff',
     'antiquewhite':'#faebd7',
@@ -1215,13 +1268,13 @@ module.exports = {
     'yellow':'#ffff00',
     'yellowgreen':'#9acd32'
 };
-},{}],14:[function(require,module,exports){
+},{}],15:[function(require,module,exports){
 module.exports = {
     colors: require('./colors'),
     unitConversions: require('./unit-conversions')
 };
 
-},{"./colors":13,"./unit-conversions":15}],15:[function(require,module,exports){
+},{"./colors":14,"./unit-conversions":16}],16:[function(require,module,exports){
 module.exports = {
     length: {
         'm': 1,
@@ -1243,7 +1296,7 @@ module.exports = {
         'turn': 1
     }
 };
-},{}],16:[function(require,module,exports){
+},{}],17:[function(require,module,exports){
 // Export a new default each time
 module.exports = function() {
     return {
@@ -1288,7 +1341,7 @@ module.exports = function() {
          * that references an image, exactly the same URL will be output in the css. 
          * This option allows you to re-write URL's in imported files so that the 
          * URL is always relative to the base imported file */
-        relativeUrls: false,
+        rewriteUrls: false,
 
         /* Compatibility with IE8. Used for limiting data-uri length */
         ieCompat: false,  // true until 3.0
@@ -1317,7 +1370,7 @@ module.exports = function() {
         urlArgs: ''
     }
 }
-},{}],17:[function(require,module,exports){
+},{}],18:[function(require,module,exports){
 var abstractFileManager = function() {
 };
 
@@ -1442,7 +1495,7 @@ abstractFileManager.prototype.extractUrlParts = function extractUrlParts(url, ba
 
 module.exports = abstractFileManager;
 
-},{}],18:[function(require,module,exports){
+},{}],19:[function(require,module,exports){
 var functionRegistry = require('../functions/function-registry'),
     LessError = require('../less-error');
 
@@ -1633,7 +1686,7 @@ AbstractPluginLoader.prototype.printUsage = function(plugins) {
 module.exports = AbstractPluginLoader;
 
 
-},{"../functions/function-registry":26,"../less-error":37}],19:[function(require,module,exports){
+},{"../functions/function-registry":27,"../less-error":38}],20:[function(require,module,exports){
 /**
  * @todo Document why this abstraction exists, and the relationship between
  *       environment, file managers, and plugin manager
@@ -1691,7 +1744,7 @@ environment.prototype.clearFileManagers = function () {
 
 module.exports = environment;
 
-},{"../logger":38}],20:[function(require,module,exports){
+},{"../logger":39}],21:[function(require,module,exports){
 
 var functionRegistry = require('./function-registry'),
     Anonymous = require('../tree/anonymous'),
@@ -1708,7 +1761,7 @@ functionRegistry.addMultiple({
     }
 });
 
-},{"../tree/anonymous":50,"../tree/keyword":70,"./function-registry":26}],21:[function(require,module,exports){
+},{"../tree/anonymous":50,"../tree/keyword":70,"./function-registry":27}],22:[function(require,module,exports){
 var Color = require('../tree/color'),
     functionRegistry = require('./function-registry');
 
@@ -1784,7 +1837,7 @@ for (var f in colorBlendModeFunctions) {
 
 functionRegistry.addMultiple(colorBlend);
 
-},{"../tree/color":55,"./function-registry":26}],22:[function(require,module,exports){
+},{"../tree/color":55,"./function-registry":27}],23:[function(require,module,exports){
 var Dimension = require('../tree/dimension'),
     Color = require('../tree/color'),
     Quoted = require('../tree/quoted'),
@@ -1795,8 +1848,17 @@ var Dimension = require('../tree/dimension'),
 function clamp(val) {
     return Math.min(1, Math.max(0, val));
 }
-function hsla(color) {
-    return colorFunctions.hsla(color.h, color.s, color.l, color.a);
+function hsla(origColor, hsl) {
+    var color = colorFunctions.hsla(hsl.h, hsl.s, hsl.l, hsl.a);
+    if (color) {
+        if (origColor.value && 
+            /^(rgb|hsl)/.test(origColor.value)) {
+            color.value = origColor.value;
+        } else {
+            color.value = 'rgb';
+        }
+        return color;
+    }
 }
 function number(n) {
     if (n instanceof Dimension) {
@@ -1819,46 +1881,79 @@ function scaled(n, size) {
 }
 colorFunctions = {
     rgb: function (r, g, b) {
-        return colorFunctions.rgba(r, g, b, 1.0);
+        var color = colorFunctions.rgba(r, g, b, 1.0);
+        if (color) {
+            color.value = 'rgb';
+            return color;
+        }
     },
     rgba: function (r, g, b, a) {
-        var rgb = [r, g, b].map(function (c) { return scaled(c, 255); });
-        a = number(a);
-        return new Color(rgb, a);
+        try {
+            if (r instanceof Color) {
+                if (g) {
+                    a = number(g);
+                } else {
+                    a = r.alpha;
+                }
+                return new Color(r.rgb, a, 'rgba');
+            }
+            var rgb = [r, g, b].map(function (c) { return scaled(c, 255); });
+            a = number(a);
+            return new Color(rgb, a, 'rgba');
+        }
+        catch (e) {}
     },
     hsl: function (h, s, l) {
-        return colorFunctions.hsla(h, s, l, 1.0);
+        var color = colorFunctions.hsla(h, s, l, 1.0);
+        if (color) {
+            color.value = 'hsl';
+            return color;
+        }
     },
     hsla: function (h, s, l, a) {
+        try {
+            if (h instanceof Color) {
+                if (s) {
+                    a = number(s);
+                } else {
+                    a = h.alpha;
+                }
+                return new Color(h.rgb, a, 'hsla');
+            }
 
-        var m1, m2;
+            var m1, m2;
 
-        function hue(h) {
-            h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h);
-            if (h * 6 < 1) {
-                return m1 + (m2 - m1) * h * 6;
-            }
-            else if (h * 2 < 1) {
-                return m2;
-            }
-            else if (h * 3 < 2) {
-                return m1 + (m2 - m1) * (2 / 3 - h) * 6;
-            }
-            else {
-                return m1;
+            function hue(h) {
+                h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h);
+                if (h * 6 < 1) {
+                    return m1 + (m2 - m1) * h * 6;
+                }
+                else if (h * 2 < 1) {
+                    return m2;
+                }
+                else if (h * 3 < 2) {
+                    return m1 + (m2 - m1) * (2 / 3 - h) * 6;
+                }
+                else {
+                    return m1;
+                }
             }
-        }
 
-        h = (number(h) % 360) / 360;
-        s = clamp(number(s)); l = clamp(number(l)); a = clamp(number(a));
+            h = (number(h) % 360) / 360;
+            s = clamp(number(s)); l = clamp(number(l)); a = clamp(number(a));
 
-        m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
-        m1 = l * 2 - m2;
+            m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
+            m1 = l * 2 - m2;
 
-        return colorFunctions.rgba(hue(h + 1 / 3) * 255,
-            hue(h)       * 255,
-            hue(h - 1 / 3) * 255,
-            a);
+            var rgb = [
+                hue(h + 1 / 3) * 255,
+                hue(h)       * 255,
+                hue(h - 1 / 3) * 255
+            ];
+            a = number(a);
+            return new Color(rgb, a, 'hsla');
+        }
+        catch (e) {}
     },
 
     hsv: function(h, s, v) {
@@ -1946,7 +2041,7 @@ colorFunctions = {
             hsl.s += amount.value / 100;
         }
         hsl.s = clamp(hsl.s);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     desaturate: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -1958,7 +2053,7 @@ colorFunctions = {
             hsl.s -= amount.value / 100;
         }
         hsl.s = clamp(hsl.s);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     lighten: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -1970,7 +2065,7 @@ colorFunctions = {
             hsl.l += amount.value / 100;
         }
         hsl.l = clamp(hsl.l);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     darken: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -1982,7 +2077,7 @@ colorFunctions = {
             hsl.l -= amount.value / 100;
         }
         hsl.l = clamp(hsl.l);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     fadein: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -1994,7 +2089,7 @@ colorFunctions = {
             hsl.a += amount.value / 100;
         }
         hsl.a = clamp(hsl.a);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     fadeout: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -2006,14 +2101,14 @@ colorFunctions = {
             hsl.a -= amount.value / 100;
         }
         hsl.a = clamp(hsl.a);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     fade: function (color, amount) {
         var hsl = color.toHSL();
 
         hsl.a = amount.value / 100;
         hsl.a = clamp(hsl.a);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     spin: function (color, amount) {
         var hsl = color.toHSL();
@@ -2021,7 +2116,7 @@ colorFunctions = {
 
         hsl.h = hue < 0 ? 360 + hue : hue;
 
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     //
     // Copyright (c) 2006-2009 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
@@ -2125,8 +2220,9 @@ colorFunctions = {
     },
     color: function(c) {
         if ((c instanceof Quoted) &&
-            (/^#([a-f0-9]{6}|[a-f0-9]{3})$/i.test(c.value))) {
-            return new Color(c.value.slice(1));
+            (/^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3,4})$/i.test(c.value))) {
+            var val = c.value.slice(1);
+            return new Color(val, undefined, '#' + val);
         }
         if ((c instanceof Color) || (c = Color.fromKeyword(c.value))) {
             c.value = undefined;
@@ -2134,7 +2230,7 @@ colorFunctions = {
         }
         throw {
             type:    'Argument',
-            message: 'argument must be a color keyword or 3/6 digit hex e.g. #FFF'
+            message: 'argument must be a color keyword or 3|4|6|8 digit hex e.g. #FFF'
         };
     },
     tint: function(color, amount) {
@@ -2146,7 +2242,7 @@ colorFunctions = {
 };
 functionRegistry.addMultiple(colorFunctions);
 
-},{"../tree/anonymous":50,"../tree/color":55,"../tree/dimension":62,"../tree/quoted":80,"./function-registry":26}],23:[function(require,module,exports){
+},{"../tree/anonymous":50,"../tree/color":55,"../tree/dimension":62,"../tree/quoted":80,"./function-registry":27}],24:[function(require,module,exports){
 module.exports = function(environment) {
     var Quoted = require('../tree/quoted'),
         URL = require('../tree/url'),
@@ -2167,7 +2263,7 @@ module.exports = function(environment) {
         var mimetype = mimetypeNode && mimetypeNode.value;
         var filePath = filePathNode.value;
         var currentFileInfo = this.currentFileInfo;
-        var currentDirectory = currentFileInfo.relativeUrls ?
+        var currentDirectory = currentFileInfo.rewriteUrls ?
             currentFileInfo.currentDirectory : currentFileInfo.entryPath;
 
         var fragmentStart = filePath.indexOf('#');
@@ -2236,7 +2332,7 @@ module.exports = function(environment) {
     });
 };
 
-},{"../logger":38,"../tree/quoted":80,"../tree/url":85,"../utils":89,"./function-registry":26}],24:[function(require,module,exports){
+},{"../logger":39,"../tree/quoted":80,"../tree/url":85,"../utils":89,"./function-registry":27}],25:[function(require,module,exports){
 var Keyword = require('../tree/keyword'),
     functionRegistry = require('./function-registry');
 
@@ -2265,7 +2361,7 @@ functionRegistry.add('default', defaultFunc.eval.bind(defaultFunc));
 
 module.exports = defaultFunc;
 
-},{"../tree/keyword":70,"./function-registry":26}],25:[function(require,module,exports){
+},{"../tree/keyword":70,"./function-registry":27}],26:[function(require,module,exports){
 var Expression = require('../tree/expression');
 
 var functionCaller = function(name, context, index, currentFileInfo) {
@@ -2313,7 +2409,7 @@ functionCaller.prototype.call = function(args) {
 
 module.exports = functionCaller;
 
-},{"../tree/expression":64}],26:[function(require,module,exports){
+},{"../tree/expression":64}],27:[function(require,module,exports){
 function makeRegistry( base ) {
     return {
         _data: {},
@@ -2349,7 +2445,7 @@ function makeRegistry( base ) {
 }
 
 module.exports = makeRegistry( null );
-},{}],27:[function(require,module,exports){
+},{}],28:[function(require,module,exports){
 module.exports = function(environment) {
     var functions = {
         functionRegistry: require('./function-registry'),
@@ -2372,9 +2468,11 @@ module.exports = function(environment) {
     return functions;
 };
 
-},{"./boolean":20,"./color":22,"./color-blending":21,"./data-uri":23,"./default":24,"./function-caller":25,"./function-registry":26,"./list":28,"./math":30,"./number":31,"./string":32,"./svg":33,"./types":34}],28:[function(require,module,exports){
-var Dimension = require('../tree/dimension'),
+},{"./boolean":21,"./color":23,"./color-blending":22,"./data-uri":24,"./default":25,"./function-caller":26,"./function-registry":27,"./list":29,"./math":31,"./number":32,"./string":33,"./svg":34,"./types":35}],29:[function(require,module,exports){
+var Comment = require('../tree/comment'),
+    Dimension = require('../tree/dimension'),
     Declaration = require('../tree/declaration'),
+    Expression = require('../tree/expression'),
     Ruleset = require('../tree/ruleset'),
     Selector = require('../tree/selector'),
     Element = require('../tree/element'),
@@ -2401,8 +2499,36 @@ functionRegistry.addMultiple({
     length: function(values) {
         return new Dimension(getItemsFromNode(values).length);
     },
+    /**
+     * Creates a Less list of incremental values.
+     * Modeled after Lodash's range function, also exists natively in PHP
+     * 
+     * @param {Dimension} [start=1]
+     * @param {Dimension} end  - e.g. 10 or 10px - unit is added to output
+     * @param {Dimension} [step=1] 
+     */
+    range: function(start, end, step) {
+        var from, to, stepValue = 1, list = [];
+        if (end) {
+            to = end;
+            from = start.value;
+            if (step) {
+                stepValue = step.value;
+            }
+        }
+        else {
+            from = 1;
+            to = start;
+        }
+
+        for (var i = from; i <= to.value; i += stepValue) {
+            list.push(new Dimension(i, to.unit));
+        }
+
+        return new Expression(list);
+    },
     each: function(list, rs) {
-        var i = 0, rules = [], newRules, iterator;
+        var rules = [], newRules, iterator;
 
         if (list.value) {
             if (Array.isArray(list.value)) {
@@ -2412,6 +2538,8 @@ functionRegistry.addMultiple({
             }
         } else if (list.ruleset) {
             iterator = list.ruleset.rules;
+        } else if (list.rules) {
+            iterator = list.rules;
         } else if (Array.isArray(list)) {
             iterator = list;
         } else {
@@ -2430,17 +2558,20 @@ functionRegistry.addMultiple({
         } else {
             rs = rs.ruleset;
         }
-        
-        iterator.forEach(function(item) {
-            i = i + 1;
-            var key, value;
+
+        for (var i = 0; i < iterator.length; i++) {
+            var key, value, item = iterator[i];
             if (item instanceof Declaration) {
                 key = typeof item.name === 'string' ? item.name : item.name[0].value;
                 value = item.value;
             } else {
-                key = new Dimension(i);
+                key = new Dimension(i + 1);
                 value = item;
             }
+            
+            if (item instanceof Comment) {
+                continue;
+            }
 
             newRules = rs.rules.slice(0);
             if (valueName) {
@@ -2450,7 +2581,7 @@ functionRegistry.addMultiple({
             }
             if (indexName) {
                 newRules.push(new Declaration(indexName,
-                    new Dimension(i),
+                    new Dimension(i + 1),
                     false, false, this.index, this.currentFileInfo));
             }
             if (keyName) {
@@ -2464,7 +2595,7 @@ functionRegistry.addMultiple({
                 rs.strictImports,
                 rs.visibilityInfo()
             ));
-        });
+        }
 
         return new Ruleset([ new(Selector)([ new Element("", '&') ]) ],
                 rules,
@@ -2475,7 +2606,7 @@ functionRegistry.addMultiple({
     }
 });
 
-},{"../tree/declaration":60,"../tree/dimension":62,"../tree/element":63,"../tree/ruleset":81,"../tree/selector":82,"./function-registry":26}],29:[function(require,module,exports){
+},{"../tree/comment":57,"../tree/declaration":60,"../tree/dimension":62,"../tree/element":63,"../tree/expression":64,"../tree/ruleset":81,"../tree/selector":82,"./function-registry":27}],30:[function(require,module,exports){
 var Dimension = require('../tree/dimension');
 
 var MathHelper = function() {
@@ -2492,7 +2623,7 @@ MathHelper._math = function (fn, unit, n) {
     return new Dimension(fn(parseFloat(n.value)), unit);
 };
 module.exports = MathHelper;
-},{"../tree/dimension":62}],30:[function(require,module,exports){
+},{"../tree/dimension":62}],31:[function(require,module,exports){
 var functionRegistry = require('./function-registry'),
     mathHelper = require('./math-helper.js');
 
@@ -2523,7 +2654,7 @@ mathFunctions.round = function (n, f) {
 
 functionRegistry.addMultiple(mathFunctions);
 
-},{"./function-registry":26,"./math-helper.js":29}],31:[function(require,module,exports){
+},{"./function-registry":27,"./math-helper.js":30}],32:[function(require,module,exports){
 var Dimension = require('../tree/dimension'),
     Anonymous = require('../tree/anonymous'),
     functionRegistry = require('./function-registry'),
@@ -2606,7 +2737,7 @@ functionRegistry.addMultiple({
     }
 });
 
-},{"../tree/anonymous":50,"../tree/dimension":62,"./function-registry":26,"./math-helper.js":29}],32:[function(require,module,exports){
+},{"../tree/anonymous":50,"../tree/dimension":62,"./function-registry":27,"./math-helper.js":30}],33:[function(require,module,exports){
 var Quoted = require('../tree/quoted'),
     Anonymous = require('../tree/anonymous'),
     JavaScript = require('../tree/javascript'),
@@ -2645,7 +2776,7 @@ functionRegistry.addMultiple({
     }
 });
 
-},{"../tree/anonymous":50,"../tree/javascript":68,"../tree/quoted":80,"./function-registry":26}],33:[function(require,module,exports){
+},{"../tree/anonymous":50,"../tree/javascript":68,"../tree/quoted":80,"./function-registry":27}],34:[function(require,module,exports){
 module.exports = function(environment) {
     var Dimension = require('../tree/dimension'),
         Color = require('../tree/color'),
@@ -2734,7 +2865,7 @@ module.exports = function(environment) {
     });
 };
 
-},{"../tree/color":55,"../tree/dimension":62,"../tree/expression":64,"../tree/quoted":80,"../tree/url":85,"./function-registry":26}],34:[function(require,module,exports){
+},{"../tree/color":55,"../tree/dimension":62,"../tree/expression":64,"../tree/quoted":80,"../tree/url":85,"./function-registry":27}],35:[function(require,module,exports){
 var Keyword = require('../tree/keyword'),
     DetachedRuleset = require('../tree/detached-ruleset'),
     Dimension = require('../tree/dimension'),
@@ -2810,7 +2941,7 @@ functionRegistry.addMultiple({
     }
 });
 
-},{"../tree/anonymous":50,"../tree/color":55,"../tree/detached-ruleset":61,"../tree/dimension":62,"../tree/keyword":70,"../tree/operation":77,"../tree/quoted":80,"../tree/url":85,"./function-registry":26}],35:[function(require,module,exports){
+},{"../tree/anonymous":50,"../tree/color":55,"../tree/detached-ruleset":61,"../tree/dimension":62,"../tree/keyword":70,"../tree/operation":77,"../tree/quoted":80,"../tree/url":85,"./function-registry":27}],36:[function(require,module,exports){
 var contexts = require('./contexts'),
     Parser = require('./parser/parser'),
     LessError = require('./less-error'),
@@ -2821,7 +2952,7 @@ var contexts = require('./contexts'),
 module.exports = function(environment) {
 
     // FileInfo = {
-    //  'relativeUrls' - option - whether to adjust URL's to be relative
+    //  'rewriteUrls' - option - whether to adjust URL's to be relative
     //  'filename' - full resolved filename of current file
     //  'rootpath' - path to append to normal URLs for this node
     //  'currentDirectory' - path to the current file, absolute
@@ -2878,7 +3009,7 @@ module.exports = function(environment) {
         };
 
         var newFileInfo = {
-            relativeUrls: this.context.relativeUrls,
+            rewriteUrls: this.context.rewriteUrls,
             entryPath: currentFileInfo.entryPath,
             rootpath: currentFileInfo.rootpath,
             rootFilename: currentFileInfo.rootFilename
@@ -2905,7 +3036,7 @@ module.exports = function(environment) {
             // - If path of imported file is '../mixins.less' and rootpath is 'less/',
             //   then rootpath should become 'less/../'
             newFileInfo.currentDirectory = fileManager.getPath(resolvedFilename);
-            if (newFileInfo.relativeUrls) {
+            if (newFileInfo.rewriteUrls) {
                 newFileInfo.rootpath = fileManager.join(
                     (importManager.context.rootpath || ''),
                     fileManager.pathDiff(newFileInfo.currentDirectory, newFileInfo.entryPath));
@@ -2979,12 +3110,12 @@ module.exports = function(environment) {
     return ImportManager;
 };
 
-},{"./contexts":12,"./less-error":37,"./logger":38,"./parser/parser":44,"./utils":89,"promise":undefined}],36:[function(require,module,exports){
+},{"./contexts":13,"./less-error":38,"./logger":39,"./parser/parser":44,"./utils":89,"promise":undefined}],37:[function(require,module,exports){
 module.exports = function(environment, fileManagers) {
     var SourceMapOutput, SourceMapBuilder, ParseTree, ImportManager, Environment;
 
     var initial = {
-        version: [3, 6, 0],
+        version: [3, 9, 0],
         data: require('./data'),
         tree: require('./tree'),
         Environment: (Environment = require('./environment/environment')),
@@ -3036,7 +3167,7 @@ module.exports = function(environment, fileManagers) {
     return api;
 };
 
-},{"./contexts":12,"./data":14,"./environment/abstract-file-manager":17,"./environment/abstract-plugin-loader":18,"./environment/environment":19,"./functions":27,"./import-manager":35,"./less-error":37,"./logger":38,"./parse":41,"./parse-tree":40,"./parser/parser":44,"./plugin-manager":45,"./render":46,"./source-map-builder":47,"./source-map-output":48,"./transform-tree":49,"./tree":67,"./utils":89,"./visitors":93}],37:[function(require,module,exports){
+},{"./contexts":13,"./data":15,"./environment/abstract-file-manager":18,"./environment/abstract-plugin-loader":19,"./environment/environment":20,"./functions":28,"./import-manager":36,"./less-error":38,"./logger":39,"./parse":41,"./parse-tree":40,"./parser/parser":44,"./plugin-manager":45,"./render":46,"./source-map-builder":47,"./source-map-output":48,"./transform-tree":49,"./tree":67,"./utils":89,"./visitors":93}],38:[function(require,module,exports){
 var utils = require('./utils');
 /**
  * This is a centralized class of any error that could be thrown internally (mostly by the parser).
@@ -3179,7 +3310,7 @@ LessError.prototype.toString = function(options) {
     return message;
 };
 
-},{"./utils":89}],38:[function(require,module,exports){
+},{"./utils":89}],39:[function(require,module,exports){
 module.exports = {
     error: function(msg) {
         this._fireEvent('error', msg);
@@ -3215,13 +3346,6 @@ module.exports = {
     _listeners: []
 };
 
-},{}],39:[function(require,module,exports){
-module.exports = {
-    ALWAYS: 0,
-    PARENS_DIVISION: 1,
-    PARENS: 2,
-    STRICT_LEGACY: 3
-};
 },{}],40:[function(require,module,exports){
 var LessError = require('./less-error'),
     transformTree = require('./transform-tree'),
@@ -3284,7 +3408,7 @@ module.exports = function(SourceMapBuilder) {
     return ParseTree;
 };
 
-},{"./less-error":37,"./logger":38,"./transform-tree":49}],41:[function(require,module,exports){
+},{"./less-error":38,"./logger":39,"./transform-tree":49}],41:[function(require,module,exports){
 var PromiseConstructor,
     contexts = require('./contexts'),
     Parser = require('./parser/parser'),
@@ -3333,7 +3457,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
                 var entryPath = filename.replace(/[^\/\\]*$/, '');
                 rootFileInfo = {
                     filename: filename,
-                    relativeUrls: context.relativeUrls,
+                    rewriteUrls: context.rewriteUrls,
                     rootpath: context.rootpath || '',
                     currentDirectory: entryPath,
                     entryPath: entryPath,
@@ -3377,7 +3501,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
     return parse;
 };
 
-},{"./contexts":12,"./less-error":37,"./parser/parser":44,"./plugin-manager":45,"./utils":89,"promise":undefined}],42:[function(require,module,exports){
+},{"./contexts":13,"./less-error":38,"./parser/parser":44,"./plugin-manager":45,"./utils":89,"promise":undefined}],42:[function(require,module,exports){
 // Split the input into chunks.
 module.exports = function (input, fail) {
     var len = input.length, level = 0, parenLevel = 0,
@@ -4515,15 +4639,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 color: function () {
                     var rgb;
 
-                    if (parserInput.currentChar() === '#' && (rgb = parserInput.$re(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/))) {
-                        // strip colons, brackets, whitespaces and other characters that should not
-                        // definitely be part of color string
-                        var colorCandidateString = rgb.input.match(/^#([\w]+).*/);
-                        colorCandidateString = colorCandidateString[1];
-                        if (!colorCandidateString.match(/^[A-Fa-f0-9]+$/)) { // verify if candidate consists only of allowed HEX characters
-                            error('Invalid HEX color code');
-                        }
-                        return new(tree.Color)(rgb[1], undefined, '#' + colorCandidateString);
+                    if (parserInput.currentChar() === '#' && (rgb = parserInput.$re(/^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3,4})/))) {
+                        return new(tree.Color)(rgb[1], undefined, rgb[0]);
                     }
                 },
 
@@ -6161,7 +6278,7 @@ Parser.serializeVars = function(vars) {
 
 module.exports = Parser;
 
-},{"../functions/function-registry":26,"../less-error":37,"../tree":67,"../utils":89,"../visitors":93,"./parser-input":43}],45:[function(require,module,exports){
+},{"../functions/function-registry":27,"../less-error":38,"../tree":67,"../utils":89,"../visitors":93,"./parser-input":43}],45:[function(require,module,exports){
 /**
  * Plugin Manager
  */
@@ -6500,7 +6617,7 @@ module.exports = function (environment) {
             sourceColumns,
             i;
 
-        if (fileInfo) {
+        if (fileInfo && fileInfo.filename) {
             var inputSource = this._contentsMap[fileInfo.filename];
 
             // remove vars/banner added to the top of the file
@@ -6519,7 +6636,7 @@ module.exports = function (environment) {
         lines = chunk.split('\n');
         columns = lines[lines.length - 1];
 
-        if (fileInfo) {
+        if (fileInfo && fileInfo.filename) {
             if (!mapLines) {
                 this._sourceMapGenerator.addMapping({ generated: { line: this._lineNumber + 1, column: this._column},
                     original: { line: sourceLines.length, column: sourceColumns.length},
@@ -6679,7 +6796,7 @@ module.exports = function(root, options) {
     return evaldRoot;
 };
 
-},{"./contexts":12,"./tree":67,"./visitors":93}],50:[function(require,module,exports){
+},{"./contexts":13,"./tree":67,"./visitors":93}],50:[function(require,module,exports){
 var Node = require('./node');
 
 var Anonymous = function (value, index, currentFileInfo, mapLines, rulesetLike, visibilityInfo) {
@@ -7005,7 +7122,7 @@ Call.prototype.genCSS = function (context, output) {
 };
 module.exports = Call;
 
-},{"../functions/function-caller":25,"./anonymous":50,"./node":76}],55:[function(require,module,exports){
+},{"../functions/function-caller":26,"./anonymous":50,"./node":76}],55:[function(require,module,exports){
 var Node = require('./node'),
     colors = require('../data/colors');
 
@@ -7013,6 +7130,7 @@ var Node = require('./node'),
 // RGB Colors - #ff0014, #eee
 //
 var Color = function (rgb, a, originalForm) {
+    var self = this;
     //
     // The end goal here, is to parse the arguments
     // into an integer triplet, such as `128, 255, 0`
@@ -7021,16 +7139,26 @@ var Color = function (rgb, a, originalForm) {
     //
     if (Array.isArray(rgb)) {
         this.rgb = rgb;
-    } else if (rgb.length == 6) {
-        this.rgb = rgb.match(/.{2}/g).map(function (c) {
-            return parseInt(c, 16);
+    } else if (rgb.length >= 6) {
+        this.rgb = [];
+        rgb.match(/.{2}/g).map(function (c, i) {
+            if (i < 3) {
+                self.rgb.push(parseInt(c, 16));
+            } else {
+                self.alpha = (parseInt(c, 16)) / 255;
+            }
         });
     } else {
-        this.rgb = rgb.split('').map(function (c) {
-            return parseInt(c + c, 16);
+        this.rgb = [];
+        rgb.split('').map(function (c, i) {
+            if (i < 3) {
+                self.rgb.push(parseInt(c + c, 16));
+            } else {
+                self.alpha = (parseInt(c + c, 16)) / 255;
+            }
         });
     }
-    this.alpha = typeof a === 'number' ? a : 1;
+    this.alpha = this.alpha || (typeof a === 'number' ? a : 1);
     if (typeof originalForm !== 'undefined') {
         this.value = originalForm;
     }
@@ -7065,25 +7193,54 @@ Color.prototype.genCSS = function (context, output) {
     output.add(this.toCSS(context));
 };
 Color.prototype.toCSS = function (context, doNotCompress) {
-    var compress = context && context.compress && !doNotCompress, color, alpha;
+    var compress = context && context.compress && !doNotCompress, color, alpha,
+        colorFunction, args = [];
 
     // `value` is set if this color was originally
     // converted from a named color string so we need
     // to respect this and try to output named color too.
+    alpha = this.fround(context, this.alpha);
+
     if (this.value) {
-        return this.value;
+        if (this.value.indexOf('rgb') === 0) {
+            if (alpha < 1) {
+                colorFunction = 'rgba';
+            }
+        } else if (this.value.indexOf('hsl') === 0) {
+            if (alpha < 1) {
+                colorFunction = 'hsla';
+            } else {
+                colorFunction = 'hsl';
+            }
+        } else {
+            return this.value;
+        }
+    } else {
+        if (alpha < 1) {
+            colorFunction = 'rgba';
+        }
     }
 
-    // If we have some transparency, the only way to represent it
-    // is via `rgba`. Otherwise, we use the hex representation,
-    // which has better compatibility with older browsers.
-    // Values are capped between `0` and `255`, rounded and zero-padded.
-    alpha = this.fround(context, this.alpha);
-    if (alpha < 1) {
-        return 'rgba(' + this.rgb.map(function (c) {
-            return clamp(Math.round(c), 255);
-        }).concat(clamp(alpha, 1))
-            .join(',' + (compress ? '' : ' ')) + ')';
+    switch (colorFunction) {
+        case 'rgba':
+            args = this.rgb.map(function (c) {
+                return clamp(Math.round(c), 255);
+            }).concat(clamp(alpha, 1));
+            break;
+        case 'hsla':
+            args.push(clamp(alpha, 1));
+        case 'hsl':
+            color = this.toHSL();
+            args = [
+                this.fround(context, color.h),
+                this.fround(context, color.s * 100) + '%',
+                this.fround(context, color.l * 100) + '%'
+            ].concat(args);
+    }
+
+    if (colorFunction) {
+        // Values are capped between `0` and `255`, rounded and zero-padded.
+        return colorFunction + '(' + args.join(',' + (compress ? '' : ' ')) + ')';
     }
 
     color = this.toRGB();
@@ -7196,7 +7353,7 @@ Color.fromKeyword = function(keyword) {
 };
 module.exports = Color;
 
-},{"../data/colors":13,"./node":76}],56:[function(require,module,exports){
+},{"../data/colors":14,"./node":76}],56:[function(require,module,exports){
 var Node = require('./node');
 
 var Combinator = function (value) {
@@ -7330,7 +7487,7 @@ var Node = require('./node'),
     Value = require('./value'),
     Keyword = require('./keyword'),
     Anonymous = require('./anonymous'),
-    MATH = require('../math-constants');
+    MATH = require('../constants').Math;
 
 var Declaration = function (name, value, important, merge, index, currentFileInfo, inline, variable) {
     this.name = name;
@@ -7428,7 +7585,7 @@ Declaration.prototype.makeImportant = function () {
 };
 
 module.exports = Declaration;
-},{"../math-constants":39,"./anonymous":50,"./keyword":70,"./node":76,"./value":86}],61:[function(require,module,exports){
+},{"../constants":12,"./anonymous":50,"./keyword":70,"./node":76,"./value":86}],61:[function(require,module,exports){
 var Node = require('./node'),
     contexts = require('../contexts'),
     utils = require('../utils');
@@ -7453,7 +7610,7 @@ DetachedRuleset.prototype.callEval = function (context) {
 };
 module.exports = DetachedRuleset;
 
-},{"../contexts":12,"../utils":89,"./node":76}],62:[function(require,module,exports){
+},{"../contexts":13,"../utils":89,"./node":76}],62:[function(require,module,exports){
 var Node = require('./node'),
     unitConversions = require('../data/unit-conversions'),
     Unit = require('./unit'),
@@ -7616,7 +7773,7 @@ Dimension.prototype.convertTo = function (conversions) {
 };
 module.exports = Dimension;
 
-},{"../data/unit-conversions":15,"./color":55,"./node":76,"./unit":84}],63:[function(require,module,exports){
+},{"../data/unit-conversions":16,"./color":55,"./node":76,"./unit":84}],63:[function(require,module,exports){
 var Node = require('./node'),
     Paren = require('./paren'),
     Combinator = require('./combinator');
@@ -7687,7 +7844,7 @@ var Node = require('./node'),
     Paren = require('./paren'),
     Comment = require('./comment'),
     Dimension = require('./dimension'),
-    MATH = require('../math-constants');
+    MATH = require('../constants').Math;
 
 var Expression = function (value, noSpacing) {
     this.value = value;
@@ -7749,7 +7906,7 @@ Expression.prototype.throwAwayComments = function () {
 };
 module.exports = Expression;
 
-},{"../math-constants":39,"./comment":57,"./dimension":62,"./node":76,"./paren":78}],65:[function(require,module,exports){
+},{"../constants":12,"./comment":57,"./dimension":62,"./node":76,"./paren":78}],65:[function(require,module,exports){
 var Node = require('./node'),
     Selector = require('./selector');
 
@@ -7909,17 +8066,18 @@ Import.prototype.evalForImport = function (context) {
 };
 Import.prototype.evalPath = function (context) {
     var path = this.path.eval(context);
-    var rootpath = this._fileInfo && this._fileInfo.rootpath;
+    var fileInfo = this._fileInfo;
 
     if (!(path instanceof URL)) {
-        if (rootpath) {
-            var pathValue = path.value;
-            // Add the base path if the import is relative
-            if (pathValue && context.isPathRelative(pathValue)) {
-                path.value = rootpath + pathValue;
-            }
+        // Add the rootpath if the URL requires a rewrite
+        var pathValue = path.value;
+        if (fileInfo &&
+            pathValue &&
+            context.pathRequiresRewrite(pathValue)) {
+            path.value = context.rewritePath(pathValue, fileInfo.rootpath);
+        } else {
+            path.value = context.normalizePath(path.value);
         }
-        path.value = context.normalizePath(path.value);
     }
 
     return path;
@@ -7991,7 +8149,7 @@ Import.prototype.doEval = function (context) {
 };
 module.exports = Import;
 
-},{"../less-error":37,"../utils":89,"./anonymous":50,"./media":71,"./node":76,"./quoted":80,"./ruleset":81,"./url":85}],67:[function(require,module,exports){
+},{"../less-error":38,"../utils":89,"./anonymous":50,"./media":71,"./node":76,"./quoted":80,"./ruleset":81,"./url":85}],67:[function(require,module,exports){
 var tree = Object.create(null);
 
 tree.Node = require('./node');
@@ -8476,7 +8634,7 @@ MixinCall.prototype.format = function (args) {
 };
 module.exports = MixinCall;
 
-},{"../functions/default":24,"./mixin-definition":73,"./node":76,"./selector":82}],73:[function(require,module,exports){
+},{"../functions/default":25,"./mixin-definition":73,"./node":76,"./selector":82}],73:[function(require,module,exports){
 var Selector = require('./selector'),
     Element = require('./element'),
     Ruleset = require('./ruleset'),
@@ -8687,7 +8845,7 @@ Definition.prototype.matchArgs = function (args, context) {
 };
 module.exports = Definition;
 
-},{"../contexts":12,"../utils":89,"./declaration":60,"./detached-ruleset":61,"./element":63,"./expression":64,"./ruleset":81,"./selector":82}],74:[function(require,module,exports){
+},{"../contexts":13,"../utils":89,"./declaration":60,"./detached-ruleset":61,"./element":63,"./expression":64,"./ruleset":81,"./selector":82}],74:[function(require,module,exports){
 var Node = require('./node'),
     Variable = require('./variable'),
     Ruleset = require('./ruleset'),
@@ -8953,7 +9111,7 @@ module.exports = Node;
 var Node = require('./node'),
     Color = require('./color'),
     Dimension = require('./dimension'),
-    MATH = require('../math-constants');
+    MATH = require('../constants').Math;
 
 var Operation = function (op, operands, isSpaced) {
     this.op = op.trim();
@@ -9005,7 +9163,7 @@ Operation.prototype.genCSS = function (context, output) {
 
 module.exports = Operation;
 
-},{"../math-constants":39,"./color":55,"./dimension":62,"./node":76}],78:[function(require,module,exports){
+},{"../constants":12,"./color":55,"./dimension":62,"./node":76}],78:[function(require,module,exports){
 var Node = require('./node');
 
 var Paren = function (node) {
@@ -9965,7 +10123,7 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
 };
 module.exports = Ruleset;
 
-},{"../contexts":12,"../functions/default":24,"../functions/function-registry":26,"../utils":89,"./anonymous":50,"./comment":57,"./debug-info":59,"./declaration":60,"./element":63,"./keyword":70,"./node":76,"./paren":78,"./selector":82}],82:[function(require,module,exports){
+},{"../contexts":13,"../functions/default":25,"../functions/function-registry":27,"../utils":89,"./anonymous":50,"./comment":57,"./debug-info":59,"./declaration":60,"./element":63,"./keyword":70,"./node":76,"./paren":78,"./selector":82}],82:[function(require,module,exports){
 var Node = require('./node'),
     Element = require('./element'),
     LessError = require('../less-error');
@@ -10098,7 +10256,7 @@ Selector.prototype.getIsOutput = function() {
 };
 module.exports = Selector;
 
-},{"../less-error":37,"./element":63,"./node":76}],83:[function(require,module,exports){
+},{"../less-error":38,"./element":63,"./node":76}],83:[function(require,module,exports){
 var Node = require('./node');
 
 var UnicodeDescriptor = function (value) {
@@ -10232,7 +10390,7 @@ Unit.prototype.cancel = function () {
 };
 module.exports = Unit;
 
-},{"../data/unit-conversions":15,"../utils":89,"./node":76}],85:[function(require,module,exports){
+},{"../data/unit-conversions":16,"../utils":89,"./node":76}],85:[function(require,module,exports){
 var Node = require('./node');
 
 var URL = function (val, index, currentFileInfo, isEvald) {
@@ -10256,20 +10414,19 @@ URL.prototype.eval = function (context) {
         rootpath;
 
     if (!this.isEvald) {
-        // Add the base path if the URL is relative
+        // Add the rootpath if the URL requires a rewrite
         rootpath = this.fileInfo() && this.fileInfo().rootpath;
-        if (rootpath &&
+        if (typeof rootpath === 'string' &&
             typeof val.value === 'string' &&
-            context.isPathRelative(val.value)) {
-
+            context.pathRequiresRewrite(val.value)) {
             if (!val.quote) {
-                rootpath = rootpath.replace(/[\(\)'"\s]/g, function(match) { return '\\' + match; });
+                rootpath = escapePath(rootpath);
             }
-            val.value = rootpath + val.value;
+            val.value = context.rewritePath(val.value, rootpath);
+        } else {
+            val.value = context.normalizePath(val.value);
         }
 
-        val.value = context.normalizePath(val.value);
-
         // Add url args if enabled
         if (context.urlArgs) {
             if (!val.value.match(/^\s*data:/)) {
@@ -10286,6 +10443,11 @@ URL.prototype.eval = function (context) {
 
     return new URL(val, this.getIndex(), this.fileInfo(), true);
 };
+
+function escapePath(path) {
+    return path.replace(/[\(\)'"\s]/g, function(match) { return '\\' + match; });
+}
+
 module.exports = URL;
 
 },{"./node":76}],86:[function(require,module,exports){
@@ -10349,16 +10511,19 @@ VariableCall.prototype.eval = function (context) {
         error = new LessError({message: 'Could not evaluate variable call ' + this.variable});
 
     if (!detachedRuleset.ruleset) {
-        if (Array.isArray(detachedRuleset)) {
+        if (detachedRuleset.rules) {
             rules = detachedRuleset;
         }
+        else if (Array.isArray(detachedRuleset)) {
+            rules = new Ruleset('', detachedRuleset);
+        }
         else if (Array.isArray(detachedRuleset.value)) {
-            rules = detachedRuleset.value;
+            rules = new Ruleset('', detachedRuleset.value);
         }
         else {
             throw error;
         }
-        detachedRuleset = new DetachedRuleset(new Ruleset('', rules));
+        detachedRuleset = new DetachedRuleset(rules);
     }
     if (detachedRuleset.ruleset) {
         return detachedRuleset.callEval(context);
@@ -10367,7 +10532,7 @@ VariableCall.prototype.eval = function (context) {
 };
 module.exports = VariableCall;
 
-},{"../less-error":37,"./detached-ruleset":61,"./node":76,"./ruleset":81,"./variable":88}],88:[function(require,module,exports){
+},{"../less-error":38,"./detached-ruleset":61,"./node":76,"./ruleset":81,"./variable":88}],88:[function(require,module,exports){
 var Node = require('./node'),
     Call = require('./call');
 
@@ -10431,7 +10596,8 @@ module.exports = Variable;
 
 },{"./call":54,"./node":76}],89:[function(require,module,exports){
 /* jshint proto: true */
-var MATH = require('./math-constants');
+var Constants = require('./constants');
+var clone = require('clone');
 
 var utils = {
     getLocation: function(index, inputStream) {
@@ -10471,49 +10637,58 @@ var utils = {
         return cloned;
     },
     copyOptions: function(obj1, obj2) {
+        if (obj2 && obj2._defaults) {
+            return obj2;
+        }
         var opts = utils.defaults(obj1, obj2);
         if (opts.strictMath) {
-            opts.math = MATH.STRICT_LEGACY;
+            opts.math = Constants.Math.STRICT_LEGACY;
         }
-        if (opts.hasOwnProperty('math') && typeof opts.math === 'string') {
+        // Back compat with changed relativeUrls option
+        if (opts.relativeUrls) {
+            opts.rewriteUrls = Constants.RewriteUrls.ALL;
+        }
+        if (typeof opts.math === 'string') {
             switch (opts.math.toLowerCase()) {
                 case 'always':
-                    opts.math = MATH.ALWAYS;
+                    opts.math = Constants.Math.ALWAYS;
                     break;
                 case 'parens-division':
-                    opts.math = MATH.PARENS_DIVISION;
+                    opts.math = Constants.Math.PARENS_DIVISION;
                     break;
                 case 'strict':
                 case 'parens':
-                    opts.math = MATH.PARENS;
+                    opts.math = Constants.Math.PARENS;
                     break;
                 case 'strict-legacy':
-                    opts.math = MATH.STRICT_LEGACY;
+                    opts.math = Constants.Math.STRICT_LEGACY;
+            }
+        }
+        if (typeof opts.rewriteUrls === 'string') {
+            switch (opts.rewriteUrls.toLowerCase()) {
+                case 'off':
+                    opts.rewriteUrls = Constants.RewriteUrls.OFF;
+                    break;
+                case 'local':
+                    opts.rewriteUrls = Constants.RewriteUrls.LOCAL;
+                    break;
+                case 'all':
+                    opts.rewriteUrls = Constants.RewriteUrls.ALL;
+                    break;
             }
         }
         return opts;
     },
     defaults: function(obj1, obj2) {
-        if (!obj2._defaults || obj2._defaults !== obj1) {
-            for (var prop in obj1) {
-                if (obj1.hasOwnProperty(prop)) {
-                    if (!obj2.hasOwnProperty(prop)) {
-                        obj2[prop] = obj1[prop];
-                    }
-                    else if (Array.isArray(obj1[prop])
-                        && Array.isArray(obj2[prop])) {
-
-                        obj1[prop].forEach(function(p) {
-                            if (obj2[prop].indexOf(p) === -1) {
-                                obj2[prop].push(p);
-                            }
-                        });
-                    }
-                }
-            }
+        var newObj = obj2 || {};
+        if (!obj2._defaults) {
+            newObj = {};
+            var defaults = clone(obj1);
+            newObj._defaults = defaults;
+            var cloned = obj2 ? clone(obj2) : {};
+            Object.assign(newObj, defaults, cloned);
         }
-        obj2._defaults = obj1;
-        return obj2;
+        return newObj;
     },
     merge: function(obj1, obj2) {
         for (var prop in obj2) {
@@ -10540,7 +10715,7 @@ var utils = {
 };
 
 module.exports = utils;
-},{"./math-constants":39}],90:[function(require,module,exports){
+},{"./constants":12,"clone":100}],90:[function(require,module,exports){
 var tree = require('../tree'),
     Visitor = require('./visitor'),
     logger = require('../logger'),
@@ -11004,7 +11179,7 @@ ProcessExtendsVisitor.prototype = {
 
 module.exports = ProcessExtendsVisitor;
 
-},{"../logger":38,"../tree":67,"../utils":89,"./visitor":97}],91:[function(require,module,exports){
+},{"../logger":39,"../tree":67,"../utils":89,"./visitor":97}],91:[function(require,module,exports){
 function ImportSequencer(onSequencerEmpty) {
     this.imports = [];
     this.variableImports = [];
@@ -11252,7 +11427,7 @@ ImportVisitor.prototype = {
 };
 module.exports = ImportVisitor;
 
-},{"../contexts":12,"../utils":89,"./import-sequencer":91,"./visitor":97}],93:[function(require,module,exports){
+},{"../contexts":13,"../utils":89,"./import-sequencer":91,"./visitor":97}],93:[function(require,module,exports){
 var visitors = {
     Visitor: require('./visitor'),
     ImportVisitor: require('./import-visitor'),
@@ -12170,6 +12345,265 @@ rawAsap.makeRequestCallFromTimer = makeRequestCallFromTimer;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 },{}],100:[function(require,module,exports){
+var clone = (function() {
+'use strict';
+
+function _instanceof(obj, type) {
+  return type != null && obj instanceof type;
+}
+
+var nativeMap;
+try {
+  nativeMap = Map;
+} catch(_) {
+  // maybe a reference error because no `Map`. Give it a dummy value that no
+  // value will ever be an instanceof.
+  nativeMap = function() {};
+}
+
+var nativeSet;
+try {
+  nativeSet = Set;
+} catch(_) {
+  nativeSet = function() {};
+}
+
+var nativePromise;
+try {
+  nativePromise = Promise;
+} catch(_) {
+  nativePromise = function() {};
+}
+
+/**
+ * Clones (copies) an Object using deep copying.
+ *
+ * This function supports circular references by default, but if you are certain
+ * there are no circular references in your object, you can save some CPU time
+ * by calling clone(obj, false).
+ *
+ * Caution: if `circular` is false and `parent` contains circular references,
+ * your program may enter an infinite loop and crash.
+ *
+ * @param `parent` - the object to be cloned
+ * @param `circular` - set to true if the object to be cloned may contain
+ *    circular references. (optional - true by default)
+ * @param `depth` - set to a number if the object is only to be cloned to
+ *    a particular depth. (optional - defaults to Infinity)
+ * @param `prototype` - sets the prototype to be used when cloning an object.
+ *    (optional - defaults to parent prototype).
+ * @param `includeNonEnumerable` - set to true if the non-enumerable properties
+ *    should be cloned as well. Non-enumerable properties on the prototype
+ *    chain will be ignored. (optional - false by default)
+*/
+function clone(parent, circular, depth, prototype, includeNonEnumerable) {
+  if (typeof circular === 'object') {
+    depth = circular.depth;
+    prototype = circular.prototype;
+    includeNonEnumerable = circular.includeNonEnumerable;
+    circular = circular.circular;
+  }
+  // maintain two arrays for circular references, where corresponding parents
+  // and children have the same index
+  var allParents = [];
+  var allChildren = [];
+
+  var useBuffer = typeof Buffer != 'undefined';
+
+  if (typeof circular == 'undefined')
+    circular = true;
+
+  if (typeof depth == 'undefined')
+    depth = Infinity;
+
+  // recurse this function so we don't reset allParents and allChildren
+  function _clone(parent, depth) {
+    // cloning null always returns null
+    if (parent === null)
+      return null;
+
+    if (depth === 0)
+      return parent;
+
+    var child;
+    var proto;
+    if (typeof parent != 'object') {
+      return parent;
+    }
+
+    if (_instanceof(parent, nativeMap)) {
+      child = new nativeMap();
+    } else if (_instanceof(parent, nativeSet)) {
+      child = new nativeSet();
+    } else if (_instanceof(parent, nativePromise)) {
+      child = new nativePromise(function (resolve, reject) {
+        parent.then(function(value) {
+          resolve(_clone(value, depth - 1));
+        }, function(err) {
+          reject(_clone(err, depth - 1));
+        });
+      });
+    } else if (clone.__isArray(parent)) {
+      child = [];
+    } else if (clone.__isRegExp(parent)) {
+      child = new RegExp(parent.source, __getRegExpFlags(parent));
+      if (parent.lastIndex) child.lastIndex = parent.lastIndex;
+    } else if (clone.__isDate(parent)) {
+      child = new Date(parent.getTime());
+    } else if (useBuffer && Buffer.isBuffer(parent)) {
+      if (Buffer.allocUnsafe) {
+        // Node.js >= 4.5.0
+        child = Buffer.allocUnsafe(parent.length);
+      } else {
+        // Older Node.js versions
+        child = new Buffer(parent.length);
+      }
+      parent.copy(child);
+      return child;
+    } else if (_instanceof(parent, Error)) {
+      child = Object.create(parent);
+    } else {
+      if (typeof prototype == 'undefined') {
+        proto = Object.getPrototypeOf(parent);
+        child = Object.create(proto);
+      }
+      else {
+        child = Object.create(prototype);
+        proto = prototype;
+      }
+    }
+
+    if (circular) {
+      var index = allParents.indexOf(parent);
+
+      if (index != -1) {
+        return allChildren[index];
+      }
+      allParents.push(parent);
+      allChildren.push(child);
+    }
+
+    if (_instanceof(parent, nativeMap)) {
+      parent.forEach(function(value, key) {
+        var keyChild = _clone(key, depth - 1);
+        var valueChild = _clone(value, depth - 1);
+        child.set(keyChild, valueChild);
+      });
+    }
+    if (_instanceof(parent, nativeSet)) {
+      parent.forEach(function(value) {
+        var entryChild = _clone(value, depth - 1);
+        child.add(entryChild);
+      });
+    }
+
+    for (var i in parent) {
+      var attrs;
+      if (proto) {
+        attrs = Object.getOwnPropertyDescriptor(proto, i);
+      }
+
+      if (attrs && attrs.set == null) {
+        continue;
+      }
+      child[i] = _clone(parent[i], depth - 1);
+    }
+
+    if (Object.getOwnPropertySymbols) {
+      var symbols = Object.getOwnPropertySymbols(parent);
+      for (var i = 0; i < symbols.length; i++) {
+        // Don't need to worry about cloning a symbol because it is a primitive,
+        // like a number or string.
+        var symbol = symbols[i];
+        var descriptor = Object.getOwnPropertyDescriptor(parent, symbol);
+        if (descriptor && !descriptor.enumerable && !includeNonEnumerable) {
+          continue;
+        }
+        child[symbol] = _clone(parent[symbol], depth - 1);
+        if (!descriptor.enumerable) {
+          Object.defineProperty(child, symbol, {
+            enumerable: false
+          });
+        }
+      }
+    }
+
+    if (includeNonEnumerable) {
+      var allPropertyNames = Object.getOwnPropertyNames(parent);
+      for (var i = 0; i < allPropertyNames.length; i++) {
+        var propertyName = allPropertyNames[i];
+        var descriptor = Object.getOwnPropertyDescriptor(parent, propertyName);
+        if (descriptor && descriptor.enumerable) {
+          continue;
+        }
+        child[propertyName] = _clone(parent[propertyName], depth - 1);
+        Object.defineProperty(child, propertyName, {
+          enumerable: false
+        });
+      }
+    }
+
+    return child;
+  }
+
+  return _clone(parent, depth);
+}
+
+/**
+ * Simple flat clone using prototype, accepts only objects, usefull for property
+ * override on FLAT configuration object (no nested props).
+ *
+ * USE WITH CAUTION! This may not behave as you wish if you do not know how this
+ * works.
+ */
+clone.clonePrototype = function clonePrototype(parent) {
+  if (parent === null)
+    return null;
+
+  var c = function () {};
+  c.prototype = parent;
+  return new c();
+};
+
+// private utility functions
+
+function __objToStr(o) {
+  return Object.prototype.toString.call(o);
+}
+clone.__objToStr = __objToStr;
+
+function __isDate(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Date]';
+}
+clone.__isDate = __isDate;
+
+function __isArray(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Array]';
+}
+clone.__isArray = __isArray;
+
+function __isRegExp(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+}
+clone.__isRegExp = __isRegExp;
+
+function __getRegExpFlags(re) {
+  var flags = '';
+  if (re.global) flags += 'g';
+  if (re.ignoreCase) flags += 'i';
+  if (re.multiline) flags += 'm';
+  return flags;
+}
+clone.__getRegExpFlags = __getRegExpFlags;
+
+return clone;
+})();
+
+if (typeof module === 'object' && module.exports) {
+  module.exports = clone;
+}
+
+},{}],101:[function(require,module,exports){
 'use strict';
 
 var asap = require('asap/raw');
@@ -12384,7 +12818,7 @@ function doResolve(fn, promise) {
   }
 }
 
-},{"asap/raw":99}],101:[function(require,module,exports){
+},{"asap/raw":99}],102:[function(require,module,exports){
 'use strict';
 
 //This file contains the ES6 extensions to the core Promises/A+ API
@@ -12493,7 +12927,7 @@ Promise.prototype['catch'] = function (onRejected) {
   return this.then(null, onRejected);
 };
 
-},{"./core.js":100}],102:[function(require,module,exports){
+},{"./core.js":101}],103:[function(require,module,exports){
 // should work in any browser without browserify
 
 if (typeof Promise.prototype.done !== 'function') {
@@ -12506,7 +12940,7 @@ if (typeof Promise.prototype.done !== 'function') {
     })
   }
 }
-},{}],103:[function(require,module,exports){
+},{}],104:[function(require,module,exports){
 // not "use strict" so we can declare global "Promise"
 
 var asap = require('asap');
@@ -12518,5 +12952,5 @@ if (typeof Promise === 'undefined') {
 
 require('./polyfill-done.js');
 
-},{"./lib/core.js":100,"./lib/es6-extensions.js":101,"./polyfill-done.js":102,"asap":98}]},{},[2])(2)
+},{"./lib/core.js":101,"./lib/es6-extensions.js":102,"./polyfill-done.js":103,"asap":98}]},{},[2])(2)
 });