1.0.17

1.0.16
2023-08-10 21:12:59 +03:00 · 2021-07-28 01:45:25 +06:00 · 2021-07-01 03:03:57 +06:00 · 2021-07-01 03:01:35 +06:00 · 2021-06-22 00:57:29 +06:00 · 2021-06-08 09:59:42 +06:00
6 changed files with 406 additions and 126 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 vendor*
 /books.fw.png
 /datatypes.fw.png
+/styles.fw.png
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,106 @@
+# Changelog
+
+## 1.0.17 (2021-07-28)
+
+* Fixed &quot; and &amp; in sheets names
+
+## 1.0.16 (2021-07-01)
+
+* Fixed &quot;&amp;&quot; in hyperlinks
+
+## 1.0.15 (2021-06-22)
+
+* Fixed *mailto* hyperlinks detection
+
+## 1.0.14 (2021-06-08)
+
+* Added *mailto* hyperlinks support (thx Howard Martin)
+```php
+SimpleXLSXGen::fromArray([
+	['Mailto hyperlink', '<a href="mailto:sergey.shuchkin@gmail.com">Please email me</a>']
+])->saveAs('test.xlsx');
+```
+## 1.0.13 (2021-05-29)
+
+* Fixed hyperlinks in several sheets
+* Added [Opencollective donation link](https://opencollective.com/simplexlsx)
+
+## 1.0.12 (2021-05-19)
+
+* Fixed hyperlink regex
+
+## 1.0.11 (2021-05-14)
+
+* Fixed 0.00% format, thx [marcrobledo](https://github.com/shuchkin/simplexlsxgen/pull/34), more examples in README.md
+
+## 1.0.10 (2021-05-03)
+
+Stable release
+
+* Added hyperlinks and minimal formatting
+
+## 0.9.25 (2021-02-26)
+
+* Added PHP Datetime object values in a cells
+
+## 0.9.24 (2021-02-26)
+
+* Percent support
+
+
+## 0.9.23 (2021-01-25)
+
+* Fix local floats in XML
+
+
+## 0.9.22 (2020-11-04)
+
+* Added multiple sheets support, thx [Savino59](https://github.com/Savino59), class ready for extend now
+ 
+## 0.9.21 (2020-10-17)
+
+* Updated images
+
+## 0.9.20 (2020-10-04)
+
+* Disable type detection if string started with chr(0)
+
+## 0.9.19 (2020-08-23)
+
+* Numbers like SKU right aligned now
+
+## 0.9.18 (2020-08-22)
+
+* Fixed fast shared strings index
+ 
+## 0.9.17 (2020-08-21)
+
+* Fixed real numbers in 123.45 format detection, fast shared strings index (thx fredriksundin)
+ 
+## 0.9.16 (2020-07-29)
+
+* Fixed time detection in HH:MM:SS format
+
+## 0.9.15 (2020-07-14)
+
+* Escape of shared strings for special chars in cells [#1](https://github.com/shuchkin/simplexlsxgen/issues/1) 
+
+## 0.9.14 (2020-05-31)
+
+* Fixed num2name A-Z,AA-AZ column names, thx Ertan Yusufoglu
+
+## 0.9.13 (2020-05-21)
+
+* If string more 160 chars, save as inlineStr
+
+## 0.9.12 (2020-05-21)
+
+* Readme fixed
+
+## 0.9.11 (2020-05-21)
+
+* Removed XML unimportant attributes
+
+## 0.9.10 (2020-05-20)
+
+* Initial release
--- a/README.md
+++ b/README.md
@ -1,12 +1,12 @@
-# SimpleXLSXGen class 0.9.25 (Official)
-[<img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.herokuapp.com%2Fshuchkin" />](https://www.patreon.com/shuchkin) [<img src="https://img.shields.io/github/license/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/blob/master/license.md) [<img src="https://img.shields.io/github/stars/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/stargazers) [<img src="https://img.shields.io/github/forks/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/network) [<img src="https://img.shields.io/github/issues/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/issues)
+# SimpleXLSXGen
+[<img src="https://img.shields.io/github/license/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/blob/master/license.md) [<img src="https://img.shields.io/github/stars/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/stargazers) [<img src="https://img.shields.io/github/forks/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/network) [<img src="https://img.shields.io/github/issues/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/issues)

 Export data to Excel XLSX file. PHP XLSX generator. No external tools and libraries.<br/>
 (!) XLSX reader [here](https://github.com/shuchkin/simplexlsx).  

 **Sergey Shuchkin** <sergey.shuchkin@gmail.com> 2020-2021<br/>

-*Hey, bro, please ★ the package for my motivation :)* 
+*Hey, bro, please ★ the package for my motivation :) and [donate](https://opencollective.com/simplexlsx) for more motivation!* 

 ## Basic Usage
 ```php
@ -16,7 +16,7 @@ $books = [
    [908606664, 'Slinky Malinki', 'Lynley Dodd', 'Mallinson Rendel', 'NZ']
 ];
 $xlsx = SimpleXLSXGen::fromArray( $books );
-$xlsx->saveAs('books.xlsx'); // or downloadAs('books.xlsx')
+$xlsx->saveAs('books.xlsx'); // or downloadAs('books.xlsx') or $xlsx_content = (string) $xlsx 
 ```
 ![XLSX screenshot](books.png)

@ -42,25 +42,57 @@ $data = [
    ['Time','02:38:00'],
    ['Datetime PHP', new DateTime('2021-02-06 21:07:00')],
    ['String', 'Long UTF-8 String in autoresized column'],
+    ['Hyperlink', 'https://github.com/shuchkin/simplexlsxgen'],
+    ['Hyperlink + Anchor', '<a href="https://github.com/shuchkin/simplexlsxgen">SimpleXLSXGen</a>'],
    ['RAW string', "\0".'2020-10-04 16:02:00']
 ];
 SimpleXLSXGen::fromArray( $data )->saveAs('datatypes.xlsx');
 ```
 ![XLSX screenshot](datatypes.png)
-### Fluid examples
+
+### Formatting
 ```php
-SimpleXLSXGen::fromArray( $books )->downloadAs('table.xlsx'); // output to browser for download
-SimpleXLSXGen::fromArray( $books )->addSheet( $books2 )->download(); // multiple sheets
-(new SimpleXLSXGen)->addSheet( $books, 'Modern style')->save();
+$data = [
+    ['Normal', '12345.67'],
+    ['Bold', '<b>12345.67</b>'],
+    ['Italic', '<i>12345.67</i>'],
+    ['Underline', '<u>12345.67</u>'],
+    ['Strike', '<s>12345.67</s>'],
+    ['Bold + Italic', '<b><i>12345.67</i></b>'],
+    ['Hyperlink', 'https://github.com/shuchkin/simplexlsxgen'],
+    ['Italic + Hyperlink + Anchor', '<i><a href="https://github.com/shuchkin/simplexlsxgen">SimpleXLSXGen</a></i>'],
+    ['Left', '<left>12345.67</left>'],
+    ['Center', '<center>12345.67</center>'],
+    ['Right', '<right>Right Text</right>'],
+    ['Center + Bold', '<center><b>Name</b></center>']
+];
+SimpleXLSXGen::fromArray( $data )
+    ->setDefaultFont( 'Courier New' )
+    ->setDefaultFontSize( 14 )
+    ->saveAs('styles_and_tags.xlsx');
 ```
-### Old school, multiple sheets
+![XLSX screenshot](styles.png)
+
+### More examples
 ```php
+// Fluid interface, output to browser for download
+SimpleXLSXGen::fromArray( $books )->downloadAs('table.xlsx');
+
+// Fluid interface, multiple sheets
+SimpleXLSXGen::fromArray( $books )->addSheet( $books2 )->download();
+
+// Alternative interface, sheet name, get xlsx content
+$xlsx_cache = (string) (new SimpleXLSXGen)->addSheet( $books, 'Modern style');
+
+// Classic interface
 $xlsx = new SimpleXLSXGen();
 $xlsx->addSheet( $books, 'Catalog 2021' );
 $xlsx->addSheet( $books2, 'Stephen King catalog');
 $xlsx->downloadAs('books_2021.xlsx');
+exit();
 ```
-### Debug
+
+## Debug
 ```php
 ini_set('error_reporting', E_ALL );
 ini_set('display_errors', 1 );
@ -69,23 +101,4 @@ $data = [
    ['Debug', 123]
 ]
 SimpleXLSXGen::fromArray( $data )->saveAs('debug.xlsx');
-```
-
-
-## History
-v0.9.25 (2021-02-26) Added PHP Datetime object values in a cells
-v0.9.24 (2021-02-26) * Percent<br/>
-v0.9.23 (2021-01-25) Fix local floats in XML<br/>
-v0.9.22 (2020-11-04) Added multiple sheets support, thx [Savino59](https://github.com/Savino59), class ready for extend now<br/> 
-v0.9.21 (2020-10-17) Updated images<br/>
-v0.9.20 (2020-10-04) Disable type detection if string started with chr(0)<br/>
-v0.9.19 (2020-08-23) Numbers like SKU right aligned now<br/>
-v0.9.18 (2020-08-22) Fixed fast shared strings index<br/> 
-v0.9.17 (2020-08-21) Fixed real numbers in 123.45 format detection, fast shared strings index (thx fredriksundin)<br/> 
-v0.9.16 (2020-07-29) Fixed time detection in HH:MM:SS format<br/>
-v0.9.15 (2020-07-14) escape of shared strings for special chars in cells [#1](https://github.com/shuchkin/simplexlsxgen/issues/1) <br/>
-v0.9.14 (2020-05-31) fixed num2name A-Z,AA-AZ column names, thx Ertan Yusufoglu<br/>
-v0.9.13 (2020-05-21) if string more 160 chars, save as inlineStr<br/>
-v0.9.12 (2020-05-21) readme fixed<br/>
-v0.9.11 (2020-05-21) removed XML unimportant attributes<br/>
-v0.9.10 (2020-05-20) initial release
+```
--- a/datatypes.png
+++ b/datatypes.png
--- a/src/SimpleXLSXGen.php
+++ b/src/SimpleXLSXGen.php
@ -8,27 +8,45 @@
 class SimpleXLSXGen {

 	public $curSheet;
+	protected $defaultFont;
+	protected $defaultFontSize;
 	protected $sheets;
 	protected $template;
-	protected $SI, $SI_KEYS;
+	protected $F, $F_KEYS; // fonts
+	protected $XF, $XF_KEYS; // cellXfs
+	protected $SI, $SI_KEYS; // shared strings
+	const N_NORMAL = 0; // General
+	const N_INT = 1; // 0
+	const N_DEC = 2; // 0.00
+	const N_PERCENT_INT = 9; // 0%
+	const N_PRECENT_DEC = 10; // 0.00%
+	const N_DATE = 14; // mm-dd-yy
+	const N_TIME = 20; // h:mm
+	const N_DATETIME = 22; // m/d/yy h:mm
+	const F_NORMAL = 0;
+	const F_HYPERLINK = 1;
+	const F_BOLD = 2;
+	const F_ITALIC = 4;
+	const F_UNDERLINE = 8;
+	const F_STRIKE = 16;
+	const A_DEFAULT = 0;
+	const A_LEFT = 1;
+	const A_RIGHT = 2;
+	const A_CENTER = 3;
+

 	public function __construct() {
 		$this->curSheet = -1;
-		$this->sheets = [ ['name' => 'Sheet1', 'rows' => [] ] ];
+		$this->defaultFont = 'Calibri';
+		$this->sheets = [ ['name' => 'Sheet1', 'rows' => [], 'hyperlinks' => [] ] ];
 		$this->SI = [];		// sharedStrings index
 		$this->SI_KEYS = []; //  & keys
+		$this->F = [ self::F_NORMAL ]; // fonts
+		$this->F_KEYS = [0]; // & keys
+		$this->XF  = [ [self::N_NORMAL, self::F_NORMAL, self::A_DEFAULT] ]; // styles
+		$this->XF_KEYS = ['N0F0A0' => 0 ]; // & keys
+
 		$this->template = [
-			'[Content_Types].xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
-<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
-<Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
-<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
-<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
-{SHEETS}
-<Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>
-<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>
-<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
-</Types>',
 			'_rels/.rels' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
 <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>
@ -51,33 +69,42 @@ class SimpleXLSXGen {
 <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
 {SHEETS}',
 			'xl/worksheets/sheet1.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"><dimension ref="{REF}"/><cols>{COLS}</cols><sheetData>{ROWS}</sheetData></worksheet>',
+<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+	xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+><dimension ref="{REF}"/>{COLS}<sheetData>{ROWS}</sheetData>{HYPERLINKS}</worksheet>',
+			'xl/worksheets/_rels/sheet1.xml.rels' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">{HYPERLINKS}</Relationships>',
 			'xl/sharedStrings.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="{CNT}" uniqueCount="{CNT}">{STRINGS}</sst>',
 			'xl/styles.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
-<fonts count="2"><font><name val="Calibri"/><family val="2"/></font><font><name val="Calibri"/><family val="2"/><b/></font></fonts>
+{FONTS}
 <fills count="1"><fill><patternFill patternType="none"/></fill></fills>
 <borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders>
 <cellStyleXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0" /></cellStyleXfs>
-<cellXfs count="6">
-	<xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
-	<xf numFmtId="1" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
-	<xf numFmtId="9" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>	
-	<xf numFmtId="10" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
-	<xf numFmtId="14" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
-	<xf numFmtId="20" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
-	<xf numFmtId="22" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
-	<xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1" applyAlignment="1"><alignment horizontal="right"/></xf>	
-</cellXfs>
-<cellStyles count="1"><cellStyle name="Normal" xfId="0" builtinId="0"/></cellStyles>
+{XF}
+<cellStyles count="1">
+	<cellStyle name="Normal" xfId="0" builtinId="0"/>
+</cellStyles>
 </styleSheet>',
 			'xl/workbook.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
 <fileVersion appName="'.__CLASS__.'"/><sheets>
 {SHEETS}
-</sheets></workbook>'
+</sheets></workbook>',
+			'[Content_Types].xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+<Override PartName="/rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+<Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
+<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
+<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+<Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>
+<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>
+<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
+{TYPES}
+</Types>',
 		];
+
 		// <col min="1" max="1" width="22.1796875" bestFit="1" customWidth="1"/>
 		// <row r="1" spans="1:2" x14ac:dyDescent="0.35"><c r="A1" t="s"><v>0</v></c><c r="B1"><v>100</v></c></row><row r="2" spans="1:2" x14ac:dyDescent="0.35"><c r="A2" t="s"><v>1</v></c><c r="B2"><v>200</v></c></row>
 		// <si><t>Простой шаблон</t></si><si><t>Будем делать генератор</t></si>
@ -90,7 +117,7 @@ class SimpleXLSXGen {
 	public function addSheet( array $rows, $name = null ) {
 		$this->curSheet++;

-		$this->sheets[$this->curSheet] = ['name' => $name ?: 'Sheet'.($this->curSheet+1)];
+		$this->sheets[$this->curSheet] = ['name' => $name ?: 'Sheet'.($this->curSheet+1), 'hyperlinks' => []];

 		if ( is_array( $rows ) && isset( $rows[0] ) && is_array($rows[0]) ) {
 			$this->sheets[$this->curSheet]['rows'] = $rows;
@ -177,17 +204,7 @@ class SimpleXLSXGen {
 		$cnt_sheets = count( $this->sheets );

 		foreach ($this->template as $cfilename => $template ) {
-			if ( $cfilename === '[Content_Types].xml' ) {
-				$s = '';
-				for ( $i = 0; $i < $cnt_sheets; $i++) {
-					$s .= '<Override PartName="/xl/worksheets/sheet'.($i+1).
-							'.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
-				}
-				$template = str_replace('{SHEETS}', $s, $template);
-				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
-				$entries++;
-			}
-			elseif ( $cfilename === 'xl/_rels/workbook.xml.rels' ) {
+			if ( $cfilename === 'xl/_rels/workbook.xml.rels' ) {
 				$s = '';
 				for ( $i = 0; $i < $cnt_sheets; $i++) {
 					$s .= '<Relationship Id="rId'.($i+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"'.
@ -197,11 +214,10 @@ class SimpleXLSXGen {
 				$template = str_replace('{SHEETS}', $s, $template);
 				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
 				$entries++;
-			}
-			elseif ( $cfilename === 'xl/workbook.xml' ) {
+			} elseif ( $cfilename === 'xl/workbook.xml' ) {
 				$s = '';
 				foreach ( $this->sheets as $k => $v ) {
-					$s .= '<sheet name="' . $v['name'] . '" sheetId="' . ( $k + 1) . '" state="visible" r:id="rId' . ( $k + 2) . '"/>';
+					$s .= '<sheet name="' . $this->esc( $v['name'] ) . '" sheetId="' . ( $k + 1) . '" state="visible" r:id="rId' . ( $k + 2) . '"/>';
 				}
 				$template = str_replace('{SHEETS}', $s, $template);
 				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
@ -228,8 +244,61 @@ class SimpleXLSXGen {
 					$entries++;
 				}
 				$xml = null;
-			}
-			else {
+			} elseif ( $cfilename === 'xl/worksheets/_rels/sheet1.xml.rels' ) {
+				foreach ( $this->sheets as $k => $v ) {
+					if ( count($v['hyperlinks'])) {
+						$RH = [];
+						$filename = 'xl/worksheets/_rels/sheet' . ( $k + 1 ) . '.xml.rels';
+						foreach ( $v['hyperlinks'] as $h ) {
+							$RH[] = '<Relationship Id="' . $h['ID'] . '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" Target="' . $this->esc($h['H']) . '" TargetMode="External"/>';
+						}
+						$xml = str_replace( '{HYPERLINKS}', implode( "\r\n", $RH ), $template );
+						$this->_writeEntry( $fh, $cdrec, $filename, $xml );
+						$entries++;
+					}
+				}
+				$xml = null;
+
+			} elseif ( $cfilename === '[Content_Types].xml' ) {
+				$TYPES = ['<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>'];
+				foreach ( $this->sheets as $k => $v) {
+					$TYPES[] = '<Override PartName="/xl/worksheets/sheet'.($k+1).
+							'.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
+					if (count( $v['hyperlinks'])) {
+						$TYPES[] = '<Override PartName="/xl/worksheets/_rels/sheet'.($k+1).'.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
+					}
+				}
+				$template = str_replace('{TYPES}', implode("\r\n", $TYPES), $template);
+				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
+				$entries++;
+			} elseif ( $cfilename === 'xl/styles.xml' ) {
+				$FONTS = ['<fonts count="'.count($this->F).'">'];
+				foreach ( $this->F as $f ) {
+					$FONTS[] = '<font><name val="'.$this->defaultFont.'"/><family val="2"/>'
+						. ( $this->defaultFontSize ? '<sz val="'.$this->defaultFontSize.'"/>' : '' )
+						.( $f & self::F_BOLD ? '<b/>' : '')
+						.( $f & self::F_ITALIC ? '<i/>' : '')
+						.( $f & self::F_UNDERLINE ? '<u/>' : '')
+						.( $f & self::F_STRIKE ? '<strike/>' : '')
+						.( $f & self::F_HYPERLINK ? '<color rgb="FF0563C1"/><u/>' : '')
+						.'</font>';
+				}
+				$FONTS[] = '</fonts>';
+				$XF = ['<cellXfs count="'.count($this->XF).'">'];
+				foreach( $this->XF as $xf ) {
+					$align = ($xf[2] === self::A_LEFT ? ' applyAlignment="1"><alignment horizontal="left"/>' : '')
+						.($xf[2] === self::A_RIGHT ? ' applyAlignment="1"><alignment horizontal="right"/>' : '')
+						.($xf[2] === self::A_CENTER ? ' applyAlignment="1"><alignment horizontal="center"/>' : '');
+					$XF[] = '<xf numFmtId="'.$xf[0].'" fontId="'.$xf[1].'" fillId="0" borderId="0" xfId="0"'
+						.($xf[0] > 0 ? ' applyNumberFormat="1"' : '')
+						.($align ? $align . '</xf>' : '/>');
+
+				}
+				$XF[] = '</cellXfs>';
+				$template = str_replace(['{FONTS}','{XF}'], [implode("\r\n", $FONTS), implode("\r\n", $XF)], $template);
+				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
+				$entries++;
+			} else {
 				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
 				$entries++;
 			}
@ -337,6 +406,7 @@ class SimpleXLSXGen {
 		$COLS = [];
 		$ROWS = [];
 		if ( count($this->sheets[$idx]['rows']) ) {
+			$COLS[] = '<cols>';
 			$CUR_ROW = 0;
 			$COL = [];
 			foreach( $this->sheets[$idx]['rows'] as $r ) {
@ -354,60 +424,110 @@ class SimpleXLSXGen {

 					$cname = $this->num2name($CUR_COL) . $CUR_ROW;

-					$ct = $cs = null;
+					$ct = $cv = null;
+					$N = $F = $A = 0;

 					if ( is_string($v) ) {

-						$vl = mb_strlen( $v );
-
-						if ( $v === '0' || preg_match( '/^[-+]?[1-9]\d{0,14}$/', $v ) ) { // Integer as General
-							$cv = ltrim( $v, '+' );
-							if ( $vl > 10 ) {
-								$cs = 1; // [1] 0
-							}
-						} elseif ( preg_match('/^[-+]?(0|[1-9]\d*)\.\d+$/', $v ) ) {
-							$cv = ltrim($v,'+');
-						} elseif ( preg_match('/^([-+]?\d+)%$/', $v, $m) ) {
-							$cv = round( $m[1] / 100, 2);
-							$cs = 2; // [9] 0%
-						} elseif ( preg_match('/^([-+]\d+\.\d+)%$/', $v, $m) ) {
-							$cv = round( $m[1] / 100, 4 );
-							$cs = 3; // [10] 0.00%
-						} elseif ( preg_match('/^(\d\d\d\d)-(\d\d)-(\d\d)$/', $v, $m ) ){
-							$cv = $this->date2excel($m[1],$m[2],$m[3]);
-							$cs = 4; // [14] mm-dd-yy
-						} elseif ( preg_match('/^(\d\d)\/(\d\d)\/(\d\d\d\d)$/', $v, $m ) ){
-							$cv = $this->date2excel($m[3],$m[2],$m[1]);
-							$cs = 4; // [14] mm-dd-yy
-						} elseif ( preg_match('/^(\d\d):(\d\d):(\d\d)$/', $v, $m ) ){
-							$cv = $this->date2excel(0,0,0,$m[1],$m[2],$m[3]);
-							$cs = 5; // [14] mm-dd-yy
-						} elseif ( preg_match('/^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
-							$cv = $this->date2excel( $m[1], $m[2], $m[3], $m[4], $m[5], $m[6] );
-							$cs = 6; // [22] m/d/yy h:mm
-						} elseif ( preg_match('/^(\d\d)\/(\d\d)\/(\d\d\d\d) (\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
-							$cv = $this->date2excel( $m[3], $m[2], $m[1], $m[4], $m[5], $m[6] );
-							$cs = 6; // [22] m/d/yy h:mm
-						} elseif ( mb_strlen( $v ) > 160 ) {
-							$ct = 'inlineStr';
-							$cv = str_replace(['&','<','>',"\x03"],['&amp;','&lt;','&gt;',''], $v);
+						if ( $v[0] === "\0" ) { // RAW value as string
+							$v = substr($v,1);
+							$vl = mb_strlen( $v );
 						} else {
-							if ( preg_match('/^[0-9+-.]+$/', $v ) ) { // Long ?
-								$cs = 7; // Align Right
-							}
-							$v = ltrim($v,"\0"); // disabled type detection
-							$ct = 's'; // shared string
-							$v = str_replace(['&','<','>',"\x03"],['&amp;','&lt;','&gt;',''], $v);
-							$cv = false;
-							$skey = '~'.$v;
-							if ( isset($this->SI_KEYS[ $skey ]) ) {
-								$cv = $this->SI_KEYS[ $skey ];
+							if ( strpos( $v, '<' ) !== false ) { // tags?
+								if ( strpos( $v, '<b>' ) !== false ) {
+									$F += self::F_BOLD;
+								}
+								if ( strpos( $v, '<i>' ) !== false ) {
+									$F += self::F_ITALIC;
+								}
+								if ( strpos( $v, '<u>' ) !== false ) {
+									$F += self::F_UNDERLINE;
+								}
+								if ( strpos( $v, '<s>' ) !== false ) {
+									$F += self::F_STRIKE;
+								}
+								if ( strpos( $v, '<left>' ) !== false ) {
+									$A += self::A_LEFT;
+								}
+								if ( strpos( $v, '<center>' ) !== false ) {
+									$A += self::A_CENTER;
+								}
+								if ( strpos( $v, '<right>' ) !== false ) {
+									$A += self::A_RIGHT;
+								}
+								if ( preg_match( '/<a href="(https?:\/\/[^"]+)">(.*?)<\/a>/i', $v, $m ) ) {
+									$h = explode( '#', $m[1] );
+									$this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => $h[0], 'L' => isset( $h[1] ) ? $h[1] : ''];
+									$F = self::F_HYPERLINK; // Hyperlink
+								}
+								if ( preg_match( '/<a href="(mailto?:[^"]+)">(.*?)<\/a>/i', $v, $m ) ) {
+									$this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => $m[1], 'L' => ''];
+									$F = self::F_HYPERLINK; // mailto hyperlink
+								}
+								$v = strip_tags( $v );
+							} // tags
+							$vl = mb_strlen( $v );
+							if ( $v === '0' || preg_match( '/^[-+]?[1-9]\d{0,14}$/', $v ) ) { // Integer as General
+								$cv = ltrim( $v, '+' );
+								if ( $vl > 10 ) {
+									$N = self::N_INT; // [1] 0
+								}
+							} elseif ( preg_match( '/^[-+]?(0|[1-9]\d*)\.(\d+)$/', $v, $m ) ) {
+								$cv = ltrim( $v, '+' );
+								if ( strlen( $m[2] ) < 3 ) {
+									$N = self::N_DEC;
+								}
+							} elseif ( preg_match( '/^([-+]?\d+)%$/', $v, $m ) ) {
+								$cv = round( $m[1] / 100, 2 );
+								$N = self::N_PERCENT_INT; // [9] 0%
+							} elseif ( preg_match( '/^([-+]?\d+\.\d+)%$/', $v, $m ) ) {
+								$cv = round( $m[1] / 100, 4 );
+								$N = self::N_PRECENT_DEC; // [10] 0.00%
+							} elseif ( preg_match( '/^(\d\d\d\d)-(\d\d)-(\d\d)$/', $v, $m ) ) {
+								$cv = $this->date2excel( $m[1], $m[2], $m[3] );
+								$N = self::N_DATE; // [14] mm-dd-yy
+							} elseif ( preg_match( '/^(\d\d)\/(\d\d)\/(\d\d\d\d)$/', $v, $m ) ) {
+								$cv = $this->date2excel( $m[3], $m[2], $m[1] );
+								$N = self::N_DATE; // [14] mm-dd-yy
+							} elseif ( preg_match( '/^(\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
+								$cv = $this->date2excel( 0, 0, 0, $m[1], $m[2], $m[3] );
+								$N = self::N_TIME; // time
+							} elseif ( preg_match( '/^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
+								$cv = $this->date2excel( $m[1], $m[2], $m[3], $m[4], $m[5], $m[6] );
+								$N = self::N_DATETIME; // [22] m/d/yy h:mm
+							} elseif ( preg_match( '/^(\d\d)\/(\d\d)\/(\d\d\d\d) (\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
+								$cv = $this->date2excel( $m[3], $m[2], $m[1], $m[4], $m[5], $m[6] );
+								$N = self::N_DATETIME; // [22] m/d/yy h:mm
+							} elseif ( preg_match( '/^[0-9+-.]+$/', $v ) ) { // Long ?
+								$A = self::A_RIGHT;
+							} elseif ( preg_match( '/^https?:\/\/\S+$/i', $v ) ) {
+								$h = explode( '#', $v );
+								$this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => $h[0], 'L' => isset( $h[1] ) ? $h[1] : ''];
+								$F = self::F_HYPERLINK; // Hyperlink
+							} elseif ( preg_match( "/^([a-zA-Z0-9_\.\-]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)$/i", $v ) ) {
+								$this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => 'mailto:' . $v, 'L' => ''];
+								$F = self::F_HYPERLINK; // Hyperlink
 							}
+						}
+						if ( !$cv) {

-							if ( $cv === false ) {
-								$this->SI[] = $v;
-								$cv  = count( $this->SI ) - 1;
-								$this->SI_KEYS[$skey] = $cv;
+							$v = $this->esc( $v );
+
+							if ( mb_strlen( $v ) > 160 ) {
+								$ct = 'inlineStr';
+								$cv = $v;
+							} else {
+								$ct = 's'; // shared string
+								$cv = false;
+								$skey = '~' . $v;
+								if ( isset( $this->SI_KEYS[ $skey ] ) ) {
+									$cv = $this->SI_KEYS[ $skey ];
+								}
+								if ( $cv === false ) {
+									$this->SI[] = $v;
+									$cv = count( $this->SI ) - 1;
+									$this->SI_KEYS[ $skey ] = $cv;
+								}
 							}
 						}
 					} elseif ( is_int( $v ) ) {
@ -419,13 +539,34 @@ class SimpleXLSXGen {
 					} elseif ( $v instanceof DateTime ) {
 						$vl = 16;
 						$cv = $this->date2excel( $v->format('Y'), $v->format('m'), $v->format('d'), $v->format('H'), $v->format('i'), $v->format('s') );
-						$cs = 6; // [22] m/d/yy h:mm
+						$N = self::N_DATETIME; // [22] m/d/yy h:mm
 					} else {
 						continue;
 					}

 					$COL[ $CUR_COL ] = max( $vl, $COL[ $CUR_COL ] );

+					$cs = 0;
+					if ( $N + $F + $A > 0 ) {
+
+						if ( isset($this->F_KEYS[ $F ] ) ) {
+							$cf = $this->F_KEYS[ $F ];
+						} else {
+							$cf = count($this->F);
+							$this->F_KEYS[$F] = $cf;
+							$this->F[] = $F;
+						}
+						$NFA = 'N' . $N . 'F' . $cf . 'A' . $A;
+						if ( isset( $this->XF_KEYS[ $NFA ] ) ) {
+							$cs = $this->XF_KEYS[ $NFA ];
+						}
+						if ( $cs === 0 ) {
+							$cs = count( $this->XF );
+							$this->XF_KEYS[ $NFA ] = $cs;
+							$this->XF[] = [$N, $cf, $A];
+						}
+					}
+
 					$row .= '<c r="' . $cname . '"'.($ct ? ' t="'.$ct.'"' : '').($cs ? ' s="'.$cs.'"' : '').'>'
 					        .($ct === 'inlineStr' ? '<is><t>'.$cv.'</t></is>' : '<v>' . $cv . '</v>')."</c>\r\n";
 				}
@ -434,17 +575,25 @@ class SimpleXLSXGen {
 			foreach ( $COL as $k => $max ) {
 				$COLS[] = '<col min="'.$k.'" max="'.$k.'" width="'.min( $max+1, 60).'" />';
 			}
+			$COLS[] = '</cols>';
 			$REF = 'A1:'.$this->num2name(count($COLS)) . $CUR_ROW;
 		} else {
-			$COLS[] = '<col min="1" max="1" bestFit="1" />';
 			$ROWS[] = '<row r="1"><c r="A1" t="s"><v>0</v></c></row>';
 			$REF = 'A1:A1';
 		}
+		$HYPERLINKS = [];
+		if ( count( $this->sheets[$idx]['hyperlinks']) ) {
+			$HYPERLINKS[] = '<hyperlinks>';
+			foreach ( $this->sheets[$idx]['hyperlinks'] as $h ) {
+				$HYPERLINKS[] = '<hyperlink ref="' . $h['R'] . '" r:id="' . $h['ID'] . '" location="' . $this->esc( $h['L'] ) . '" display="' . $this->esc( $h['H'] . ( $h['L'] ? ' - ' . $h['L'] : '' ) ) . '" />';
+			}
+			$HYPERLINKS[] = '</hyperlinks>';
+		}
 		//restore locale
 		setlocale(LC_NUMERIC, $_loc);

-		return str_replace(['{REF}','{COLS}','{ROWS}'],
-			[ $REF, implode("\r\n", $COLS), implode("\r\n",$ROWS) ],
+		return str_replace(['{REF}','{COLS}','{ROWS}','{HYPERLINKS}'],
+			[ $REF, implode("\r\n", $COLS), implode("\r\n",$ROWS), implode("\r\n", $HYPERLINKS) ],
 			$template );
 	}

@ -484,4 +633,15 @@ class SimpleXLSXGen {

 		return (float) $excelDate + $excelTime;
 	}
+	public function setDefaultFont( $name ) {
+		$this->defaultFont = $name;
+		return $this;
+	}
+	public function setDefaultFontSize( $size ) {
+		$this->defaultFontSize = $size;
+		return $this;
+	}
+	public function esc( $str ) {
+		return str_replace( ['&', '<', '>', "\x03"], ['&amp;', '&lt;', '&gt;', ''], $str );
+	}
 }
--- a/styles.png
+++ b/styles.png
Author	SHA1	Message	Date
Sergey Shuchkin	c8a94d552a	1.0.17	2021-07-28 01:45:25 +06:00
Sergey Shuchkin	c9fa7da689	1.0.16	2021-07-01 03:03:57 +06:00
Sergey Shuchkin	0d059fdf6e	1.0.16	2021-07-01 03:01:35 +06:00
Sergey Shuchkin	dcb5f8ad65	1.0.15	2021-06-22 00:57:29 +06:00
Sergey Shuchkin	f970452779	1.0.14	2021-06-08 09:59:42 +06:00
Sergey Shuchkin	6abd0286bb	1.0.14	2021-06-08 09:51:10 +06:00
Sergey Shuchkin	8bfbe078db	1.0.13	2021-05-29 23:21:45 +06:00
Sergey Shuchkin	6ece83f9ce	1.0.12	2021-05-19 10:21:09 +06:00
Sergey Shuchkin	4f375a4c30	1.0.11	2021-05-14 16:52:30 +06:00
Sergey Shuchkin	41c6e7ca51	Merge pull request #34 from marcrobledo/marcrobledo-fix-percentage fix percentage with decimals	2021-05-14 16:37:33 +06:00
Marc Robledo	ef7b0fff02	fix percentage with decimals make sign optional for percentage values with decimals	2021-05-14 10:55:07 +02:00
Sergey Shuchkin	860da7f493	1.0.10	2021-05-03 03:22:26 +06:00
Sergey Shuchkin	eeec88dbf0	1.0.10	2021-05-03 03:19:14 +06:00
Sergey Shuchkin	1e866f82bf	1.0.10	2021-05-03 03:17:24 +06:00
Sergey Shuchkin	17098b57ef	1.0.10	2021-05-03 03:08:41 +06:00
Sergey Shuchkin	ab49ffadd7	example $xlsx_content = (string) $xlsx	2021-03-01 00:09:42 +06:00
Sergey Shuchkin	99c6be2fb4	Added PHP Datetime object values in a cells	2021-02-26 21:45:38 +06:00