diagrammatron 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5e755dfc41bacfbfb226e77365b8d54a5ff0f01ea5b642febdbb1699497d21
-  data.tar.gz: c9b8b67509f94635cd65b77ed89a3cf0a456f6c666a7b3773539760a8e429fec
+  metadata.gz: f620125fb02691c986e3f340cc3248fbab02ecc99cd075ed9b0a9dfd2159a541
+  data.tar.gz: b384432f4b082379eedce471810cd8ad011bc1e016dc5410c00b99e3b1187b70
 SHA512:
-  metadata.gz: '081df6de2fb3489cc0976a2805c829fb846ce5561617b15d7446dda4a6bfd0a63bbc9abf234e89e895ed90f710f756cbc8b1f47618ee4216e89a2c4e522e9046'
-  data.tar.gz: 85e77e7adf696cd3f46fe2b41a77266d67cf1d7e904cb1c9eb4f83bae6e3fef8db7f199313923e588c8802e8edb6d8148869f2c8ef93685aeb3af48dc6a83252
+  metadata.gz: edd885e247f16df32a67c6524cbfabfddaf9c6901fce6104c373fb6c7bd107c734fb275be133c09f06f128bade0bd34e9c626f87e14e097b580817a970277020
+  data.tar.gz: 3b7febb11202fc30fd0ba522d276e6f41ab4c25d72b2bf468c11ce8bd4b7f3c27001e7520e3e68705518e4b5646bb6708152ab766059cbd6b646f10b703e272c

data/bin/diagrammatron-edges

@@ -68,7 +68,7 @@ def work_copy(src, quiet)
       next
     end
     label = node['label']
-    if label2idx.key?(label) && edge_nodes.key?(label)
+    if label2idx.key?(label) && edge_nodes.member?(label)
       aargh "Edge-referred label used twice: #{label}"
       errors = true
     end
@@ -424,63 +424,111 @@ def segment_order(a, b)
     return d unless d.zero?
     d = a[2].range.min <=> b[2].range.min
     return d unless d.zero?
-  when 1 # From top left, down, bottom right: -|_
-    d = a[2].range.min <=> b[2].range.min # Guesstimate for DFS.
+  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.min <=> b[2].range.min # Guesstimate for DFS.
+    d = a[2].range.max <=> b[2].range.max # Descend on maximum.
     return -d unless d.zero?
-  when 3 # Descending on length, range maximum. |=
-    d = b[2].length <=> a[2].length
-    return d unless d.zero?
-    d = b[2].range.max <=> a[2].range.max
+    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) do
+GapState = Struct.new(:order, :cross_count, :lut) do
   def fitness(segments, k)
+    table = lut[k]
     crossings = 0
-    s = segments[k]
-    prev = (s[1] == 1) ? s[2].range.max : s[2].range.min
     order.each do |n|
-      placed = segments[n]
-      if placed[2].range.min <= prev && prev <= placed[2].range.max
-        crossings += 1
-      end
-      v = (placed[1] == 1) ? placed[2].range.min : placed[2].range.max
-      if s[2].range.min <= v && v <= s[2].range.max
-        crossings += 1
-      end
+      crossings += table[n]
     end
     cross_count + crossings
   end
 end
 
-def depth_first_search(segments, state, best)
-  if state.order.size < segments.size
-    segments.each_index do |k|
-      next if state.order.include? 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), best)
-      state.order.pop
+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
-  else
-    best = GapState.new(state.order.clone, state.cross_count)
+    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(segments)
+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.
-  best = nil
+  lut = {}
   segments.each_index do |k|
-    best = depth_first_search(segments, GapState.new([ k ], 0), best)
+    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|
@@ -653,7 +701,7 @@ def place_edges(work)
     chosen.each_value do |p|
       (1...(p.segments.size - 1)).each do |k|
         # Middle segments always have surrounding segments.
-        s, before, after, sb, sa = p.segment_directions(k)
+        s, below, above, sb, sa = p.segment_directions(k)
         so = s.clone # More accurate info on actual range with end offsets.
         if so.range[0] < so.range[1]
           so.range[0] += sb.offset unless sb.offset.nil?
@@ -662,7 +710,7 @@ def place_edges(work)
           so.range[0] += sb.offset.nil? ? 0.9999 : sb.offset
           so.range[1] += sa.offset unless sa.offset.nil?
         end
