Skip to content

Commit 4f94225

Browse files
xurixuri
committed
- Fix missing element in worksheet, workbook and styles. Related issue qax-os#81;
- Format code and update readme
1 parent 4b7d21b commit 4f94225

File tree

5 files changed

+74
-48
lines changed

5 files changed

+74
-48
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func main() {
173173

174174
## Contributing
175175

176-
Contributions are welcome! Open a pull request to fix a bug, or open an issue to discuss a new feature or change.
176+
Contributions are welcome! Open a pull request to fix a bug, or open an issue to discuss a new feature or change. XML is compliant with [part 1 of the 5th edition of the ECMA-376 Standard for Office Open XML](http://www.ecma-international.org/publications/standards/Ecma-376.htm).
177177

178178
## Credits
179179

‎styles.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var builtInNumFmt = map[int]string{
5050
// langNumFmt defined number format code (with unicode values provided for
5151
// language glyphs where they occur) in different language.
5252
var langNumFmt = map[string]map[int]string{
53-
"zh-tw": map[int]string{
53+
"zh-tw": {
5454
27: "[$-404]e/m/d",
5555
28: `[$-404]e"年"m"月"d"日"`,
5656
29: `[$-404]e"年"m"月"d"日"`,
@@ -71,7 +71,7 @@ var langNumFmt = map[string]map[int]string{
7171
57: "[$-404]e/m/d",
7272
58: `[$-404]e"年"m"月"d"日"`,
7373
},
74-
"zh-cn": map[int]string{
74+
"zh-cn": {
7575
27: `yyyy"年"m"月"`,
7676
28: `m"月"d"日"`,
7777
29: `m"月"d"日"`,
@@ -92,7 +92,7 @@ var langNumFmt = map[string]map[int]string{
9292
57: `yyyy"年"m"月"`,
9393
58: `m"月"d"日"`,
9494
},
95-
"zh-tw_unicode": map[int]string{
95+
"zh-tw_unicode": {
9696
27: "[$-404]e/m/d",
9797
28: `[$-404]e"5E74"m"6708"d"65E5"`,
9898
29: `[$-404]e"5E74"m"6708"d"65E5"`,
@@ -113,7 +113,7 @@ var langNumFmt = map[string]map[int]string{
113113
57: "[$-404]e/m/d",
114114
58: `[$-404]e"5E74"m"6708"d"65E5"`,
115115
},
116-
"zh-cn_unicode": map[int]string{
116+
"zh-cn_unicode": {
117117
27: `yyyy"5E74"m"6708"`,
118118
28: `m"6708"d"65E5"`,
119119
29: `m"6708"d"65E5"`,
@@ -134,7 +134,7 @@ var langNumFmt = map[string]map[int]string{
134134
57: `yyyy"5E74"m"6708"`,
135135
58: `m"6708"d"65E5"`,
136136
},
137-
"ja-jp": map[int]string{
137+
"ja-jp": {
138138
27: "[$-411]ge.m.d",
139139
28: `[$-411]ggge"年"m"月"d"日"`,
140140
29: `[$-411]ggge"年"m"月"d"日"`,
@@ -155,7 +155,7 @@ var langNumFmt = map[string]map[int]string{
155155
57: "[$-411]ge.m.d",
156156
58: `[$-411]ggge"年"m"月"d"日"`,
157157
},
158-
"ko-kr": map[int]string{
158+
"ko-kr": {
159159
27: `yyyy"年" mm"月" dd"日"`,
160160
28: "mm-dd",
161161
29: "mm-dd",
@@ -176,7 +176,7 @@ var langNumFmt = map[string]map[int]string{
176176
57: `yyyy"年" mm"月" dd"日"`,
177177
58: "mm-dd",
178178
},
179-
"ja-jp_unicode": map[int]string{
179+
"ja-jp_unicode": {
180180
27: "[$-411]ge.m.d",
181181
28: `[$-411]ggge"5E74"m"6708"d"65E5"`,
182182
29: `[$-411]ggge"5E74"m"6708"d"65E5"`,
@@ -197,7 +197,7 @@ var langNumFmt = map[string]map[int]string{
197197
57: "[$-411]ge.m.d",
198198
58: `[$-411]ggge"5E74"m"6708"d"65E5"`,
199199
},
200-
"ko-kr_unicode": map[int]string{
200+
"ko-kr_unicode": {
201201
27: `yyyy"5E74" mm"6708" dd"65E5"`,
202202
28: "mm-dd",
203203
29: "mm-dd",
@@ -218,7 +218,7 @@ var langNumFmt = map[string]map[int]string{
218218
57: `yyyy"5E74" mm"6708" dd"65E5"`,
219219
58: "mm-dd",
220220
},
221-
"th-th": map[int]string{
221+
"th-th": {
222222
59: "t0",
223223
60: "t0.00",
224224
61: "t#,##0",
@@ -239,7 +239,7 @@ var langNumFmt = map[string]map[int]string{
239239
80: "นน:ทท.0",
240240
81: "d/m/bb",
241241
},
242-
"th-th_unicode": map[int]string{
242+
"th-th_unicode": {
243243
59: "t0",
244244
60: "t0.00",
245245
61: "t#,##0",

‎xmlStyles.go

+24-14
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ type xlsxAlignment struct {
3535
WrapText bool `xml:"wrapText,attr,omitempty"`
3636
}
3737

38+
// xlsxProtection (Protection Properties) contains protection properties
39+
// associated with the cell. Each cell has protection properties that can be
40+
// set. The cell protection properties do not take effect unless the sheet has
41+
// been protected.
42+
type xlsxProtection struct {
43+
Hidden bool `xml:"hidden,attr"`
44+
Locked bool `xml:"locked,attr"`
45+
}
46+
3847
// xlsxLine directly maps the line style element in the namespace
3948
// http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have
4049
// not checked it for completeness - it does as much as I need.
@@ -190,20 +199,21 @@ type xlsxCellStyleXfs struct {
190199
// xlsxXf directly maps the xf element. A single xf element describes all of the
191200
// formatting for a cell.
192201
type xlsxXf struct {
193-
ApplyAlignment bool `xml:"applyAlignment,attr"`
194-
ApplyBorder bool `xml:"applyBorder,attr"`
195-
ApplyFill bool `xml:"applyFill,attr"`
196-
ApplyFont bool `xml:"applyFont,attr"`
197-
ApplyNumberFormat bool `xml:"applyNumberFormat,attr"`
198-
ApplyProtection bool `xml:"applyProtection,attr"`
199-
BorderID int `xml:"borderId,attr"`
200-
FillID int `xml:"fillId,attr"`
201-
FontID int `xml:"fontId,attr"`
202-
NumFmtID int `xml:"numFmtId,attr"`
203-
PivotButton bool `xml:"pivotButton,attr,omitempty"`
204-
QuotePrefix bool `xml:"quotePrefix,attr,omitempty"`
205-
XfID *int `xml:"xfId,attr,omitempty"`
206-
Alignment *xlsxAlignment `xml:"alignment"`
202+
ApplyAlignment bool `xml:"applyAlignment,attr"`
203+
ApplyBorder bool `xml:"applyBorder,attr"`
204+
ApplyFill bool `xml:"applyFill,attr"`
205+
ApplyFont bool `xml:"applyFont,attr"`
206+
ApplyNumberFormat bool `xml:"applyNumberFormat,attr"`
207+
ApplyProtection bool `xml:"applyProtection,attr"`
208+
BorderID int `xml:"borderId,attr"`
209+
FillID int `xml:"fillId,attr"`
210+
FontID int `xml:"fontId,attr"`
211+
NumFmtID int `xml:"numFmtId,attr"`
212+
PivotButton bool `xml:"pivotButton,attr,omitempty"`
213+
QuotePrefix bool `xml:"quotePrefix,attr,omitempty"`
214+
XfID *int `xml:"xfId,attr,omitempty"`
215+
Alignment *xlsxAlignment `xml:"alignment"`
216+
Protection *xlsxProtection `xml:"protection"`
207217
}
208218

209219
// xlsxCellXfs directly maps the cellXfs element. This element contains the

‎xmlWorkbook.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ type xlsxDefinedName struct {
203203
FunctionGroupID int `xml:"functionGroupId,attr,omitempty"`
204204
Help string `xml:"help,attr,omitempty"`
205205
Hidden bool `xml:"hidden,attr,omitempty"`
206-
LocalSheetID int `xml:"localSheetId,attr,omitempty"`
206+
LocalSheetID int `xml:"localSheetId,attr"`
207207
Name string `xml:"name,attr,omitempty"`
208208
PublishToServer bool `xml:"publishToServer,attr,omitempty"`
209209
ShortcutKey string `xml:"shortcutKey,attr,omitempty"`
@@ -223,7 +223,7 @@ type xlsxCalcPr struct {
223223
CalcID string `xml:"calcId,attr,omitempty"`
224224
CalcMode string `xml:"calcMode,attr,omitempty"`
225225
CalcOnSave bool `xml:"calcOnSave,attr,omitempty"`
226-
ConcurrentCalc bool `xml:"concurrentCalc,attr,omitempty"`
226+
ConcurrentCalc *bool `xml:"concurrentCalc,attr"`
227227
ConcurrentManualCount int `xml:"concurrentManualCount,attr,omitempty"`
228228
ForceFullCalc bool `xml:"forceFullCalc,attr,omitempty"`
229229
FullCalcOnLoad bool `xml:"fullCalcOnLoad,attr,omitempty"`

‎xmlWorksheet.go

+37-21
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ type xlsxWorksheet struct {
1515
SheetData xlsxSheetData `xml:"sheetData"`
1616
SheetProtection *xlsxSheetProtection `xml:"sheetProtection"`
1717
AutoFilter *xlsxAutoFilter `xml:"autoFilter"`
18-
MergeCells *xlsxMergeCells `xml:"mergeCells,omitempty"`
18+
MergeCells *xlsxMergeCells `xml:"mergeCells"`
19+
PhoneticPr *xlsxPhoneticPr `xml:"phoneticPr"`
1920
ConditionalFormatting []*xlsxConditionalFormatting `xml:"conditionalFormatting"`
2021
DataValidations *xlsxDataValidations `xml:"dataValidations"`
2122
Hyperlinks *xlsxHyperlinks `xml:"hyperlinks"`
@@ -73,7 +74,7 @@ type xlsxPageSetUp struct {
7374
Draft bool `xml:"draft,attr,omitempty"`
7475
Errors string `xml:"errors,attr,omitempty"`
7576
FirstPageNumber int `xml:"firstPageNumber,attr,omitempty"`
76-
FitToHeight int `xml:"fitToHeight,attr,omitempty"`
77+
FitToHeight *int `xml:"fitToHeight,attr"`
7778
FitToWidth int `xml:"fitToWidth,attr,omitempty"`
7879
HorizontalDPI float32 `xml:"horizontalDpi,attr,omitempty"`
7980
RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"`
@@ -144,24 +145,26 @@ type xlsxSheetViews struct {
144145
// multiple windows are viewing the same sheet, multiple sheetView elements
145146
// (with corresponding workbookView entries) are saved.
146147
type xlsxSheetView struct {
147-
WindowProtection bool `xml:"windowProtection,attr,omitempty"`
148-
ShowFormulas bool `xml:"showFormulas,attr,omitempty"`
149-
ShowGridLines string `xml:"showGridLines,attr,omitempty"`
150-
ShowRowColHeaders bool `xml:"showRowColHeaders,attr,omitempty"`
151-
ShowZeros bool `xml:"showZeros,attr,omitempty"`
152-
RightToLeft bool `xml:"rightToLeft,attr,omitempty"`
153-
TabSelected bool `xml:"tabSelected,attr,omitempty"`
154-
ShowOutlineSymbols bool `xml:"showOutlineSymbols,attr,omitempty"`
155-
DefaultGridColor bool `xml:"defaultGridColor,attr"`
156-
View string `xml:"view,attr,omitempty"`
157-
TopLeftCell string `xml:"topLeftCell,attr,omitempty"`
158-
ColorID int `xml:"colorId,attr,omitempty"`
159-
ZoomScale float64 `xml:"zoomScale,attr,omitempty"`
160-
ZoomScaleNormal float64 `xml:"zoomScaleNormal,attr,omitempty"`
161-
ZoomScalePageLayoutView float64 `xml:"zoomScalePageLayoutView,attr,omitempty"`
162-
WorkbookViewID int `xml:"workbookViewId,attr"`
163-
Pane *xlsxPane `xml:"pane,omitempty"`
164-
Selection []*xlsxSelection `xml:"selection"`
148+
WindowProtection bool `xml:"windowProtection,attr,omitempty"`
149+
ShowFormulas bool `xml:"showFormulas,attr,omitempty"`
150+
ShowGridLines string `xml:"showGridLines,attr,omitempty"`
151+
ShowRowColHeaders bool `xml:"showRowColHeaders,attr,omitempty"`
152+
ShowZeros bool `xml:"showZeros,attr,omitempty"`
153+
RightToLeft bool `xml:"rightToLeft,attr,omitempty"`
154+
TabSelected bool `xml:"tabSelected,attr,omitempty"`
155+
ShowWhiteSpace *bool `xml:"showWhiteSpace,attr"`
156+
ShowOutlineSymbols bool `xml:"showOutlineSymbols,attr,omitempty"`
157+
DefaultGridColor bool `xml:"defaultGridColor,attr"`
158+
View string `xml:"view,attr,omitempty"`
159+
TopLeftCell string `xml:"topLeftCell,attr,omitempty"`
160+
ColorID int `xml:"colorId,attr,omitempty"`
161+
ZoomScale float64 `xml:"zoomScale,attr,omitempty"`
162+
ZoomScaleNormal float64 `xml:"zoomScaleNormal,attr,omitempty"`
163+
ZoomScalePageLayoutView float64 `xml:"zoomScalePageLayoutView,attr,omitempty"`
164+
ZoomScaleSheetLayoutView float64 `xml:"zoomScaleSheetLayoutView,attr,omitempty"`
165+
WorkbookViewID int `xml:"workbookViewId,attr"`
166+
Pane *xlsxPane `xml:"pane,omitempty"`
167+
Selection []*xlsxSelection `xml:"selection"`
165168
}
166169

167170
// xlsxSelection directly maps the selection element in the namespace
@@ -189,7 +192,7 @@ type xlsxPane struct {
189192
type xlsxSheetPr struct {
190193
XMLName xml.Name `xml:"sheetPr"`
191194
CodeName string `xml:"codeName,attr,omitempty"`
192-
EnableFormatConditionsCalculation bool `xml:"enableFormatConditionsCalculation,attr,omitempty"`
195+
EnableFormatConditionsCalculation *bool `xml:"enableFormatConditionsCalculation,attr"`
193196
FilterMode bool `xml:"filterMode,attr,omitempty"`
194197
Published bool `xml:"published,attr,omitempty"`
195198
SyncHorizontal bool `xml:"syncHorizontal,attr,omitempty"`
@@ -344,6 +347,19 @@ type xlsxSheetProtection struct {
344347
SpinCount int `xml:"spinCount,attr,omitempty"`
345348
}
346349

350+
// xlsxPhoneticPr (Phonetic Properties) represents a collection of phonetic
351+
// properties that affect the display of phonetic text for this String Item
352+
// (si). Phonetic text is used to give hints as to the pronunciation of an East
353+
// Asian language, and the hints are displayed as text within the spreadsheet
354+
// cells across the top portion of the cell. Since the phonetic hints are text,
355+
// every phonetic hint is expressed as a phonetic run (rPh), and these
356+
// properties specify how to display that phonetic run.
357+
type xlsxPhoneticPr struct {
358+
Alignment string `xml:"alignment,attr,omitempty"`
359+
FontID int `xml:"fontId,attr,omitempty"`
360+
Type string `xml:"type,attr,omitempty"`
361+
}
362+
347363
// A Conditional Format is a format, such as cell shading or font color, that a
348364
// spreadsheet application can automatically apply to cells if a specified
349365
// condition is true. This collection expresses conditional formatting rules

0 commit comments

Comments
 (0)