This closes #1447, add support for strict theme namespace

- Support specify if applying number format style for the cell calculation result
- Reduce cyclomatic complexities for the OpenReader function

calc.go

@@ -767,20 +767,29 @@ type formulaFuncs struct {
 //	YIELDMAT
 //	Z.TEST
 //	ZTEST
-func (f *File) CalcCellValue(sheet, cell string) (result string, err error) {
+func (f *File) CalcCellValue(sheet, cell string, opts ...Options) (result string, err error) {
-	var token formulaArg
+	var (
-	token, err = f.calcCellValue(&calcContext{
+		rawCellValue = parseOptions(opts...).RawCellValue
+		styleIdx     int
+		token        formulaArg
+	)
+	if token, err = f.calcCellValue(&calcContext{
 		entry:      fmt.Sprintf("%s!%s", sheet, cell),
 		iterations: make(map[string]uint),
-	}, sheet, cell)
+	}, sheet, cell); err != nil {
+		return
+	}
+	if !rawCellValue {
+		styleIdx, _ = f.GetCellStyle(sheet, cell)
+	}
 	result = token.Value()
 	if isNum, precision, decimal := isNumeric(result); isNum {
 		if precision > 15 {
-			result = strings.ToUpper(strconv.FormatFloat(decimal, 'G', 15, 64))
+			result, err = f.formattedValue(styleIdx, strings.ToUpper(strconv.FormatFloat(decimal, 'G', 15, 64)), rawCellValue)
 			return
 		}
 		if !strings.HasPrefix(result, "0") {
-			result = strings.ToUpper(strconv.FormatFloat(decimal, 'f', -1, 64))
+			result, err = f.formattedValue(styleIdx, strings.ToUpper(strconv.FormatFloat(decimal, 'f', -1, 64)), rawCellValue)
 		}
 	}
 	return

excelize.go

@@ -132,15 +132,9 @@ func newFile() *File {
 	}
 }
 
-// OpenReader read data stream from io.Reader and return a populated
+// checkOpenReaderOptions check and validate options field value for open
-// spreadsheet file.
+// reader.
-func OpenReader(r io.Reader, opts ...Options) (*File, error) {
+func (f *File) checkOpenReaderOptions() error {
-	b, err := io.ReadAll(r)
-	if err != nil {
-		return nil, err
-	}
-	f := newFile()
-	f.options = parseOptions(opts...)
 	if f.options.UnzipSizeLimit == 0 {
 		f.options.UnzipSizeLimit = UnzipSizeLimit
 		if f.options.UnzipXMLSizeLimit > f.options.UnzipSizeLimit {
@@ -154,7 +148,22 @@ func OpenReader(r io.Reader, opts ...Options) (*File, error) {
 		}
 	}
 	if f.options.UnzipXMLSizeLimit > f.options.UnzipSizeLimit {
-		return nil, ErrOptionsUnzipSizeLimit
+		return ErrOptionsUnzipSizeLimit
+	}
+	return nil
+}
+
+// OpenReader read data stream from io.Reader and return a populated
+// spreadsheet file.
+func OpenReader(r io.Reader, opts ...Options) (*File, error) {
+	b, err := io.ReadAll(r)
+	if err != nil {
+		return nil, err
+	}
+	f := newFile()
+	f.options = parseOptions(opts...)
+	if err = f.checkOpenReaderOptions(); err != nil {
+		return nil, err
 	}
 	if bytes.Contains(b, oleIdentifier) {
 		if b, err = Decrypt(b, f.options); err != nil {

lib.go

@@ -497,12 +497,16 @@ func (avb *attrValBool) UnmarshalXML(d *xml.Decoder, start xml.StartElement) err
 // Transitional namespaces.
 func namespaceStrictToTransitional(content []byte) []byte {
 	namespaceTranslationDic := map[string]string{
+		StrictNameSpaceDocumentPropertiesVariantTypes: NameSpaceDocumentPropertiesVariantTypes.Value,
+		StrictNameSpaceDrawingMLMain:                  NameSpaceDrawingMLMain,
+		StrictNameSpaceExtendedProperties:             NameSpaceExtendedProperties,
+		StrictNameSpaceSpreadSheet:                    NameSpaceSpreadSheet.Value,
 		StrictSourceRelationship:                      SourceRelationship.Value,
-		StrictSourceRelationshipOfficeDocument: SourceRelationshipOfficeDocument,
 		StrictSourceRelationshipChart:                 SourceRelationshipChart,
 		StrictSourceRelationshipComments:              SourceRelationshipComments,
+		StrictSourceRelationshipExtendProperties:      SourceRelationshipExtendProperties,
 		StrictSourceRelationshipImage:                 SourceRelationshipImage,
-		StrictNameSpaceSpreadSheet:             NameSpaceSpreadSheet.Value,
+		StrictSourceRelationshipOfficeDocument:        SourceRelationshipOfficeDocument,
 	}
 	for s, n := range namespaceTranslationDic {
 		content = bytesReplace(content, []byte(s), []byte(n), -1)

xmlDrawing.go

@@ -54,9 +54,11 @@ const (
 	ContentTypeTemplateMacro                      = "application/vnd.ms-excel.template.macroEnabled.main+xml"
 	ContentTypeVBA                                = "application/vnd.ms-office.vbaProject"
 	ContentTypeVML                                = "application/vnd.openxmlformats-officedocument.vmlDrawing"
+	NameSpaceDrawingMLMain                        = "http://schemas.openxmlformats.org/drawingml/2006/main"
 	NameSpaceDublinCore                           = "http://purl.org/dc/elements/1.1/"
 	NameSpaceDublinCoreMetadataInitiative         = "http://purl.org/dc/dcmitype/"
 	NameSpaceDublinCoreTerms                      = "http://purl.org/dc/terms/"
+	NameSpaceExtendedProperties                   = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
 	NameSpaceXML                                  = "http://www.w3.org/XML/1998/namespace"
 	NameSpaceXMLSchemaInstance                    = "http://www.w3.org/2001/XMLSchema-instance"
 	SourceRelationshipChart                       = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"
@@ -65,6 +67,7 @@ const (
 	SourceRelationshipDialogsheet                 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/dialogsheet"
 	SourceRelationshipDrawingML                   = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing"
 	SourceRelationshipDrawingVML                  = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing"
+	SourceRelationshipExtendProperties            = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"
 	SourceRelationshipHyperLink                   = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
 	SourceRelationshipImage                       = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
 	SourceRelationshipOfficeDocument              = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"
@@ -74,10 +77,14 @@ const (
 	SourceRelationshipTable                       = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table"
 	SourceRelationshipVBAProject                  = "http://schemas.microsoft.com/office/2006/relationships/vbaProject"
 	SourceRelationshipWorkSheet                   = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"
+	StrictNameSpaceDocumentPropertiesVariantTypes = "http://purl.oclc.org/ooxml/officeDocument/docPropsVTypes"
+	StrictNameSpaceDrawingMLMain                  = "http://purl.oclc.org/ooxml/drawingml/main"
+	StrictNameSpaceExtendedProperties             = "http://purl.oclc.org/ooxml/officeDocument/extendedProperties"
 	StrictNameSpaceSpreadSheet                    = "http://purl.oclc.org/ooxml/spreadsheetml/main"
 	StrictSourceRelationship                      = "http://purl.oclc.org/ooxml/officeDocument/relationships"
 	StrictSourceRelationshipChart                 = "http://purl.oclc.org/ooxml/officeDocument/relationships/chart"
 	StrictSourceRelationshipComments              = "http://purl.oclc.org/ooxml/officeDocument/relationships/comments"
+	StrictSourceRelationshipExtendProperties      = "http://purl.oclc.org/ooxml/officeDocument/relationships/extendedProperties"
 	StrictSourceRelationshipImage                 = "http://purl.oclc.org/ooxml/officeDocument/relationships/image"
 	StrictSourceRelationshipOfficeDocument        = "http://purl.oclc.org/ooxml/officeDocument/relationships/officeDocument"
 	// ExtURIConditionalFormattings is the extLst child element