rwdtinker 1.67 → 1.68

data/ev/rwd.rb

@@ -15,6 +15,7 @@ rescue LoadError
 end
 
 $rwd_exit	= ARGV.include?("--rwd-exit")	# Hack ???
+$rwd_exit	= true	if defined?(REQUIRE2LIB)
 $rwd_debug	= ($rwd_debug or $DEBUG or false)
 $rwd_border	= ($rwd_border or 0)
 $rwd_dir	= Dir.pwd
@@ -27,10 +28,12 @@ end
 
 RWDEmptyline	= "..."
 
+#module RWD
+
 rcfile	= nil
-s	= ENV["HOME"]		; s = s + "/.rwdrc"	if not s.nil?	; rcfile = s	if (not s.nil? and rcfile.nil? and File.file?(s))
-s	= ENV["USERPROFILE"]	; s = s + "/rwd.cfg"	if not s.nil?	; rcfile = s	if (not s.nil? and rcfile.nil? and File.file?(s))
-s	= ENV["windir"]		; s = s + "/rwd.cfg"	if not s.nil?	; rcfile = s	if (not s.nil? and rcfile.nil? and File.file?(s))
+s	= ENV["HOME"]		; s = File.expand_path(".rwdrc", s)	unless s.nil?	; rcfile = s	if (not s.nil? and rcfile.nil? and File.file?(s))
+s	= ENV["USERPROFILE"]	; s = File.expand_path("rwd.cfg", s)	unless s.nil?	; rcfile = s	if (not s.nil? and rcfile.nil? and File.file?(s))
+s	= ENV["windir"]		; s = File.expand_path("rwd.cfg", s)	unless s.nil?	; rcfile = s	if (not s.nil? and rcfile.nil? and File.file?(s))
 
 AL	= "align='left'"
 AC	= "align='center'"
@@ -51,9 +54,9 @@ ENV["RWDBROWSER"]	= (ENV["RWDBROWSER"] or defaultbrowser) or puts "No browser fo
 ENV["RWDPORTS"]		= (ENV["RWDPORTS"] or "7701-7709")
 ENV["RWDTHEME"]		= (ENV["RWDTHEME"] or "DEFAULT")
 
-trap("INT")	{puts "Terminating..." ; exit}
+#trap("INT")	{puts "Terminating..." ; exit}
 
-$SAFE	= 2
+$SAFE	= 0
 
 class IE
   def initialize(url)
@@ -93,7 +96,7 @@ class Array
       a	= [emptyline].concat(self)
     end
 
-    a.numsort.collect{|s| "<option>#{s.to_html}</option>" }.join("\n")
+    a.numsort.collect{|s| "<option>#{s.to_s.to_html}</option>" }.join("\n")
   end
 
   def rwd_method(method)
@@ -109,17 +112,32 @@ class Array
     return res
   end
 
-  def rwd_row(key=nil, value=nil)
+  def rwd_row(key=nil, value=nil, bold=false)
     res	= ""
 
     res	= res + "<row valign='top'>"
     res	= res + "<radio name='#{key.to_html}' value='#{value.to_html}'/>"	unless key.nil?
-    res	= res + self.collect{|s| "<p align='left'>#{s.to_html}</p>"}.join("")
+    res	= res + self.collect{|s| "<p align='#{(s.kind_of?(Numeric) or s =~ /^\d+\.\d+$/) ? "right" : "left"}'>#{"<b>" if bold}#{s.to_s.to_html}#{"</b>" if bold}</p>"}.join("")
     res	= res + "</row>"
 
     return res
   end
 
+  def rwd_table(headers=nil, highlightrows=[])
+    res	= ""
+
+    highlightrows	= [highlightrows].flatten
+
+    n	= -1
+
+    res	= res + "<table>"
+    res	= res + headers.rwd_row(nil, nil, true)	unless headers.nil?
+    res	= res + self.collect{|a| a.rwd_row(nil, nil, highlightrows.include?(n+=1))}.join("")
+    res	= res + "</table>"
+
+    return res
+  end
+
   def rwd_headers(emptyfield=false)
     res	= ""
 
@@ -131,7 +149,7 @@ class Array
     return res
   end
 
-  def rwd_form(prefix, values, twoparts=0, options={})
+  def rwd_form(prefix, values=[], twoparts=0, options={})
     res	= []
 
     res << "<table>"
@@ -151,7 +169,7 @@ class Array
         s	= ""
 
         s << "<text name='#{name}'"
