fixing problems with non ISO-8859-1 characters (KUBO Atsuhiro)
git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@123757 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
parent
d67328bad6
commit
7d6b7d621d
|
|
@ -561,7 +561,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
||||||
{
|
{
|
||||||
return(pack("C", $this->ptg[$token]));
|
return(pack("C", $this->ptg[$token]));
|
||||||
}
|
}
|
||||||
elseif(preg_match("/[A-Z0-9À-Ü\.]+/",$token))
|
elseif(preg_match("/[A-Z0-9\xc0-\xdc\.]+/",$token))
|
||||||
{
|
{
|
||||||
return($this->_convertFunction($token,$this->_func_args));
|
return($this->_convertFunction($token,$this->_func_args));
|
||||||
}
|
}
|
||||||
|
|
@ -1097,7 +1097,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
||||||
return($token);
|
return($token);
|
||||||
}
|
}
|
||||||
// if it's a function call
|
// if it's a function call
|
||||||
elseif(eregi("^[A-Z0-9À-Ü\.]+$",$token) and ($this->_lookahead == "("))
|
elseif(eregi("^[A-Z0-9\xc0-\xdc\.]+$",$token) and ($this->_lookahead == "("))
|
||||||
{
|
{
|
||||||
return($token);
|
return($token);
|
||||||
}
|
}
|
||||||
|
|
@ -1348,7 +1348,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
|
||||||
return($result);
|
return($result);
|
||||||
}
|
}
|
||||||
// if it's a function call
|
// if it's a function call
|
||||||
elseif (eregi("^[A-Z0-9À-Ü\.]+$",$this->_current_token))
|
elseif (eregi("^[A-Z0-9\xc0-\xdc\.]+$",$this->_current_token))
|
||||||
{
|
{
|
||||||
$result = $this->_func();
|
$result = $this->_func();
|
||||||
return($result);
|
return($result);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue