Index: xotcl/library/lib/htmllib.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/htmllib.xotcl	(.../htmllib.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/lib/htmllib.xotcl	(.../htmllib.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,4 @@
-## $Header: /home/neumann/cvs/xotcl/xotcl/library/lib/htmllib.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+## $Header: /home/neumann/cvs/xotcl/xotcl/library/lib/htmllib.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 
 #
 # htmllib.xotcl
@@ -36,636 +36,642 @@
 # 
 
 package provide xotcl::htmllib 0.1
-
 package require XOTcl
 
+namespace eval ::xotcl::htmllib {
+    namespace import ::xotcl::*
 
-@ @File {
-    description {
-        This package provides the class HtmlBuilder, which can be used to 
-        generate HTML documents, or a part of a document.
+    @ @File {
+	description {
+	    This package provides the class HtmlBuilder, which can be used to 
+	    generate HTML documents, or a part of a document.
+	}
+	authors {
+	    Antti Salonen, as@fishpool.fi
+	}
+	date {
+	    $Date: 2005/09/09 21:07:23 $
+	}
     }
-    authors {
-        Antti Salonen, as@fishpool.fi
+    
+    #
+    # the compressed parameter means that minimal HTML page are created
+    # i.e. that space indentation is turned off
+    #
+    Class HtmlBuilder -parameter {
+	{compressed 0}
     }
-    date {
-        $Date: 2004/05/23 22:50:39 $
-    }
-}
-	
-#
-# the compressed parameter means that minimal HTML page are created
-# i.e. that space indentation is turned off
-#
-Class HtmlBuilder -parameter {
-  {compressed 0}
-}
 
-## The constructor.
-##
-## The HtmlBuilder object has two instance variables. The document Tcl list
-## contains the document as a list of strings. The document is stored as a list
-## rather than a single string to allow further indentation of the whole
-## document when necessary.
-##   The indentLevel variable is the level of indentation, which is generally
-## increased for the contents of any HTML element that may contain block-level
-## elements. Typical examples would be <ul>, <li>, <td> and so forth.
+    ## The constructor.
+    ##
+    ## The HtmlBuilder object has two instance variables. The document Tcl list
+    ## contains the document as a list of strings. The document is stored as a list
+    ## rather than a single string to allow further indentation of the whole
+    ## document when necessary.
+    ##   The indentLevel variable is the level of indentation, which is generally
+    ## increased for the contents of any HTML element that may contain block-level
+    ## elements. Typical examples would be <ul>, <li>, <td> and so forth.
 
-HtmlBuilder instproc init {} {
-    my instvar document indentLevel
-    set document [list] 
-    set indentLevel 0
-    return
-}
+    HtmlBuilder instproc init {} {
+	my instvar document indentLevel
+	set document [list] 
+	set indentLevel 0
+	return
+    }
 
 
-HtmlBuilder instproc clear {} {
-    my instvar document indentLevel
+    HtmlBuilder instproc clear {} {
+	my instvar document indentLevel
 
-    set document [list]
-    set indentLevel 0
-    return
-}
+	set document [list]
+	set indentLevel 0
+	return
+    }
 
 
-HtmlBuilder instproc getDocument {} {
-    my instvar document
-    return $document
-}
+    HtmlBuilder instproc getDocument {} {
+	my instvar document
+	return $document
+    }
 
 
-HtmlBuilder instproc toString {} {
-    my instvar document compressed
-    set rvalue ""
-    foreach line $document {
-      if {$compressed == "0"} {
-        append rvalue "$line\n"
-      } else {
-	## only new line for closing tags at the beginnig 
-	## of a document element
-	if {[string equal -length 2 "</" $line]} {
-	  append rvalue "$line\n"
-	} else {
-	  append rvalue "$line "
+    HtmlBuilder instproc toString {} {
+	my instvar document compressed
+	set rvalue ""
+	foreach line $document {
+	    if {$compressed == "0"} {
+		append rvalue "$line\n"
+	    } else {
+		## only new line for closing tags at the beginnig 
+		## of a document element
+		if {[string equal -length 2 "</" $line]} {
+		    append rvalue "$line\n"
+		} else {
+		    append rvalue "$line "
+		}
+	    }
 	}
-      }
+	return $rvalue
     }
-    return $rvalue
-}
 
 
-## parseArguments - Parses the arguments in argList as described in the two
-## additional Tcl lists. In addition to the arguments listed in the two 
-## additional lists, the procedure also accepts arguments common to all
-## HTML elements.
-## Arguments:
-##   argList - List of arguments to be parsed
-##   argParamList - List of arguments that take a parameter
-##   argNoParamList - List of arguments that don't take a parameter
-## Returns:
-##   A string with arguments to an HTML element.
+    ## parseArguments - Parses the arguments in argList as described in the two
+    ## additional Tcl lists. In addition to the arguments listed in the two 
+    ## additional lists, the procedure also accepts arguments common to all
+    ## HTML elements.
+    ## Arguments:
+    ##   argList - List of arguments to be parsed
+    ##   argParamList - List of arguments that take a parameter
+    ##   argNoParamList - List of arguments that don't take a parameter
+    ## Returns:
+    ##   A string with arguments to an HTML element.
 
-HtmlBuilder proc parseArguments {argList argParamList argNoParamList} {
-    set rvalue ""
-    set argParamList [concat $argParamList [list "ID" "CLASS" "STYLE" "TITLE" "LANG" "DIR"]]
-    set param 0
-    foreach arg $argList {
-        if {$param} {
-            append rvalue "=\"$arg\""
-            set param 0
-        } else {
-            set arg2 [string toupper [string trimleft $arg "-"]]
-            if {[lsearch -exact $argParamList $arg2] != -1} {
-                append rvalue " $arg2"
-                set param 1
-            } elseif {[lsearch -exact $argNoParamList $arg2] != -1} {
-                append rvalue " $arg2"
-            } else {
-                error "HTML syntax error: Invalid argument $arg2 to element"
-            }
-        }
+    HtmlBuilder proc parseArguments {argList argParamList argNoParamList} {
+	set rvalue ""
+	set argParamList [concat $argParamList [list "ID" "CLASS" "STYLE" "TITLE" "LANG" "DIR"]]
+	set param 0
+	foreach arg $argList {
+	    if {$param} {
+		append rvalue "=\"$arg\""
+		set param 0
+	    } else {
+		set arg2 [string toupper [string trimleft $arg "-"]]
+		if {[lsearch -exact $argParamList $arg2] != -1} {
+		    append rvalue " $arg2"
+		    set param 1
+		} elseif {[lsearch -exact $argNoParamList $arg2] != -1} {
+		    append rvalue " $arg2"
+		} else {
+		    error "HTML syntax error: Invalid argument $arg2 to element"
+		}
+	    }
+	}
+	if {$param} {
+	    error "HTML syntax error: Missing parameter to argument $arg2"
+	}
+	return $rvalue
     }
-    if {$param} {
-        error "HTML syntax error: Missing parameter to argument $arg2"
-    }
-    return $rvalue
-}
 
 
-##############################################################################
-## Low-level modification methods:
-##
-## The efficiency of these is of utmost importance if efficiency is an issue
-## in the first place.
-##
-## addString
-## addStringIncr
-## addStringDecr
-## addWhiteSpace
-## addDocument
-## mergeDocument
+    ##############################################################################
+    ## Low-level modification methods:
+    ##
+    ## The efficiency of these is of utmost importance if efficiency is an issue
+    ## in the first place.
+    ##
+    ## addString
+    ## addStringIncr
+    ## addStringDecr
+    ## addWhiteSpace
+    ## addDocument
+    ## mergeDocument
 
 
-## Add a new arbitrary string to the document. This method is used by other
-## modification methods, as well as the user directly to add content other than
-## HTML elements. The string str is appended to the document with proper
-## indentation.
+    ## Add a new arbitrary string to the document. This method is used by other
+    ## modification methods, as well as the user directly to add content other than
+    ## HTML elements. The string str is appended to the document with proper
+    ## indentation.
 
-HtmlBuilder instproc addString {str} {
-    my instvar document indentLevel compressed
-    
-    if {$compressed == "0"} {
-      for {set n 0} {$n < $indentLevel} {incr n} {
-          append newLine "  "
-      }
+    HtmlBuilder instproc addString {str} {
+	my instvar document indentLevel compressed
+	
+	if {$compressed == "0"} {
+	    for {set n 0} {$n < $indentLevel} {incr n} {
+		append newLine "  "
+	    }
+	}
+	append newLine $str
+	lappend document $newLine
+	
+	return
     }
-    append newLine $str
-    lappend document $newLine
-    
-    return
-}
 
-## Add a string to the document and increase the indentation level.
+    ## Add a string to the document and increase the indentation level.
 
-HtmlBuilder instproc addStringIncr {str} {
-    my instvar indentLevel
-    my addString $str
-    incr indentLevel
-    return
-}
+    HtmlBuilder instproc addStringIncr {str} {
+	my instvar indentLevel
+	my addString $str
+	incr indentLevel
+	return
+    }
 
 
-## Decrease the indentation level and add a string to the document.
+    ## Decrease the indentation level and add a string to the document.
 
-HtmlBuilder instproc addStringDecr {str} {
-    my instvar indentLevel
-    incr indentLevel -1
-    my addString $str
-    return
-}
+    HtmlBuilder instproc addStringDecr {str} {
+	my instvar indentLevel
+	incr indentLevel -1
+	my addString $str
+	return
+    }
 
-#
-# add the string and replace all line breaks in the
-# string with addLineBreak calls so that given plain text 
-# appears similar in HTML output
+    #
+    # add the string and replace all line breaks in the
+    # string with addLineBreak calls so that given plain text 
+    # appears similar in HTML output
 
-HtmlBuilder instproc addStringWithLineBreaks {str} {
-  while {[set idx [string first "\n" $str]] != -1} {
-    my addString [string range $str 0 [expr $idx - 1]]
-    my addLineBreak
-    set str [string range $str [expr $idx + 1] end]
-  }
-  my addString $str
-}
- 
-## Add a single line of white space to the HTML document.
-   
-HtmlBuilder instproc addWhiteSpace {} {
-    my addString ""
-    return
-}
+    HtmlBuilder instproc addStringWithLineBreaks {str} {
+	while {[set idx [string first "\n" $str]] != -1} {
+	    my addString [string range $str 0 [expr $idx - 1]]
+	    my addLineBreak
+	    set str [string range $str [expr $idx + 1] end]
+	}
+	my addString $str
+    }
+    
+    ## Add a single line of white space to the HTML document.
+    
+    HtmlBuilder instproc addWhiteSpace {} {
+	my addString ""
+	return
+    }
 
-## Add the content of the document given as parameter.
+    ## Add the content of the document given as parameter.
 
-HtmlBuilder instproc addDocument {document} {
-    set documentList [$document getDocument]
-    
-    foreach line $documentList {
-        my addString $line
+    HtmlBuilder instproc addDocument {document} {
+	set documentList [$document getDocument]
+	
+	foreach line $documentList {
+	    my addString $line
+	}
+	return
     }
-    return
-}
 
-## Merge the content of the document given as a parameter. The difference
-## to addDocument is that the document merged is destroyed.
+    ## Merge the content of the document given as a parameter. The difference
+    ## to addDocument is that the document merged is destroyed.
 
-HtmlBuilder instproc mergeDocument {document} {
-    set documentList [$document getDocument]
-    
-    foreach line $documentList {
-        my addString $line
+    HtmlBuilder instproc mergeDocument {document} {
+	set documentList [$document getDocument]
+	
+	foreach line $documentList {
+	    my addString $line
+	}
+	$document destroy
+	return
     }
-    $document destroy
-    return
-}
 
 
 
 
-##############################################################################
-## HTML generation methods:                                                
-##              
-## The methods for generating various HTML structures are either a pair of 
-## start and end methods, such as startParagraph and endParagraph, or a single
-## method such as addListItem. Even if the the closing tag for <p>, for
-## example, is not required by the HTML specification, using the closing method
-## is necessary to have the document properly indented.
+    ##############################################################################
+    ## HTML generation methods:                                                
+    ##              
+    ## The methods for generating various HTML structures are either a pair of 
+    ## start and end methods, such as startParagraph and endParagraph, or a single
+    ## method such as addListItem. Even if the the closing tag for <p>, for
+    ## example, is not required by the HTML specification, using the closing method
+    ## is necessary to have the document properly indented.
 
 
-# Add a string to the document within <strong>...</strong>
+    # Add a string to the document within <strong>...</strong>
 
-HtmlBuilder instproc addStringStrong {str} {
-    my addString "<STRONG>$str</STRONG>"
-    return
-}
+    HtmlBuilder instproc addStringStrong {str} {
+	my addString "<STRONG>$str</STRONG>"
+	return
+    }
 
-# Add a string to the document within <em>...</em>
+    # Add a string to the document within <em>...</em>
 
-HtmlBuilder instproc addStringEmphasized {str} {
-    my addString "<EM>$str</EM>"
-    return
-}
+    HtmlBuilder instproc addStringEmphasized {str} {
+	my addString "<EM>$str</EM>"
+	return
+    }
 
-# Add a comment to the document <!-- ... -->
+    # Add a comment to the document <!-- ... -->
 
-HtmlBuilder instproc addComment {str} {
-    my addString "<!-- $str -->"
-    return
-}
+    HtmlBuilder instproc addComment {str} {
+	my addString "<!-- $str -->"
+	return
+    }
 
-HtmlBuilder instproc addLineBreak {} {
-    my addString "<BR>"
-    return
-}
+    HtmlBuilder instproc addLineBreak {} {
+	my addString "<BR>"
+	return
+    }
 
-## startDocument - Start an HTML document. Currently all documents are HTML 4.0
-## Transitional. HTML, BODY, HEAD and TITLE elements are added/started here.
-## Optional arguments:
-##   -title documentTitle (empty if not given)
-##   -stylesheet externalStyleSheet
-##   -bgcolor backgroundColour (deprecated in HTML 4.0)
+    ## startDocument - Start an HTML document. Currently all documents are HTML 4.0
+    ## Transitional. HTML, BODY, HEAD and TITLE elements are added/started here.
+    ## Optional arguments:
+    ##   -title documentTitle (empty if not given)
+    ##   -stylesheet externalStyleSheet
+    ##   -bgcolor backgroundColour (deprecated in HTML 4.0)
 
-HtmlBuilder instproc startDocument {args} {
-    set title ""
-    foreach {name value} $args {
-        switch -- $name {
-            -title {
-                set title $value
-            }
-            -stylesheet {
-                set stylesheet $value
-            }
-            -bgcolor {
-                set bgcolor $value
+    HtmlBuilder instproc startDocument {args} {
+	set title ""
+	foreach {name value} $args {
+	    switch -- $name {
+		-title {
+		    set title $value
+		}
+		-stylesheet {
+		    set stylesheet $value
+		}
+		-bgcolor {
+		    set bgcolor $value
+		}
 	    }
-        }
+	}
+	my addString {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">}
+	my addWhiteSpace
+	my addString {<HTML>}
+	my addStringIncr {<HEAD>}
+	my addString "<TITLE>$title</TITLE>"
+	if {[info exists stylesheet]} {
+	    my addString "<LINK REL=\"StyleSheet\" HREF=\"$stylesheet\" TYPE=\"text/css\">"
+	}
+	my addStringDecr {</HEAD>}
+	my addWhiteSpace
+	if {[info exists bgcolor]} {
+	    my addStringIncr "<BODY BGCOLOR=\"$bgcolor\">"
+	} else {
+	    my addStringIncr {<BODY>}
+	}
+	return
     }
-    my addString {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">}
-    my addWhiteSpace
-    my addString {<HTML>}
-    my addStringIncr {<HEAD>}
-    my addString "<TITLE>$title</TITLE>"
-    if {[info exists stylesheet]} {
-        my addString "<LINK REL=\"StyleSheet\" HREF=\"$stylesheet\" TYPE=\"text/css\">"
-    }
-    my addStringDecr {</HEAD>}
-    my addWhiteSpace
-    if {[info exists bgcolor]} {
-        my addStringIncr "<BODY BGCOLOR=\"$bgcolor\">"
-    } else {
-        my addStringIncr {<BODY>}
-    }
-    return
-}
 
-## endDocument - end an HTML document
+    ## endDocument - end an HTML document
 
-HtmlBuilder instproc endDocument {} {
-    my addStringDecr {</BODY>}
-    my addString {</HTML>}
-    return
-}
+    HtmlBuilder instproc endDocument {} {
+	my addStringDecr {</BODY>}
+	my addString {</HTML>}
+	return
+    }
 
-## startParagraph - start a P element
-## Optional arguments:
-##   Common HTML arguments
+    ## startParagraph - start a P element
+    ## Optional arguments:
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startParagraph {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addStringIncr "<P$attributes>"
-    return
-}
+    HtmlBuilder instproc startParagraph {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addStringIncr "<P$attributes>"
+	return
+    }
 
-## endParagraph - end a P element
+    ## endParagraph - end a P element
 
-HtmlBuilder instproc endParagraph {} {
-    my addStringDecr {</P>}
-    return
-}
+    HtmlBuilder instproc endParagraph {} {
+	my addStringDecr {</P>}
+	return
+    }
 
-## startAnchor - start an A element
-## Optional arguments:
-##   -href URI
-##   -name cdata
-##   -target frameTarget
-##   Common HTML arguments
+    ## startAnchor - start an A element
+    ## Optional arguments:
+    ##   -href URI
+    ##   -name cdata
+    ##   -target frameTarget
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startAnchor {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "HREF" "NAME" "TARGET"] [list]]
-    my addStringIncr "<A$attributes>"
-    return
-}
+    HtmlBuilder instproc startAnchor {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "HREF" "NAME" "TARGET"] [list]]
+	my addStringIncr "<A$attributes>"
+	return
+    }
 
-## endAnchor - end an A element
+    ## endAnchor - end an A element
 
-HtmlBuilder instproc endAnchor {args} {
-    my addStringDecr {</A>}
-    return
-}
+    HtmlBuilder instproc endAnchor {args} {
+	my addStringDecr {</A>}
+	return
+    }
 
-## addAnchor - add an A element, using content as the visible link.
-## Optional arguments:
-##   -href URI
-##   -name cdata
-##   -target frameTarget
-##   Common HTML arguments
+    ## addAnchor - add an A element, using content as the visible link.
+    ## Optional arguments:
+    ##   -href URI
+    ##   -name cdata
+    ##   -target frameTarget
+    ##   Common HTML arguments
 
-HtmlBuilder instproc addAnchor {content args} {
-    eval my startAnchor $args
-    my addString $content
-    my endAnchor
-    return
-}
+    HtmlBuilder instproc addAnchor {content args} {
+	eval my startAnchor $args
+	my addString $content
+	my endAnchor
+	return
+    }
 
-## startUnorderedList - start a UL element
-## Optional arguments:
-##   Commmon HTML arguments
+    ## startUnorderedList - start a UL element
+    ## Optional arguments:
+    ##   Commmon HTML arguments
 
-HtmlBuilder instproc startUnorderedList {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addStringIncr "<UL$attributes>"
-    return
-}
+    HtmlBuilder instproc startUnorderedList {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addStringIncr "<UL$attributes>"
+	return
+    }
 
-## endUnorderedList - end a UL element
+    ## endUnorderedList - end a UL element
 
-HtmlBuilder instproc endUnorderedList {} {
-    my addStringDecr {</UL>}
-    return
-}
+    HtmlBuilder instproc endUnorderedList {} {
+	my addStringDecr {</UL>}
+	return
+    }
 
-## startListItem - start an LI element
-## Optional arguments:
-##   Common HTML arguments
+    ## startListItem - start an LI element
+    ## Optional arguments:
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startListItem {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addStringIncr "<LI$attributes>"
-    return
-}
+    HtmlBuilder instproc startListItem {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addStringIncr "<LI$attributes>"
+	return
+    }
 
-## endListItem - end an LI element
+    ## endListItem - end an LI element
 
-HtmlBuilder instproc endListItem {} {
-    my addStringDecr {</LI>}
-    return
-}
+    HtmlBuilder instproc endListItem {} {
+	my addStringDecr {</LI>}
+	return
+    }
 
-## add a simple list item
-HtmlBuilder instproc addListItem {content} {
-  my startListItem
-  my addString $content
-  my endListItem
-}
+    ## add a simple list item
+    HtmlBuilder instproc addListItem {content} {
+	my startListItem
+	my addString $content
+	my endListItem
+    }
 
-## startTable - start a TABLE element. Note that if the -border argument isn't
-## used, by default the table are created with borders (<TABLE BORDER>).
+    ## startTable - start a TABLE element. Note that if the -border argument isn't
+    ## used, by default the table are created with borders (<TABLE BORDER>).
 
-## Optional arguments:
-##   -border pixels
-##   -cellpadding length
-##   -cellspacing length
-##   -summary text
-##   -width length
-##   -bgcolor  color spec
-##   Common HTML arguments
+    ## Optional arguments:
+    ##   -border pixels
+    ##   -cellpadding length
+    ##   -cellspacing length
+    ##   -summary text
+    ##   -width length
+    ##   -bgcolor  color spec
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startTable {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "BORDER" "CELLPADDING" "CELLSPACING" "SUMMARY" \
-                     "WIDTH" "BGCOLOR"] [list]]
-    if {[lsearch $args "-border"] == -1} {
-        append attributes " BORDER"
+    HtmlBuilder instproc startTable {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "BORDER" "CELLPADDING" "CELLSPACING" "SUMMARY" \
+				 "WIDTH" "BGCOLOR"] [list]]
+	if {[lsearch $args "-border"] == -1} {
+	    append attributes " BORDER"
+	}
+	my addStringIncr "<TABLE$attributes>"
+	return
     }
-    my addStringIncr "<TABLE$attributes>"
-    return
-}
 
-## endTable - end a TABLE element
+    ## endTable - end a TABLE element
 
-HtmlBuilder instproc endTable {} {
-    my addStringDecr {</TABLE>}
-    return
-}
+    HtmlBuilder instproc endTable {} {
+	my addStringDecr {</TABLE>}
+	return
+    }
 
-## startTableRow - start a TR element
-## Optional arguments:
-##   Common HTML arguments
-HtmlBuilder instproc startTableRow {args} {
-    set attributes [HtmlBuilder parseArguments $args [list "VALIGN"] [list]]
-    my addStringIncr "<TR$attributes>"
-    return
-}
+    ## startTableRow - start a TR element
+    ## Optional arguments:
+    ##   Common HTML arguments
+    HtmlBuilder instproc startTableRow {args} {
+	set attributes [HtmlBuilder parseArguments $args [list "VALIGN"] [list]]
+	my addStringIncr "<TR$attributes>"
+	return
+    }
 
-## endTableRow - end a TR element
+    ## endTableRow - end a TR element
 
-HtmlBuilder instproc endTableRow {} {
-    my addStringDecr {</TR>}
-    return
-}
+    HtmlBuilder instproc endTableRow {} {
+	my addStringDecr {</TR>}
+	return
+    }
 
-## startTableCell - start a TD element
-## Optional arguments:
-##   -colspan number
-##   -rowspan number
-##   -align left|center|right|justify|char
-##   -valign top|middle|bottom|baseline
-##   -bgcolor
-##   -width
-##   Common HTML arguments
+    ## startTableCell - start a TD element
+    ## Optional arguments:
+    ##   -colspan number
+    ##   -rowspan number
+    ##   -align left|center|right|justify|char
+    ##   -valign top|middle|bottom|baseline
+    ##   -bgcolor
+    ##   -width
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startTableCell {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "COLSPAN" "ROWSPAN" "ALIGN" "VALIGN" \
-		      "BGCOLOR" "WIDTH"] [list]]
-    my addStringIncr "<TD$attributes>"
-    return
-}
+    HtmlBuilder instproc startTableCell {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "COLSPAN" "ROWSPAN" "ALIGN" "VALIGN" \
+				 "BGCOLOR" "WIDTH"] [list]]
+	my addStringIncr "<TD$attributes>"
+	return
+    }
 
-## endTableCell - end a TD element
+    ## endTableCell - end a TD element
 
-HtmlBuilder instproc endTableCell {} {
-    my addStringDecr {</TD>}
-    return
-}
+    HtmlBuilder instproc endTableCell {} {
+	my addStringDecr {</TD>}
+	return
+    }
 
-#
-# add a simple table cell which just contains a string
-#
-HtmlBuilder instproc addTableCell {{string ""} args} {
-  eval my startTableCell $args
-  my addString $string
-  my endTableCell
-}
+    #
+    # add a simple table cell which just contains a string
+    #
+    HtmlBuilder instproc addTableCell {{string ""} args} {
+	eval my startTableCell $args
+	my addString $string
+	my endTableCell
+    }
 
-## startTableHeaderCell - start a TH element
-## Optional arguments:
-##   -colspan number
-##   -rowspan number
-##   -align left|center|right|justify|char
-##   -valign top|middle|bottom|baseline
-##   Common HTML arguments
+    ## startTableHeaderCell - start a TH element
+    ## Optional arguments:
+    ##   -colspan number
+    ##   -rowspan number
+    ##   -align left|center|right|justify|char
+    ##   -valign top|middle|bottom|baseline
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startTableHeaderCell {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "COLSPAN" "ROWSPAN" "ALIGN" "VALIGN"] [list]]
-    my addStringIncr "<TH$attributes>"
-    return
-}
+    HtmlBuilder instproc startTableHeaderCell {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "COLSPAN" "ROWSPAN" "ALIGN" "VALIGN"] [list]]
+	my addStringIncr "<TH$attributes>"
+	return
+    }
 
