diagrammatron 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 393c2881f870f2371e5af2e9a33fcfac3f82d9c3da69f7f377d87606b7230557
-  data.tar.gz: '019f726f35066af4fc209d61a2adbf36de1c6393d0089924912ca6c0e73baef0'
+  metadata.gz: 7f4b7974989ef344d2eaaae0c54f82567b8ed9edd9c7fb5d2dfc3e405895efa7
+  data.tar.gz: efdd52da27d648f9da7fed309ba668eae6237eeddd51a703c47c46c45c394435
 SHA512:
-  metadata.gz: 737105dcbe2c8dc6d636833079d2313be3b5f2c66d86d252127664948365b92f976622b65019e9b5ddd1f7b760f35a15fef9e30fdd749fae99441a31fb03bb8e
-  data.tar.gz: c091a6a5f862353afb8f730dbf8b35cf226c5627e6d352f1ad8366ca6d03cb338e61264c22876948806afdc0965f1df0ee81223f07750f61c73a8cd171ab0538
+  metadata.gz: e235a20fb0fb4013e4f0006731743830f84500519d2ab4262b04caa9bae0962bd7da5127cd30e44c9e6bf891b735a02f10fe193149047fa6b54ec0bd6185f2e5
+  data.tar.gz: e6c4c3db889c83d23390ee874379215747fb4336fbb3f1f2f543226ab72788fe948a6394e500ea89ed4d4a013126a324b10fa5b49bf73be9233cd94e9781a024

data/bin/diagrammatron-edges

