Merge branch 'dev'

.gitignore

@@ -1,3 +1,4 @@
 
 .DS_Store
 xlsx.test
+*.swp

sheet.go

@@ -141,6 +141,12 @@ func (s *Sheet) makeXLSXSheet(refTable *RefTable, styles *xlsxStyleSheet) *xlsxW
 				if xCellXf.NumFmtId > 0 {
 					xCellXf.ApplyNumberFormat = true
 				}
+
+				xCellStyleXf.Alignment.Horizontal = style.Alignment.Horizontal
+				xCellStyleXf.Alignment.Vertical = style.Alignment.Vertical
+				xCellXf.Alignment.Horizontal = style.Alignment.Horizontal
+				xCellXf.Alignment.Vertical = style.Alignment.Vertical
+
 				styles.addCellStyleXf(xCellStyleXf)
 				XfId = styles.addCellXf(xCellXf)
 			}

style.go

@@ -5,13 +5,14 @@ import "strconv"
 // Style is a high level structure intended to provide user access to
 // the contents of Style within an XLSX file.
 type Style struct {
-	Border      Border
-	Fill        Fill
-	Font        Font
-	ApplyBorder bool
-	ApplyFill   bool
-	ApplyFont   bool
-	Alignment   Alignment
+	Border         Border
+	Fill           Fill
+	Font           Font
+	ApplyBorder    bool
+	ApplyFill      bool
+	ApplyFont      bool
+	ApplyAlignment bool
+	Alignment      Alignment
 }
 
 // Return a new Style structure initialised with the default values.
@@ -62,11 +63,15 @@ func (style *Style) makeXLSXStyleElements() (xFont xlsxFont, xFill xlsxFill, xBo
 	xCellXf.ApplyBorder = style.ApplyBorder
 	xCellXf.ApplyFill = style.ApplyFill
 	xCellXf.ApplyFont = style.ApplyFont
+	xCellXf.ApplyAlignment = style.ApplyAlignment
 	xCellXf.NumFmtId = 0
 	xCellStyleXf.ApplyBorder = style.ApplyBorder
 	xCellStyleXf.ApplyFill = style.ApplyFill
 	xCellStyleXf.ApplyFont = style.ApplyFont
+	xCellStyleXf.ApplyAlignment = style.ApplyAlignment
 	xCellStyleXf.NumFmtId = 0
+
+	xCellStyleXf.Alignment = xlsxAlignment{Horizontal: style.Alignment.Horizontal, Vertical: style.Alignment.Vertical}
 	return
 }
 
@@ -112,6 +117,7 @@ func NewFont(size int, name string) *Font {
 
 type Alignment struct {
 	Horizontal string
+	Vertical   string
 }
 
 func DefaulFont() *Font {

xmlStyle.go

@@ -123,6 +123,7 @@ func (styles *xlsxStyleSheet) getStyle(styleIndex int) (style *Style) {
 		style.ApplyBorder = xf.ApplyBorder || styleXf.ApplyBorder
 		style.ApplyFill = xf.ApplyFill || styleXf.ApplyFill
 		style.ApplyFont = xf.ApplyFont || styleXf.ApplyFont
+		style.ApplyAlignment = xf.ApplyAlignment || styleXf.ApplyAlignment
 
 		if xf.BorderId > -1 && xf.BorderId < styles.Borders.Count {
 			var border xlsxBorder
@@ -154,13 +155,17 @@ func (styles *xlsxStyleSheet) getStyle(styleIndex int) (style *Style) {
 			if italic := xfont.I; italic != nil && italic.Val != "0" {
 				style.Font.Italic = true
 			}
-			if underline := xfont.U; underline != nil && underline.Val != "0"  {
+			if underline := xfont.U; underline != nil && underline.Val != "0" {
 				style.Font.Underline = true
 			}
 		}
 		if xf.Alignment.Horizontal != "" {
 			style.Alignment.Horizontal = xf.Alignment.Horizontal
 		}
+
+		if xf.Alignment.Vertical != "" {
+			style.Alignment.Vertical = xf.Alignment.Vertical
+		}
 		styles.lock.Lock()
 		styles.styleCache[styleIndex] = style
 		styles.lock.Unlock()