-## endTableHeaderCell - end a TH element
+    ## endTableHeaderCell - end a TH element
 
-HtmlBuilder instproc endTableHeaderCell {} {
-    my addStringDecr {</TH>}
-    return
-}
+    HtmlBuilder instproc endTableHeaderCell {} {
+	my addStringDecr {</TH>}
+	return
+    }
 
-## startForm - start a FORM element
-## Required arguments:
-##   -action URI
-## Optional arguments:
-##   -method get|post
-##   Common HTML arguments
+    ## startForm - start a FORM element
+    ## Required arguments:
+    ##   -action URI
+    ## Optional arguments:
+    ##   -method get|post
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startForm {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "ACTION" "METHOD" "ENCTYPE"] [list]]
-    my addStringIncr "<FORM$attributes>"
-    return
-}
+    HtmlBuilder instproc startForm {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "ACTION" "METHOD" "ENCTYPE"] [list]]
+	my addStringIncr "<FORM$attributes>"
+	return
+    }
 
-## endForm - end a FORM element
+    ## endForm - end a FORM element
 
-HtmlBuilder instproc endForm {} {
-    my addStringDecr {</FORM>}
-    return
-}
+    HtmlBuilder instproc endForm {} {
+	my addStringDecr {</FORM>}
+	return
+    }
 
