rwdaddresses 1.03 → 1.04

data/ev/tree.rb

@@ -88,7 +88,7 @@ class TreeObject
   def inspect
     parent, children	= @parent, @children
 
-    @parent, @children	= parent.id, children.collect{|obj| obj.id}
+    @parent, @children	= parent.object_id, children.collect{|obj| obj.object_id}
 
     res = "  " * (level-1) + "#{self.class}(#{@subtype}) #{super}"
 
@@ -96,6 +96,34 @@ class TreeObject
 
     res
   end
+
+  def previous(klass=[], skip=[])
+    klass	= [klass].flatten
+    skip	= [skip].flatten
+
+    po	= @parent
+    return nil	if po.nil?
+
+    ch	= po.children
+    return nil	if ch.nil?
+
+    n	= ch.index(self)
+    return nil	if n.nil?
+
+    res	= nil
+    if klass.nil?
+      n -= 1
+      res	= ch[n]
+    else
+      begin
+        n -= 1
+        res	= ch[n]
+      end while (klass.empty? or klass.collect{|k| ch[n-1].kind_of?(k)}.sort.uniq == [true]) \
+            and (skip.empty? or skip.collect{|k| ch[n-1].kind_of?(k)}.sort.uniq == [false])
+    end
+
+    res
+  end
 end
 
 class Tree
@@ -138,7 +166,7 @@ class Tree
   end
 
   def self.location(url, form=Hash.new)
-    s	= HTTPClient.get(url, form)
+    s	= HTTPClient.get(url, {}, form)
     s	= ""	if s.nil?
     new(s)
   end
@@ -155,7 +183,7 @@ class Tree
 
     tree	= nil
 
-    Dir.mkdirrec(dir)
+    File.mkpath(dir)
 
     if File.file?(file)
       @@mutex.synchronize do
@@ -227,7 +255,7 @@ class Tree
   end
 
   def markclosed
-    ([self].concat @objects).each do |obj|
+    ([self] + @objects).each do |obj|
       obj.children.each_index do |i|
         co1		= obj.children[i]
         co2		= obj.children[i+1]
@@ -238,7 +266,7 @@ class Tree
   end
 
   def deletedummies
-    ([self].concat @objects).each do |obj|
+    ([self] + @objects).each do |obj|
       obj.children.delete_if do |obj2|
         obj2.upordown == Dummy
       end

data/ev/xml.rb

@@ -1,4 +1,101 @@
 require "ev/sgml"
 
+class SGMLObject
+  def to_x(closetags=true)
+    res	= ""
+
+    parsetree("prechildren_to_x", "postchildren_to_x", res, closetags)
+
+    res
+  end
+end
+
+class Text < SGMLObject
+  def prechildren_to_x(res, closetags)
+    res << @text.strip	unless @text.strip.empty?
+  end
+end
+
+class Comment < SGMLObject
+  def prechildren_to_x(res, closetags)
+    res << "\n"	if not previous([], [Text]).kind_of?(Comment)
+    lines	= @text.gsub(/(<!--|-->)/, "").lf.split(/\n/)
+    if lines.length == 1
+      res << "  "*(@level-1) + "<!-- " + lines[0].strip + " -->" + "\n"
+    else
+      res << "  "*(@level-1) + "<!--" + "\n"
+      res << lines.collect{|s| "  "*(@level-1) + s.strip}.delete_if{|s| s.compress.empty?}.join("\n")
+      res << "\n"
+      res << "  "*(@level-1) + "-->" + "\n"
+      res << "\n"
+    end
+  end
+end
+
+class Special < SGMLObject
+  def prechildren_to_x(res, closetags)
+    res << "  "*(@level-1) + @text.compress + "\n"
+  end
+end
+
+class Instruction < SGMLObject
+  def prechildren_to_x(res, closetags)
+    res << "  "*(@level-1) + @text.compress + "\n"
+  end
+end
+
+class OpenTag < Tag
+  def prechildren_to_x(res, closetags)
+    a	= [@subtype]
+
+    args	= @args.dup
+    args.delete("id")
+    args.delete("name")
+    args	= args.sort
+    args.unshift(["id", @args["id"]])		if @args.include?("id")
+    args.unshift(["name", @args["name"]])	if @args.include?("name")
+
+    args.each do |k, v|
+      if not v.include?("'")
+        a << "#{k}='#{v}'"
+      else
+        if not v.include?('"')
+          a << "#{k}=\"#{v}\""
+        else
+          a << "#{k}='#{v.gsub(/\'/, '"')}'"
+        end
+      end
+    end
+
+    if @children.length == 0 or (@children.length == 1 and @children[0].kind_of?(Text) and @children[0].text.compress.empty?)
+      res << "  "*(@level-1) + "<#{a.join(" ")}/>" + "\n"
+    else
+      if @children.length == 1 and @children[0].kind_of?(Text) and @children[0].text.lf.split(/\n/).length == 1
+        res << "  "*(@level-1) + "<#{a.join(" ")}>"
+      else
+        res << "  "*(@level-1) + "<#{a.join(" ")}>" + "\n"
+      end
+    end
+  end
+
+  def postchildren_to_x(res, closetags)
+    if closetags
+      unless @children.length == 0 or (@children.length == 1 and @children[0].kind_of?(Text) and @children[0].text.compress.empty?)
+        res << "\n"		if @children.length == 1 and @children[0].kind_of?(Text) and @children[0].text.lf.split(/\n/).length > 1
+        res << "  "*(@level-1)	unless @children.length == 1 and @children[0].kind_of?(Text) and @children[0].text.lf.split(/\n/).length == 1
+        res << "</#{@subtype}>"
+        res << "\n"
+      end
+    end
+  end
+end
+
 class XML < SGML
+  def to_x(closetags=true)
+    res	= ""
+
+    parsetree("prechildren_to_x", "postchildren_to_x", res, closetags)
+
+    res
+  end
 end

data/rwdconfig.dist

@@ -1,4 +1,4 @@
-##VERSION:1.63
+##VERSION:1.68
 # rwdtinker core configuration file
 ##NAME: ConfigLocation:0
 ConfigLocation=""