-        s << " value='#{values[n].to_html}'"	if n < values.length
+        s << " value='#{values[n].to_s.to_html}'"	if n < values.length
         s << "/>"
 
         res << s
@@ -266,8 +284,8 @@ class OpenTag
       template	= $rwd_html_1
       template	= $rwd_html_PDA_1	if pda
 
-      res <<(template(template, args))
-    when "p"		then     res << "<p #{align} > "
+      res << (template(template, args))
+    when "p"		then res << "<p #{align}>"
     when "pre"		then res << "<pre #{align}>"
     when "big"		then res << "<p #{align}><big>"
     when "small"	then res << "<p #{align}><small>"
@@ -308,10 +326,10 @@ class OpenTag
     when "hidden"	then res << "<p #{align}><input name='#{@args["name"]}' value='#{value1}' type='hidden'>"
     when "text"
       maxlength	= ""
-       maxlength	= "maxlength='%s'" % @args["maxlength"]	if @args.include?("maxlength")
+      maxlength	= "maxlength='%s'" % @args["maxlength"]	if @args.include?("maxlength")
       size	= ""
-      size = "size='%s'" % @args["size"] if @args.include?("size")
-        size	= "size='%s'" % 10			if pda
+      size	= "size='%s'" % @args["size"]		if @args.include?("size")
+      size	= "size='%s'" % 10			if pda
       res << "<p #{align}><input name='#{@args["name"]}' value='#{value1}' type='text' #{maxlength} #{size}>"
       oneormorefields	<< "true"
     when "textarea"
@@ -341,7 +359,7 @@ class OpenTag
       end
       oneormorefields	<< "true"
     when "select"
-      res << "<select #{align} name='#{@args["name"]}' width='#{@args["width"]}'>"
+     res << "<select #{align} name='#{@args["name"]}' width='#{@args["width"]} size='#{@args["size"]}'>"	# ??? Misschien nog iets met 'multiple'?
       name	= @args["name"]
       $select	= varshtml[name]
       oneormorefields	<< "true"
@@ -481,7 +499,7 @@ class OpenTag
       template	= $rwd_html_2
       template	= $rwd_html_PDA_2	if pda
 
-      res <<(template(template, args))
+      res << (template(template, args))
     when "p"		then res << "</p>"
     when "pre"		then res << "</pre>"
     when "big"		then res << "</big></p>"
@@ -556,10 +574,15 @@ class OpenTag
     end
 
     logo	= nil
-    logo	= File.expand_path(vars["logo"], $rwd_files)	if vars.include?("logo")
-    logo	= nil						unless logo.nil? or File.file?(logo)
+    logo	= File.expand_path(vars["logo"], $rwd_files)		if vars.include?("logo")
+    logo	= nil							unless logo.nil? or File.file?(logo)
+
+    watermark	= nil
+    watermark	= File.expand_path(vars["watermark"], $rwd_files)	if vars.include?("watermark")
+    watermark	= nil							unless watermark.nil? or File.file?(watermark)
 
     a["LOGO"]		= ""	unless not logo.nil?
+    a["WATERMARK"]	= ""	unless not watermark.nil?
 
     a["HELPBUTTON"]	= (not (vars["nohelpbutton"]))
     a["BACKBUTTONS"]	= (not (vars["nobackbuttons"]))
@@ -620,10 +643,12 @@ class RWDWindow
       tree	= XML.new(rwd)
 
       tree.parse(OpenTag, "window") do |type, obj|
+        $rwd_appvars.each{|k, v| obj.args[k] = v}
         @@windows[rwd][obj.args["name"]]	= obj.to_h
       end
 
       tree.parse(OpenTag, "helpwindow") do |type, obj|
+        $rwd_appvars.each{|k, v| obj.args[k] = v}
         @@helpwindows[rwd][obj.args["name"]]	= obj.to_h
       end
     end
@@ -639,6 +664,8 @@ class RWDWindow
     firstaction		= ""
     html		= []
 
+    vars	= vars.deep_dup
+
     vars.each do |key, value|
       if not key.empty?
         if value.respond_to? "to_s"
@@ -731,7 +758,7 @@ end
 
 class RWDDone < RWDWindow
   def initialize(exitbrowser)
