From de1cb768ecb044f595d6db22f290378bd8024946 Mon Sep 17 00:00:00 2001
From: Xavier Noguer Gallego <xnoguer@php.net>
Date: Mon, 28 Apr 2003 22:44:56 +0000
Subject: [PATCH] adding unserscore as a valid character for sheet names (JT
 Hughes) TODO: find out what all the valid characters are

git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@125036 c90b9560-bf6c-de11-be94-00142212c4b1
---
 Writer/Parser.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Writer/Parser.php b/Writer/Parser.php
index 6329934..ff04b5f 100644
--- a/Writer/Parser.php
+++ b/Writer/Parser.php
@@ -538,7 +538,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
             return($this->_convertRef2d($token));
         }
         // match external references like Sheet1!A1
-        elseif(preg_match("/^([A-Za-z0-9]+\![A-I]?[A-Z])(\d+)$/",$token))
+        elseif(preg_match("/^([A-Za-z0-9_]+\![A-I]?[A-Z])(\d+)$/",$token))
         {
             return($this->_convertRef3d($token));
         }
@@ -553,7 +553,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
             return($this->_convertRange2d($token));
         }
         // match external ranges like Sheet1!A1:B2
-        elseif(preg_match("/^([A-Za-z0-9]+\![A-I]?[A-Z])(\d+)\:([A-I]?[A-Z])(\d+)$/",$token))
+        elseif(preg_match("/^([A-Za-z0-9_]+\![A-I]?[A-Z])(\d+)\:([A-I]?[A-Z])(\d+)$/",$token))
         {
             return($this->_convertRange3d($token));
         }
@@ -1063,7 +1063,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
                     return $token;
                 }
                 // If it's an external reference (Sheet1!A1)
-                elseif(eregi("^[A-Za-z0-9]+\![A-I]?[A-Z][0-9]+$",$token) and
+                elseif(eregi("^[A-Za-z0-9_]+\![A-I]?[A-Z][0-9]+$",$token) and
                        !ereg("[0-9]",$this->_lookahead) and
                        ($this->_lookahead != ':') and ($this->_lookahead != '.'))
                 {
@@ -1082,7 +1082,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
                     return $token;
                 }
                 // If it's a external range
-                elseif(eregi("^[A-Za-z0-9]+\![A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$",$token) and
+                elseif(eregi("^[A-Za-z0-9_]+\![A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$",$token) and
                        !ereg("[0-9]",$this->_lookahead))
                 {
                     return($token);
@@ -1322,7 +1322,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
             return $result;
         }
         // If it's an external reference (Sheet1!A1)
-        elseif(eregi("^[A-Za-z0-9]+\![A-I]?[A-Z][0-9]+$",$this->_current_token))
+        elseif(eregi("^[A-Za-z0-9_]+\![A-I]?[A-Z][0-9]+$",$this->_current_token))
         {
             $result = $this->_createTree($this->_current_token, '', '');
             $this->_advance();
@@ -1337,7 +1337,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
             return $result;
         }
         // If it's an external range (Sheet1!A1:B2)
-        elseif(eregi("^[A-Za-z0-9]+\![A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$",$this->_current_token))
+        elseif(eregi("^[A-Za-z0-9_]+\![A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$",$this->_current_token))
         {
             $result = $this->_current_token;
             $this->_advance();