diagrammatron 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f620125fb02691c986e3f340cc3248fbab02ecc99cd075ed9b0a9dfd2159a541
-  data.tar.gz: b384432f4b082379eedce471810cd8ad011bc1e016dc5410c00b99e3b1187b70
+  metadata.gz: 7f4b7974989ef344d2eaaae0c54f82567b8ed9edd9c7fb5d2dfc3e405895efa7
+  data.tar.gz: efdd52da27d648f9da7fed309ba668eae6237eeddd51a703c47c46c45c394435
 SHA512:
-  metadata.gz: edd885e247f16df32a67c6524cbfabfddaf9c6901fce6104c373fb6c7bd107c734fb275be133c09f06f128bade0bd34e9c626f87e14e097b580817a970277020
-  data.tar.gz: 3b7febb11202fc30fd0ba522d276e6f41ab4c25d72b2bf468c11ce8bd4b7f3c27001e7520e3e68705518e4b5646bb6708152ab766059cbd6b646f10b703e272c
+  metadata.gz: e235a20fb0fb4013e4f0006731743830f84500519d2ab4262b04caa9bae0962bd7da5127cd30e44c9e6bf891b735a02f10fe193149047fa6b54ec0bd6185f2e5
+  data.tar.gz: e6c4c3db889c83d23390ee874379215747fb4336fbb3f1f2f543226ab72788fe948a6394e500ea89ed4d4a013126a324b10fa5b49bf73be9233cd94e9781a024

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Ismo Kärkkäinen
+Copyright (c) 2021-2023 Ismo Kärkkäinen
 
 The Universal Permissive License (UPL), Version 1.0
 

data/bin/diagrammatron-edges

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021, 2022 Ismo Kärkkäinen
+# Copyright © 2021-2023 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
 require_relative '../lib/common'
@@ -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,126 +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
 
-GapState = Struct.new(:order, :cross_count, :lut) do
-  def fitness(segments, k)
-    table = lut[k]
-    crossings = 0
-    order.each do |n|
-      crossings += table[n]
-    end
-    cross_count + crossings
-  end
-end
-
-def candidate_compare(a, b)
-  d = a[1] <=> b[1]
-  return d unless d == 0
-  a[0] <=> b[0]
-end
-
-def candidate_order(lut, used)
-  # Compute crossing sums for all remaining segments among themselves.
-  cands = []
-  lut.keys.each do |k|
-    next if used.include? k
-    total = 0
-    lut.each_pair do |idx, v|
-      total += v[k] unless used.include? idx
-    end
-    cands.push([k, total])
-  end
-  cands.sort! { |a, b| candidate_compare(a, b) }
-  cands.map { |a| a[0] }
-end
-
-def depth_first_search(segments, state, best)
-  if state.order.size == segments.size
-    $stderr.puts state.order.join(', '), state.cross_count
-    return GapState.new(state.order.clone, state.cross_count, state.lut)
-  end
-  cands = candidate_order(state.lut, state.order)
-  cands.each do |k|
-    c = state.fitness(segments, k)
-    next if (best.nil? ? c + 1 : best.cross_count) <= c
-    state.order.push(k)
-    best = depth_first_search(segments, GapState.new(state.order, c, state.lut), best)
-    state.order.pop
-  end
-  best
-end
-
-def zigzag_order(from_right_up_to_left, from_left_up_to_right)
-  # Interleave the two sets.
-  out = []
-  from_right_up_to_left.each { |x| out.push x }
-  from_left_up_to_right.each { |x| out.push x }
-  return out
-  return segments if segments.size < 2
-  # DFS. Fitness is how many end segments cross the placed segments.
-  # Sort so that those that cross least when at start are first and vice versa.
-  lut = {}
-  segments.each_index do |k|
-    crossings = Hash.new(0)
-    lut[k] = crossings
-    s = segments[k]
-    prev = (s[1] == 1) ? s[2].range.max : s[2].range.min
-    segments.each_index do |n|
-      next if k == n
-      other = segments[n]
-      if other[2].range.min <= prev && prev <= other[2].range.max
-        crossings[n] = crossings[n] + 1
-      end
-      v = (other[1] == 1) ? other[2].range.min : other[2].range.max
-      if s[2].range.min <= v && v <= s[2].range.max
-        crossings[n] = crossings[n] + 1
-      end
-    end
-  end
-  $stderr.puts segments.size, lut
-  # Could take all crossings for k, sort, sum up to get minimum fitness for
-  # used set size N ignoring what set has. Since real fitness can not be
-  # lower, once minimal sum + cross_count exceeds best, we can not use that
-  # segment in any later position and can cut off search.
-  # Add to GapState after lut.
-  # Also, coult set time budget for single search and terminate search.
-  best = nil
-  cands = candidate_order(lut, [])
-  cands.each do |k|
-    best = depth_first_search(segments, GapState.new([ k ], 0, lut), best)
-  end
-  out = []
-  best.order.each do |k|
-    out.push segments[k]
-  end
-  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)
@@ -544,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)
@@ -717,29 +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? }
+        grul = gap.select { |a| a[1] == 1 }
+        glur = gap.select { |a| a[1] == 2 }
         gright = gap.select { |a| a[1] == 3 }