-## addInput - add in INPUT element
-## Required arguments:
-##   -type <input type>
-##   -name <control name>
-## Optional arguments:
-##   -value <initial value>
-##   -size <width of input, in pixels of characters>
-##   -maxlength <max number of characters for text input>
-##   -checked
-##   Common HTML arguments
- 
-HtmlBuilder instproc addInput {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "TYPE" "NAME" "VALUE" "SIZE" "MAXLENGTH"] \
-                    [list "CHECKED"]]
-    my addString "<INPUT$attributes>"
-    return
-}
+    ## addInput - add in INPUT element
+    ## Required arguments:
+    ##   -type <input type>
+    ##   -name <control name>
+    ## Optional arguments:
+    ##   -value <initial value>
+    ##   -size <width of input, in pixels of characters>
+    ##   -maxlength <max number of characters for text input>
+    ##   -checked
+    ##   Common HTML arguments
+    
+    HtmlBuilder instproc addInput {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "TYPE" "NAME" "VALUE" "SIZE" "MAXLENGTH"] \
+			    [list "CHECKED"]]
+	my addString "<INPUT$attributes>"
+	return
+    }
 
-## addTextArea - start a TEXTAREA element
-## First parameter: value - Default value of the text area
-## Required arguments:
-##   -rows <number of rows>
-##   -cols <number of columns>
-## Optional arguments:
-##   -name <control name>
-##   Common HTML Arguments
+    ## addTextArea - start a TEXTAREA element
+    ## First parameter: value - Default value of the text area
+    ## Required arguments:
+    ##   -rows <number of rows>
+    ##   -cols <number of columns>
+    ## Optional arguments:
+    ##   -name <control name>
+    ##   Common HTML Arguments
 
