Merge branch '1.5.0-wip' into sourcemaps-wip

.npmignore

@@ -0,0 +1 @@
+.gitattributes

CHANGELOG.md

@@ -14,6 +14,15 @@
  - Added no-js option to lessc (in browser, use javascriptEnabled: false) which disallows JavaScript in less files
  - switched from the little supported and buggy cssmin (previously ycssmin) to clean-css
 
+# 1.4.2
+
+2013-07-20
+
+ - if you don't pass a strict maths option, font size/line height options are output correctly again
+ - npmignore now include .gitattributes
+ - property names may include capital letters
+ - various windows path fixes (capital letters, multiple // in a path)
+
 # 1.4.1
 
 2013-07-05

CONTRIBUTING.md

@@ -46,4 +46,4 @@ _Pull requests are encouraged!_
 ## Developing
 If you want to take an issue just add a small comment saying you are having a go at something, so we don't get duplication.
 
-Learn more about [developing Less.js](https://github.com/cloudhead/less.js/wiki/Developing-less.js). 
+Learn more about [developing Less.js](https://github.com/less/less.js/wiki/Developing-less.js).

README.md

@@ -10,7 +10,7 @@ about
 
 This is the JavaScript, and now official, stable version of LESS.
 
-For more information on the language and usage visit [lesscss.org](http://lesscss.org). More information also available [in our wiki](https://github.com/cloudhead/less.js/wiki)
+For more information on the language and usage visit [lesscss.org](http://lesscss.org). More information also available [in our wiki](https://github.com/less/less.js/wiki)
 
 license
 -------

lib/less/browser.js

@@ -204,7 +204,7 @@ function extractUrlParts(url, baseUrl) {
     // urlParts[4] = filename
     // urlParts[5] = parameters
 
-    var urlPartsRegex = /^((?:[a-z-]+:)?\/+?(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/,
+    var urlPartsRegex = /^((?:[a-z-]+:)?\/+?(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/i,
         urlParts = url.match(urlPartsRegex),
         returner = {}, directories = [], i, baseUrlParts;
 
@@ -225,7 +225,7 @@ function extractUrlParts(url, baseUrl) {
     }
 
     if (urlParts[3]) {
-        directories = urlParts[3].replace("\\", "/").split("/");
+        directories = urlParts[3].replace(/\\/g, "/").split("/");
 
         // extract out . before .. so .. doesn't absorb a non-directory
         for(i = 0; i < directories.length; i++) {

lib/less/index.js

@@ -5,7 +5,7 @@ var path = require('path'),
     fs = require('fs');
 
 var less = {
-    version: [1, 4, 1],
+    version: [1, 4, 2],
     Parser: require('./parser').Parser,
     tree: require('./tree'),
     render: function (input, options, callback) {

lib/less/parser.js

@@ -1686,14 +1686,14 @@ less.Parser = function Parser(env) {
             property: function () {
                 var name;
 
-                if (name = $(/^(\*?-?[_a-z0-9-]+)\s*:/)) {
+                if (name = $(/^(\*?-?[_a-zA-Z0-9-]+)\s*:/)) {
                     return name[1];
                 }
             },
             ruleProperty: function () {
                 var name;
 
-                if (name = $(/^(\*?-?[_a-z0-9-]+)\s*(\+?)\s*:/)) {
+                if (name = $(/^(\*?-?[_a-zA-Z0-9-]+)\s*(\+?)\s*:/)) {
                     return name[1] + (name[2] || "");
                 }
             }

lib/less/tree/rule.js

@@ -31,7 +31,7 @@ tree.Rule.prototype = {
     toCSS: tree.toCSS,
     eval: function (env) {
         var strictMathBypass = false;
-        if (this.name === "font" && env.strictMath === false) {
+        if (this.name === "font" && !env.strictMath) {
             strictMathBypass = true;
             env.strictMath = true;
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": "Alexis Sellier <self@cloudhead.net>",
@@ -22,7 +22,7 @@
     "test": "./test"
   },
   "jam": {
-    "main": "./dist/less-1.4.1.js"
+    "main": "./dist/less-1.4.2.js"
   },
   "engines": {
     "node": ">=0.4.2"

test/css/css-3.css

@@ -112,3 +112,6 @@ foo|* {
 h1 {
   color: green;
 }
+.upper-test {
+  UpperCaseProperties: allowed;
+}

test/less-test.js

@@ -40,7 +40,7 @@ runTestSet({strictMath: true, dumpLineNumbers: 'all'}, "debug/", null,
            function(name) { return name + '-all'; });
 runTestSet({strictMath: true, relativeUrls: false, rootpath: "folder (1)/"}, "static-urls/");
 runTestSet({strictMath: true, compress: true}, "compression/");
-runTestSet({strictMath: false}, "legacy/");
+runTestSet({}, "legacy/");
 runTestSet({strictMath: true, strictUnits: true, sourceMap: true }, "sourcemaps/",
     testSourcemap, null, null, function(filename) { return path.join('test/sourcemaps', filename) + '.json'; });
 

test/less/css-3.less

@@ -111,4 +111,7 @@ foo|h1 { color: blue; }
 foo|* { color: yellow; }
 |h1 { color: red; }
 *|h1 { color: green; }
-h1 { color: green; }
+h1 { color: green; }
+.upper-test {
+  UpperCaseProperties: allowed;
+}