Merge pull request yui#245 from own3mall/master

Adds spaces to the operators for CSS calc functions.

Author: tml

.gitignore

@@ -10,6 +10,7 @@ CVS/
 *#*#
 build/classes
 build/jar
+build/build_tmp
 build/yuicompressor*.jar
 .project
 .classpath

ant.properties

@@ -3,6 +3,6 @@ lib.dir = lib
 doc.dir = doc
 build.dir = build
 product.name = yuicompressor
-version.number = 2.4.8
+version.number = 2.4.9
 jar.name = ${product.name}-${version.number}.jar
 dist.package.name = ${product.name}-${version.number}

maven_central/build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="YUI Compressor bundle for Maven Central" default="maven-central-bundle" basedir=".">
-    <property name="yui.version">2.4.8</property>
+    <property name="yui.version">2.4.9</property>
     <property name="rhino.version">1.7R2</property>
 
     <target name="clean">

package.json

@@ -1,7 +1,7 @@
 {
     "name": "yuicompressor",
     "description": "YUICompressor CLI and Node.js require",
-    "version": "2.4.8",
+    "version": "2.4.9",
     "author": "Julien Lecomte <julien.lecomte@gmail.com>",
     "contributors": [ 
         {
@@ -13,6 +13,9 @@
         }, {
             "name" : "Stoyan Stefanov",
             "email" : "assttoo@ymail.com"
+        }, {
+            "name" : "Eric Arnol-Martin",
+            "email" : "earnolmartin@gmail.com"
         }
     ],
     "bugs": { "url" : "http://yuilibrary.com/projects/yuicompressor/newticket" },

src/com/yahoo/platform/yui/compressor/CssCompressor.java

@@ -501,6 +501,25 @@ public void compress(Writer out, int linebreakpos)
         for(i = 0, max = preservedTokens.size(); i < max; i++) {
             css = css.replace("___YUICSSMIN_PRESERVED_TOKEN_" + i + "___", preservedTokens.get(i).toString());
         }
+        
+        // Add spaces back in between operators for css calc function
+        // https://developer.mozilla.org/en-US/docs/Web/CSS/calc
+        // Added by Eric Arnol-Martin (earnolmartin@gmail.com)
+        sb = new StringBuffer();
+        p = Pattern.compile("calc\\([^\\)]*\\)");
+        m = p.matcher(css);
+        while (m.find()) {
+            String s = m.group();
+            
+            s = s.replaceAll("(?<=[%|px|em|rem|vw|\\d]+)\\+", " + ");
+            s = s.replaceAll("(?<=[%|px|em|rem|vw|\\d]+)\\-", " - ");
+            s = s.replaceAll("(?<=[%|px|em|rem|vw|\\d]+)\\*", " * ");
+            s = s.replaceAll("(?<=[%|px|em|rem|vw|\\d]+)\\/", " / ");
+            
+            m.appendReplacement(sb, s);
+        }
+        m.appendTail(sb);
+        css = sb.toString(); 
 
         // Trim the final string (for any leading or trailing white spaces)
         css = css.trim();