less 2.0.4 → 2.1.0

data/lib/less/js/lib/less/tree/paren.js

@@ -0,0 +1,16 @@
+
+(function (tree) {
+
+tree.Paren = function (node) {
+    this.value = node;
+};
+tree.Paren.prototype = {
+    toCSS: function (env) {
+        return '(' + this.value.toCSS(env) + ')';
+    },
+    eval: function (env) {
+        return new(tree.Paren)(this.value.eval(env));
+    }
+};
+
+})(require('../tree'));

data/lib/less/js/lib/less/tree/quoted.js

@@ -20,10 +20,10 @@ tree.Quoted.prototype = {
             return new(tree.JavaScript)(exp, that.index, true).eval(env).value;
         }).replace(/@\{([\w-]+)\}/g, function (_, name) {
             var v = new(tree.Variable)('@' + name, that.index).eval(env);
-            return v.value || v.toCSS();
+            return ('value' in v) ? v.value : v.toCSS();
         });
         return new(tree.Quoted)(this.quote + value + this.quote, value, this.escaped, this.index);
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

data/lib/less/js/lib/less/tree/rule.js

@@ -1,10 +1,11 @@
 (function (tree) {
 
-tree.Rule = function (name, value, important, index) {
+tree.Rule = function (name, value, important, index, inline) {
     this.name = name;
     this.value = (value instanceof tree.Value) ? value : new(tree.Value)([value]);
     this.important = important ? ' ' + important.trim() : '';
     this.index = index;
+    this.inline = inline || false;
 
     if (name.charAt(0) === '@') {
         this.variable = true;
@@ -15,12 +16,15 @@ tree.Rule.prototype.toCSS = function (env) {
     else {
         return this.name + (env.compress ? ':' : ': ') +
                this.value.toCSS(env) +
-               this.important + ";";
+               this.important + (this.inline ? "" : ";");
     }
 };
 
 tree.Rule.prototype.eval = function (context) {
-    return new(tree.Rule)(this.name, this.value.eval(context), this.important, this.index);
+    return new(tree.Rule)(this.name,
+                          this.value.eval(context),
+                          this.important,
+                          this.index, this.inline);
 };
 
 tree.Shorthand = function (a, b) {
@@ -35,4 +39,4 @@ tree.Shorthand.prototype = {
     eval: function () { return this }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

data/lib/less/js/lib/less/tree/ruleset.js

@@ -1,21 +1,24 @@
 (function (tree) {
 
-tree.Ruleset = function (selectors, rules) {
+tree.Ruleset = function (selectors, rules, strictImports) {
     this.selectors = selectors;
     this.rules = rules;
     this._lookups = {};
+    this.strictImports = strictImports;
 };
 tree.Ruleset.prototype = {
     eval: function (env) {
-        var ruleset = new(tree.Ruleset)(this.selectors, this.rules.slice(0));
+        var selectors = this.selectors && this.selectors.map(function (s) { return s.eval(env) });
+        var ruleset = new(tree.Ruleset)(selectors, this.rules.slice(0), this.strictImports);
 
         ruleset.root = this.root;
+        ruleset.allowImports = this.allowImports;
 
         // push the current ruleset to the frames stack
         env.frames.unshift(ruleset);
 
         // Evaluate imports
-        if (ruleset.root) {
+        if (ruleset.root || ruleset.allowImports || !ruleset.strictImports) {
             for (var i = 0; i < ruleset.rules.length; i++) {
                 if (ruleset.rules[i] instanceof tree.Import) {
                     Array.prototype.splice
@@ -90,7 +93,7 @@ tree.Ruleset.prototype = {
             if (rule !== self) {
                 for (var j = 0; j < rule.selectors.length; j++) {
                     if (match = selector.match(rule.selectors[j])) {
-                        if (selector.elements.length > 1) {
+                        if (selector.elements.length > rule.selectors[j].elements.length) {
                             Array.prototype.push.apply(rules, rule.find(
                                 new(tree.Selector)(selector.elements.slice(1)), self));
                         } else {
@@ -120,11 +123,7 @@ tree.Ruleset.prototype = {
             if (context.length === 0) {
                 paths = this.selectors.map(function (s) { return [s] });
             } else {
-                for (var s = 0; s < this.selectors.length; s++) {
-                    for (var c = 0; c < context.length; c++) {
-                        paths.push(context[c].concat([this.selectors[s]]));
-                    }
-                }
+                this.joinSelectors(paths, context, this.selectors);
             }
         }
 
@@ -132,7 +131,7 @@ tree.Ruleset.prototype = {
         for (var i = 0; i < this.rules.length; i++) {
             rule = this.rules[i];
 
-            if (rule.rules || (rule instanceof tree.Directive)) {
+            if (rule.rules || (rule instanceof tree.Directive) || (rule instanceof tree.Media)) {
                 rulesets.push(rule.toCSS(paths, env));
             } else if (rule instanceof tree.Comment) {
                 if (!rule.silent) {
@@ -164,7 +163,8 @@ tree.Ruleset.prototype = {
                     return p.map(function (s) {
                         return s.toCSS(env);
                     }).join('').trim();
-                }).join(env.compress ? ',' : (paths.length > 3 ? ',\n' : ', '));
+                }).join( env.compress ? ',' : ',\n');
+
                 css.push(selector,
                         (env.compress ? '{' : ' {\n  ') +
                         rules.join(env.compress ? '' : '\n  ') +
@@ -174,6 +174,43 @@ tree.Ruleset.prototype = {
         css.push(rulesets);
 
         return css.join('') + (env.compress ? '\n' : '');
+    },
+
+    joinSelectors: function (paths, context, selectors) {
+        for (var s = 0; s < selectors.length; s++) {
+            this.joinSelector(paths, context, selectors[s]);
+        }
+    },
+
+    joinSelector: function (paths, context, selector) {
+        var before = [], after = [], beforeElements = [],
+            afterElements = [], hasParentSelector = false, el;
+
+        for (var i = 0; i < selector.elements.length; i++) {
+            el = selector.elements[i];
+            if (el.combinator.value.charAt(0) === '&') {
+                hasParentSelector = true;
+            }
+            if (hasParentSelector) afterElements.push(el);
+            else                   beforeElements.push(el);
+        }
+
+        if (! hasParentSelector) {
+            afterElements = beforeElements;
+            beforeElements = [];
+        }
+
+        if (beforeElements.length > 0) {
+            before.push(new(tree.Selector)(beforeElements));
+        }
+
+        if (afterElements.length > 0) {
+            after.push(new(tree.Selector)(afterElements));
+        }
+
+        for (var c = 0; c < context.length; c++) {
+            paths.push(before.concat(context[c]).concat(after));
+        }
     }
 };
-})(require('less/tree'));
+})(require('../tree'));

data/lib/less/js/lib/less/tree/selector.js

@@ -7,11 +7,25 @@ tree.Selector = function (elements) {
     }
 };
 tree.Selector.prototype.match = function (other) {
-    if (this.elements[0].value === other.elements[0].value) {
-        return true;
-    } else {
+    var len  = this.elements.length,
+        olen = other.elements.length,
+        max  = Math.min(len, olen);
+
+    if (len < olen) {
         return false;
+    } else {
+        for (var i = 0; i < max; i++) {
+            if (this.elements[i].value !== other.elements[i].value) {
+                return false;
+            }
+        }
     }
+    return true;
+};
+tree.Selector.prototype.eval = function (env) {
+    return new(tree.Selector)(this.elements.map(function (e) {
+        return e.eval(env);
+    }));
 };
 tree.Selector.prototype.toCSS = function (env) {
     if (this._css) { return this._css }
@@ -25,4 +39,4 @@ tree.Selector.prototype.toCSS = function (env) {
     }).join('');
 };
 
-})(require('less/tree'));
+})(require('../tree'));

data/lib/less/js/lib/less/tree/url.js

@@ -5,7 +5,7 @@ tree.URL = function (val, paths) {
         this.attrs = val;
     } else {
         // Add the base path if the URL is relative and we are in the browser
-        if (!/^(?:https?:\/|file:\/|data:\/)?\//.test(val.value) && paths.length > 0 && typeof(window) !== 'undefined') {
+        if (typeof(window) !== 'undefined' && !/^(?:https?:\/\/|file:\/\/|data:|\/)/.test(val.value) && paths.length > 0) {
             val.value = paths[0] + (val.value.charAt(0) === '/' ? val.value.slice(1) : val.value);
         }
         this.value = val;
@@ -22,4 +22,4 @@ tree.URL.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

data/lib/less/js/lib/less/tree/value.js

@@ -21,4 +21,4 @@ tree.Value.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

data/lib/less/js/lib/less/tree/variable.js

@@ -1,6 +1,6 @@
 (function (tree) {
 
-tree.Variable = function (name, index) { this.name = name, this.index = index };
+tree.Variable = function (name, index, file) { this.name = name, this.index = index, this.file = file };
 tree.Variable.prototype = {
     eval: function (env) {
         var variable, v, name = this.name;
@@ -15,10 +15,12 @@ tree.Variable.prototype = {
             }
         })) { return variable }
         else {
-            throw { message: "variable " + name + " is undefined",
+            throw { type: 'Name',
+                    message: "variable " + name + " is undefined",
+                    filename: this.file,
                     index: this.index };
         }
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

data/lib/less/js/lib/less/tree.js

@@ -1,13 +1,17 @@
-require('less/tree').find = function (obj, fun) {
+(function (tree) {
+
+tree.find = function (obj, fun) {
     for (var i = 0, r; i < obj.length; i++) {
         if (r = fun.call(obj, obj[i])) { return r }
     }
     return null;
 };
-require('less/tree').jsify = function (obj) {
+tree.jsify = function (obj) {
     if (Array.isArray(obj.value) && (obj.value.length > 1)) {
         return '[' + obj.value.map(function (v) { return v.toCSS(false) }).join(', ') + ']';
     } else {
         return obj.toCSS(false);
     }
 };
+
+})(require('./tree'));

data/lib/less/js/package.json

@@ -5,9 +5,9 @@
   "keywords"      : ["css", "parser", "lesscss", "browser"],
   "author"        : "Alexis Sellier <self@cloudhead.net>",
   "contributors"  : [],
-  "version"       : "1.1.3",
+  "version"       : "1.3.0",
   "bin"           : { "lessc": "./bin/lessc" },
   "main"          : "./lib/less/index",
   "directories"   : { "test": "./test" },
-  "engines"       : { "node": ">=0.2.0" }
+  "engines"       : { "node": ">=0.4.0" }
 }

data/lib/less/js/test/css/colors.css

@@ -7,6 +7,9 @@
 #yelow #rgba {
   color: rgba(255, 238, 170, 0.1);
 }
+#yelow #argb {
+  color: #1affeeaa;
+}
 #blue #short {
   color: #00f;
 }
@@ -16,6 +19,9 @@
 #blue #rgba {
   color: rgba(0, 0, 255, 0.1);
 }
+#blue #argb {
+  color: #1a0000ff;
+}
 #alpha #hsla {
   color: rgba(61, 45, 41, 0.6);
 }
@@ -40,3 +46,13 @@
 #00ff00 {
   color: #00ff00;
 }
+.lightenblue {
+  color: #3333ff;
+}
+.darkenblue {
+  color: #0000cc;
+}
+.unknowncolors {
+  color: blue2;
+  border: 2px solid superred;
+}

data/lib/less/js/test/css/comments.css

@@ -8,9 +8,9 @@
     Comment
 
 */
-/*  
+/*
  * Comment Test
- * 
+ *
  * - cloudhead (http://cloudhead.net)
  *
  */
@@ -44,9 +44,13 @@
     color: grey;
   }
 */
-.selector, .lots, .comments {
-  color: grey, /* blue */ orange;
+.selector,
+.lots,
+.comments {
+  color: #808080, /* blue */ #ffa500;
+  -webkit-border-radius: 2px /* webkit only */;
+  -moz-border-radius: 8px /* moz only with operation */;
 }
 #last {
-  color: blue;
+  color: #0000ff;
 }

data/lib/less/js/test/css/css-3.css

@@ -1,6 +1,6 @@
 .comma-delimited {
   background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg);
-  text-shadow: -1px -1px 1px red, 6px 5px 5px yellow;
+  text-shadow: -1px -1px 1px #ff0000, 6px 5px 5px #ffff00;
   -moz-box-shadow: 0pt 0pt 2px rgba(255, 255, 255, 0.4) inset, 0pt 4px 6px rgba(255, 255, 255, 0.4) inset;
 }
 @font-face {
@@ -25,7 +25,9 @@ ul.comma > li:not(:only-child)::after {
 ol.comma > li:nth-last-child(2)::after {
   color: white;
 }
-li:nth-child(4n+1), li:nth-child(-5n), li:nth-child(-n+2) {
+li:nth-child(4n+1),
+li:nth-child(-5n),
+li:nth-child(-n+2) {
   color: white;
 }
 a[href^="http://"] {
@@ -40,3 +42,17 @@ form[data-disabled] {
 p::before {
   color: black;
 }
+#issue322 {
+  -webkit-animation: anim2 7s infinite ease-in-out;
+}
+@-webkit-keyframes frames {
+  0% {
+    border: 1px;
+  }
+  5.5% {
+    border: 2px;
+  }
+  100% {
+    border: 3px;
+  }
+}

data/lib/less/js/test/css/css-escapes.css

@@ -8,7 +8,7 @@
   background: red;
 }
 .\34 04 strong {
-  color: fuchsia;
+  color: #ff00ff;
   font-weight: bold;
 }
 .trailingTest\+ {

data/lib/less/js/test/css/css.css

@@ -8,7 +8,9 @@ div {
 * {
   min-width: 45em;
 }
-h1, h2 > a > p, h3 {
+h1,
+h2 > a > p,
+h3 {
   color: none;
 }
 div.class {
@@ -33,10 +35,12 @@ div#id {
   font-family: 'Garamond Pro';
   src: url("/fonts/garamond-pro.ttf");
 }
-a:hover, a:link {
+a:hover,
+a:link {
   color: #999;
 }
-p, p:first-child {
+p,
+p:first-child {
   text-transform: none;
 }
 q:lang(no) {
@@ -64,7 +68,7 @@ p + h1 {
   width: .1em;
   background-color: #009998;
   background-image: url(images/image.jpg);
-  background: -webkit-gradient(linear, left top, left bottom, from(red), to(blue));
+  background: -webkit-gradient(linear, left top, left bottom, from(#ff0000), to(#0000ff));
   margin: ;
   filter: alpha(opacity=100);
 }
@@ -80,3 +84,6 @@ p + h1 {
     kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
   background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
 }
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}

data/lib/less/js/test/css/functions.css

@@ -24,6 +24,19 @@
   lightness: 95%;
   rounded: 11;
   roundedpx: 3px;
+  percentage: 20%;
+  color: #ff0011;
+}
+#built-in .is-a {
+  color: true;
+  color: true;
+  color: true;
+  keyword: true;
+  number: true;
+  string: true;
+  pixel: true;
+  percent: true;
+  em: true;
 }
 #alpha {
   alpha: rgba(153, 94, 51, 0.6);

data/lib/less/js/test/css/ie-filters.css

@@ -0,0 +1,5 @@
+.nav {
+  filter: progid:dximagetransform.microsoft.alpha(opacity=20);
+  filter: progid:dximagetransform.microsoft.alpha(opacity=0);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr="#333333", endColorstr="#000000", GradientType=0);
+}

data/lib/less/js/test/css/import.css

@@ -1,14 +1,23 @@
 @import "import-test-d.css";
+
+@import url(http://fonts.googleapis.com/css?family=Open+Sans);
+
+@import url(something.css) screen and (color) and (max-width: 600px);
 #import {
-  color: red;
+  color: #ff0000;
 }
 .mixin {
   height: 10px;
-  color: red;
+  color: #ff0000;
 }
 #import-test {
   height: 10px;
-  color: red;
+  color: #ff0000;
   width: 10px;
   height: 30%;
 }
+@media screen and (max-width: 600px) {
+  body {
+    width: 100%;
+  }
+}

data/lib/less/js/test/css/media.css

@@ -5,7 +5,8 @@
   .class .sub {
     width: 42;
   }
-  .top, header > h1 {
+  .top,
+  header > h1 {
     color: #444444;
   }
 }
@@ -14,8 +15,65 @@
     max-width: 480;
   }
 }
-@media all and (orientation:portrait) {
+@media all and (orientation: portrait) {
   aside {
     float: none;
   }
 }
+@media handheld and (min-width: 42), screen and (min-width: 20em) {
+  body {
+    max-width: 480px;
+  }
+}
+@media print {
+  body {
+    padding: 20px;
+  }
+  body header {
+    background-color: red;
+  }
+}
+@media print and (orientation: landscape) {
+  body {
+    margin-left: 20px;
+  }
+}
+@media a, b and c {
+  body {
+    width: 95%;
+  }
+}
+@media a and x, b and c and x, a and y, b and c and y {
+  body {
+    width: 100%;
+  }
+}
+.a {
+  background: black;
+}
+@media handheld {
+  .a {
+    background: white;
+  }
+}
+@media handheld and (max-width: 100px) {
+  .a {
+    background: red;
+  }
+}
+.b {
+  background: black;
+}
+@media handheld {
+  .b {
+    background: white;
+  }
+}
+@media handheld and (max-width: 200px) {
+  .b {
+    background: red;
+  }
+}
+@media only screen and (max-width: 200px) {
+  width: 480px;
+}

data/lib/less/js/test/css/mixins-args.css

@@ -6,7 +6,7 @@
   color: blue;
   width: 10px;
   height: 99%;
-  border: 2px dotted black;
+  border: 2px dotted #000000;
 }
 .one-arg {
   width: 15px;
@@ -54,8 +54,23 @@ body {
   color: red;
 }
 .arguments {
-  border: 1px solid black;
+  border: 1px solid #000000;
+  width: 1px;
 }
 .arguments2 {
   border: 0px;
+  width: 0px;
+}
+.arguments3 {
+  border: 0px;
+  width: 0px;
+}
+.arguments4 {
+  border: 0 1 2 3 4;
+  rest: 1 2 3 4;
+  width: 0;
+}
+.edge-case {
+  border: "{";
+  width: "{";
 }

data/lib/less/js/test/css/mixins-guards.css

@@ -0,0 +1,58 @@
+.light1 {
+  color: white;
+  margin: 1px;
+}
+.light2 {
+  color: black;
+  margin: 1px;
+}
+.max1 {
+  width: 6;
+}
+.max2 {
+  width: 8;
+}
+.glob1 {
+  margin: auto auto;
+}
+.ops1 {
+  height: gt-or-eq;
+  height: lt-or-eq;
+}
+.ops2 {
+  height: gt-or-eq;
+  height: not-eq;
+}
+.ops3 {
+  height: lt-or-eq;
+  height: not-eq;
+}
+.default1 {
+  content: default;
+}
+.test1 {
+  content: "true.";
+}
+.test2 {
+  content: "false.";
+}
+.test3 {
+  content: "false.";
+}
+.test4 {
+  content: "false.";
+}
+.test5 {
+  content: "false.";
+}
+.bool1 {
+  content: true and true;
+  content: true;
+  content: false, true;
+  content: false and true and true, true;
+  content: false, true and true;
+  content: false, false, true;
+  content: false, true and true and true, false;
+  content: not false;
+  content: not false and false, not false;
+}

data/lib/less/js/test/css/mixins-important.css

@@ -0,0 +1,17 @@
+.class {
+  border: 1;
+  boxer: 1;
+  border: 2 !important;
+  boxer: 2 !important;
+  border: 3;
+  boxer: 3;
+  border: 4 !important;
+  boxer: 4 !important;
+  border: 5;
+  boxer: 5;
+  border: 0 !important;
+  boxer: 0 !important;
+  border: 9 !important;
+  border: 9;
+  boxer: 9;
+}