From 626075511ae1db1e539e8986e9b20fbfb1c64961 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Sat, 27 Sep 2008 21:11:33 +0000
Subject: [PATCH] Minify/HTML.php : Fix of Issue 53

---
 min/lib/Minify/HTML.php                         |  6 +++---
 min_unit_tests/_test_files/html/before.min.html | 17 +++++------------
 .../_test_files/html/before2.min.html           | 17 +++++------------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/min/lib/Minify/HTML.php b/min/lib/Minify/HTML.php
index 674764d..615ef6c 100644
--- a/min/lib/Minify/HTML.php
+++ b/min/lib/Minify/HTML.php
@@ -99,6 +99,9 @@ class Minify_HTML {
             ,array('Minify_HTML', '_outsideTagCB')
             ,$html);
         
+        // use newlines before 1st attribute in open tags (to limit line lengths)
+        $html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $html);
+        
         // fill placeholders
         $html = str_replace(
             array_keys(self::$_placeholders)
@@ -107,9 +110,6 @@ class Minify_HTML {
         );
         self::$_placeholders = array();
         
-        // use newlines before 1st attribute in open tags (to limit line lengths)
-        $html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $html);
-        
         self::$_cssMinifier = self::$_jsMinifier = null;
         return $html;
     }
diff --git a/min_unit_tests/_test_files/html/before.min.html b/min_unit_tests/_test_files/html/before.min.html
index d8862c2..369333a 100644
--- a/min_unit_tests/_test_files/html/before.min.html
+++ b/min_unit_tests/_test_files/html/before.min.html
@@ -4,18 +4,12 @@ http-equiv="content-type" content="text/html; charset=iso-8859-1" /><meta
 name="author" content="Dave Shea" /><meta
 name="keywords" content="design, css, cascading, style, sheets, xhtml, graphic design, w3c, web standards, visual, display" /><meta
 name="description" content="A demonstration of what can be accomplished visually through CSS-based design." /><meta
-name="robots" content="all" /><title>css Zen Garden: The Beauty in CSS Design</title><script
-type="text/javascript">var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'}
+name="robots" content="all" /><title>css Zen Garden: The Beauty in CSS Design</title><script type="text/javascript">var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'}
 is.mac=is.ua.indexOf('mac')>=0;if(is.ua.indexOf('opera')>=0){is.ie=is.ns=false;is.opera=true;}
-if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}</script><script
-type="text/javascript">/*<![CDATA[*/var i=0;while(++i<10)
-{}/*]]>*/</script><script
-type="text/javascript">i=1;</script><script
-type="text/javascript">/*<![CDATA[*/(i<1);/*]]>*/</script><!--[if IE 6]><style
-type="text/css">/*<![CDATA[*/
+if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}</script><script type="text/javascript">/*<![CDATA[*/var i=0;while(++i<10)
+{}/*]]>*/</script><script type="text/javascript">i=1;</script><script type="text/javascript">/*<![CDATA[*/(i<1);/*]]>*/</script><!--[if IE 6]><style type="text/css">/*<![CDATA[*/
 /* copyright: you'll need CDATA for this < & */
-body{background:white}/*]]>*/</style><![endif]--><style
-type="text/css" title="currentStyle" media="screen">@import "/001/001.css";/*\*/css
+body{background:white}/*]]>*/</style><![endif]--><style type="text/css" title="currentStyle" media="screen">@import "/001/001.css";/*\*/css
 hack{}/**//*/*/css
 hack{}/**/css
 hack{display/**/:/**/none;display:none}</style><link
@@ -37,7 +31,6 @@ class="p1"><span>A demonstration of what can be accomplished visually through <a
 title="Cascading Style Sheets">CSS</acronym>-based design. Select any style sheet from the list to load it into this page.</span></p><p
 class="p2"><span>Download the sample <a
 href="/zengarden-sample.html" title="This page's source HTML code, not to be modified.">html file</a> and <a
-href="/zengarden-sample.css" title="This page's sample CSS, the file you may modify.">css file</a></span></p></div><textarea
-name="comment" id="comment" rows="6" class="maxwidth" cols="80">66666
+href="/zengarden-sample.css" title="This page's sample CSS, the file you may modify.">css file</a></span></p></div><textarea name="comment" id="comment" rows="6" class="maxwidth" cols="80">66666
 
 1234567890</textarea></div></body></html>
\ No newline at end of file
diff --git a/min_unit_tests/_test_files/html/before2.min.html b/min_unit_tests/_test_files/html/before2.min.html
index 69168aa..ce777ae 100644
--- a/min_unit_tests/_test_files/html/before2.min.html
+++ b/min_unit_tests/_test_files/html/before2.min.html
@@ -4,18 +4,12 @@ http-equiv="content-type" content="text/html; charset=iso-8859-1"><meta
 name="author" content="Dave Shea"><meta
 name="keywords" content="design, css, cascading, style, sheets, xhtml, graphic design, w3c, web standards, visual, display"><meta
 name="description" content="A demonstration of what can be accomplished visually through CSS-based design."><meta
-name="robots" content="all"><title>css Zen Garden: The Beauty in CSS Design</title><script
-type="text/javascript">var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'}
+name="robots" content="all"><title>css Zen Garden: The Beauty in CSS Design</title><script type="text/javascript">var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'}
 is.mac=is.ua.indexOf('mac')>=0;if(is.ua.indexOf('opera')>=0){is.ie=is.ns=false;is.opera=true;}
-if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}</script><script
-type="text/javascript">var i=0;while(++i<10)
-{}</script><script
-type="text/javascript">i=1;</script><script
-type="text/javascript">(i<1);</script><!--[if IE 6]><style
-type="text/css">
+if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}</script><script type="text/javascript">var i=0;while(++i<10)
+{}</script><script type="text/javascript">i=1;</script><script type="text/javascript">(i<1);</script><!--[if IE 6]><style type="text/css">
 /* copyright: you'll need CDATA for this < & */
-body{background:white}</style><![endif]--><style
-type="text/css" title="currentStyle" media="screen">@import "/001/001.css";/*\*/css
+body{background:white}</style><![endif]--><style type="text/css" title="currentStyle" media="screen">@import "/001/001.css";/*\*/css
 hack{}/**//*/*/css
 hack{}/**/css
 hack{display/**/:/**/none;display:none}</style><link
@@ -37,7 +31,6 @@ class="p1"><span>A demonstration of what can be accomplished visually through <a
 title="Cascading Style Sheets">CSS</acronym>-based design. Select any style sheet from the list to load it into this page.</span></p><p
 class="p2"><span>Download the sample <a
 href="/zengarden-sample.html" title="This page's source HTML code, not to be modified.">html file</a> and <a
-href="/zengarden-sample.css" title="This page's sample CSS, the file you may modify.">css file</a></span></p></div><textarea
-name="comment" id="comment" rows="6" class="maxwidth" cols="80">66666
+href="/zengarden-sample.css" title="This page's sample CSS, the file you may modify.">css file</a></span></p></div><textarea name="comment" id="comment" rows="6" class="maxwidth" cols="80">66666
 
 1234567890</textarea></div></body></html>
\ No newline at end of file