-        group = (before.negative? ? 0 : 1) + (after.negative? ? 0 : 2)
+        group = (below.negative? ? 0 : 1) + (above.negative? ? 0 : 2)
         d = gaps[s.vertical]
         d[s.cc] = d.fetch(s.cc, []).push([ s, group, so ])
       end
@@ -672,7 +720,7 @@ def place_edges(work)
         gap.sort! { |a, b| segment_order(a, b) }
         gleft = gap.select { |a| a[1].zero? }
         gright = gap.select { |a| a[1] == 3 }
-        gmiddle = zigzag_order(gap.select { |a| a[1] == 1 || a[1] == 2 })
+        gmiddle = zigzag_order(gap.select() { |a| a[1] == 1 }, gap.select() { |a| a[1] == 2 })
         gmiddle.each do |s|
           s[1] = 1
         end

data/bin/diagrammatron-nodes

@@ -312,7 +312,7 @@ def work_copy(src, quiet)
       next
     end
     label = node['label']
-    if label2idx.key?(label) && edge_nodes.key?(label)
+    if label2idx.key?(label) && edge_nodes.member?(label)
       aargh "Edge-referred label used twice: #{label}"
       errors = true
     end

data/bin/diagrammatron-render

@@ -76,94 +76,101 @@ def separate_coordinates(doc)
   [ xcoords, ycoords, ckd2count ]
 end
 
-class FontInfo
-  attr_reader :descender, :max_ascend, :ascender, :cap_height, :line_spacing, :width, :size
-
-  def initialize(template)
-    font = template.fetch('defaults', {}).fetch('font', { 'font_size' => 16 })
-    @cap_height = font.fetch('cap_height', 0.8 * font.fetch('font_size', 16))
-    @ascender = font.fetch('ascender', @cap_height)
-    @max_ascend = [ @cap_height, @ascender ].max
-    @descender = font.fetch('descender', 0.25 * @max_ascend)
-    @size = font.fetch('font_size', @max_ascend + @descender)
-    @line_spacing = font.fetch('line_spacing', 0.2 * @max_ascend)
-    @width = font.fetch('width', 0.5 * @size)
+class Styles
+  def base_styles(m, styles, group)
+    d = styles.dig(group, 'default') || {}
+    m['default'] = m.fetch('default', {}).merge(d)
+    styles.fetch(group, {}).each_pair do |name, values|
+      s = d.clone
+      s.merge!(values) unless name == 'default'
+      m[name] = m.fetch(name, {}).merge(s)
+    end
+    m
+  end
+
+  def initialize(template_styles, diagram_styles)
+    @n = base_styles(base_styles({}, template_styles, 'node'), diagram_styles, 'node')
+    @e = base_styles(base_styles({}, template_styles, 'edge'), diagram_styles, 'edge')
+    @d = base_styles(base_styles({}, template_styles, 'diagram'), diagram_styles, 'diagram')
+  end
+
+  def fill(mapping, type_name, item)
+    styles = item.fetch('style', [ 'default' ])
+    styles = [ styles ] unless styles.is_a?(Array)
+    s = {}
+    found = false
+    styles.each do |name|
+      ns = mapping.fetch(name, nil)
+      next if ns.nil?
+      found = true
+      s.merge! ns
+    end
+    s.merge!(mapping['default']) unless found # Merge default at least.
+    # Keep values specified explicitly.
+    item.merge!(s) {|key, existing, from_template| existing }
+  end
+
+  def apply_node_styles(node)
+    fill(@n, 'node', node)
   end
-end
 
-class Defaults
-  attr_reader :width_key, :height_key, :width_margin, :height_margin, :edge_gap
-  attr_reader :font
-
-  def initialize(template)
-    defaults = template.fetch('defaults', {})
-    @width_key = defaults.fetch('width_key', 'w')
-    @height_key = defaults.fetch('height_key', 'h')
-    @width_margin = defaults.fetch('width_margin', 10)
-    @height_margin = defaults.fetch('height_margin', 10)
-    @edge_gap = defaults.fetch('edge_gap', 20)
-    @font = FontInfo.new(template)
+  def apply_edge_styles(edge)
+    fill(@e, 'edge', edge)
+  end
+
+  def apply_diagram_styles(diagram)
+    fill(@d, 'diagram', diagram)
   end
 end
 
 class SizeEstimation
-  attr_accessor :node, :template, :ckd2count, :defaults
+  attr_accessor :node, :ckd2count, :doc
 
