Fixed expanding + signs in calc() when mixed up with adjacent (+) selector.

diff --git a/lib/clean.js b/lib/clean.js
index 425b343..0bc0dfe 100644 (file)
--- a/lib/clean.js
+++ b/lib/clean.js
@@ -115,7 +115,7 @@ var CleanCSS = {
     replace(/\} /g, '}') // whitespace after definition
     
     // Get the special comments, content content, and spaces inside calc back
-    replace(/calc\((.+)\)([;\}\w])/, function(match) {
+    replace(/calc\([^\}]+\}/g, function(match) {
       return match.replace(/\+/g, ' + ');
     });
     replace(/__CSSCOMMENT__/g, function() { return specialComments.shift(); });

diff --git a/test/unit-test.js b/test/unit-test.js
index be02e8d..59b2fa9 100644 (file)
--- a/test/unit-test.js
+++ b/test/unit-test.js
@@ -131,6 +131,10 @@ vows.describe('clean-units').addBatch({
     'not strip standalone universal selector': [
       'label ~ * + span',
       'label~*+span'
+    ],
+    'not expand + in selectors mixed with calc methods': [
+      'div{width:calc(50% + 3em)}div + div{width:100%}div:hover{width:calc(50% + 4em)}* > div {border:1px solid #f0f}',
+      'div{width:calc(50% + 3em)}div+div{width:100%}div:hover{width:calc(50% + 4em)}*>div{border:1px solid #f0f}'
     ]
   }),
   'comments': cssContext({