Merge branch 'master' into master

CHANGELOG.md

@@ -1,10 +1,20 @@
 # Changelog
+## v1.6.12
+
+### Description
+
+
+### Closed Issues
+* CSS: Preserve Newlines ([#537](https://github.com/beautify-web/js-beautify/issues/537))
+
+
 ## v1.6.11
 
 ### Description
 Reverted #1117 - Preserve newlines broken
 
 ### Closed Issues
+* On beautify, new line before next CSS selector ([#1142](https://github.com/beautify-web/js-beautify/issues/1142))
 
 
 ## v1.6.10

README.md

@@ -21,17 +21,17 @@ JS Beautifier is hosted on two CDN services: [cdnjs](https://cdnjs.com/libraries
 
 To pull from one of these services include one set of the script tags below in your document:
 ```html
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.11/beautify.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.11/beautify-css.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.11/beautify-html.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.12/beautify.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.12/beautify-css.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.12/beautify-html.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.11/beautify.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.11/beautify-css.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.11/beautify-html.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.12/beautify.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.12/beautify-css.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.12/beautify-html.min.js"></script>
 
-<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.6.11/js/lib/beautify.js"></script>
-<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.6.11/js/lib/beautify-css.js"></script>
-<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.6.11/js/lib/beautify-html.js"></script>
+<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.6.12/js/lib/beautify.js"></script>
+<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.6.12/js/lib/beautify-css.js"></script>
+<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.6.12/js/lib/beautify-html.js"></script>
 ```
 Disclaimer: These are free services, so there are [no uptime or support guarantees](https://github.com/rgrove/rawgit/wiki/Frequently-Asked-Questions#i-need-guaranteed-100-uptime-should-i-use-cdnrawgitcom).
 
@@ -316,4 +316,4 @@ Thanks also to Jason Diamond, Patrick Hof, Nochum Sossonko, Andreas Schneider, D
 Vasilevsky, Vital Batmanov, Ron Baldwin, Gabriel Harrison, Chris J. Shull,
 Mathias Bynens, Vittorio Gambaletta and others.
 
-(README.md: [email protected].11)
+(README.md: [email protected].12)

index.html

@@ -381,7 +381,7 @@
                 <label for="detect-packers">Detect packers and obfuscators?</label>
                 <br>
                 <input class="checkbox" type="checkbox" id="brace-preserve-inline">
-                <label for="keep-array-indentation">Preserve inline braces/code blocks?</label>
+                <label for="brace-preserve-inline">Preserve inline braces/code blocks?</label>
                 <br>
                 <input class="checkbox" type="checkbox" id="keep-array-indentation">
                 <label for="keep-array-indentation">Keep array indentation?</label>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-beautify",
-  "version": "1.6.11",
+  "version": "1.6.12",
   "description": "jsbeautifier.org for node",
   "main": "js/index.js",
   "bin": {

python/jsbeautifier/__version__.py

@@ -1 +1 @@
-__version__ = '1.6.11'
+__version__ = '1.6.12'