diagrammatron 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32bd6ca5ad8db808b0b6c921ee0efe5b8e1a6befe4e535636f16ff98a22de139
-  data.tar.gz: c00027483fc54a9fab024c1e42a4e10e27b797e52e3a9217319a50542926a894
+  metadata.gz: 393c2881f870f2371e5af2e9a33fcfac3f82d9c3da69f7f377d87606b7230557
+  data.tar.gz: '019f726f35066af4fc209d61a2adbf36de1c6393d0089924912ca6c0e73baef0'
 SHA512:
-  metadata.gz: 7723bc76dfd7463a864319421074d8c17357f6c88a309efd81919c165ad836f876d48e062bf618b45e2b7fe779b1c564afaedfa6b105ae1fee9f84e5f52003d5
-  data.tar.gz: ed23e22fd6476e33afb4360cce23cefb0373dbd2c763611d9f61d0a20a283fe2dcd7a4bac6f137d628020db86819aacdea6387c889e5821a3ed4b958a5a2a736
+  metadata.gz: 737105dcbe2c8dc6d636833079d2313be3b5f2c66d86d252127664948365b92f976622b65019e9b5ddd1f7b760f35a15fef9e30fdd749fae99441a31fb03bb8e
+  data.tar.gz: c091a6a5f862353afb8f730dbf8b35cf226c5627e6d352f1ad8366ca6d03cb338e61264c22876948806afdc0965f1df0ee81223f07750f61c73a8cd171ab0538

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'
@@ -443,97 +443,11 @@ def segment_order(a, b)
   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.
+  # 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 }
-  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
 end
 
@@ -717,10 +631,17 @@ def place_edges(work)
     end
     gaps.each_value do |direction|
       direction.each_value do |gap|
-        gap.sort! { |a, b| segment_order(a, b) }
+        #gap.sort! { |a, b| segment_order(a, b) }
         gleft = gap.select { |a| a[1].zero? }
+        gleft.sort! { |a, b| segment_order(a, b) }
         gright = gap.select { |a| a[1] == 3 }
-        gmiddle = zigzag_order(gap.select() { |a| a[1] == 1 }, gap.select() { |a| a[1] == 2 })
+        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
@@ -735,7 +656,7 @@ def place_edges(work)
         denominator = 1 + c[0]
         (1...c.size).each do |k|
           denominator += c[k]
-          before[k] = c[k - 1] + before[k - 1]
+          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

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,12 @@ 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', {}) if d.nil?
+    else
+      m['default'] = m.fetch('default', {}).merge(d)
+    end
     styles.fetch(group, {}).each_pair do |name, values|
       s = d.clone
       s.merge!(values) unless name == 'default'
@@ -98,13 +102,16 @@ class Styles
     styles = item.fetch('style', [ 'default' ])
     styles = [ styles ] unless styles.is_a?(Array)
     s = {}
+    found = false
     styles.each do |name|
       ns = mapping.fetch(name, nil)
-      raise "No such #{type_name} style: #{name} in #{mapping.keys.join(', ')}" if ns.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 }
+    item.merge!(s) { |key, existing, from_template| existing || from_template }
   end
 
   def apply_node_styles(node)

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

@@ -29,4 +29,4 @@ styles:
     default:
       stroke_width: 2
       stroke: "#000000"