-    super("<window title='RWD Message' nobackbuttons noclosebutton><p>Done.</p><horizontal><close/>#{exitbrowser ? "" : "<button caption='Again'/>"}</horizontal>#{exitbrowser ? "<closewindow/>" : ""}</window>")
+    super("<window title='RWD Message' nobackbuttons noclosebutton><p>Done.</p><i>(Some browsers don't close,<br>because of security reasons.)</i><horizontal><close/>#{exitbrowser ? "" : "<button caption='Again'/>"}</horizontal>#{exitbrowser ? "<closewindow/>" : ""}</window>")
   end
 end
 
@@ -742,6 +769,14 @@ class RWDialog
     @rwd_history		= []
     @rwd_ignore_vars		= []
     @rwd_call_after_back	= []
+    @rwd_time			= Time.now
+
+    $rwd_appvars	= {}	if $rwd_appvars.nil?
+    XML.new(xml).parse(OpenTag, "application") do |type, obj|
+      obj.args.deep_dup.each do |k, v|
+        $rwd_appvars[k]	= v
+      end
+    end
   end
 
   def self.file(rwdfile, *args)
@@ -765,9 +800,14 @@ class RWDialog
     port	= port.to_i
 
     @rwd_server	= RWDServer.new(self, port, io, auth, realm)
+
+    self
   end
 
   def render(res, path, post, download, downloadfile, pda, sessionid)
+		# Avoid a timeout.
+
+    @rwd_time		= Time.now
 
 		# Initialize some vars.
 
@@ -778,7 +818,7 @@ class RWDialog
     help		= false
     back		= false
     tab			= ""
-    @rwd_msgtype	= nil
+    @rwd_msgtype	= nil	if @rwd_progress_thread.nil?
     @rwd_download	= nil
     @rwd_download_file	= nil
 
@@ -819,6 +859,8 @@ class RWDialog
       @rwd_action		= "rwd_back"
     end
 
+    @rwd_history	= [["main", [], "main", ""]]	if @rwd_history.empty?
+
     if @rwd_action =~ /^rwd_tab_/
       @rwd_tab	= @rwd_action.sub(/^rwd_tab_/, "")
       @rwd_history[-1][3]	= @rwd_tab
@@ -840,6 +882,7 @@ class RWDialog
         @rwd_history			= []
       when "rwd_quit"
         done				= true
+      else
       end
 
 		# History stuff
@@ -883,6 +926,15 @@ class RWDialog
         a		= [@rwd_action, @rwd_args, @rwd_window, @rwd_tab]
 
         @rwd_history.push a				if (@rwd_history[-1] != a or not @rwd_msgtype.nil?)
+
+        if @rwd_window == "rwd_back"
+          @rwd_history.pop
+          @rwd_history.pop
+          @rwd_action			= (@rwd_history[-1] or [nil, nil, nil])[0]
+          @rwd_args			= (@rwd_history[-1] or [nil, nil, nil])[1]
+          @rwd_window			= (@rwd_history[-1] or [nil, nil, nil])[2]
+          @rwd_tab			= (@rwd_history[-1] or [nil, nil, nil])[3]
+        end
       end
     end
 
@@ -911,12 +963,13 @@ class RWDialog
         download	<< @rwd_download
         downloadfile	<< @rwd_download_file
       else
-        if not @rwd_msgtype.nil?
-          res << RWDMessage.new(@rwd_msg).render(pda)	if @rwd_msgtype == "message"
-          res << RWDError.new(@rwd_msg).render(pda)	if @rwd_msgtype == "error"
+        if not @rwd_progress_thread.nil?
+          res << RWDProgressBar.new(@rwd_progress_refresh, @rwd_progress_progress).render(pda, @rwd_refresh_action)
         else
-          if not @rwd_progress_thread.nil?
-            res << RWDProgressBar.new(@rwd_progress_refresh, @rwd_progress_progress).render(pda, @rwd_refresh_action)
+          if not @rwd_msgtype.nil?
+            res << RWDMessage.new(@rwd_msg).render(pda)	if @rwd_msgtype == "message"
+            res << RWDError.new(@rwd_msg).render(pda)	if @rwd_msgtype == "error"
+            res << @rwd_msg				if @rwd_msgtype == "text"
           else
             puts "Window: #{@rwd_window}"		if $rwd_debug
             puts "Tab: #{@rwd_tab}"		if $rwd_debug
@@ -944,6 +997,11 @@ class RWDialog
     @rwd_msgtype	= "error"
   end
 
