Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pieter Sheth-Voss 2015-03-19 22:50:22 -04:00
commit 33c32f0647

@ -464,15 +464,13 @@ top-level attributes: `fill`, `font`, `numFmt`, `alignment`, and `border`.
| | diagonalDown | `true||false`
**COLOR_SPEC** Colors for `fill`, `font`, and `border` are specified as objects, either:
**COLOR_SPEC**: Colors for `fill`, `font`, and `border` are specified as objects, either:
* `{ auto: 1}` specifying automatic values
* `{ rgb: "FFFFAA00" }` specifying a hex ARGB value
* `{ theme: "1", tint: "-0.25"}` specifying an integer index to a theme color and a tint value (default 0)
* `{ indexed: 64}` default value for `fill.bgColor`
**BORDER_STYLE** is a string value which may take on one of the following values:
**BORDER_STYLE**: Border style is a string value which may take on one of the following values:
* `thin`
* `medium`
* `thick`
@ -487,6 +485,14 @@ top-level attributes: `fill`, `font`, `numFmt`, `alignment`, and `border`.
* `slantDashDot`
Borders for merged areas are specified for each cell within the merged area. So to apply a box border to a merged area of 3x3 cells, border styles would need to be specified for eight different cells:
* left borders for the three cells on the left,
* right borders for the cells on the right
* top borders for the cells on the top
* bottom borders for the cells on the left
## Tested Environments
- NodeJS 0.8, 0.10 (latest release), 0.11 (unstable)
@ -575,5 +581,3 @@ Open Document Format for Office Applications Version 1.2 (29 September 2011)
[![Build Status](https://travis-ci.org/SheetJS/js-xlsx.svg?branch=master)](https://travis-ci.org/SheetJS/js-xlsx)
[![Coverage Status](http://img.shields.io/coveralls/SheetJS/js-xlsx/master.svg)](https://coveralls.io/r/SheetJS/js-xlsx?branch=master)
[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/ed5bb2c4c4346a474fef270f847f3f78 "githalytics.com")](http://githalytics.com/SheetJS/js-xlsx)