-  def initialize(template, ckd2count, defaults)
+  def initialize(ckd2count, doc)
     @node = nil
-    @template = template
     @ckd2count = ckd2count
-    @defaults = defaults
+    @doc = doc
   end
 
-  def get_binding
+  def exposed_binding
     binding
   end
 
-  def get_default(key, default_value = nil)
-    @template.fetch('defaults', {}).fetch(key, default_value)
-  end
-
   def max_edges(key, edge_gap)
     c = [ @node['xo'], @node['yo'], key, -1 ]
     count = @ckd2count[c]
     c[3] = 1
     count = [ count, @ckd2count[c] ].max
     return 0 if count < 2
-    (count - 1) * (edge_gap || @defaults.edge_gap)
+    (count - 1) * edge_gap
   end
 
-  def default_size(width_scale = nil, height_scale = nil, line_spacing = nil,
-      width_margin = nil, height_margin = nil, edge_gap = nil)
-    lines = @node['label']
-    w = 2 * (width_margin || @defaults.width_margin) +
-      (width_scale || @default.font.width) * (lines.map &(:size)).max
-    @node[@defaults.width_key] = [ w, max_edges('xo', edge_gap) ].max
-    h = 2 * (height_margin || @defaults.height_margin) +
-      (height_scale || @defaults.font.size) * lines.size +
-      (line_spacing || @defaults.font.line_spacing) * (lines.size - 1)
-    @node[@defaults.height_key] = [ h, max_edges('yo', edge_gap) ].max
+  # font_size is the actual size.
+  # font_width, font_height, font_line_spacing are [0, 1] size scaling factors.
+  # width_margin, height_margin are in same units as fonti, space inside node.
+  # edge_gap is minimum space between edges at any node side.
+  def default_size(font_size, font_width, font_height, font_line_spacing,
+      width_margin, height_margin, edge_gap)
+    lines = @node['text']
+    w = 2 * width_margin + font_width * font_size * (lines.map &(:size)).max
+    @node['w'] = [ w, max_edges('xo', edge_gap) ].max
+    h = 2 * height_margin + font_height * font_size * lines.size +
+      font_line_spacing * font_size * (lines.size - 1)
+    @node['h'] = [ h, max_edges('yo', edge_gap) ].max
   end
 end
 
-def estimate_sizes(doc, template, ckd2count, defaults)
-  $render = SizeEstimation.new(template, ckd2count, defaults)
-  sizes = template.fetch('sizes', {})
-  defaults = template.fetch('defaults', {})
+def estimate_sizes(doc, ckd2count)
+  $render = SizeEstimation.new(ckd2count, doc)
   doc['nodes'].each do |node|
-    label = node.fetch('label', 'unnamed')
-    # Substitute "text" as label if present, split to lines.
-    node['label'] = node.fetch('text', node.fetch('label', '')).split("\n")
     $render.node = node
+    label = node.fetch('label', 'unnamed')
     style = node.fetch('style', 'default')
-    code = sizes.fetch(style, defaults.fetch('size',
-      %(raise NotImplementedError, "No size estimator for style: #{style}")))
-    if sizes.key? code
-      code = sizes.fetch(code)
-    end
+    code = node.fetch('size_estimator',
+      %(raise NotImplementedError, "No size estimator for style: #{style}"))
     code = code.join("\n") if code.is_a? Array
     begin
-      eval(code, $render.get_binding)
+      eval(code, $render.exposed_binding)
     rescue StandardError => e
       return aargh("Size estimate style #{style} node #{label} error #{e}", false)
     end
@@ -172,20 +179,20 @@ def estimate_sizes(doc, template, ckd2count, defaults)
   true
 end
 
-def maxima(doc, defaults)
+def maxima(doc)
   xmax = Hash.new(0)
   ymax = Hash.new(0)
   doc.fetch('nodes', []).each do |node|
-    xmax[node['xo']] = [ node[defaults.width_key], xmax[node['xo']] ].max
-    ymax[node['yo']] = [ node[defaults.height_key], ymax[node['yo']] ].max
+    xmax[node['xo']] = [ node['w'], xmax[node['xo']] ].max
+    ymax[node['yo']] = [ node['h'], ymax[node['yo']] ].max
   end
   [ xmax, ymax ]
 end
 
-def apply_maxima(doc, xmax, ymax, defaults)
+def apply_maxima(doc, xmax, ymax)
   doc.fetch('nodes', []).each do |node|