+  def text(msg)
+    @rwd_msg		= "<html><body><pre>#{msg}</pre></body></html>"
+    @rwd_msgtype	= "text"
+  end
+
   def progressbar(refresh, *progress)
     @rwd_progress_refresh	= (refresh or 1)
     @rwd_progress_progress	= []
@@ -984,6 +1042,23 @@ class RWDialog
   def exitbrowser
     @rwd_exitbrowser	= true
   end
+
+  def timeout(timeout, interval=1)
+    @rwd_timeout	= timeout
+
+    unless @rwd_timeout_thread
+      @rwd_timeout_thread =
+      Thread.new do
+        loop do
+          if Time.now - @rwd_time > @rwd_timeout
+            $stderr.puts "Exiting due to timeout (#{@rwd_timeout} seconds)."
+            exit 1
+          end
+          sleep interval
+        end
+      end
+    end
+  end
 end
 
 class RWDLogin < RWDialog
@@ -1040,7 +1115,7 @@ class Sessions
   end
 end
 
-class Session < Hash
+class RWDSession < Hash
   attr_reader :sessionid
   attr_reader :lastaccess
   attr_reader :authenticated
@@ -1055,9 +1130,7 @@ class Session < Hash
   def touch
     @lastaccess	= Time.now
   end
-end
 
-class RWDSession < Session
   def render(res, path, post, download, downloadfile, pda)
     done	= self["object"].render(res, path, post, download, downloadfile, pda, @sessionid)
 
@@ -1093,18 +1166,13 @@ class RWDServer
             browser	= ENV["RWDBROWSER"].dup
             url		= "http://localhost:%s/" % [port]
 
-            if cygwin?
-              browser.gsub!(/\\/, "/")
-              browser.gsub!(/ /, "\\ ")
-            end
-
             re		= /[$%]1\b/
             command	= "%s \"%s\"" % [browser, url]
             command	= browser.gsub(re, url)	if browser =~ re
 
             command.gsub!(/%port%/, port.to_s)
 
-            system(command) or puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
+            system(command) or $stderr.puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
           #end
 
           puts "The browser has terminated."
@@ -1120,8 +1188,10 @@ class RWDServer
 
     HTTPServer.serve(portio, (not auth.nil?)) do |req, resp|
       threadlimiter.wait do
-
-        vars	= req.vars.dup
+        vars	= {}
+        req.vars.each do |k, v|
+          vars[k]	= v.join("\t")
+        end
         pad	= (req.request.path or "/")
 
         if auth.kind_of? String
@@ -1152,7 +1222,7 @@ class RWDServer
           end
 
           if oldsessionid.nil? or oldsessionid.empty?
-            if not auth.nil? and not auth.empty? and not session.authenticated and pad != "/rwd_pixel.gif"
+            if not auth.nil? and not auth.empty? and not session.authenticated and pad !~ /^\/rwd_/
 
 		# Check authentication
 
@@ -1290,6 +1360,10 @@ $rwd_html["DEFAULT"]	= "
     <style type='text/css'>
     <!--
 
+	body {
+		background		: url(%WATERMARK%) white center center no-repeat fixed;
+	}
+
 	a {
 		text-decoration		: none;
 	}
@@ -1380,22 +1454,22 @@ $rwd_html["DEFAULT"]	= "
             <table align='center' border='0' cellspacing='0' cellpadding='0'>
 
               <tr align='center'>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
               </tr>
 
               <tr align='center'>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
@@ -1403,12 +1477,12 @@ $rwd_html["DEFAULT"]	= "
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
               </tr>
 
               <tr align='center'>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
@@ -1418,11 +1492,11 @@ $rwd_html["DEFAULT"]	= "
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
               </tr>
 
               <tr align='center'>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
@@ -1432,7 +1506,7 @@ $rwd_html["DEFAULT"]	= "
                 <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
               </tr>
 
               <tr align='center'>
@@ -1521,7 +1595,7 @@ $rwd_html["DEFAULT"]	= "
               </tr>
 
               <tr align='center'>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
@@ -1531,11 +1605,11 @@ $rwd_html["DEFAULT"]	= "
                 <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
               </tr>
 
               <tr align='center'>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
@@ -1545,12 +1619,12 @@ $rwd_html["DEFAULT"]	= "
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
               </tr>
 
               <tr align='center'>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
@@ -1558,22 +1632,22 @@ $rwd_html["DEFAULT"]	= "
                 <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
               </tr>
 
               <tr align='center'>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
                 <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
+                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
               </tr>
 
             </table>
