gtk2html 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b81efb096425aecfebf68214bf408e611cd28ee
-  data.tar.gz: 326fc3bb1f2d4b7fb92a7c641852cabc9f03fcb8
+  metadata.gz: 2c71c9bf3bcd28dc51ea164bda94b482e0ce3ee7
+  data.tar.gz: 1a42d43901620e37f640e58af6bf6f3a813214b1
 SHA512:
-  metadata.gz: a2cd659cebe59ea8420966134300b4b32538e255989d69221f8d3b01feda70b10c60302b2f1c994d74c2d0701fc0a8cdee3834097f33c8e90546e305c31090da
-  data.tar.gz: e1ce4bf4c31357354b112c6fcefde89a9a4778ee2e269385cf0f00cc703ca5dbcae439673d5f3f94aad61a3c3360d459603f42300da9bd0e40b4525b6840e458
+  metadata.gz: b5d3685e45170d735b58133c936684e42257f6008f0184f041d73f9eb7a90187f805001252d282cb04867f3e3142e7f80625942672130c3f3f6e05ae818d3e6b
+  data.tar.gz: 3caf8a98e72ec960d47f137afc8414710d4bc40a9d2e139f1cf0010dec7338c3e188975598a2c15c1da6a554f741ad42af33e4839296c2706bdd3317592896f0

data/lib/gtk2html.rb

@@ -6,13 +6,51 @@ 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 Gtk2HTML
 
   class Render < DomRender
 
     def initialize(x, width, height)
       
-      @width, @height = width, height
+      @width, @height = width.to_i, height.to_i
       super x
       
     end    
@@ -20,17 +58,30 @@ module Gtk2HTML
     def body(e, attributes, raw_style)
 
       style = style_filter(attributes).merge(raw_style)
-
-      h = attributes
+      margin = style[:margin].values
+      coords = [nil, nil, nil, nil]
+      padding = style[:padding].values
       
-      [[:draw_box, [x1,y1,x2,y2], style], render_all(e)]
+      [[:draw_box, margin, coords, padding, style], render_all(e)]
     end    
+    
+    def strong(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+      margin = style[:margin].values
+      coords = [nil, nil, nil, nil]
+      padding = style[:padding].values
+      
+      [[:draw_box, margin, coords, padding, style], render_all(e)]
+    end      
+    
+    alias b strong
 
     def div(e, attributes, raw_style)
       
       style = style_filter(attributes).merge(raw_style)
       margin = style[:margin].values
-      coords = [0, nil, @width, @height/2]
+      coords = [nil, nil, nil, nil]
       padding = style[:padding].values
       
       [[:draw_box, margin, coords, padding, style], render_all(e)]
@@ -43,7 +94,11 @@ module Gtk2HTML
       padding = style[:padding].values
 
       [[:draw_box, margin, coords, padding, style], render_all(e)]
-    end    
+    end
+
+    def style(*args)
+      
+    end
     
     private
     
@@ -51,12 +106,17 @@ module Gtk2HTML
       
       h = super attribute
 
-      %i(margin padding).inject(h) do |r,x|
+      r2 = %i(margin padding).inject(h) do |r,x|
 
         if h.has_key? x then
 
           a = expand_shorthand(h[x]) 
-          a.map!(&:to_i) # assumes everything is in pixels not em
+
+          a.map! do |v|
+            # note: there is 16px in 1em, see http://pxtoem.com/
+            v =~ /em$/i ? v.to_f * 16 : v.to_f
+          end
+
           r.merge!(x => Hash[%i(top right bottom left).zip(a)])
         else
           r
@@ -64,6 +124,8 @@ module Gtk2HTML
 
       end
       
+      r2
+      
     end    
     
     def style_filter(attributes)
@@ -77,55 +139,82 @@ module Gtk2HTML
   end
   
   class Layout
+    include InspectArray
     
     attr_reader :to_a
     
     def initialize(instructions, width: 320, height: 240)
       
-      @width, @height = width, height
-      a = lay_out(instructions, pcoords: [0, 0, @width, @height])
-      @to_a = a
+      @pcoords = [0, 0, width, height]
+      @a = lay_out(instructions)
       
     end
     
+    def to_a(inspect: false, verbose: false)
+      
+      if inspect or verbose then
+        scan @a
+        puts
+      else
+        @a
+      end
+
+    end
+    
 
     private
 
-    def lay_out(a, pcoords: [])
+    def lay_out(a)
 
-      item, children = a
-      
-      name, margin, raw_coords, padding, style = item
+      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)
+        
+      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.map do |row|
+
+          if a.first.is_a? String then
+            a.concat [@pcoords.take(2), style]
+          else
+            lay_out(row)
+          end
+        end
+
+      end
+
+    end         
+    
+    def set_row(row)
+
+      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]}
       
       x1 = coords[0] + margin[0]
       y1 = coords[1] + margin[1]
       x2 = coords[2] - margin[2]
       y2 = coords[3] - margin[3]      
 
