Merge branch 'master' into fix/cell_lock

1 files changed, 18 insertions, 22 deletions

diff --git a/README.md b/README.md
index eae0072..b3106df 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-<p align="center"><img width="650" src="./excelize.png" alt="Excelize logo"></p>
+<p align="center"><img width="650" src="./excelize.svg" alt="Excelize logo"></p>
 
 <p align="center">
     <a href="https://travis-ci.org/360EntSecGroup-Skylar/excelize"><img src="https://travis-ci.org/360EntSecGroup-Skylar/excelize.svg?branch=master" alt="Build Status"></a>
     <a href="https://codecov.io/gh/360EntSecGroup-Skylar/excelize"><img src="https://codecov.io/gh/360EntSecGroup-Skylar/excelize/branch/master/graph/badge.svg" alt="Code Coverage"></a>
     <a href="https://goreportcard.com/report/github.com/360EntSecGroup-Skylar/excelize"><img src="https://goreportcard.com/badge/github.com/360EntSecGroup-Skylar/excelize" alt="Go Report Card"></a>
-    <a href="https://godoc.org/github.com/360EntSecGroup-Skylar/excelize"><img src="https://godoc.org/github.com/360EntSecGroup-Skylar/excelize?status.svg" alt="GoDoc"></a>
+    <a href="https://pkg.go.dev/github.com/360EntSecGroup-Skylar/excelize/v2?tab=doc"><img src="https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white" alt="go.dev"></a>
     <a href="https://opensource.org/licenses/BSD-3-Clause"><img src="https://img.shields.io/badge/license-bsd-orange.svg" alt="Licenses"></a>
     <a href="https://www.paypal.me/xuri"><img src="https://img.shields.io/badge/Donate-PayPal-green.svg" alt="Donate"></a>
 </p>
@@ -13,8 +13,7 @@
 
 ## Introduction
 
-Excelize is a library written in pure Go providing a set of functions that allow you to write to and read from XLSX files. Supports reading and writing XLSX file generated by Microsoft Excel&trade; 2007 and later.
-Supports saving a file without losing original charts of XLSX. This library needs Go version 1.8 or later. The full API docs can be seen using go's built-in documentation tool, or online at [godoc.org](https://godoc.org/github.com/360EntSecGroup-Skylar/excelize) and [docs reference](https://xuri.me/excelize/).
+Excelize is a library written in pure Go providing a set of functions that allow you to write to and read from XLSX / XLSM / XLTM files. Supports reading and writing spreadsheet documents generated by Microsoft Excel&trade; 2007 and later. Supports complex components by high compatibility, and provided streaming API for generating or reading data from a worksheet with huge amounts of data. This library needs Go version 1.10 or later. The full API docs can be seen using go's built-in documentation tool, or online at [go.dev](https://pkg.go.dev/github.com/360EntSecGroup-Skylar/excelize/v2?tab=doc) and [docs reference](https://xuri.me/excelize/).
 
 ## Basic Usage
 
@@ -24,6 +23,12 @@ Supports saving a file without losing original charts of XLSX. This library need
 go get github.com/360EntSecGroup-Skylar/excelize
 ```
 
+- If your package management with [Go Modules](https://blog.golang.org/using-go-modules), please install with following command.
+
+```bash
+go get github.com/360EntSecGroup-Skylar/excelize/v2
+```
+
 ### Create XLSX file
 
 Here is a minimal example usage that will create XLSX file.
@@ -47,8 +52,7 @@ func main() {
     // Set active sheet of the workbook.
     f.SetActiveSheet(index)
     // Save xlsx file by the given path.
-    err := f.SaveAs("./Book1.xlsx")
-    if err != nil {
+    if err := f.SaveAs("Book1.xlsx"); err != nil {
         fmt.Println(err)
     }
 }
@@ -68,7 +72,7 @@ import (
 )
 
 func main() {
-    f, err := excelize.OpenFile("./Book1.xlsx")
+    f, err := excelize.OpenFile("Book1.xlsx")
     if err != nil {
         fmt.Println(err)
         return
@@ -116,14 +120,12 @@ func main() {
     for k, v := range values {
         f.SetCellValue("Sheet1", k, v)
     }
-    err := f.AddChart("Sheet1", "E1", `{"type":"col3DClustered","series":[{"name":"Sheet1!$A$2","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"},{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"title":{"name":"Fruit 3D Clustered Column Chart"}}`)
-    if err != nil {
+    if err := f.AddChart("Sheet1", "E1", `{"type":"col3DClustered","series":[{"name":"Sheet1!$A$2","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"},{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"title":{"name":"Fruit 3D Clustered Column Chart"}}`); err != nil {
         fmt.Println(err)
         return
     }
     // Save xlsx file by the given path.
-    err = f.SaveAs("./Book1.xlsx")
-    if err != nil {
+    if err := f.SaveAs("Book1.xlsx"); err != nil {
         fmt.Println(err)
     }
 }
@@ -144,29 +146,25 @@ import (
 )
 
 func main() {
-    f, err := excelize.OpenFile("./Book1.xlsx")
+    f, err := excelize.OpenFile("Book1.xlsx")
     if err != nil {
         fmt.Println(err)
         return
     }
     // Insert a picture.
-    err = f.AddPicture("Sheet1", "A2", "./image1.png", "")
-    if err != nil {
+    if err := f.AddPicture("Sheet1", "A2", "image.png", ""); err != nil {
         fmt.Println(err)
     }
     // Insert a picture to worksheet with scaling.
-    err = f.AddPicture("Sheet1", "D2", "./image2.jpg", `{"x_scale": 0.5, "y_scale": 0.5}`)
-    if err != nil {
+    if err := f.AddPicture("Sheet1", "D2", "image.jpg", `{"x_scale": 0.5, "y_scale": 0.5}`); err != nil {
         fmt.Println(err)
     }
     // Insert a picture offset in the cell with printing support.
-    err = f.AddPicture("Sheet1", "H2", "./image3.gif", `{"x_offset": 15, "y_offset": 10, "print_obj": true, "lock_aspect_ratio": false, "locked": false}`)
-    if err != nil {
+    if err := f.AddPicture("Sheet1", "H2", "image.gif", `{"x_offset": 15, "y_offset": 10, "print_obj": true, "lock_aspect_ratio": false, "locked": false}`); err != nil {
         fmt.Println(err)
     }
     // Save the xlsx file with the origin path.
-    err = f.Save()
-    if err != nil {
+    if err = f.Save(); err != nil {
         fmt.Println(err)
     }
 }
@@ -182,6 +180,4 @@ This program is under the terms of the BSD 3-Clause License. See [https://openso
 
 The Excel logo is a trademark of [Microsoft Corporation](https://aka.ms/trademarks-usage). This artwork is an adaptation.
 
-Some struct of XML originally by [tealeg/xlsx](https://github.com/tealeg/xlsx). Licensed under the [BSD 3-Clause License](https://github.com/tealeg/xlsx/blob/master/LICENSE).
-
 gopher.{ai,svg,png} was created by [Takuya Ueda](https://twitter.com/tenntenn). Licensed under the [Creative Commons 3.0 Attributions license](http://creativecommons.org/licenses/by/3.0/).