-    node[defaults.width_key] = xmax[node['xo']]
-    node[defaults.height_key] = ymax[node['yo']]
+    node['w'] = xmax[node['xo']]
+    node['h'] = ymax[node['yo']]
   end
 end
 
@@ -200,8 +207,8 @@ def parallel_edge_step_minima(coords)
   c2m
 end
 
-def remap_coordinates(coords, cmax, c2min, defaults)
-  c = defaults.edge_gap
+def remap_coordinates(coords, cmax, c2min, edge_gap)
+  c = edge_gap
   gap = 0 # How much space all edge segments need.
   zero_after_decrease = false
   prev_dir = -2
@@ -210,19 +217,19 @@ def remap_coordinates(coords, cmax, c2min, defaults)
     case coord.direction
     when -1
       c += gap if -1 < prev_dir
-      gap = defaults.edge_gap
+      gap = edge_gap
       coord.object[coord.key] = c
     when 0
-      gap = defaults.edge_gap / c2min[coord.integer]
+      gap = edge_gap / c2min[coord.integer]
       if zero_after_decrease
         # Edge segment is at same range as nodes.
         coord.object[coord.key] = c + coord.fraction * cmax[coord.integer]
       else
         coord.object[coord.key] =
-          c + (defaults.edge_gap * coord.fraction) / c2min[coord.integer]
+          c + (edge_gap * coord.fraction) / c2min[coord.integer]
       end
     when 1
-      gap = defaults.edge_gap
+      gap = edge_gap
       c += cmax[coord.integer] unless prev_dir == 1
       coord.object[coord.key] = c
       zero_after_decrease = false
@@ -232,28 +239,23 @@ def remap_coordinates(coords, cmax, c2min, defaults)
 end
 
 class Render
-  attr_accessor :doc, :template, :defaults
+  attr_accessor :doc, :template
 
-  def initialize(doc, template, defaults)
+  def initialize(doc, template)
     @doc = doc
     @template = template
-    @defaults = defaults
   end
 
-  def get_binding
+  def exposed_binding
     binding
   end
 
-  def get_default(key, default_value = nil)
-    @template.fetch('defaults', {}).fetch(key, default_value)
-  end
-
   def dimensions
     w = 0
     h = 0
     @doc.fetch('nodes', []).each do |node|
-      w = [ w, node['xo'] + node[@defaults.width_key] ].max
-      h = [ h, node['yo'] + node[@defaults.height_key] ].max
+      w = [ w, node['xo'] + node['w'] ].max
+      h = [ h, node['yo'] + node['h'] ].max
     end
     @doc.fetch('edges', []).each do |edge|
       path = edge.fetch('path', nil)
@@ -267,9 +269,9 @@ class Render
   end
 end
 
-def apply(doc, template, defaults)
-  $render = Render.new(doc, template, defaults)
-  out = ERB.new(template.fetch('template', '')).result($render.get_binding)
+def apply(doc, template)
+  $render = Render.new(doc, template)
+  out = ERB.new(template.fetch('template', '')).result($render.exposed_binding)
   $render = nil
   out
 end
@@ -278,6 +280,7 @@ def main
   template = nil
   input = nil
   output = nil
+  styles = nil
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
     opts.summary_width = 20
@@ -317,29 +320,37 @@ Output is the file produced by the erb-template.
       return aargh("Key #{key} base-64 decoding failed to key #{nk}", 2)
     end
   end
-  defaults = Defaults.new(template)
 
   doc = load_source(input)
   return 2 if doc.nil?
 
+  styles = Styles.new(template.fetch('styles', {}), doc.fetch('styles', {}))
+  doc.fetch('nodes', []).each do |node|
+    styles.apply_node_styles(node)
+    node['text'] = node.fetch('text', node.fetch('label', '')).split("\n")
+  end
+  doc.fetch('edges', []).each { |edge| styles.apply_edge_styles(edge) }
+  doc['diagram'] = {} unless doc.key? 'diagram'
+  styles.apply_diagram_styles(doc['diagram'])
+
   begin
     xcoords, ycoords, ckd2count = separate_coordinates(doc)
   rescue StandardError
     return aargh('Error processing input.', 3)
   end
 
-  return 4 unless estimate_sizes(doc, template, ckd2count, defaults)
+  return 4 unless estimate_sizes(doc, ckd2count)
 
   # Make all rows the same height and all columns the same width.