-HtmlBuilder instproc addTextArea {value args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "ROWS" "COLS" "NAME"] [list]]
-    my addString "<TEXTAREA$attributes>$value</TEXTAREA>"
-    return
-}
+    HtmlBuilder instproc addTextArea {value args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "ROWS" "COLS" "NAME"] [list]]
+	my addString "<TEXTAREA$attributes>$value</TEXTAREA>"
+	return
+    }
 
-## startOptionSelector - start a SELECT element
-## Optional arguments:
-##   -name <control name>
-##   -size <number of visible items>
-##   -multiple
-##   Common HTML arguments
+    ## startOptionSelector - start a SELECT element
+    ## Optional arguments:
+    ##   -name <control name>
+    ##   -size <number of visible items>
+    ##   -multiple
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startOptionSelector {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "NAME" "SIZE"] [list "MULTIPLE"]]
-    my addStringIncr "<SELECT$attributes>"
-    return
-}    
+    HtmlBuilder instproc startOptionSelector {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "NAME" "SIZE"] [list "MULTIPLE"]]
+	my addStringIncr "<SELECT$attributes>"
+	return
+    }    
 
-## endOptionSelector - end a SELECT element
+    ## endOptionSelector - end a SELECT element
 
-HtmlBuilder instproc endOptionSelector {} {
-    my addStringDecr "</SELECT>"
-    return
-}
+    HtmlBuilder instproc endOptionSelector {} {
+	my addStringDecr "</SELECT>"
+	return
+    }
 