-base64template: PD94bWwgdmVyc2lvbj0iMS4wIj8+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpoaCArPSAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnaGVpZ2h0X21hcmdpbicpCgpvdXQgPSBbCiAgJSg8c3ZnIHdpZHRoPSIje3cgKyAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnd2lkdGhfbWFyZ2luJyl9IiBoZWlnaHQ9IiN7aGh9IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiPikKXQokcmVuZGVyLmRvYy5mZXRjaCgnbm9kZXMnLCBbXSkuZWFjaCBkbyB8bm9kZXwKICB3ID0gbm9kZVsndyddLnRvX2kKICBoID0gbm9kZVsnaCddLnRvX2kKICB4ID0gbm9kZVsneG8nXS50b19pCiAgeSA9IGhoIC0gbm9kZVsneW8nXS50b19pIC0gaAogIG5vZGVzdHlsZSA9ICUoZmlsbD0iI3tub2RlWydmaWxsJ119IiBzdHJva2U9IiN7bm9kZVsnc3Ryb2tlJ119IiBzdHJva2Utd2lkdGg9IiN7bm9kZVsnc3Ryb2tlX3dpZHRoJ119IikKICBvdXQucHVzaCglKDxyZWN0ICN7bm9kZXN0eWxlfSBoZWlnaHQ9IiN7aH0iIHdpZHRoPSIje3d9IiB4PSIje3h9IiB5PSIje3l9Ii8+KSkKICB4ICs9IG5vZGVbJ3dpZHRoX21hcmdpbiddCiAgZnMgPSBub2RlWydmb250X3NpemUnXQogIGxoID0gZnMgKiAoMSArIG5vZGVbJ2ZvbnRfbGluZV9zcGFjaW5nJ10pCiAgeSArPSBub2RlWydoZWlnaHRfbWFyZ2luJ10gKyBmcyAqIG5vZGVbJ2ZvbnRfYXNjZW5kJ10gIyBCYXNlbGluZSBmb3IgZmlyc3QgbGluZS4KICB1cmwgPSBub2RlLmZldGNoKCd1cmwnLCBuaWwpCiAgdXJsLmVuY29kZSEoOnhtbCA9PiA6YXR0cikgdW5sZXNzIHVybC5uaWw/CiAgeTAgPSB5CiAgdGV4dHN0eWxlID0gJShmaWxsPSIje25vZGVbJ2ZvbnRfZmlsbCddfSIgZm9udC1mYW1pbHk9InNlcmlmIiBmb250LXNpemU9IiN7ZnN9IiBzdHJva2U9IiN7bm9kZVsnZm9udF9maWxsJ119IiBzdHJva2Utd2lkdGg9IjAiIHhtbDpzcGFjZT0icHJlc2VydmUiKQogIGxpbmtzdHlsZSA9ICUoZmlsbD0iI3tub2RlWyd1cmxfZmlsbCddfSIgZm9udC1mYW1pbHk9InNlcmlmIiBmb250LXNpemU9IiN7ZnN9IiBzdHJva2U9IiN7bm9kZVsndXJsX2ZpbGwnXX0iIHN0cm9rZS13aWR0aD0iMCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIpCiAgbm9kZVsndGV4dCddLmVhY2ggZG8gfGxpbmV8CiAgICBsaW5lLmVuY29kZSEoOnhtbCA9PiA6dGV4dCkKICAgIGlmIHVybC5uaWw/CiAgICAgIG91dC5wdXNoKCUoPHRleHQgI3t0ZXh0c3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PikpCiAgICBlbHNlCiAgICAgIG91dC5wdXNoKCUoPGEgeGxpbms6aHJlZj0je3VybH0gdGFyZ2V0PSJfcGFyZW50Ij48dGV4dCAje2xpbmtzdHlsZX0geD0iI3t4fSIgeT0iI3t5MH0iPiN7bGluZX08L3RleHQ+PC9hPikpCiAgICBlbmQKICAgIHkwICs9IGxoICMgU2hpZnQgYmFzZWxpbmUgYnkgZnVsbCBsaW5lICsgc3BhY2luZyBoZWlnaHQuCiAgZW5kCmVuZAokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBsaW5lc3R5bGUgPSAlKGZpbGw9Im5vbmUiIHN0cm9rZT0iI3tlZGdlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tlZGdlWydzdHJva2Vfd2lkdGgnXX0iKQogIHBhdGggPSBlZGdlLmZldGNoKCdwYXRoJywgbmlsKQogIG5leHQgaWYgcGF0aC5uaWw/CiAgcGF0aC5lYWNoIGRvIHxwfAogICAgcFsneG8nXSA9IHBbJ3hvJ10udG9faS50b19zCiAgICBwWyd5byddID0gKGhoIC0gcFsneW8nXSkudG9faS50b19zCiAgZW5kCiAgaWYgcGF0aC5zaXplID09IDIKICAgIG91dC5wdXNoKCUoPGxpbmUgI3tsaW5lc3R5bGV9IHgxPSIje3BhdGhbMF1bJ3hvJ119IiB4Mj0iI3twYXRoWzFdWyd4byddfSIgeTE9IiN7cGF0aFswXVsneW8nXX0iIHkyPSIje3BhdGhbMV1bJ3lvJ119Ii8+KSkKICBlbHNlCiAgICBwdHMgPSBwYXRoLm1hcCB7IHxwfCAiI3twWyd4byddfSwje3BbJ3lvJ119IiB9CiAgICBvdXQucHVzaCglKDxwb2x5bGluZSAje2xpbmVzdHlsZX0gcG9pbnRzPSIje3B0cy5qb2luKCcgJyl9Ii8+KSkKICBlbmQKZW5kCm91dC5qb2luKCJcbiIpCiU+Cjwvc3ZnPgo=
+base64template: PD94bWwgdmVyc2lvbj0iMS4wIj8+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpoaCArPSAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnaGVpZ2h0X21hcmdpbicpCgpvdXQgPSBbCiAgJSg8c3ZnIHdpZHRoPSIje3cgKyAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnd2lkdGhfbWFyZ2luJyl9IiBoZWlnaHQ9IiN7aGh9IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiPikKXQokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBsaW5lc3R5bGUgPSAlKGZpbGw9Im5vbmUiIHN0cm9rZT0iI3tlZGdlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tlZGdlWydzdHJva2Vfd2lkdGgnXX0iKQogIHBhdGggPSBlZGdlLmZldGNoKCdwYXRoJywgbmlsKQogIG5leHQgaWYgcGF0aC5uaWw/CiAgcGF0aC5lYWNoIGRvIHxwfAogICAgcFsneG8nXSA9IHBbJ3hvJ10udG9faS50b19zCiAgICBwWyd5byddID0gKGhoIC0gcFsneW8nXSkudG9faS50b19zCiAgZW5kCiAgaWYgcGF0aC5zaXplID09IDIKICAgIG91dC5wdXNoKCUoPGxpbmUgI3tsaW5lc3R5bGV9IHgxPSIje3BhdGhbMF1bJ3hvJ119IiB4Mj0iI3twYXRoWzFdWyd4byddfSIgeTE9IiN7cGF0aFswXVsneW8nXX0iIHkyPSIje3BhdGhbMV1bJ3lvJ119Ii8+KSkKICBlbHNlCiAgICBwdHMgPSBwYXRoLm1hcCB7IHxwfCAiI3twWyd4byddfSwje3BbJ3lvJ119IiB9CiAgICBvdXQucHVzaCglKDxwb2x5bGluZSAje2xpbmVzdHlsZX0gcG9pbnRzPSIje3B0cy5qb2luKCcgJyl9Ii8+KSkKICBlbmQKZW5kCiRyZW5kZXIuZG9jLmZldGNoKCdub2RlcycsIFtdKS5lYWNoIGRvIHxub2RlfAogIHcgPSBub2RlWyd3J10udG9faQogIGggPSBub2RlWydoJ10udG9faQogIHggPSBub2RlWyd4byddLnRvX2kKICB5ID0gaGggLSBub2RlWyd5byddLnRvX2kgLSBoCiAgbm9kZXN0eWxlID0gJShmaWxsPSIje25vZGVbJ2ZpbGwnXX0iIHN0cm9rZT0iI3tub2RlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tub2RlWydzdHJva2Vfd2lkdGgnXX0iKQogIG91dC5wdXNoKCUoPHJlY3QgI3tub2Rlc3R5bGV9IGhlaWdodD0iI3tofSIgd2lkdGg9IiN7d30iIHg9IiN7eH0iIHk9IiN7eX0iLz4pKQogIHggKz0gbm9kZVsnd2lkdGhfbWFyZ2luJ10KICBmcyA9IG5vZGVbJ2ZvbnRfc2l6ZSddCiAgbGggPSBmcyAqICgxICsgbm9kZVsnZm9udF9saW5lX3NwYWNpbmcnXSkKICB5ICs9IG5vZGVbJ2hlaWdodF9tYXJnaW4nXSArIGZzICogbm9kZVsnZm9udF9hc2NlbmQnXSAjIEJhc2VsaW5lIGZvciBmaXJzdCBsaW5lLgogIHVybCA9IG5vZGUuZmV0Y2goJ3VybCcsIG5pbCkKICB1cmwuZW5jb2RlISg6eG1sID0+IDphdHRyKSB1bmxlc3MgdXJsLm5pbD8KICB5MCA9IHkKICB0ZXh0c3R5bGUgPSAlKGZpbGw9IiN7bm9kZVsnZm9udF9maWxsJ119IiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iI3tub2RlWydmb250X2ZpbGwnXX0iIHN0cm9rZS13aWR0aD0iMCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIpCiAgbGlua3N0eWxlID0gJShmaWxsPSIje25vZGVbJ3VybF9maWxsJ119IiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iI3tub2RlWyd1cmxfZmlsbCddfSIgc3Ryb2tlLXdpZHRoPSIwIiB4bWw6c3BhY2U9InByZXNlcnZlIikKICBub2RlWyd0ZXh0J10uZWFjaCBkbyB8bGluZXwKICAgIGxpbmUuZW5jb2RlISg6eG1sID0+IDp0ZXh0KQogICAgaWYgdXJsLm5pbD8KICAgICAgb3V0LnB1c2goJSg8dGV4dCAje3RleHRzdHlsZX0geD0iI3t4fSIgeT0iI3t5MH0iPiN7bGluZX08L3RleHQ+KSkKICAgIGVsc2UKICAgICAgb3V0LnB1c2goJSg8YSB4bGluazpocmVmPSN7dXJsfSB0YXJnZXQ9Il9wYXJlbnQiPjx0ZXh0ICN7bGlua3N0eWxlfSB4PSIje3h9IiB5PSIje3kwfSI+I3tsaW5lfTwvdGV4dD48L2E+KSkKICAgIGVuZAogICAgeTAgKz0gbGggIyBTaGlmdCBiYXNlbGluZSBieSBmdWxsIGxpbmUgKyBzcGFjaW5nIGhlaWdodC4KICBlbmQKZW5kCm91dC5qb2luKCJcbiIpCiU+Cjwvc3ZnPgo=

data/template/svg_1.1.erb

@@ -6,6 +6,21 @@ 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']}"/>))
+  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
@@ -32,21 +47,6 @@ $render.doc.fetch('nodes', []).each do |node|
     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(' ')}"/>))
-  end
-end
 out.join("\n")
 %>
 </svg>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Ismo Kärkkäinen