-  xmax, ymax = maxima(doc, defaults)
-  apply_maxima(doc, xmax, ymax, defaults)
+  xmax, ymax = maxima(doc)
+  apply_maxima(doc, xmax, ymax)
 
   x2min = parallel_edge_step_minima(xcoords)
   y2min = parallel_edge_step_minima(ycoords)
-  remap_coordinates(xcoords, xmax, x2min, defaults)
-  remap_coordinates(ycoords, ymax, y2min, defaults)
+  remap_coordinates(xcoords, xmax, x2min, doc.dig('diagram', 'edge_gap'))
+  remap_coordinates(ycoords, ymax, y2min, doc.dig('diagram', 'edge_gap'))
 
-  dump_result(output, apply(doc, template, defaults), 5)
+  dump_result(output, apply(doc, template), 5)
 end
 
 exit(main) if (defined? $unit_test).nil?

data/bin/diagrammatron-template

@@ -21,7 +21,7 @@ def add_field(doc, field_name, content)
 end
 
 def missing(doc)
-  %w[defaults sizes template].each do |key|
+  %w[template].each do |key|
     next if doc.key? key
     next if doc.key? "base64#{key}"
     return aargh("#{key} is missing", 4)

data/template/internal.yaml

@@ -1,21 +1,32 @@
 ---
