gtk2html 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c71c9bf3bcd28dc51ea164bda94b482e0ce3ee7
-  data.tar.gz: 1a42d43901620e37f640e58af6bf6f3a813214b1
+  metadata.gz: c3c83b7cc3a743e07cb251e5cd12f1ec77726c1d
+  data.tar.gz: 7ef2fe8b12107278ac1a120dfe8752b47d05bdf9
 SHA512:
-  metadata.gz: b5d3685e45170d735b58133c936684e42257f6008f0184f041d73f9eb7a90187f805001252d282cb04867f3e3142e7f80625942672130c3f3f6e05ae818d3e6b
-  data.tar.gz: 3caf8a98e72ec960d47f137afc8414710d4bc40a9d2e139f1cf0010dec7338c3e188975598a2c15c1da6a554f741ad42af33e4839296c2706bdd3317592896f0
+  metadata.gz: abea0a4c76a50eefd65095c0fb0b9c1803456a939fae247a87f2300337d251a1c158ec6fc87770da9fb81eff42f9ebf5793f7a62747d8e9774ca024af5fd7026
+  data.tar.gz: 28b09a3d12a556e3b299b3f2c354822f22667b68672f8ae31b6d40053807a3d825086be785277e5c9c5e3c3ec6f7aa0ff7cf232140941719b447f968c492943a

data/lib/gtk2html.rb

@@ -6,42 +6,7 @@ require 'gtk2svg'
 require 'htmle'
 
 
-module InspectArray
-      
-  def scan(a, i=0)
-    
-    if a.first.is_a? Symbol
-      
-        puts a.inspect    
-        
-    else
-      
-      puts ('  ' * i) + '['
-
-      a.each.with_index do |row, j|
-
-        if row.is_a? String or row.is_a? Symbol then
-          print ('  ' * (i+1)) + row.inspect
-          print ',' unless a.length - 1 == j
-          puts
-        elsif row.first.is_a? Symbol or row.first.is_a? String
-          puts ('  ' * (i+1)) + '['
-          puts ('  ' * (i+2)) + row.inspect[1..-2]
-          print ('  ' * (i+1)) + ']'
-          print ',' unless a.length - 1 == j
-          puts
-        else
-          scan(row,i+1)
-          print ',' unless a.length - 1 == j
-          puts
-        end
-      end
-
-      print indent = ('  ' * i) + ']'
-    end
-  end
-  
-end
+# module InspectArray is located in dom_render.rb
 
 
 module Gtk2HTML
@@ -123,8 +88,24 @@ module Gtk2HTML
         end
 
       end
+
+      r3 =  %i(height width).inject(r2) do |r,x|
+
+        if r.has_key? x then
+
+          v = r[x]
+
+          # note: there is 16px in 1em, see http://pxtoem.com/
+          r[x] = v =~ /em$/i ? v.to_f * 16 : v.to_f          
+          r
+
+        else
+          r
+        end
+
+      end      
       
-      r2
+      r3
       
     end    
     
@@ -145,9 +126,11 @@ module Gtk2HTML
     
     def initialize(instructions, width: 320, height: 240)
       
-      @pcoords = [0, 0, width, height]
-      @a = lay_out(instructions)
-      
+      pcoords = [0, 0, width, height]
+      @pcoords = [0,0,0,0]      
+      a = lay_out(instructions, pcoords)
+      @a = del_pcoords a
+
     end
     
     def to_a(inspect: false, verbose: false)
@@ -155,6 +138,7 @@ module Gtk2HTML
       if inspect or verbose then
         scan @a
         puts
+        @a
       else
         @a
       end
@@ -163,56 +147,103 @@ module Gtk2HTML
     
 
     private
+    
+    def del_pcoords(a)
+      
+      if a.first.is_a? Array then
+        a.map {|row| del_pcoords row }
+      else
+        a.pop
+        a
+      end
+    end
 
-    def lay_out(a)
-
+    def lay_out(a, pcoords=[])
+            
       if a.first.is_a? Symbol then
-
-        @text_style = %i(font-size color).inject({}){|r,x| r.merge(x => a[4][x]) }
-
-        set_row(a)
+        
+        @text_style = %i(font-size color).inject({})\
+                                                 {|r,x| r.merge(x => a[4][x]) }
+        set_row(a, pcoords)
         
       elsif a.first.is_a? String then
-        a.concat [@pcoords.take(2), @text_style]
-      elsif a.first.is_a? Array and a.first.empty?
-        a.delete a.first
-        lay_out a
-      else
+        
+        [a.first, @pcoords.take(2), @text_style, pcoords]
+        
+      elsif a.first.is_a? Array 
+        
+        if a.first.empty? then
+          a.delete a.first
+          lay_out a, pcoords
+        else
+          
+          if a.first.first.is_a? Symbol then            
+            
+            item, children = a
+
+            r = lay_out(item, pcoords)
+
+            pcoords = r[-1]            
+
+            if children then
 
