--- nfo/php/libs/com.newsblob.phphtmllib/HTMLTagClass.inc	2003/02/22 20:55:24	1.2
+++ nfo/php/libs/com.newsblob.phphtmllib/HTMLTagClass.inc	2004/05/06 12:58:02	1.3
@@ -3,7 +3,7 @@
 /**
  * Holds the HTMLTagClass
  *
- * $Id: HTMLTagClass.inc,v 1.2 2003/02/22 20:55:24 jonen Exp $
+ * $Id: HTMLTagClass.inc,v 1.3 2004/05/06 12:58:02 jonen Exp $
  * 
  * @author Walter A. Boring IV <waboring@buildabetterweb.com>
  * @package phpHtmlLib
@@ -46,7 +46,7 @@
 
 	/**
 	 * The list of attributes not to render
-	 * if HTML_RENDER_TYPE is "XHTML STRICT"
+	 * if $GLOBALS["HTML_RENDER_TYPE"] is "XHTML STRICT"
 	 *
      * We comment this declaration out
      * to save memory, since only a small
@@ -105,8 +105,8 @@
 		//this is a magic test.  It assumes that
 		//someone has created the define for
 		//HTML_RENDER_TYPE
-		if ( HTML_RENDER_TYPE == XHTML ||
-			 HTML_RENDER_TYPE == XHTML_STRICT ) {
+		if ( $GLOBALS["HTML_RENDER_TYPE"] == XHTML ||
+			 $GLOBALS["HTML_RENDER_TYPE"] == XHTML_STRICT ) {
 			$this->_flags |= _XHTMLCOMPLIANT;
 
 		}
@@ -245,8 +245,8 @@
 
 		$indent = $this->_render_indent($indent_level, TRUE);
 
-		$tag_prefix = htmlspecialchars( ($this->_tag_prefix ? $this->_tag_prefix : _TAG_PREFIX));
-		$tab_postfix = htmlspecialchars( ($this->_tag_postfix ? $this->_tag_postfix : _TAG_SUFFIX));
+		$tag_prefix = htmlspecialchars( (@$this->_tag_prefix ? $this->_tag_prefix : _TAG_PREFIX));
+		$tab_postfix = htmlspecialchars( (@$this->_tag_postfix ? $this->_tag_postfix : _TAG_SUFFIX));
 		$str = $indent . $tag_prefix. "<span class=\"purple\" style=\"white-space:nowrap;\">";
 		$str .= $this->_tag . "</span>";
 
@@ -396,24 +396,30 @@
 				}
 			}
 
-			if ( HTML_RENDER_TYPE == XHTML_STRICT && 
+			if ( $GLOBALS["HTML_RENDER_TYPE"] == XHTML_STRICT && 
 				 @in_array($name, $this->_xhtml_strict_attributes) ) {
 				$returnval = NULL;
 			}
 		} else {
 			//hack to make non name-value pair work.
 			//ie <option name=foo value=bar CHECKED>
-			if ( HTML_RENDER_TYPE == XHTML_STRICT && !is_int($name) ) {
+			if ( $GLOBALS["HTML_RENDER_TYPE"] == XHTML_STRICT && !is_int($name) ) {
 				//We do this because XHTML STRICT complains about
 				//html characters such as &.  So we mask them.
-				$value = htmlentities($value);
+				$value = htmlspecialchars($value);
 			}
 
-			if ( HTML_RENDER_TYPE == XHTML_STRICT && 
+			if ( $GLOBALS["HTML_RENDER_TYPE"] == XHTML_STRICT && 
 				 @in_array($name, $this->_xhtml_strict_attributes) ) {
 				$returnval = NULL;
 			} else {
-				$returnval = XMLTagClass::_build_attribute_string($name, $value);
+                if ( ((int)$name - 0) === $name) {
+                    $returnval = " ".$value;
+                } else if ( $value === NULL ) {
+                    $returnval = " ".$name;
+                } else {
+                    $returnval= " ".$name."=\"".$value."\"";
+                }
 			}
 		}
 		return $returnval;
@@ -423,5 +429,29 @@
 	// Misc functions
 	//****************************************************************
 
+
+    /**
+     * This function checks to see if
+     * there is only 1 content data, and
+     * its not an object, then it auto
+     * sets some of the indentation flags
+     *
+     */
+    function _prepare_flags() { 
+		if ($this->_flags & _CONTENTREQUIRED) {
+			if ($this->count_content() == 1) {
+				if (!is_object($this->_content[0])) {
+					//ok looks like this object has only
+					//1 data for content and its a string.          
+					if ( !strstr($this->_content[0], "\n") ) {
+						$this->_flags &= ~_NEWLINEAFTEROPENTAG;
+					}
+				}
+			} else if ($this->count_content() == 0) {
+                $this->_flags &= ~_NEWLINEAFTEROPENTAG;
+            }
+		}
+    }
+
 }
 ?>