-defaults:
-  edge_gap: 20
-  width_margin: 10
-  height_margin: 10
-  font:
-    font_size: 16
-  stroke_width: 2
-  width_key: w
-  height_key: h
-  size: default
-sizes:
-  default: |
-    $render.default_size(
-    $render.node.fetch('width_scale', $render.defaults.font.width),
-    $render.node.fetch('height_scale', $render.defaults.font.size),
-    $render.node.fetch('line_spacing', $render.defaults.font.line_spacing),
-    $render.node.fetch('width_margin', $render.defaults.width_margin),
-    $render.node.fetch('height_margin', $render.defaults.height_margin),
-    $render.node.fetch('edge_gap', $render.defaults.edge_gap))
-base64template: PD94bWwgdmVyc2lvbj0iMS4wIj8+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpobSA9ICRyZW5kZXIuZGVmYXVsdHMuaGVpZ2h0X21hcmdpbgpoaCArPSBobQptYSA9ICRyZW5kZXIuZGVmYXVsdHMuZm9udC5tYXhfYXNjZW5kCmZzID0gJHJlbmRlci5kZWZhdWx0cy5mb250LnNpemUKbGggPSBmcyArICRyZW5kZXIuZGVmYXVsdHMuZm9udC5saW5lX3NwYWNpbmcKd20gPSAkcmVuZGVyLmRlZmF1bHRzLndpZHRoX21hcmdpbgpzdyA9ICRyZW5kZXIuZ2V0X2RlZmF1bHQoJ3N0cm9rZV93aWR0aCcsIDUpCmxpbmVzdHlsZSA9ICUoZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwMDAwIiBzdHJva2Utd2lkdGg9IiN7c3d9IikKdGV4dHN0eWxlID0gJShmaWxsPSIjMDAwMDAwIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iIzAwMDAwMCIgc3Ryb2tlLXdpZHRoPSIwIiB4bWw6c3BhY2U9InByZXNlcnZlIikKbGlua3N0eWxlID0gJShmaWxsPSIjMjAyMGZmIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iIzIwMjBmZiIgc3Ryb2tlLXdpZHRoPSIwIiB4bWw6c3BhY2U9InByZXNlcnZlIikKCm91dCA9IFsKICAlKDxzdmcgd2lkdGg9IiN7dyArICRyZW5kZXIuZGVmYXVsdHMud2lkdGhfbWFyZ2lufSIgaGVpZ2h0PSIje2hofSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIj4pCl0KJHJlbmRlci5kb2MuZmV0Y2goJ25vZGVzJywgW10pLmVhY2ggZG8gfG5vZGV8CiAgdyA9IG5vZGVbJHJlbmRlci5kZWZhdWx0cy53aWR0aF9rZXldLnRvX2kKICBoID0gbm9kZVskcmVuZGVyLmRlZmF1bHRzLmhlaWdodF9rZXldLnRvX2kKICB4ID0gbm9kZVsneG8nXS50b19pCiAgeSA9IGhoIC0gbm9kZVsneW8nXS50b19pIC0gaAogIG5vZGVzdHlsZSA9ICUoZmlsbD0iI3tub2RlLmZldGNoKCdmaWxsJywgJyNmZmZmZmYnKX0iIHN0cm9rZT0iIzAwMDAwMCIgc3Ryb2tlLXdpZHRoPSIje3N3fSIpCiAgb3V0LnB1c2goJSg8cmVjdCAje25vZGVzdHlsZX0gaGVpZ2h0PSIje2h9IiB3aWR0aD0iI3t3fSIgeD0iI3t4fSIgeT0iI3t5fSIvPikpCiAgeCArPSB3bQogIHkgKz0gaG0gKyBtYSAjIEJhc2VsaW5lIGZvciBmaXJzdCBsaW5lLgogIHVybCA9IG5vZGUuZmV0Y2goJ3VybCcsIG5pbCkKICB1cmwuZW5jb2RlISg6eG1sID0+IDphdHRyKSB1bmxlc3MgdXJsLm5pbD8KICB5MCA9IHkKICBub2RlWydsYWJlbCddLmVhY2ggZG8gfGxpbmV8CiAgICBsaW5lLmVuY29kZSEoOnhtbCA9PiA6dGV4dCkKICAgIGlmIHVybC5uaWw/CiAgICAgIG91dC5wdXNoKCUoPHRleHQgI3t0ZXh0c3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PikpCiAgICBlbHNlCiAgICAgIG91dC5wdXNoKCUoPGEgeGxpbms6aHJlZj0je3VybH0gdGFyZ2V0PSJfcGFyZW50Ij48dGV4dCAje2xpbmtzdHlsZX0geD0iI3t4fSIgeT0iI3t5MH0iPiN7bGluZX08L3RleHQ+PC9hPikpCiAgICBlbmQKICAgIHkwICs9IGxoICMgU2hpZnQgYmFzZWxpbmUgYnkgZnVsbCBsaW5lICsgc3BhY2luZyBoZWlnaHQuCiAgZW5kCmVuZAokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBwYXRoID0gZWRnZS5mZXRjaCgncGF0aCcsIG5pbCkKICBuZXh0IGlmIHBhdGgubmlsPwogIHBhdGguZWFjaCBkbyB8cHwKICAgIHBbJ3hvJ10gPSBwWyd4byddLnRvX2kudG9fcwogICAgcFsneW8nXSA9IChoaCAtIHBbJ3lvJ10pLnRvX2kudG9fcwogIGVuZAogIGlmIHBhdGguc2l6ZSA9PSAyCiAgICBvdXQucHVzaCglKDxsaW5lICN7bGluZXN0eWxlfSB4MT0iI3twYXRoWzBdWyd4byddfSIgeDI9IiN7cGF0aFsxXVsneG8nXX0iIHkxPSIje3BhdGhbMF1bJ3lvJ119IiB5Mj0iI3twYXRoWzFdWyd5byddfSIvPikpCiAgZWxzZQogICAgcHRzID0gcGF0aC5tYXAgeyB8cHwgIiN7cFsneG8nXX0sI3twWyd5byddfSIgfQogICAgb3V0LnB1c2goJSg8cG9seWxpbmUgI3tsaW5lc3R5bGV9IHBvaW50cz0iI3twdHMuam9pbignICcpfSIvPikpCiAgZW5kCmVuZApvdXQuam9pbigiXG4iKQolPgo8L3N2Zz4K
+styles:
+  diagram:
+    default:
+      edge_gap: 20
+      width_margin: 10
+      height_margin: 10
+  node:
+    default:
+      width_margin: 10
+      height_margin: 10
+      font_size: 16
+      font_ascend: 0.8
+      font_line_spacing: 0.2
+      font_height: 1
+      font_width: 0.5
+      font_fill: "#000000"
+      url_fill: "#000000"
+      fill: "#ffffff"
+      stroke: "#000000"
+      stroke_width: 2
+      size_estimator: |
+        $render.default_size($render.node['font_size'],
+        $render.node['font_width'], $render.node['font_height'],
+        $render.node['font_line_spacing'],
+        $render.node['width_margin'], $render.node['height_margin'],
+        $render.doc['diagram']['edge_gap'])
+  edge:
+    default:
+      stroke_width: 2
+      stroke: "#000000"
+base64template: PD94bWwgdmVyc2lvbj0iMS4wIj8+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpoaCArPSAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnaGVpZ2h0X21hcmdpbicpCgpvdXQgPSBbCiAgJSg8c3ZnIHdpZHRoPSIje3cgKyAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnd2lkdGhfbWFyZ2luJyl9IiBoZWlnaHQ9IiN7aGh9IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiPikKXQokcmVuZGVyLmRvYy5mZXRjaCgnbm9kZXMnLCBbXSkuZWFjaCBkbyB8bm9kZXwKICB3ID0gbm9kZVsndyddLnRvX2kKICBoID0gbm9kZVsnaCddLnRvX2kKICB4ID0gbm9kZVsneG8nXS50b19pCiAgeSA9IGhoIC0gbm9kZVsneW8nXS50b19pIC0gaAogIG5vZGVzdHlsZSA9ICUoZmlsbD0iI3tub2RlWydmaWxsJ119IiBzdHJva2U9IiN7bm9kZVsnc3Ryb2tlJ119IiBzdHJva2Utd2lkdGg9IiN7bm9kZVsnc3Ryb2tlX3dpZHRoJ119IikKICBvdXQucHVzaCglKDxyZWN0ICN7bm9kZXN0eWxlfSBoZWlnaHQ9IiN7aH0iIHdpZHRoPSIje3d9IiB4PSIje3h9IiB5PSIje3l9Ii8+KSkKICB4ICs9IG5vZGVbJ3dpZHRoX21hcmdpbiddCiAgZnMgPSBub2RlWydmb250X3NpemUnXQogIGxoID0gZnMgKiAoMSArIG5vZGVbJ2ZvbnRfbGluZV9zcGFjaW5nJ10pCiAgeSArPSBub2RlWydoZWlnaHRfbWFyZ2luJ10gKyBmcyAqIG5vZGVbJ2ZvbnRfYXNjZW5kJ10gIyBCYXNlbGluZSBmb3IgZmlyc3QgbGluZS4KICB1cmwgPSBub2RlLmZldGNoKCd1cmwnLCBuaWwpCiAgdXJsLmVuY29kZSEoOnhtbCA9PiA6YXR0cikgdW5sZXNzIHVybC5uaWw/CiAgeTAgPSB5CiAgdGV4dHN0eWxlID0gJShmaWxsPSIje25vZGVbJ2ZvbnRfZmlsbCddfSIgZm9udC1mYW1pbHk9InNlcmlmIiBmb250LXNpemU9IiN7ZnN9IiBzdHJva2U9IiN7bm9kZVsnZm9udF9maWxsJ119IiBzdHJva2Utd2lkdGg9IjAiIHhtbDpzcGFjZT0icHJlc2VydmUiKQogIGxpbmtzdHlsZSA9ICUoZmlsbD0iI3tub2RlWyd1cmxfZmlsbCddfSIgZm9udC1mYW1pbHk9InNlcmlmIiBmb250LXNpemU9IiN7ZnN9IiBzdHJva2U9IiN7bm9kZVsndXJsX2ZpbGwnXX0iIHN0cm9rZS13aWR0aD0iMCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIpCiAgbm9kZVsndGV4dCddLmVhY2ggZG8gfGxpbmV8CiAgICBsaW5lLmVuY29kZSEoOnhtbCA9PiA6dGV4dCkKICAgIGlmIHVybC5uaWw/CiAgICAgIG91dC5wdXNoKCUoPHRleHQgI3t0ZXh0c3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PikpCiAgICBlbHNlCiAgICAgIG91dC5wdXNoKCUoPGEgeGxpbms6aHJlZj0je3VybH0gdGFyZ2V0PSJfcGFyZW50Ij48dGV4dCAje2xpbmtzdHlsZX0geD0iI3t4fSIgeT0iI3t5MH0iPiN7bGluZX08L3RleHQ+PC9hPikpCiAgICBlbmQKICAgIHkwICs9IGxoICMgU2hpZnQgYmFzZWxpbmUgYnkgZnVsbCBsaW5lICsgc3BhY2luZyBoZWlnaHQuCiAgZW5kCmVuZAokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBsaW5lc3R5bGUgPSAlKGZpbGw9Im5vbmUiIHN0cm9rZT0iI3tlZGdlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tlZGdlWydzdHJva2Vfd2lkdGgnXX0iKQogIHBhdGggPSBlZGdlLmZldGNoKCdwYXRoJywgbmlsKQogIG5leHQgaWYgcGF0aC5uaWw/CiAgcGF0aC5lYWNoIGRvIHxwfAogICAgcFsneG8nXSA9IHBbJ3hvJ10udG9faS50b19zCiAgICBwWyd5byddID0gKGhoIC0gcFsneW8nXSkudG9faS50b19zCiAgZW5kCiAgaWYgcGF0aC5zaXplID09IDIKICAgIG91dC5wdXNoKCUoPGxpbmUgI3tsaW5lc3R5bGV9IHgxPSIje3BhdGhbMF1bJ3hvJ119IiB4Mj0iI3twYXRoWzFdWyd4byddfSIgeTE9IiN7cGF0aFswXVsneW8nXX0iIHkyPSIje3BhdGhbMV1bJ3lvJ119Ii8+KSkKICBlbHNlCiAgICBwdHMgPSBwYXRoLm1hcCB7IHxwfCAiI3twWyd4byddfSwje3BbJ3lvJ119IiB9CiAgICBvdXQucHVzaCglKDxwb2x5bGluZSAje2xpbmVzdHlsZX0gcG9pbnRzPSIje3B0cy5qb2luKCcgJyl9Ii8+KSkKICBlbmQKZW5kCm91dC5qb2luKCJcbiIpCiU+Cjwvc3ZnPgo=

