Changeset 20748 for lang/php

Timestamp:

10/05/08 06:21:43 (2 months ago)

Author:

drry

Message:

• fixed regexes.
  
• et cetera.
  

Location:

lang/php/HTML_CSS_Mobile/trunk/HTML/CSS

Files:

• Mobile.php (modified) (9 diffs)
• lib/selectorToXPath.php (modified) (3 diffs)

lang/php/HTML_CSS_Mobile/trunk/HTML/CSS/Mobile.php

@@ -99 +99 @@
                         }
                 }
-                
+
                 return $this;
         }
@@ -124 +124 @@
                 // loadHTML/saveHTMLのバグに対応。XML宣言の一時退避
                 $declaration = '';
-                if (preg_match('/^<\?xml\s+.+?\?>\n?/i', $document, $e)) 
+                if (preg_match('/^<\?xml\s[^>]+?\?>\s*/', $document, $e))
                 {
                         $declaration = $e[0];
@@ -130 +130 @@
                 }
 
-                // 数値文字参照・実体参照をエスケープ
-                $document = preg_replace('/&(#\d+|\w+);/', 'HTMLCSSINLINERESCAPE%$1%::::::::', $document);
+                // 文字参照をエスケープ
+                $document = preg_replace('/&(#(?:\d+|x[0-9a-fA-F]+)|[A-Za-z0-9]+);/', 'HTMLCSSINLINERESCAPE%$1%::::::::', $document);
 
                 // 機種依存文字がエラーになる問題を回避するため、UTF-8に変換して処理
@@ -155 +155 @@
                 }
                 /****************************************
-                 * 本処理 
+                 * 本処理
                  ****************************************/
 
@@ -198 +198 @@
                                         $inline_style .= $k . ':' . $v . ';';
                                 }
-                                foreach ($elements as $element) 
+                                foreach ($elements as $element)
                                 {
                                         if ($attr_style = $element->attributes->getNamedItem('style'))
@@ -222 +222 @@
                 {
                         $new_style = implode(PHP_EOL, $add_style);
+                        $new_style = str_replace(']]>', ']]]><![CDATA[]>', $new_style);
                         $new_style = implode(PHP_EOL, array('<![CDATA[', $new_style, ']]>'));
 
@@ -243 +244 @@
 
                 // エスケープしていた参照を復元
-                $result = preg_replace('/HTMLCSSINLINERESCAPE%(#\d+|\w+)%::::::::/', '&$1;', $result);
+                $result = preg_replace('/HTMLCSSINLINERESCAPE%(#(?:\d+|x[0-9a-fA-F]+)|[A-Za-z0-9]+)%::::::::/', '&$1;', $result);
 
                 // 退避したXML宣言を復元
@@ -321 +322 @@
         {
                 // 文字コードをDOM利用のためにUTF-8化
-                $css_encoding = mb_detect_encoding($css_string, 'UTF-8, eucjp-win, sjis-win,  iso-2022-jp');
+                $css_encoding = mb_detect_encoding($css_string, 'UTF-8, eucjp-win, sjis-win, iso-2022-jp');
                 if ($css_encoding != 'UTF-8')
                 {
@@ -329 +330 @@
                 $html_css = new HTML_CSS();
                 $css_error = $html_css->parseString($css_string);
-                if ($css_error) 
+                if ($css_error)
                 {
                         throw new RuntimeException('ERROR: css parse error');

lang/php/HTML_CSS_Mobile/trunk/HTML/CSS/lib/selectorToXPath.php

@@ -26 +26 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- */ 
+ */
 
 /**
@@ -34 +34 @@
  * のPHP移殖版
  *   理解のいたる範囲で移植したので劣化コピーかもしれない。
- */ 
+ */
 class selectorToXPath
 {
@@ -43 +43 @@
       'element'    => '/^(\*|[a-z_][a-z0-9_-]*)/i',
       'id_class'   => '/^([#.])([a-z0-9*_-]*)/i',
-      'attribute'  => '/^\[\s*([^~\|=\s]+)\s*([~\|]?=)\s*"([^"]+)"\s*\]/i',
-      'attr_box'   => '/^\[([^\]]*)\]/i',
-      'attr_not'   => '/^:not\((.*?)\)/i',
+      'attribute'  => '/^\[\s*([^~|=\s]+)\s*([~|]?=)\s*"([^"]+)"\s*\]/',
+      'attr_box'   => '/^\[([^\]]*)\]/',
+      'attr_not'   => '/^:not\(([^)]*)\)/i',
       'pseudo'     => '/^:([a-z0-9_-]+)(\(([a-z0-9_-]+)\))?/i',
       'combinator' => '/^(\s*[>+~\s])/i',
-      'comma'      => '/^,/i',
+      'comma'      => '/^,/',
     );