@@ -158,6 +158,10 @@ Segment = Struct.new(:vertical, :cc, :range, :edge_index, :at_node, :segment_ind
   def increase?
     range[0] < range[1]
   end
+
+  def within(s)
+    s.range.min < range.min && range.max < s.range.max
+  end
 end
 
 def segment(x0, y0, x1, y1)
@@ -415,40 +419,16 @@ def path_order_at_side(a, b, conn)
   d
 end
 
-def segment_order(a, b)
-  d = a[1] <=> b[1]
+def length_order(a, b)
+  d = a[2].length <=> b[2].length
   return d unless d.zero?
-  case a[1]
-  when 0 # Ascending on length, range minimum. =|
-    d = a[2].length <=> b[2].length
-    return d unless d.zero?
-    d = a[2].range.min <=> b[2].range.min
-    return d unless d.zero?
-  when 1 # Top left, vertical, bottom right: -|_
-    d = a[2].range.min <=> b[2].range.min # Ascend on minimum.
-    return d unless d.zero?
-    d = a[2].length <=> b[2].length # Ascend on length.
-    return d unless d.zero?
-  when 2 # From top right, down, bottom left: _|-
-    d = a[2].range.max <=> b[2].range.max # Descend on maximum.
-    return -d unless d.zero?
-    d = a[2].length <=> b[2].length # Ascend on length.
-    return d unless d.zero?
-  when 3 # Descending on length, range maximum. |=
-    d = a[2].length <=> b[2].length
-    return -d unless d.zero?
-    d = a[2].range.max <=> b[2].range.max
-    return -d unless d.zero?
-  end
   a[0].edge_index <=> b[0].edge_index
 end
 
-def zigzag_order(from_right_up_to_left, from_left_up_to_right)
-  # Eventually interleave the two sets, if it makes sense.
-  out = []
-  from_right_up_to_left.each { |x| out.push x }
-  from_left_up_to_right.each { |x| out.push x }
-  out
+def min_order(a, b)
+  d = a[2].range.min <=> b[2].range.min
+  return d unless d.zero?
+  a[0].edge_index <=> b[0].edge_index
 end
 
 def overlaps_set(c, others)
@@ -458,47 +438,59 @@ def overlaps_set(c, others)
   false
 end
 
-def group_minimal_offsets(group)
-  return 0 if group.empty?
-  off = { 1 => [] }
-  cands = off.keys
-  group.each do |a|
-    fit = false
-    cands.each do |k|
-      next if overlaps_set(a[2], off[k])
-      off[k].push(a)
-      fit = true
-      break
+def layered_order(u_shaped, z_shaped)
+  u_shaped.sort! { |a, b| length_order(a, b) }
+  z_shaped.sort! { |a, b| min_order(a, b) }
+  out = []
+  layer = []
+  until u_shaped.empty?
+    rejects = []
+    found = false
+    u_shaped.each do |a|
+      unless overlaps_set(a[2], layer)
+        found = true
+        # Creates crossing by putting in front of shorter segment fully within?
+        rejects.each do |r|
+          if r[2].within(a[2])
+            found = false
+            break
+          end
+        end
+      end
+      if found
+        layer.push a
+        found = false
+      else
+        rejects.push a
+      end
+    end
+    u_shaped = rejects
+    unless layer.empty?
+      out.concat layer
+      out.push nil
+      layer = []
     end
-    next if fit
-    cands.push(cands.last + 1)
-    off[cands.last] = [ a ]
   end
-  off.each_pair do |offset, fitting|
-    fitting.each do |sg|
-      sg[0].offset = offset
+  until z_shaped.empty?
+    rejects = []
+    found = false
+    z_shaped.each do |a|
+      if overlaps_set(a[2], layer)
+        rejects.push a
+      else
+        layer.push a
+        found = true
+      end
+    end
+    z_shaped = rejects
+    unless layer.empty?
+      out.concat layer
+      out.push nil
+      layer = []
     end
   end
-  off.keys.max
-end
-
-def group_stacked_offsets(group)
-  return 0 if group.empty?
-  group.each_index do |k|
-    group[k][0].offset = k + 1
-  end
-  return group.size
-%q(
-  # This produces narrower gaps but they may be less clear.
-  prev = group[0]
-  prev[0].offset = 1
-  (1...group.size).each do |k|
-    g = group[k]
-    g[0].offset = prev[0].offset + (g[2].range_overlap(prev[2]) ? 1 : 0)
-    prev = g
-  end
-  prev[0].offset
-)
+  out.concat(layer) unless layer.empty?
+  out
 end
 
 def direct_range(paths)
@@ -631,36 +623,22 @@ def place_edges(work)
     end
     gaps.each_value do |direction|
       direction.each_value do |gap|
-        #gap.sort! { |a, b| segment_order(a, b) }
         gleft = gap.select { |a| a[1].zero? }
-        gleft.sort! { |a, b| segment_order(a, b) }
+        grul = gap.select { |a| a[1] == 1 }
+        glur = gap.select { |a| a[1] == 2 }
         gright = gap.select { |a| a[1] == 3 }
-        gright.sort! { |a, b| segment_order(a, b) }
-        gright.reverse!
-        grul = gap.select() { |a| a[1] == 1 }
-        grul.sort! { |a, b| segment_order(a, b) }
-        glur = gap.select() { |a| a[1] == 2 }
-        glur.sort! { |a, b| segment_order(a, b) }
-        gmiddle = zigzag_order(grul, glur)
-        gmiddle.each do |s|
-          s[1] = 1
-        end
-        gap = gleft + gmiddle + gright
-        c = [
-          group_minimal_offsets(gleft),
-          group_stacked_offsets(gmiddle),
-          0,
-          group_minimal_offsets(gright)
-        ]
-        before = [ 0 ]
-        denominator = 1 + c[0]
-        (1...c.size).each do |k|
-          denominator += c[k]
-          before.push(c[k - 1] + before.last)
-        end
-        gap.each do |sg|
-          sg[0].offset = c[sg[1]] + 1 - sg[0].offset if sg[1] > 1
-          sg[0].offset = Rational(sg[0].offset + before[sg[1]], denominator)
+        all = layered_order(gleft, grul)
+        all.push nil
+        all.concat(layered_order(gright, glur).reverse)
+        # Give each rational offset using layer index + 1 and layer count + 2.
+        denominator = 2 + all.count { |x| x.nil? }
+        layer = 1
+        all.each do |sg|
+          if sg.nil?
+            layer += 1
+          else
+            sg[0].offset = Rational(layer, denominator)
+          end
         end
       end
     end

data/bin/diagrammatron-render

@@ -80,9 +80,10 @@ class Styles
   def base_styles(m, styles, group)
     d = styles.dig(group, 'default')
     if d.nil?
-      d = m.fetch('default', {}) if d.nil?
+      d = m.fetch('default', {}) # No default in styles.
     else
       m['default'] = m.fetch('default', {}).merge(d)
+      d = m['default']
     end
     styles.fetch(group, {}).each_pair do |name, values|
       s = d.clone
@@ -280,6 +281,27 @@ def apply(doc, template)
   out
 end
 
+def reverse_depth_order(a, b)
+  d = b['depth'] <=> a['depth']
+  return d unless d.zero?
+  d = a['index'] <=> b['index']
+  return d unless d.zero?
+  a['kind'] <=> b['kind']
+end
+
+def reverse_depth_sort(items)
+  arr = []
+  items.each_index do |k|
+    arr.push({
+      'depth' => items[k].fetch('depth', 0),
+      'index' => k,
+      'kind' => items[k].fetch('kind', 'unknown')
+    })
+  end
+  arr.sort! { |a, b| reverse_depth_order(a, b) }
+  arr.map { |x| items[x['index']] }
+end
+
 def main
   template = nil
   input = nil
@@ -354,6 +376,30 @@ Output is the file produced by the erb-template.
   remap_coordinates(xcoords, xmax, x2min, doc.dig('diagram', 'edge_gap'))
   remap_coordinates(ycoords, ymax, y2min, doc.dig('diagram', 'edge_gap'))
 
+  doc['nodes'] = reverse_depth_sort(doc.fetch('nodes', []))
+  doc['edges'] = reverse_depth_sort(doc.fetch('edges', []))
+  all = doc.fetch('nodes', []).map do |a|
+    {
+      'kind' => 'node',
+      'depth' => a.fetch('depth', 0),
+      'item' => a
+    }
+  end
+  all.concat(doc.fetch('edges', []).map do |a|
+    {
+      'kind' => 'edge',
+      'depth' => a.fetch('depth', 0),
+      'item' => a
+    }
+  end)
+  all = reverse_depth_sort(all)
+  doc['all'] = all.map do |x|
+    {
+      'kind' => x['kind'],
+      'item' => x['item']
+    }
+  end
+
   dump_result(output, apply(doc, template), 5)
 end
 

data/template/internal.yaml

@@ -19,6 +19,7 @@ styles:
       fill: "#ffffff"
       stroke: "#000000"
       stroke_width: 2
+      depth: 0
       size_estimator: |
         $render.default_size($render.node['font_size'],
         $render.node['font_width'], $render.node['font_height'],
@@ -29,4 +30,5 @@ styles:
     default:
       stroke_width: 2
       stroke: "#000000"
-base64template: PD94bWwgdmVyc2lvbj0iMS4wIj8+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpoaCArPSAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnaGVpZ2h0X21hcmdpbicpCgpvdXQgPSBbCiAgJSg8c3ZnIHdpZHRoPSIje3cgKyAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnd2lkdGhfbWFyZ2luJyl9IiBoZWlnaHQ9IiN7aGh9IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiPikKXQokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBsaW5lc3R5bGUgPSAlKGZpbGw9Im5vbmUiIHN0cm9rZT0iI3tlZGdlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tlZGdlWydzdHJva2Vfd2lkdGgnXX0iKQogIHBhdGggPSBlZGdlLmZldGNoKCdwYXRoJywgbmlsKQogIG5leHQgaWYgcGF0aC5uaWw/CiAgcGF0aC5lYWNoIGRvIHxwfAogICAgcFsneG8nXSA9IHBbJ3hvJ10udG9faS50b19zCiAgICBwWyd5byddID0gKGhoIC0gcFsneW8nXSkudG9faS50b19zCiAgZW5kCiAgaWYgcGF0aC5zaXplID09IDIKICAgIG91dC5wdXNoKCUoPGxpbmUgI3tsaW5lc3R5bGV9IHgxPSIje3BhdGhbMF1bJ3hvJ119IiB4Mj0iI3twYXRoWzFdWyd4byddfSIgeTE9IiN7cGF0aFswXVsneW8nXX0iIHkyPSIje3BhdGhbMV1bJ3lvJ119Ii8+KSkKICBlbHNlCiAgICBwdHMgPSBwYXRoLm1hcCB7IHxwfCAiI3twWyd4byddfSwje3BbJ3lvJ119IiB9CiAgICBvdXQucHVzaCglKDxwb2x5bGluZSAje2xpbmVzdHlsZX0gcG9pbnRzPSIje3B0cy5qb2luKCcgJyl9Ii8+KSkKICBlbmQKZW5kCiRyZW5kZXIuZG9jLmZldGNoKCdub2RlcycsIFtdKS5lYWNoIGRvIHxub2RlfAogIHcgPSBub2RlWyd3J10udG9faQogIGggPSBub2RlWydoJ10udG9faQogIHggPSBub2RlWyd4byddLnRvX2kKICB5ID0gaGggLSBub2RlWyd5byddLnRvX2kgLSBoCiAgbm9kZXN0eWxlID0gJShmaWxsPSIje25vZGVbJ2ZpbGwnXX0iIHN0cm9rZT0iI3tub2RlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tub2RlWydzdHJva2Vfd2lkdGgnXX0iKQogIG91dC5wdXNoKCUoPHJlY3QgI3tub2Rlc3R5bGV9IGhlaWdodD0iI3tofSIgd2lkdGg9IiN7d30iIHg9IiN7eH0iIHk9IiN7eX0iLz4pKQogIHggKz0gbm9kZVsnd2lkdGhfbWFyZ2luJ10KICBmcyA9IG5vZGVbJ2ZvbnRfc2l6ZSddCiAgbGggPSBmcyAqICgxICsgbm9kZVsnZm9udF9saW5lX3NwYWNpbmcnXSkKICB5ICs9IG5vZGVbJ2hlaWdodF9tYXJnaW4nXSArIGZzICogbm9kZVsnZm9udF9hc2NlbmQnXSAjIEJhc2VsaW5lIGZvciBmaXJzdCBsaW5lLgogIHVybCA9IG5vZGUuZmV0Y2goJ3VybCcsIG5pbCkKICB1cmwuZW5jb2RlISg6eG1sID0+IDphdHRyKSB1bmxlc3MgdXJsLm5pbD8KICB5MCA9IHkKICB0ZXh0c3R5bGUgPSAlKGZpbGw9IiN7bm9kZVsnZm9udF9maWxsJ119IiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iI3tub2RlWydmb250X2ZpbGwnXX0iIHN0cm9rZS13aWR0aD0iMCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIpCiAgbGlua3N0eWxlID0gJShmaWxsPSIje25vZGVbJ3VybF9maWxsJ119IiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iI3tub2RlWyd1cmxfZmlsbCddfSIgc3Ryb2tlLXdpZHRoPSIwIiB4bWw6c3BhY2U9InByZXNlcnZlIikKICBub2RlWyd0ZXh0J10uZWFjaCBkbyB8bGluZXwKICAgIGxpbmUuZW5jb2RlISg6eG1sID0+IDp0ZXh0KQogICAgaWYgdXJsLm5pbD8KICAgICAgb3V0LnB1c2goJSg8dGV4dCAje3RleHRzdHlsZX0geD0iI3t4fSIgeT0iI3t5MH0iPiN7bGluZX08L3RleHQ+KSkKICAgIGVsc2UKICAgICAgb3V0LnB1c2goJSg8YSB4bGluazpocmVmPSN7dXJsfSB0YXJnZXQ9Il9wYXJlbnQiPjx0ZXh0ICN7bGlua3N0eWxlfSB4PSIje3h9IiB5PSIje3kwfSI+I3tsaW5lfTwvdGV4dD48L2E+KSkKICAgIGVuZAogICAgeTAgKz0gbGggIyBTaGlmdCBiYXNlbGluZSBieSBmdWxsIGxpbmUgKyBzcGFjaW5nIGhlaWdodC4KICBlbmQKZW5kCm91dC5qb2luKCJcbiIpCiU+Cjwvc3ZnPgo=
+      depth: 0
+base64template: PD94bWwgdmVyc2lvbj0iMS4wIj8+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpoaCArPSAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnaGVpZ2h0X21hcmdpbicpCgpvdXQgPSBbCiAgJSg8c3ZnIHdpZHRoPSIje3cgKyAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnd2lkdGhfbWFyZ2luJyl9IiBoZWlnaHQ9IiN7aGh9IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiPikKXQokcmVuZGVyLmRvY1snYWxsJ10uZWFjaCBkbyB8aXRlbXwKICBpZiBpdGVtWydraW5kJ10gPT0gJ25vZGUnCiAgICBub2RlID0gaXRlbVsnaXRlbSddCiAgICB3ID0gbm9kZVsndyddLnRvX2kKICAgIGggPSBub2RlWydoJ10udG9faQogICAgeCA9IG5vZGVbJ3hvJ10udG9faQogICAgeSA9IGhoIC0gbm9kZVsneW8nXS50b19pIC0gaAogICAgbm9kZXN0eWxlID0gJShmaWxsPSIje25vZGVbJ2ZpbGwnXX0iIHN0cm9rZT0iI3tub2RlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tub2RlWydzdHJva2Vfd2lkdGgnXX0iKQogICAgb3V0LnB1c2goJSg8cmVjdCAje25vZGVzdHlsZX0gaGVpZ2h0PSIje2h9IiB3aWR0aD0iI3t3fSIgeD0iI3t4fSIgeT0iI3t5fSIvPikpCiAgICB4ICs9IG5vZGVbJ3dpZHRoX21hcmdpbiddCiAgICBmcyA9IG5vZGVbJ2ZvbnRfc2l6ZSddCiAgICBsaCA9IGZzICogKDEgKyBub2RlWydmb250X2xpbmVfc3BhY2luZyddKQogICAgeSArPSBub2RlWydoZWlnaHRfbWFyZ2luJ10gKyBmcyAqIG5vZGVbJ2ZvbnRfYXNjZW5kJ10gIyBCYXNlbGluZSBmb3IgZmlyc3QgbGluZS4KICAgIHVybCA9IG5vZGUuZmV0Y2goJ3VybCcsIG5pbCkKICAgIHVybC5lbmNvZGUhKDp4bWwgPT4gOmF0dHIpIHVubGVzcyB1cmwubmlsPwogICAgeTAgPSB5CiAgICB0ZXh0c3R5bGUgPSAlKGZpbGw9IiN7bm9kZVsnZm9udF9maWxsJ119IiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iI3tub2RlWydmb250X2ZpbGwnXX0iIHN0cm9rZS13aWR0aD0iMCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIpCiAgICBsaW5rc3R5bGUgPSAlKGZpbGw9IiN7bm9kZVsndXJsX2ZpbGwnXX0iIGZvbnQtZmFtaWx5PSJzZXJpZiIgZm9udC1zaXplPSIje2ZzfSIgc3Ryb2tlPSIje25vZGVbJ3VybF9maWxsJ119IiBzdHJva2Utd2lkdGg9IjAiIHhtbDpzcGFjZT0icHJlc2VydmUiKQogICAgbm9kZVsndGV4dCddLmVhY2ggZG8gfGxpbmV8CiAgICAgIGxpbmUuZW5jb2RlISg6eG1sID0+IDp0ZXh0KQogICAgICBpZiB1cmwubmlsPwogICAgICAgIG91dC5wdXNoKCUoPHRleHQgI3t0ZXh0c3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PikpCiAgICAgIGVsc2UKICAgICAgICBvdXQucHVzaCglKDxhIHhsaW5rOmhyZWY9I3t1cmx9IHRhcmdldD0iX3BhcmVudCI+PHRleHQgI3tsaW5rc3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PjwvYT4pKQogICAgICBlbmQKICAgICAgeTAgKz0gbGggIyBTaGlmdCBiYXNlbGluZSBieSBmdWxsIGxpbmUgKyBzcGFjaW5nIGhlaWdodC4KICAgIGVuZAogIGVsc2UKICAgIGVkZ2UgPSBpdGVtWydpdGVtJ10KICAgIGxpbmVzdHlsZSA9ICUoZmlsbD0ibm9uZSIgc3Ryb2tlPSIje2VkZ2VbJ3N0cm9rZSddfSIgc3Ryb2tlLXdpZHRoPSIje2VkZ2VbJ3N0cm9rZV93aWR0aCddfSIpCiAgICBwYXRoID0gZWRnZS5mZXRjaCgncGF0aCcsIG5pbCkKICAgIG5leHQgaWYgcGF0aC5uaWw/CiAgICBwYXRoLmVhY2ggZG8gfHB8CiAgICAgIHBbJ3hvJ10gPSBwWyd4byddLnRvX2kudG9fcwogICAgICBwWyd5byddID0gKGhoIC0gcFsneW8nXSkudG9faS50b19zCiAgICBlbmQKICAgIGlmIHBhdGguc2l6ZSA9PSAyCiAgICAgIG91dC5wdXNoKCUoPGxpbmUgI3tsaW5lc3R5bGV9IHgxPSIje3BhdGhbMF1bJ3hvJ119IiB4Mj0iI3twYXRoWzFdWyd4byddfSIgeTE9IiN7cGF0aFswXVsneW8nXX0iIHkyPSIje3BhdGhbMV1bJ3lvJ119Ii8+KSkKICAgIGVsc2UKICAgICAgcHRzID0gcGF0aC5tYXAgeyB8cHwgIiN7cFsneG8nXX0sI3twWyd5byddfSIgfQogICAgICBvdXQucHVzaCglKDxwb2x5bGluZSAje2xpbmVzdHlsZX0gcG9pbnRzPSIje3B0cy5qb2luKCcgJyl9Ii8+KSkKICAgIGVuZAogIGVuZAplbmQKb3V0LmpvaW4oIlxuIikKJT4KPC9zdmc+Cg==

data/template/root.yaml

@@ -18,6 +18,7 @@ styles:
       fill: "#ffffff"
       stroke: "#000000"
       stroke_width: 2
+      depth: 0
       size_estimator: |
         $render.default_size($render.node['font_size'],
         $render.node['font_width'], $render.node['font_height'],
@@ -28,3 +29,4 @@ styles:
     default:
       stroke_width: 2
       stroke: "#000000"
+      depth: 0

data/template/svg_1.1.erb

@@ -6,45 +6,48 @@ hh += $render.doc.dig('diagram', 'height_margin')
 out = [
   %(<svg width="#{w + $render.doc.dig('diagram', 'width_margin')}" height="#{hh}" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">)
 ]
-$render.doc.fetch('edges', []).each do |edge|
-  linestyle = %(fill="none" stroke="#{edge['stroke']}" stroke-width="#{edge['stroke_width']}")
-  path = edge.fetch('path', nil)
-  next if path.nil?
-  path.each do |p|
-    p['xo'] = p['xo'].to_i.to_s
-    p['yo'] = (hh - p['yo']).to_i.to_s
-  end
-  if path.size == 2
-    out.push(%(<line #{linestyle} x1="#{path[0]['xo']}" x2="#{path[1]['xo']}" y1="#{path[0]['yo']}" y2="#{path[1]['yo']}"/>))
+$render.doc['all'].each do |item|
+  if item['kind'] == 'node'
+    node = item['item']
+    w = node['w'].to_i
+    h = node['h'].to_i
+    x = node['xo'].to_i
+    y = hh - node['yo'].to_i - h
+    nodestyle = %(fill="#{node['fill']}" stroke="#{node['stroke']}" stroke-width="#{node['stroke_width']}")
+    out.push(%(<rect #{nodestyle} height="#{h}" width="#{w}" x="#{x}" y="#{y}"/>))
+    x += node['width_margin']
+    fs = node['font_size']
+    lh = fs * (1 + node['font_line_spacing'])
+    y += node['height_margin'] + fs * node['font_ascend'] # Baseline for first line.
+    url = node.fetch('url', nil)
+    url.encode!(:xml => :attr) unless url.nil?
+    y0 = y
+    textstyle = %(fill="#{node['font_fill']}" font-family="serif" font-size="#{fs}" stroke="#{node['font_fill']}" stroke-width="0" xml:space="preserve")
+    linkstyle = %(fill="#{node['url_fill']}" font-family="serif" font-size="#{fs}" stroke="#{node['url_fill']}" stroke-width="0" xml:space="preserve")
+    node['text'].each do |line|
+      line.encode!(:xml => :text)
+      if url.nil?
+        out.push(%(<text #{textstyle} x="#{x}" y="#{y0}">#{line}</text>))
+      else
+        out.push(%(<a xlink:href=#{url} target="_parent"><text #{linkstyle} x="#{x}" y="#{y0}">#{line}</text></a>))
+      end
+      y0 += lh # Shift baseline by full line + spacing height.
+    end
   else
-    pts = path.map { |p| "#{p['xo']},#{p['yo']}" }
-    out.push(%(<polyline #{linestyle} points="#{pts.join(' ')}"/>))
-  end
-end
-$render.doc.fetch('nodes', []).each do |node|
-  w = node['w'].to_i
-  h = node['h'].to_i
-  x = node['xo'].to_i
-  y = hh - node['yo'].to_i - h
-  nodestyle = %(fill="#{node['fill']}" stroke="#{node['stroke']}" stroke-width="#{node['stroke_width']}")
-  out.push(%(<rect #{nodestyle} height="#{h}" width="#{w}" x="#{x}" y="#{y}"/>))
-  x += node['width_margin']
-  fs = node['font_size']
-  lh = fs * (1 + node['font_line_spacing'])
-  y += node['height_margin'] + fs * node['font_ascend'] # Baseline for first line.
-  url = node.fetch('url', nil)
-  url.encode!(:xml => :attr) unless url.nil?
-  y0 = y
-  textstyle = %(fill="#{node['font_fill']}" font-family="serif" font-size="#{fs}" stroke="#{node['font_fill']}" stroke-width="0" xml:space="preserve")
-  linkstyle = %(fill="#{node['url_fill']}" font-family="serif" font-size="#{fs}" stroke="#{node['url_fill']}" stroke-width="0" xml:space="preserve")
-  node['text'].each do |line|
-    line.encode!(:xml => :text)
-    if url.nil?
-      out.push(%(<text #{textstyle} x="#{x}" y="#{y0}">#{line}</text>))
+    edge = item['item']
+    linestyle = %(fill="none" stroke="#{edge['stroke']}" stroke-width="#{edge['stroke_width']}")
+    path = edge.fetch('path', nil)
+    next if path.nil?
+    path.each do |p|
+      p['xo'] = p['xo'].to_i.to_s
+      p['yo'] = (hh - p['yo']).to_i.to_s
+    end
+    if path.size == 2
+      out.push(%(<line #{linestyle} x1="#{path[0]['xo']}" x2="#{path[1]['xo']}" y1="#{path[0]['yo']}" y2="#{path[1]['yo']}"/>))
     else
-      out.push(%(<a xlink:href=#{url} target="_parent"><text #{linkstyle} x="#{x}" y="#{y0}">#{line}</text></a>))
+      pts = path.map { |p| "#{p['xo']},#{p['yo']}" }
+      out.push(%(<polyline #{linestyle} points="#{pts.join(' ')}"/>))
     end
-    y0 += lh # Shift baseline by full line + spacing height.
   end
 end
 out.join("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies: []
 description: |2