data/template/root.yaml

@@ -1,19 +1,30 @@
-defaults:
-  edge_gap: 20
-  width_margin: 10
-  height_margin: 10
-  font:
-    font_size: 16
-  stroke_width: 2
-  width_key: w
-  height_key: h
-  size: default
-sizes:
-  default: |
-    $render.default_size(
-    $render.node.fetch('width_scale', $render.defaults.font.width),
-    $render.node.fetch('height_scale', $render.defaults.font.size),
-    $render.node.fetch('line_spacing', $render.defaults.font.line_spacing),
-    $render.node.fetch('width_margin', $render.defaults.width_margin),
-    $render.node.fetch('height_margin', $render.defaults.height_margin),
-    $render.node.fetch('edge_gap', $render.defaults.edge_gap))
+styles:
+  diagram:
+    default:
+      edge_gap: 20
+      width_margin: 10
+      height_margin: 10
+  node:
+    default:
+      width_margin: 10
+      height_margin: 10
+      font_size: 16
+      font_ascend: 0.8
+      font_line_spacing: 0.2
+      font_height: 1
+      font_width: 0.5
+      font_fill: "#000000"
+      url_fill: "#000000"
+      fill: "#ffffff"
+      stroke: "#000000"
+      stroke_width: 2
+      size_estimator: |
+        $render.default_size($render.node['font_size'],
+        $render.node['font_width'], $render.node['font_height'],
+        $render.node['font_line_spacing'],
+        $render.node['width_margin'], $render.node['height_margin'],
+        $render.doc['diagram']['edge_gap'])
+  edge:
+    default:
+      stroke_width: 2
+      stroke: "#000000"