-        gmiddle = zigzag_order(gap.select() { |a| a[1] == 1 }, gap.select() { |a| a[1] == 2 })
-        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[k] = c[k - 1] + before[k - 1]
-        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-nodes

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021, 2022 Ismo Kärkkäinen
+# Copyright © 2021-2023 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
 require_relative '../lib/common'

data/bin/diagrammatron-render

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021, 2022 Ismo Kärkkäinen
+# Copyright © 2021-2023 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
 require_relative '../lib/common'
@@ -78,8 +78,13 @@ end
 
 class Styles
   def base_styles(m, styles, group)
-    d = styles.dig(group, 'default') || {}
-    m['default'] = m.fetch('default', {}).merge(d)
+    d = styles.dig(group, '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
       s.merge!(values) unless name == 'default'
@@ -107,7 +112,7 @@ class Styles
     end
     s.merge!(mapping['default']) unless found # Merge default at least.
     # Keep values specified explicitly.
-    item.merge!(s) {|key, existing, from_template| existing }
+    item.merge!(s) { |key, existing, from_template| existing || from_template }
   end
 
   def apply_node_styles(node)
@@ -276,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
@@ -350,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/bin/diagrammatron-template

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021, 2022 Ismo Kärkkäinen
+# Copyright © 2021-2023 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
 require_relative '../lib/common'
@@ -21,11 +21,15 @@ def add_field(doc, field_name, content)
 end
 
 def missing(doc)
-  %w[template].each do |key|
+  %w[template styles].each do |key|
     next if doc.key? key
     next if doc.key? "base64#{key}"
     return aargh("#{key} is missing", 4)
   end
+  %w[node edge diagram].each do |key|
+    v = doc.dig('styles', key, 'default')
+    return aargh("styles #{key} default is missing", 4) if v.nil?
+  end
   nil
 end
 
@@ -50,15 +54,24 @@ def main
 Pairs all parameter field-names with content-files contents, starting with
 either given root YAML file or with an empty root.
 
-Any field name either in root document or in parameters is trusted to be
-base-64 encoded without further checking.
-
 Outputs a YAML-file that case be used with diagrammatron-render as a template.
 All fields are base64-encoded for safety. diagrammatron-render will decode
 them and rename the fields by removing the base64 prefix.
 
-Presence of "defaults", "sizes", and "template" fields is checked for.
+Root document is expected to have at least the following:
+styles:
+  node:
+    defaults: {}
+  edge:
+    defaults: {}
+  diagram:
+    defaults: {}
+
+Presence of "template" field is checked for.
 Extra fields are not restricted in any manner.
+
+Any field name in parameters starting with "base64" is trusted to be base-64
+encoded without further checking.
 )
       exit 0
     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+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpoaCArPSAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnaGVpZ2h0X21hcmdpbicpCgpvdXQgPSBbCiAgJSg8c3ZnIHdpZHRoPSIje3cgKyAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnd2lkdGhfbWFyZ2luJyl9IiBoZWlnaHQ9IiN7aGh9IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiPikKXQokcmVuZGVyLmRvYy5mZXRjaCgnbm9kZXMnLCBbXSkuZWFjaCBkbyB8bm9kZXwKICB3ID0gbm9kZVsndyddLnRvX2kKICBoID0gbm9kZVsnaCddLnRvX2kKICB4ID0gbm9kZVsneG8nXS50b19pCiAgeSA9IGhoIC0gbm9kZVsneW8nXS50b19pIC0gaAogIG5vZGVzdHlsZSA9ICUoZmlsbD0iI3tub2RlWydmaWxsJ119IiBzdHJva2U9IiN7bm9kZVsnc3Ryb2tlJ119IiBzdHJva2Utd2lkdGg9IiN7bm9kZVsnc3Ryb2tlX3dpZHRoJ119IikKICBvdXQucHVzaCglKDxyZWN0ICN7bm9kZXN0eWxlfSBoZWlnaHQ9IiN7aH0iIHdpZHRoPSIje3d9IiB4PSIje3h9IiB5PSIje3l9Ii8+KSkKICB4ICs9IG5vZGVbJ3dpZHRoX21hcmdpbiddCiAgZnMgPSBub2RlWydmb250X3NpemUnXQogIGxoID0gZnMgKiAoMSArIG5vZGVbJ2ZvbnRfbGluZV9zcGFjaW5nJ10pCiAgeSArPSBub2RlWydoZWlnaHRfbWFyZ2luJ10gKyBmcyAqIG5vZGVbJ2ZvbnRfYXNjZW5kJ10gIyBCYXNlbGluZSBmb3IgZmlyc3QgbGluZS4KICB1cmwgPSBub2RlLmZldGNoKCd1cmwnLCBuaWwpCiAgdXJsLmVuY29kZSEoOnhtbCA9PiA6YXR0cikgdW5sZXNzIHVybC5uaWw/CiAgeTAgPSB5CiAgdGV4dHN0eWxlID0gJShmaWxsPSIje25vZGVbJ2ZvbnRfZmlsbCddfSIgZm9udC1mYW1pbHk9InNlcmlmIiBmb250LXNpemU9IiN7ZnN9IiBzdHJva2U9IiN7bm9kZVsnZm9udF9maWxsJ119IiBzdHJva2Utd2lkdGg9IjAiIHhtbDpzcGFjZT0icHJlc2VydmUiKQogIGxpbmtzdHlsZSA9ICUoZmlsbD0iI3tub2RlWyd1cmxfZmlsbCddfSIgZm9udC1mYW1pbHk9InNlcmlmIiBmb250LXNpemU9IiN7ZnN9IiBzdHJva2U9IiN7bm9kZVsndXJsX2ZpbGwnXX0iIHN0cm9rZS13aWR0aD0iMCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIpCiAgbm9kZVsndGV4dCddLmVhY2ggZG8gfGxpbmV8CiAgICBsaW5lLmVuY29kZSEoOnhtbCA9PiA6dGV4dCkKICAgIGlmIHVybC5uaWw/CiAgICAgIG91dC5wdXNoKCUoPHRleHQgI3t0ZXh0c3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PikpCiAgICBlbHNlCiAgICAgIG91dC5wdXNoKCUoPGEgeGxpbms6aHJlZj0je3VybH0gdGFyZ2V0PSJfcGFyZW50Ij48dGV4dCAje2xpbmtzdHlsZX0geD0iI3t4fSIgeT0iI3t5MH0iPiN7bGluZX08L3RleHQ+PC9hPikpCiAgICBlbmQKICAgIHkwICs9IGxoICMgU2hpZnQgYmFzZWxpbmUgYnkgZnVsbCBsaW5lICsgc3BhY2luZyBoZWlnaHQuCiAgZW5kCmVuZAokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBsaW5lc3R5bGUgPSAlKGZpbGw9Im5vbmUiIHN0cm9rZT0iI3tlZGdlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tlZGdlWydzdHJva2Vfd2lkdGgnXX0iKQogIHBhdGggPSBlZGdlLmZldGNoKCdwYXRoJywgbmlsKQogIG5leHQgaWYgcGF0aC5uaWw/CiAgcGF0aC5lYWNoIGRvIHxwfAogICAgcFsneG8nXSA9IHBbJ3hvJ10udG9faS50b19zCiAgICBwWyd5byddID0gKGhoIC0gcFsneW8nXSkudG9faS50b19zCiAgZW5kCiAgaWYgcGF0aC5zaXplID09IDIKICAgIG91dC5wdXNoKCUoPGxpbmUgI3tsaW5lc3R5bGV9IHgxPSIje3BhdGhbMF1bJ3hvJ119IiB4Mj0iI3twYXRoWzFdWyd4byddfSIgeTE9IiN7cGF0aFswXVsneW8nXX0iIHkyPSIje3BhdGhbMV1bJ3lvJ119Ii8+KSkKICBlbHNlCiAgICBwdHMgPSBwYXRoLm1hcCB7IHxwfCAiI3twWyd4byddfSwje3BbJ3lvJ119IiB9CiAgICBvdXQucHVzaCglKDxwb2x5bGluZSAje2xpbmVzdHlsZX0gcG9pbnRzPSIje3B0cy5qb2luKCcgJyl9Ii8+KSkKICBlbmQKZW5kCm91dC5qb2luKCJcbiIpCiU+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('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>))
-    else
-      out.push(%(<a xlink:href=#{url} target="_parent"><text #{linkstyle} x="#{x}" y="#{y0}">#{line}</text></a>))
+$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
-    y0 += lh # Shift baseline by full line + spacing height.
-  end
-end
-$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']}"/>))
   else
-    pts = path.map { |p| "#{p['xo']},#{p['yo']}" }
-    out.push(%(<polyline #{linestyle} points="#{pts.join(' ')}"/>))
+    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
+      pts = path.map { |p| "#{p['xo']},#{p['yo']}" }
+      out.push(%(<polyline #{linestyle} points="#{pts.join(' ')}"/>))
+    end
   end
 end
 out.join("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  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