@@ -1602,6 +1676,10 @@ $rwd_html["WINDOWSLOOKALIKE"]	= "
     <style type='text/css'>
     <!--
 
+	body {
+		background		: url(%WATERMARK%) white center center no-repeat fixed;
+	}
+
 	a {
 		text-decoration		: none;
 	}
@@ -1824,26 +1902,21 @@ $rwd_html["PDA"]	= "
 "
 
 $rwd_pixel	= "
-R0lGODlhAQABAOcAAAAAAAEBAQICAgMDAwQEBAUFBQYGBgcHBwgICAkJCQoK
-CgsLCwwMDA0NDQ4ODg8PDxAQEBERERISEhMTExQUFBUVFRYWFhcXFxgYGBkZ
-GRoaGhsbGxwcHB0dHR4eHh8fHyAgICEhISIiIiMjIyQkJCUlJSYmJicnJygo
-KCkpKSoqKisrKywsLC0tLS4uLi8vLzAwMDExMTIyMjMzMzQ0NDU1NTY2Njc3
-Nzg4ODk5OTo6Ojs7Ozw8PD09PT4+Pj8/P0BAQEFBQUJCQkNDQ0REREVFRUZG
-RkdHR0hISElJSUpKSktLS0xMTE1NTU5OTk9PT1BQUFFRUVJSUlNTU1RUVFVV
-VVZWVldXV1hYWFlZWVpaWltbW1xcXF1dXV5eXl9fX2BgYGFhYWJiYmNjY2Rk
-ZGVlZWZmZmdnZ2hoaGlpaWpqamtra2xsbG1tbW5ubm9vb3BwcHFxcXJycnNz
-c3R0dHV1dXZ2dnd3d3h4eHl5eXp6ent7e3x8fH19fX5+fn9/f4CAgIGBgYKC
-goODg4SEhIWFhYaGhoeHh4iIiImJiYqKiouLi4yMjI2NjY6Ojo+Pj5CQkJGR
-kZKSkpOTk5SUlJWVlZaWlpeXl5iYmJmZmZqampubm5ycnJ2dnZ6enp+fn6Cg
-oKGhoaKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq6ysrK2tra6urq+v
-r7CwsLGxsbKysrOzs7S0tLW1tba2tre3t7i4uLm5ubq6uru7u7y8vL29vb6+
-vr+/v8DAwMHBwcLCwsPDw8TExMXFxcbGxsfHx8jIyMnJycrKysvLy8zMzM3N
-zc7Ozs/Pz9DQ0NHR0dLS0tPT09TU1NXV1dbW1tfX19jY2NnZ2dra2tvb29zc
-3N3d3d7e3t/f3+Dg4OHh4eLi4uPj4+Tk5OXl5ebm5ufn5+jo6Onp6erq6uvr
-6+zs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf39/j4+Pn5+fr6
-+vv7+/z8/P39/f7+/v///yH+FUNyZWF0ZWQgd2l0aCBUaGUgR0lNUAAh+QQB
-CgD/ACwAAAAAAQABAAAIBAD/BQQAOw==
+R0lGODlhAQABAMIAAAAAAP///+7u7kREiP///////////////yH5BAEKAAMA
+LAAAAAABAAEAAAMCOAkAOw==
 ".unpack("m").shift
 
+$rwd_logo	= "
+R0lGODlhEAAQAMIAAAAAAP///+7u7kREiP///////////////yH5BAEKAAQA
+LAAAAAAQABAAAANCSErQ/k21QKulrIrNu8heuAGUcJ0BuQVD676DasK0zNKv
+jefB+oo6l6AxBAx7M2HRePQph5xga0RsJqfELPI2DSUAADs=
+".unpack("m").shift
+
+
 $rwd_html_1, $rwd_html_2		= $rwd_html[ENV["RWDTHEME"]].split(/^\s*%BODY%\s*\r*$/)
 $rwd_html_PDA_1, $rwd_html_PDA_2	= $rwd_html["PDA"].split(/^\s*%BODY%\s*\r*$/)
+
+#end
+#
+#class RWDialog < RWD::RWDialog
+#end

data/ev/sgml.rb

@@ -88,7 +88,7 @@ class OpenTag < Tag
   def prechildren_to_sgml(res)
     a	= [@subtype]
 
-    @args.each do |k, v|
+    @args.sort.each do |k, v|
       if not v.include?("'")
         a << "#{k}='#{v}'"
       else