Renames compactShorthands level 2 option to mergeIntoShorthands.

Why:

* It better describes what this option does.

README.md

@@ -39,6 +39,7 @@ There will be some breaking changes:
 * renames `keepSpecialComments` to `specialComments`;
 * moves `roundingPrecision` and `specialComments` to level 1 optimizations options, see examples below;
 * moves `mediaMerging`, `restructuring`, `semanticMerging`, and `shorthandCompacting` to level 2 optimizations options, see examples below;
+* renames `shorthandCompacting` option to `mergeIntoShorthands`;
 * level 1 optimizations are the new default, up to 3.x it was level 2;
 * `--keep-line-breaks` / `keepBreaks` option is replaced with `--format keep-breaks` / `{ format: 'keep-breaks' }` to ease transition.
 * `sourceMap` option is API has to be a boolean from now on. If you want to specify an input source map pass it a 2nd argument to `minify` method or via a hash instead;
@@ -174,10 +175,10 @@ Level 2 optimizations:
 
 ```bash
 cleancss -O2 one.css
-cleancss -O2 mergeMedia:off;restructureRules:off;mergeSemantically:on;compactShorthands:off one.css
+cleancss -O2 mergeMedia:off;restructureRules:off;mergeSemantically:on;mergeIntoShorthands:off one.css
 cleancss -O2 all:off;removeDuplicateRules:on one.css
-# `compactShorthands` controls shorthand compacting; defaults to `on`
 # `mergeAdjacentRules` controls adjacent rules merging; defaults to `on`
+# `mergeIntoShorthands` controls merging properties into shorthands; defaults to `on`
 # `mergeMedia` controls `@media` merging; defaults to `on`
 # `mergeNonAdjacentRules` controls non-adjacent rule merging; defaults to `on`
 # `mergeSemantically` controls semantic merging; defaults to `off`
@@ -302,8 +303,8 @@ new CleanCSS({
 new CleanCSS({
   level: {
     2: {
-      compactShorthands: true, // controls shorthand compacting; defaults to true
       mergeAdjacentRules: true, // controls adjacent rules merging; defaults to true
+      mergeIntoShorthands: true, // controls merging properties into shorthands; defaults to true
       mergeMedia: true, // controls `@media` merging; defaults to true
       mergeNonAdjacentRules: true, // controls non-adjacent rule merging; defaults to true
       mergeSemantically: false, // controls semantic merging; defaults to false
@@ -542,7 +543,7 @@ In library mode you can also pass `compatibility` as a hash of options.
 All level 2 optimizations are dispatched [here](https://github.com/jakubpawlowicz/clean-css/blob/master/lib/selectors/advanced.js#L59), and this is what they do:
 
 * `recursivelyOptimizeBlocks` - does all the following operations on a block (think `@media` or `@keyframe` at-rules);
-* `recursivelyOptimizeProperties` - optimizes properties in rulesets and "flat at-rules" (like @font-face) by splitting them into components (e.g. `margin` into `margin-(*)`), optimizing, and rebuilding them back. You may want to use `compactShorthands` option to control whether you want to turn multiple (long-hand) properties into a shorthand ones;
+* `recursivelyOptimizeProperties` - optimizes properties in rulesets and "flat at-rules" (like @font-face) by splitting them into components (e.g. `margin` into `margin-(*)`), optimizing, and rebuilding them back. You may want to use `mergeIntoShorthands` option to control whether you want to turn multiple (long-hand) properties into a shorthand ones;
 * `removeDuplicates` - gets rid of duplicate rulesets with exactly the same set of properties (think of including the same Sass / Less partial twice for no good reason);
 * `mergeAdjacent` - merges adjacent rulesets with the same selector or rules;
 * `reduceNonAdjacent` - identifies which properties are overridden in same-selector non-adjacent rulesets, and removes them;

bin/cleancss

@@ -84,10 +84,10 @@ commands.on('--help', function () {
   console.log('');
   console.log('  Level 2 optimizations:');
   console.log('    %> cleancss -O2 one.css');
-  console.log('    %> cleancss -O2 mergeMedia:off;restructureRules:off;mergeSemantically:on;compactShorthands:off one.css');
+  console.log('    %> cleancss -O2 mergeMedia:off;restructureRules:off;mergeSemantically:on;mergeIntoShorthands:off one.css');
   console.log('    %> cleancss -O2 all:off;removeDuplicateRules:on one.css');
-  console.log('    %> # `compactShorthands` controls shorthand compacting; defaults to `on`');
   console.log('    %> # `mergeAdjacentRules` controls adjacent rules merging; defaults to `on`');
+  console.log('    %> # `mergeIntoShorthands` controls merging properties into shorthands; defaults to `on`');
   console.log('    %> # `mergeMedia` controls `@media` merging; defaults to `on`');
   console.log('    %> # `mergeNonAdjacentRules` controls non-adjacent rule merging; defaults to `on`');
   console.log('    %> # `mergeSemantically` controls semantic merging; defaults to `off`');

lib/optimizer/level-2/compacting/optimize.js

@@ -25,11 +25,11 @@ function compactorOptimize(selector, properties, withCompacting, overrideOptions
     }
   }
 
-  if (overrideOptions.enabled && context.options.level[OptimizationLevel.Two].compactShorthands) {
+  if (overrideOptions.enabled && context.options.level[OptimizationLevel.Two].mergeIntoShorthands) {
     compactOverrides(_properties, context.options.compatibility, overrideOptions.merging, validator);
   }
 
-  if (withCompacting && context.options.level[OptimizationLevel.Two].compactShorthands) {
+  if (withCompacting && context.options.level[OptimizationLevel.Two].mergeIntoShorthands) {
     compactShorthands(_properties, validator);
   }
 

lib/options/optimization-level.js

@@ -33,8 +33,8 @@ DEFAULTS[OptimizationLevel.One] = {
   tidySelectors: true
 };
 DEFAULTS[OptimizationLevel.Two] = {
-  compactShorthands: true,
   mergeAdjacentRules: true,
+  mergeIntoShorthands: true,
   mergeMedia: true,
   mergeNonAdjacentRules: true,
   mergeSemantically: false,

test/binary-test.js

@@ -468,7 +468,7 @@ vows.describe('./bin/cleancss')
   })
   .addBatch({
     'shorthand compacting': {
-      'of (yet) unmergeable properties': pipedContext('a{background:url(image.png);background-color:red}', '-O2 compactShorthands:off', {
+      'of (yet) unmergeable properties': pipedContext('a{background:url(image.png);background-color:red}', '-O2 mergeIntoShorthands:off', {
         'gets right result': function (error, stdout) {
           assert.equal(stdout, 'a{background:url(image.png);background-color:red}');
         }

test/optimizer/level-2/compacting/longhand-overriding-test.js

@@ -23,7 +23,7 @@ function _optimize(source) {
         mergeMedia: true,
         restructureRules: true,
         mergeSemantically: false,
-        compactShorthands: true
+        mergeIntoShorthands: true
       }
     }
   };

test/optimizer/level-2/compacting/optimize-test.js

@@ -17,7 +17,7 @@ function _optimize(source, compatibilityOptions) {
         mergeMedia: false,
         restructureRules: false,
         mergeSemantically: false,
-        compactShorthands: true
+        mergeIntoShorthands: true
       }
     }
   };

test/optimizer/level-2/compacting/override-compacting-test.js

@@ -20,7 +20,7 @@ function _optimize(source, compat) {
     compatibility: compat,
     level: {
       2: {
-        compactShorthands: true
+        mergeIntoShorthands: true
       }
     }
   };

test/optimizer/level-2/compacting/shorthand-compacting-test.js

@@ -20,7 +20,7 @@ function _optimize(source) {
     compatibility: compat,
     level: {
       2: {
-        compactShorthands: true
+        mergeIntoShorthands: true
       }
     }
   };

test/optimizer/level-2/reduce-non-adjacent-test.js

@@ -132,7 +132,7 @@ vows.describe('remove duplicates')
         'a{padding:10px;margin:0;color:red}.one{color:red}a,p{color:red;padding:0}',
         'a{margin:0}.one{color:red}a,p{color:red;padding:0}'
       ]
-    }, { level: { 2: { all: false, reduceNonAdjacentRules: true, compactShorthands: true } } })
+    }, { level: { 2: { all: false, reduceNonAdjacentRules: true, mergeIntoShorthands: true } } })
   )
   .addBatch(
     optimizerContext('level 2 off', {

test/options/optimization-level-test.js

@@ -124,8 +124,8 @@ vows.describe(optimizationLevelFrom)
       },
       'has level 2 options': function (levelOptions) {
         assert.deepEqual(levelOptions['2'], {
-          compactShorthands: true,
           mergeAdjacentRules: true,
+          mergeIntoShorthands: true,
           mergeMedia: true,
           mergeNonAdjacentRules: true,
           mergeSemantically: false,
@@ -184,8 +184,8 @@ vows.describe(optimizationLevelFrom)
       },
       'has level 2 options': function (levelOptions) {
         assert.deepEqual(levelOptions['2'], {
-          compactShorthands: true,
           mergeAdjacentRules: true,
+          mergeIntoShorthands: true,
           mergeMedia: true,
           mergeNonAdjacentRules: true,
           mergeSemantically: false,
@@ -303,8 +303,8 @@ vows.describe(optimizationLevelFrom)
       },
       'has level 2 options': function (levelOptions) {
         assert.deepEqual(levelOptions['2'], {
-          compactShorthands: false,
           mergeAdjacentRules: false,
+          mergeIntoShorthands: false,
           mergeMedia: true,
           mergeNonAdjacentRules: false,
           mergeSemantically: false,
@@ -352,8 +352,8 @@ vows.describe(optimizationLevelFrom)
       },
       'has level 2 options': function (levelOptions) {
         assert.deepEqual(levelOptions['2'], {
-          compactShorthands: false,
           mergeAdjacentRules: false,
+          mergeIntoShorthands: false,
           mergeMedia: true,
           mergeNonAdjacentRules: false,
           mergeSemantically: false,
@@ -436,8 +436,8 @@ vows.describe(optimizationLevelFrom)
       },
       'has level 2 options': function (levelOptions) {
         assert.deepEqual(levelOptions['2'], {
-          compactShorthands: true,
           mergeAdjacentRules: true,
+          mergeIntoShorthands: true,
           mergeMedia: false,
           mergeNonAdjacentRules: true,
           mergeSemantically: true,
@@ -485,8 +485,8 @@ vows.describe(optimizationLevelFrom)
       },
       'has level 2 options': function (levelOptions) {
         assert.deepEqual(levelOptions['2'], {
-          compactShorthands: true,
           mergeAdjacentRules: true,
+          mergeIntoShorthands: true,
           mergeMedia: false,
           mergeNonAdjacentRules: true,
           mergeSemantically: true,
@@ -534,8 +534,8 @@ vows.describe(optimizationLevelFrom)
       },
       'has level 2 options': function (levelOptions) {
         assert.deepEqual(levelOptions['2'], {
-          compactShorthands: false,
           mergeAdjacentRules: false,
+          mergeIntoShorthands: false,
           mergeMedia: true,
           mergeNonAdjacentRules: false,
           mergeSemantically: true,
@@ -583,8 +583,8 @@ vows.describe(optimizationLevelFrom)
       },
       'has level 2 options': function (levelOptions) {
         assert.deepEqual(levelOptions['2'], {
-          compactShorthands: false,
           mergeAdjacentRules: false,
+          mergeIntoShorthands: false,
           mergeMedia: true,
           mergeNonAdjacentRules: false,
           mergeSemantically: true,