-## startOption - start an OPTION element
-## Optional arguments:
-##   -value <value of option>
-##   -selected
-##   Common HTML arguments
+    ## startOption - start an OPTION element
+    ## Optional arguments:
+    ##   -value <value of option>
+    ##   -selected
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startOption {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "VALUE"] [list "SELECTED"]]
-    my addStringIncr "<OPTION$attributes>"
-    return
-}
+    HtmlBuilder instproc startOption {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "VALUE"] [list "SELECTED"]]
+	my addStringIncr "<OPTION$attributes>"
+	return
+    }
 
-## endOption - end an OPTION element
+    ## endOption - end an OPTION element
 
-HtmlBuilder instproc endOption {} {
-    my addStringDecr "</OPTION>"
-    return
-}
+    HtmlBuilder instproc endOption {} {
+	my addStringDecr "</OPTION>"
+	return
+    }
 
-## addImage - add an IMG element
-## Required arguments:
-##   -src <url>
-##   -alt <alternate text>
-##   -align <alignment> (deprecated in HTML 4.0)
-## Optional arguments:
-##   Common HTML arguments
+    ## addImage - add an IMG element
+    ## Required arguments:
+    ##   -src <url>
+    ##   -alt <alternate text>
+    ##   -align <alignment> (deprecated in HTML 4.0)
+    ## Optional arguments:
+    ##   Common HTML arguments
 