data/template/svg_1.1.erb

@@ -1,33 +1,28 @@
 <?xml version="1.0"?>
 <%=
 w, hh = $render.dimensions
-hm = $render.defaults.height_margin
-hh += hm
-ma = $render.defaults.font.max_ascend
-fs = $render.defaults.font.size
-lh = fs + $render.defaults.font.line_spacing
-wm = $render.defaults.width_margin
-sw = $render.get_default('stroke_width', 5)
-linestyle = %(fill="none" stroke="#000000" stroke-width="#{sw}")
-textstyle = %(fill="#000000" font-family="serif" font-size="#{fs}" stroke="#000000" stroke-width="0" xml:space="preserve")
-linkstyle = %(fill="#2020ff" font-family="serif" font-size="#{fs}" stroke="#2020ff" stroke-width="0" xml:space="preserve")
+hh += $render.doc.dig('diagram', 'height_margin')
 
 out = [
-  %(<svg width="#{w + $render.defaults.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">)
+  %(<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[$render.defaults.width_key].to_i
-  h = node[$render.defaults.height_key].to_i
+  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.fetch('fill', '#ffffff')}" stroke="#000000" stroke-width="#{sw}")
+  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 += wm
-  y += hm + ma # Baseline for first line.
+  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
-  node['label'].each do |line|
+  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>))
@@ -38,6 +33,7 @@ $render.doc.fetch('nodes', []).each do |node|
   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|

metadata

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