-      item[2] = [x1, y1, x2, y2]
-
-      nested = if children and children.length > 1 then
-        lay_out(children, pcoords: coords) 
-      else
-        children
-      end
-      #[owidth=(coords[2] - coords[0]), oheight=(coords[3] - coords[1])]
-      r = [item]
-      r << nested if nested
-      r
-    end    
-    
-    def lay_out2(a, pcoords: [])
+      new_coords = [x1, y1, x2, y2]
       
-      name, raw_coords, attributes, style, children = a
-      coords = raw_coords.map.with_index {|x,i| x ? x : pcoords[i]}
-
-      owidth, oheight = lay_out(children, pcoords: coords) if children
+      curpos = new_coords.zip(padding).map{|x| x.inject(&:+)}      
       
-      [(coords[2] - coords[0]), (coords[3] - coords[1])]
-    end    
+      @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]      
+
+    end
     
   end
   
@@ -140,15 +229,12 @@ module Gtk2HTML
 
     end    
     
-    def draw_box(margin, raw_coords, padding, style)
-
-      coords = raw_coords.map.with_index {|x,i| x ? x : @curpos[i] }
+    def draw_box(margin, coords, padding, style)
 
       h2 = style.clone
       h2.delete :color
+
       x1, y1, x2, y2 = coords
-      
-      @curpos = coords
 
       width = x2 - x1
       height = y2 - y1
@@ -157,10 +243,10 @@ module Gtk2HTML
       @area.window.draw_rectangle(gc, 1, x1, y1, width, height)
     end
     
-    def draw_layout(text, style)
-
-      x, y = @curpos
-
+    def draw_layout(text, coords, style)
+      
+      x, y = coords
+    
       text ||= ''
       h2 = style.clone
       h2.delete :'background-color'      
@@ -195,33 +281,39 @@ module Gtk2HTML
       a.each do |row|
         
         next unless row
-        x, remaining = row
 
-        case x[0].class.to_s.to_sym
+        x = row
+
+        case row[0].class.to_s.to_sym
 
         when :Symbol
           
-          name, *args = x
+          name, margin, coords, padding, style, *children = x
                   
-          @latest_style = args[3]
-
-          method(name).call(*args)
-          draw remaining
+          @latest_style = style
+          method(name).call(margin, coords, padding, style)
+          draw children
           
         when :String then
 
           next if x.empty?
 
-          method(:draw_layout).call(x, @latest_style)
+          coords, style = row[1..-1]#remaining
+          method(:draw_layout).call(x,coords, style)
 
         when :Array
-          draw remaining
+
+          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 remaining
+          draw row[-1]
         end
 
       end
@@ -298,11 +390,12 @@ module Gtk2HTML
           
           @width, @height = window.size
           instructions = Gtk2HTML::Render.new(@doc, @width, @height).to_a
+
           @layout_instructions = Gtk2HTML::Layout.new(instructions).to_a
 
         end
 
-        drawing = DrawingInstructions.new area
+        drawing = Gtk2HTML::DrawingInstructions.new area
         drawing.render @layout_instructions
         @dirty = false
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2html
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   XW00gFE4S5Cq4J0/5Y8BLyxXWUTTXHeLXwfiIfffKOUtTUjlivG+dvqexj8Qbbv9
   bW25tpA1jigdbQ==
   -----END CERTIFICATE-----
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2svg
@@ -42,7 +42,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.12
 - !ruby/object:Gem::Dependency
   name: htmle
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
 description: 
 email: james@r0bertson.co.uk
 executables: []