-HtmlBuilder instproc addImage {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "SRC" "ALT" "ALIGN"] [list]]
-    my addString "<IMG$attributes>"
-    return
-}
+    HtmlBuilder instproc addImage {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "SRC" "ALT" "ALIGN"] [list]]
+	my addString "<IMG$attributes>"
+	return
+    }
 
-## startBlock - start a DIV element (a generic block-level container)
-## Optional arguments:
-##   Common HTML attributes
+    ## startBlock - start a DIV element (a generic block-level container)
+    ## Optional arguments:
+    ##   Common HTML attributes
 
-HtmlBuilder instproc startBlock {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addStringIncr "<DIV$attributes>"
-    return
-}
+    HtmlBuilder instproc startBlock {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addStringIncr "<DIV$attributes>"
+	return
+    }
 
-## endBlock - end a DIV element
+    ## endBlock - end a DIV element
 
-HtmlBuilder instproc endBlock {} {
-    my addStringDecr "</DIV>"
-    return
-}
+    HtmlBuilder instproc endBlock {} {
+	my addStringDecr "</DIV>"
+	return
+    }
 
-## addHorizontalRule - add an HR element
-## Optional arguments:
-##   Common HTML arguments
+    ## addHorizontalRule - add an HR element
+    ## Optional arguments:
+    ##   Common HTML arguments
 
-HtmlBuilder instproc addHorizontalRule {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addString "<HR$attributes>"
-    return
+    HtmlBuilder instproc addHorizontalRule {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addString "<HR$attributes>"
+	return
+    }
+
+    namespace export HtmlBuilder
 }
+
+namespace import ::xotcl::htmllib::*