-        a.map do |row|
+              r2 = lay_out(children, pcoords) 
+              r = [r,r2]
+            end
 
-          if a.first.is_a? String then
-            a.concat [@pcoords.take(2), style]
+            #r << pcoords
+            
           else
-            lay_out(row)
+            a.map {|row| lay_out(row, pcoords) }
           end
+
         end
 
-      end
+      else
+
+        a.map {|row| lay_out(row, pcoords) }
 
+      end
+      
     end         
     
-    def set_row(row)
-
+    def set_row(row, pcoords)
+      
       name, margin, raw_coords, padding, style = row
+    
+      coords = raw_coords.map.with_index {|x,i| x ? x : pcoords[i]}
       
-      coords = raw_coords.map.with_index {|x,i| x ? x : @pcoords[i]}
+      width, height = style[:width], style[:height]
       
       x1 = coords[0] + margin[0]
       y1 = coords[1] + margin[1]
-      x2 = coords[2] - margin[2]
-      y2 = coords[3] - margin[3]      
+      
+      if width then
 
-      new_coords = [x1, y1, x2, y2]
+        x2 = x1 + width.to_f
+        x2 += margin[2]        
+      else
+        x2 = coords[2] - margin[2]
+      end
       
-      curpos = new_coords.zip(padding).map{|x| x.inject(&:+)}      
+      if height then
+
+        y2 = y1 + height.to_f
+        y2 += margin[3]
+
+      else
+        y2 = coords[3] - margin[3]      
+      end
+
+      new_coords = [x1, y1, x2, y2]        
       
       @pcoords[0] = x1 + padding[0]
       @pcoords[1] = y1 + padding[1]
       @pcoords[2] = x2 - padding[2]
       @pcoords[3] = y2 - padding[3]      
-      
-      r = [name, margin, new_coords, padding, style]      
+      pcoords = @pcoords.clone
+
+      [name, margin, new_coords, padding, style, pcoords]
 
     end
     
@@ -244,7 +275,7 @@ module Gtk2HTML
     end
     
     def draw_layout(text, coords, style)
-      
+
       x, y = coords
     
       text ||= ''
@@ -264,7 +295,7 @@ module Gtk2HTML
     end
 
     def render(a)      
-      draw [a]
+      draw a
     end
     
     def script(args)
@@ -275,49 +306,63 @@ module Gtk2HTML
     private
     
     def draw(a)
-      
+            
       return unless a
       
-      a.each do |row|
+      if a.first.is_a? Symbol then
         
-        next unless row
+        name, margin, coords, padding, style, _, *children = a                  
+        method(name).call(margin, coords, padding, style)
+        draw children
+        
+      elsif a.first.is_a? String and not a.first.empty?
 
-        x = row
+        coords, style = a[1..-1]#remaining
+        method(:draw_layout).call(a.first, coords, style)
+        
+      else
+      
+        a.each do |row|
 
-        case row[0].class.to_s.to_sym
+          next unless row
 
-        when :Symbol
-          
-          name, margin, coords, padding, style, *children = x
-                  
-          @latest_style = style
-          method(name).call(margin, coords, padding, style)
-          draw children
-          
-        when :String then
+          x = row
+
+          case row[0].class.to_s.to_sym
+
+          when :Symbol
+            
+            name, margin, coords, padding, style, _, *children = x
+                    
+            method(name).call(margin, coords, padding, style)
+            draw children
+            
+          when :String then
 
-          next if x.empty?
+            next if x.empty?
 
-          coords, style = row[1..-1]#remaining
-          method(:draw_layout).call(x,coords, style)
+            coords, style = row[1..-1]#remaining
+            
+            method(:draw_layout).call(*row)
 
-        when :Array
+          when :Array
 
-          if row[-1][0].is_a? String then
-            method(:draw_layout).call(*row[-1])
-          else
+            if row[-1][0].is_a? String then
+              method(:draw_layout).call(*row[-1])
+            else
+              draw row[-1]
+            end
+          else    
+            
+            name, *args = x
+
+            method(name).call(args)
             draw row[-1]
           end
-        else    
-          
-          name, *args = x
 
-          method(name).call(args)
-          draw row[-1]
         end
-
       end
-      
+        
     end
     
     def set_colour(c)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2html
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   XW00gFE4S5Cq4J0/5Y8BLyxXWUTTXHeLXwfiIfffKOUtTUjlivG+dvqexj8Qbbv9
   bW25tpA1jigdbQ==
   -----END CERTIFICATE-----
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2svg