Merge pull request #1 from qax-os/master

update bcjti fork

.github/FUNDING.yml

@@ -1,5 +1,6 @@
-patreon: xuri
+github: xuri
 open_collective: excelize
+patreon: xuri
 ko_fi: xurime
 liberapay: xuri
 issuehunt: xuri

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: monthly
+

.github/workflows/go.yml

@@ -5,7 +5,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.15.x, 1.16.x, 1.17.x, 1.18.x]
+        go-version: [1.16.x, 1.17.x, 1.18.x, 1.19.x, 1.20.x, '>=1.21.1']
         os: [ubuntu-latest, macos-latest, windows-latest]
         targetplatform: [x86, x64]
 
@@ -14,7 +14,7 @@ jobs:
     steps:
 
     - name: Install Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: ${{ matrix.go-version }}
 
@@ -31,7 +31,7 @@ jobs:
       run: env GO111MODULE=on go test -v -timeout 30m -race ./... -coverprofile=coverage.txt -covermode=atomic
 
     - name: Codecov
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
       with:
         file: coverage.txt
         flags: unittests

.gitignore

@@ -1,14 +1,15 @@
+.DS_Store
+.idea
+*.json
+*.out
+*.test
 ~$*.xlsx
+test/*.png
+test/BadWorkbook.SaveAsEmptyStruct.xlsx
+test/Encryption*.xlsx
+test/excelize-*
 test/Test*.xlam
 test/Test*.xlsm
 test/Test*.xlsx
 test/Test*.xltm
 test/Test*.xltx
-# generated files
-test/BadEncrypt.xlsx
-test/BadWorkbook.SaveAsEmptyStruct.xlsx
-test/*.png
-test/excelize-*
-*.out
-*.test
-.idea

CONTRIBUTING.md

@@ -21,7 +21,7 @@ issue, please bring it to their attention right away!
 Please **DO NOT** file a public issue, instead send your report privately to
 [xuri.me](https://xuri.me).
 
-Security reports are greatly appreciated and we will publicly thank you for it.
+Security reports are greatly appreciated and we will publicly thank you for them.
 We currently do not offer a paid security bounty program, but are not
 ruling it out in the future.
 
@@ -103,14 +103,14 @@ Before contributing large or high impact changes, make the effort to coordinate
 with the maintainers of the project before submitting a pull request. This
 prevents you from doing extra work that may or may not be merged.
 
-Large PRs that are just submitted without any prior communication are unlikely
+Large PRs that are just submitted without any prior communication is unlikely
 to be successful.
 
 While pull requests are the methodology for submitting changes to code, changes
 are much more likely to be accepted if they are accompanied by additional
 engineering work. While we don't define this explicitly, most of these goals
-are accomplished through communication of the design goals and subsequent
-solutions. Often times, it helps to first state the problem before presenting
+are accomplished through the communication of the design goals and subsequent
+solutions. Oftentimes, it helps to first state the problem before presenting
 solutions.
 
 Typically, the best methods of accomplishing this are to submit an issue,
@@ -130,7 +130,7 @@ written in the imperative, followed by an optional, more detailed explanatory
 text which is separated from the summary by an empty line.
 
 Commit messages should follow best practices, including explaining the context
-of the problem and how it was solved, including in caveats or follow up changes
+of the problem and how it was solved, including in caveats or follow-up changes
 required. They should tell the story of the change and provide readers
 understanding of what led to it.
 
@@ -260,7 +260,7 @@ Don't forget: being a maintainer is a time investment. Make sure you
 will have time to make yourself available. You don't have to be a
 maintainer to make a difference on the project!
 
-If you want to become a meintainer, contact [xuri.me](https://xuri.me) and given a introduction of you.
+If you want to become a maintainer, contact [xuri.me](https://xuri.me) and given an introduction of you.
 
 ## Community guidelines
 
@@ -414,7 +414,7 @@ The first sentence should be a one-sentence summary that starts with the name be
 
 It's helpful if everyone using the package can use the same name
 to refer to its contents, which implies that the package name should
-be good: short, concise, evocative. By convention, packages are
+be good: short, concise, and evocative. By convention, packages are
 given lower case, single-word names; there should be no need for
 underscores or mixedCaps. Err on the side of brevity, since everyone
 using your package will be typing that name. And don't worry about

LICENSE

@@ -1,6 +1,7 @@
 BSD 3-Clause License
 
-Copyright (c) 2016-2022 The excelize Authors.
+Copyright (c) 2016-2023 The excelize Authors.
+Copyright (c) 2011-2017 Geoffrey J. Teale
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 
 <!--- Please describe in detail how you tested your changes. -->
 <!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
+<!--- See how your change affects other areas of the code, etc. -->
 
 ## Types of changes
 

README.md

@@ -13,7 +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 XLAM / XLSM / XLSX / XLTM / XLTX files. Supports reading and writing spreadsheet documents generated by Microsoft Excel™ 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.15 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/xuri/excelize/v2) 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 XLAM / XLSM / XLSX / XLTM / XLTX files. Supports reading and writing spreadsheet documents generated by Microsoft Excel™ 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.16 or later. There are some [incompatible changes](https://github.com/golang/go/issues/61881) in the Go 1.21.0, the Excelize library can not working with that version normally, if you are using the Go 1.21.x, please upgrade to the Go 1.21.1 and later version. The full docs can be seen using go's built-in documentation tool, or online at [go.dev](https://pkg.go.dev/github.com/xuri/excelize/v2) and [docs reference](https://xuri.me/excelize/).
 
 ## Basic Usage
 
@@ -44,8 +44,17 @@ import (
 
 func main() {
     f := excelize.NewFile()
+    defer func() {
+        if err := f.Close(); err != nil {
+            fmt.Println(err)
+        }
+    }()
     // Create a new sheet.
-    index := f.NewSheet("Sheet2")
+    index, err := f.NewSheet("Sheet2")
+    if err != nil {
+        fmt.Println(err)
+        return
+    }
     // Set value of a cell.
     f.SetCellValue("Sheet2", "A2", "Hello world.")
     f.SetCellValue("Sheet1", "B2", 100)
@@ -83,7 +92,7 @@ func main() {
             fmt.Println(err)
         }
     }()
-    // Get value from cell by given worksheet name and axis.
+    // Get value from cell by given worksheet name and cell reference.
     cell, err := f.GetCellValue("Sheet1", "B2")
     if err != nil {
         fmt.Println(err)
@@ -121,41 +130,47 @@ import (
 )
 
 func main() {
-    categories := map[string]string{
-        "A2": "Small", "A3": "Normal", "A4": "Large",
-        "B1": "Apple", "C1": "Orange", "D1": "Pear"}
-    values := map[string]int{
-        "B2": 2, "C2": 3, "D2": 3, "B3": 5, "C3": 2, "D3": 4, "B4": 6, "C4": 7, "D4": 8}
     f := excelize.NewFile()
-    for k, v := range categories {
-        f.SetCellValue("Sheet1", k, v)
-    }
-    for k, v := range values {
-        f.SetCellValue("Sheet1", k, v)
+    defer func() {
+        if err := f.Close(); err != nil {
+            fmt.Println(err)
+        }
+    }()
+    for idx, row := range [][]interface{}{
+        {nil, "Apple", "Orange", "Pear"}, {"Small", 2, 3, 3},
+        {"Normal", 5, 2, 4}, {"Large", 6, 7, 8},
+    } {
+        cell, err := excelize.CoordinatesToCellName(1, idx+1)
+        if err != nil {
+            fmt.Println(err)
+            return
+        }
+        f.SetSheetRow("Sheet1", cell, &row)
     }
-    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"
+    if err := f.AddChart("Sheet1", "E1", &excelize.Chart{
+        Type: excelize.Col3DClustered,
+        Series: []excelize.ChartSeries{
+            {
+                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: []excelize.RichTextRun{
+            {
+                Text: "Fruit 3D Clustered Column Chart",
+            },
         },
-        {
-            "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 {
+    }); err != nil {
         fmt.Println(err)
         return
     }
@@ -193,22 +208,24 @@ func main() {
         }
     }()
     // Insert a picture.
-    if err := f.AddPicture("Sheet1", "A2", "image.png", ""); err != nil {
+    if err := f.AddPicture("Sheet1", "A2", "image.png", nil); err != nil {
         fmt.Println(err)
     }
     // Insert a picture to worksheet with scaling.
     if err := f.AddPicture("Sheet1", "D2", "image.jpg",
-        `{"x_scale": 0.5, "y_scale": 0.5}`); err != nil {
+        &excelize.GraphicOptions{ScaleX: 0.5, ScaleY: 0.5}); err != nil {
         fmt.Println(err)
     }
     // Insert a picture offset in the cell with printing support.
-    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 {
+    enable, disable := true, false
+    if err := f.AddPicture("Sheet1", "H2", "image.gif",
+        &excelize.GraphicOptions{
+            PrintObject:     &enable,
+            LockAspectRatio: false,
+            OffsetX:         15,
+            OffsetY:         10,
+            Locked:          &disable,
+        }); err != nil {
         fmt.Println(err)
     }
     // Save the spreadsheet with the origin path.