diagrammatron 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '058b0f84871cad8d010d3b1607460a08c00cccfa21100868cd929dbb94f6eb02'
-  data.tar.gz: d88732e433f5a5e4de81acf2bb4a226e806d0af1fb447ad6aabcf15aacf2db95
+  metadata.gz: 6d5e755dfc41bacfbfb226e77365b8d54a5ff0f01ea5b642febdbb1699497d21
+  data.tar.gz: c9b8b67509f94635cd65b77ed89a3cf0a456f6c666a7b3773539760a8e429fec
 SHA512:
-  metadata.gz: 97b796b2b213dd6f25acf8a749d6ec25a557657c53566834a6db292c1df9a8e90f5625964f6a5b36b1f7ac9640bc7c52d053ab7ca2437b578b26988ec188a846
-  data.tar.gz: 4b25e7189ba7ccd794148b31d347c9362fd18ccbffb68af50f3f7bce1115bfdd12d3733330ee079c114f065136425bea358135303933bc33969051cc3a8ccc0a
+  metadata.gz: '081df6de2fb3489cc0976a2805c829fb846ce5561617b15d7446dda4a6bfd0a63bbc9abf234e89e895ed90f710f756cbc8b1f47618ee4216e89a2c4e522e9046'
+  data.tar.gz: 85e77e7adf696cd3f46fe2b41a77266d67cf1d7e904cb1c9eb4f83bae6e3fef8db7f199313923e588c8802e8edb6d8148869f2c8ef93685aeb3af48dc6a83252

data/bin/diagrammatron-edges

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021 Ismo Kärkkäinen
+# Copyright © 2021, 2022 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require '../lib/common.rb'
+require_relative '../lib/common'
 require 'optparse'
 require 'yaml'
 require 'set'
@@ -109,7 +109,8 @@ def edge_subsets(work)
 end
 
 Segment = Struct.new(:vertical, :cc, :range, :edge_index, :at_node, :segment_index, :offset) do
-  def direction(s) # To decreasing or increasing coordinates.
+  # To decreasing or increasing coordinates.
+  def direction(s)
     return 0 if s.nil?
     if segment_index < s.segment_index
       (cc < s.range[1]) ? 1 : -1
@@ -119,7 +120,7 @@ Segment = Struct.new(:vertical, :cc, :range, :edge_index, :at_node, :segment_ind
   end
 
   def over_other_node(work, node_subset)
-    ck, rk = vertical ? [:xo, :yo] : [:yo, :xo]
+    ck, rk = vertical ? %i[xo yo] : %i[yo xo]
     i0, i1 = (range[0] < range[1]) ? [0, 1] : [1, 0]
     node_subset.each do |n|
       node = work[:nodes][n]
@@ -172,8 +173,7 @@ def segment(x0, y0, x1, y1)
   Segment.new(vert, cc, range, 0, [false, false], 0)
 end
 
-Connection = Struct.new(:node_index, :side_index) do
-end
+Connection = Struct.new(:node_index, :side_index)
 
 $paths = {}
 Path = Struct.new(:edge_index, :ends, :segments, :id, :crosses, :steps) do
@@ -439,7 +439,7 @@ def segment_order(a, b)
   a[0].edge_index <=> b[0].edge_index
 end
 
-GapState = Struct.new(:order, :count) do
+GapState = Struct.new(:order, :cross_count) do
   def fitness(segments, k)
     crossings = 0
     s = segments[k]
@@ -454,7 +454,7 @@ GapState = Struct.new(:order, :count) do
         crossings += 1
       end
     end
-    count + crossings
+    cross_count + crossings
   end
 end
 
@@ -463,13 +463,13 @@ def depth_first_search(segments, state, best)
     segments.each_index do |k|
       next if state.order.include? k
       c = state.fitness(segments, k)
-      next if (best.nil? ? c + 1 : best.count) <= c
+      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
     end
   else
-    best = GapState.new(state.order.clone, state.count)
+    best = GapState.new(state.order.clone, state.cross_count)
   end
   best
 end
@@ -526,6 +526,7 @@ def group_stacked_offsets(group)
     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
@@ -535,6 +536,7 @@ def group_stacked_offsets(group)
     prev = g
   end
   prev[0].offset
+)
 end
 
 def direct_range(paths)
@@ -549,7 +551,7 @@ def offsets(conn, paths, direct_ranges)
   dlow = [ here[0], opposite[0] ].max
   dhigh = [ here[2] - here[1], opposite[2] - opposite[1] ].max - 1
   d = dlow + here[1] - here[0] + dhigh + 1
-  low, high, size = here
+  low, high, _size = here
   offsets = []
   (0...low).each do |k|
     offsets.push(Rational((k + 1) * dlow, (d + 1) * low))
@@ -589,7 +591,7 @@ end
 def place_edges(work)
   subsets = edge_subsets(work)
   subsets.each_pair do |sid, subset|
-    full = Hash.new
+    full = {}
     subset.each do |edge_index|
       link = work[:edges][edge_index][:between]
       full[edge_index] = candidates(
@@ -826,20 +828,7 @@ Input YAML file is expected to be the output of diagrammatron-nodes.
 
   place_edges(work)
   prepare_output(doc, work)
-  begin
-    d = YAML.dump(doc, line_width: 1000000)
-    if output.nil?
-      $stdout.puts d
-    else
-      fp = Pathname.new output
-      fp.open('w') do |f|
-        f.puts d
-      end
-    end
-  rescue StandardError => e
-    return aargh("#{e}\nFailed to write output: #{output || 'stdout'}", 4)
-  end
-  0
+  dump_result(output, YAML.dump(doc, line_width: 1_000_000), 4)
 end
 
 exit(main) if (defined? $unit_test).nil?

data/bin/diagrammatron-get

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021 Ismo Kärkkäinen
+# Copyright © 2021, 2022 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require '../lib/common.rb'
+require_relative '../lib/common'
 require 'optparse'
 require 'pathname'
 
@@ -16,7 +16,6 @@ def template(name = nil)
 end
 
 def main
-  input = nil
   output = nil
   parser = OptionParser.new do |opts|
     opts.summary_indent = '  '
@@ -48,6 +47,7 @@ Given a name of a included file, saves it to --output.
       next if name.start_with? '.'
       $stdout.puts name
     end
+    return 0
   elsif ARGV.size > 1
     return aargh('You can give only one content-file name.', 1)
   end
@@ -59,19 +59,7 @@ Given a name of a included file, saves it to --output.
   rescue StandardError => e
     return aargh("#{e}\nFailed to read #{ARGV.first}", 3)
   end
-  begin
-    if output.nil?
-      $stdout.puts src
-    else
-      fp = Pathname.new output
-      fp.open('w') do |f|
-        f.puts src
-      end
-    end
-  rescue StandardError => e
-    return aargh([ e, "Failed to write output: #{output || 'stdout'}" ], 4)
-  end
-  0
+  dump_result(output, src, 4)
 end
 
 exit(main) if (defined? $unit_test).nil?

data/bin/diagrammatron-nodes

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021 Ismo Kärkkäinen
+# Copyright © 2021, 2022 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require '../lib/common.rb'
+require_relative '../lib/common'
 require 'optparse'
 require 'yaml'
 require 'set'
@@ -420,20 +420,7 @@ The 'sid' indicates the sub-diagram consisting of connected nodes.
 
   algo.call(work)
   prepare_output(doc, work)
-  begin
-    d = YAML.dump(doc, line_width: 1000000)
-    if output.nil?
-      $stdout.puts d
-    else
-      fp = Pathname.new output
-      fp.open('w') do |f|
-        f.puts d
-      end
-    end
-  rescue StandardError => e
-    return aargh("#{e}\nFailed to write output: #{output || 'stdout'}", 4)
-  end
-  0
+  dump_result(output, YAML.dump(doc, line_width: 1_000_000), 4)
 end
 
 exit(main) if (defined? $unit_test).nil?

data/bin/diagrammatron-place

@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021 Ismo Kärkkäinen
+# Copyright © 2021, 2022 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require '../lib/common.rb'
+require_relative '../lib/common'
 require 'optparse'
 require 'yaml'
 require 'set'
 require 'pathname'
 
-def info(msg, return_value = nil, loud = false)
-  $stderr.puts(msg) unless $QUIET && !loud
+def info(msg, return_value = nil)
+  $stderr.puts(msg) unless $QUIET
   return_value
 end
 
@@ -310,7 +310,7 @@ def pre_search_bounding_boxes(work)
 end
 
 def shift(work, sid, dx, dy)
-  [ :edges, :nodes ].each do |kind|
+  %i[edges nodes].each do |kind|
     work[kind].fetch(sid, []).each do |item|
       item.shift(dx, dy)
     end
@@ -402,16 +402,16 @@ do not overlap.
     begin
       whratio = Float($W2HRATIO)
       if whratio <= 0
-        return info("Ratio must be greater than zero: #{$W2HRATIO}", 1, true)
+        return aargh("Ratio must be greater than zero: #{$W2HRATIO}", 1)
       end
       $W2HRATIO = whratio
     rescue StandardError
-      return info("Ratio parameter not a number: #{$W2HRATIO}", 1, true)
+      return aargh("Ratio parameter not a number: #{$W2HRATIO}", 1)
     end
   end
 
   unless $algorithms.key? algo
-    return info("Unrecognized algorithm: #{algo}", 2, true)
+    return aargh("Unrecognized algorithm: #{algo}", 2)
   end
   algo = $algorithms[algo]
 
@@ -422,25 +422,12 @@ do not overlap.
     work = work_copy(doc)
     return 3 if work.nil?
   rescue StandardError
-    return info('Error processing input.', 3, true)
+    return aargh('Error processing input.', 3)
   end
 
   algo.call(work)
   prepare_output(doc, work)
-  begin
-    d = YAML.dump(doc, line_width: 1000000)
-    if output.nil?
-      $stdout.puts d
-    else
-      fp = Pathname.new output
-      fp.open('w') do |f|
-        f.puts d
-      end
-    end
-  rescue StandardError => e
-    return info("#{e}\nFailed to write output: #{output || 'stdout'}", 4, true)
-  end
-  0
+  dump_result(output, YAML.dump(doc, line_width: 1_000_000), 4)
 end
 
 exit(main) if (defined? $unit_test).nil?

data/bin/diagrammatron-prune

@@ -4,7 +4,7 @@
 # Copyright © 2021 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require '../lib/common.rb'
+require_relative '../lib/common'
 require 'optparse'
 require 'yaml'
 require 'set'
@@ -98,20 +98,7 @@ removed or kept depending on options. Edges to removed nodes are removed.
     return aargh('Error processing input.', 3)
   end
 
-  begin
-    d = YAML.dump(doc, line_width: 1000000)
-    if output.nil?
-      $stdout.puts d
-    else
-      fp = Pathname.new output
-      fp.open('w') do |f|
-        f.puts d
-      end
-    end
-  rescue StandardError => e
-    return aargh("#{e}\nFailed to write output: #{output || 'stdout'}", 4)
-  end
-  0
+  dump_result(output, YAML.dump(doc, line_width: 1_000_000), 4)
 end
 
 exit(main) if (defined? $unit_test).nil?

data/bin/diagrammatron-render

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021 Ismo Kärkkäinen
+# Copyright © 2021, 2022 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require '../lib/common.rb'
+require_relative '../lib/common'
 require 'optparse'
 require 'yaml'
 require 'erb'
@@ -135,7 +135,7 @@ class SizeEstimation
 
   def default_size(width_scale = nil, height_scale = nil, line_spacing = nil,
       width_margin = nil, height_margin = nil, edge_gap = nil)
-    lines = @node.fetch('label', '').split("\n")
+    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
@@ -151,9 +151,12 @@ def estimate_sizes(doc, template, ckd2count, defaults)
   sizes = template.fetch('sizes', {})
   defaults = template.fetch('defaults', {})
   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
     style = node.fetch('style', 'default')
-    code = sizes.fetch(style, defaults.fetch('size', 
+    code = sizes.fetch(style, defaults.fetch('size',
       %(raise NotImplementedError, "No size estimator for style: #{style}")))
     if sizes.key? code
       code = sizes.fetch(code)
@@ -162,7 +165,7 @@ def estimate_sizes(doc, template, ckd2count, defaults)
     begin
       eval(code, $render.get_binding)
     rescue StandardError => e
-      return aargh("Size estimate style #{style} node #{node.fetch('label', 'unnamed')} error #{e}", false)
+      return aargh("Size estimate style #{style} node #{label} error #{e}", false)
     end
   end
   $render = nil
@@ -216,11 +219,11 @@ def remap_coordinates(coords, cmax, c2min, defaults)
         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 + (defaults.edge_gap * coord.fraction) / c2min[coord.integer]
       end
     when 1
       gap = defaults.edge_gap
-      c += cmax[coord.integer] unless 1 == prev_dir
+      c += cmax[coord.integer] unless prev_dir == 1
       coord.object[coord.key] = c
       zero_after_decrease = false
     end
@@ -336,20 +339,7 @@ Output is the file produced by the erb-template.
   remap_coordinates(xcoords, xmax, x2min, defaults)
   remap_coordinates(ycoords, ymax, y2min, defaults)
 
-  out = apply(doc, template, defaults)
-  begin
-    if output.nil?
-      $stdout.puts out
-    else
-      fp = Pathname.new output
-      fp.open('w') do |f|
-        f.puts out
-      end
-    end
-  rescue StandardError => e
-    return aargh([ e, "Failed to write output: #{output || 'stdout'}" ], 5)
-  end
-  0
+  dump_result(output, apply(doc, template, defaults), 5)
 end
 
 exit(main) if (defined? $unit_test).nil?

data/bin/diagrammatron-template

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021 Ismo Kärkkäinen
+# Copyright © 2021, 2022 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require '../lib/common.rb'
+require_relative '../lib/common'
 require 'optparse'
 require 'yaml'
 require 'set'
@@ -21,7 +21,7 @@ def add_field(doc, field_name, content)
 end
 
 def missing(doc)
-  [ 'defaults', 'sizes', 'template' ].each do |key|
+  %w[defaults sizes template].each do |key|
     next if doc.key? key
     next if doc.key? "base64#{key}"
     return aargh("#{key} is missing", 4)
@@ -88,20 +88,7 @@ Extra fields are not restricted in any manner.
   m = missing(doc)
   return m unless m.nil?
 
-  begin
-    d = YAML.dump(doc, line_width: 1000000)
-    if output.nil?
-      $stdout.puts d
-    else
-      fp = Pathname.new output
-      fp.open('w') do |f|
-        f.puts d
-      end
-    end
-  rescue StandardError => e
-    return aargh([ e, "Failed to write output: #{output || 'stdout'}" ], 5)
-  end
-  0
+  dump_result(output, YAML.dump(doc, line_width: 1_000_000), 5)
 end
 
 exit(main) if (defined? $unit_test).nil?

data/bin/dot_json2diagrammatron

@@ -1,32 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021 Ismo Kärkkäinen
+# Copyright © 2021, 2022 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
-require '../lib/common.rb'
+require_relative '../lib/common'
 require 'optparse'
 require 'yaml'
 require 'json'
 require 'pathname'
 
-'''
-def load_source
-  begin
-    if $INPUT.nil?
-      src = $stdin.read
-    else
-      src = File.read($INPUT)
-    end
-    src = JSON.parse(src)
-  rescue Errno::ENOENT
-    return aargh("Could not load #{$INPUT || 'stdin'}")
-  rescue StandardError => e
-    return aargh("#{e}\nFailed to read #{$INPUT || 'stdin'}")
-  end
-  src
-end
-'''
 
 def convert(src)
   idx2label = {}

data/lib/common.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright © 2021 Ismo Kärkkäinen
+# Copyright © 2021, 2022 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
 def aargh(message, return_value = nil)
@@ -24,3 +24,17 @@ def load_source_hash(input)
   end
   src
 end
+
+def dump_result(output, doc, error_return)
+  if output.nil?
+    $stdout.puts doc
+  else
+    fp = Pathname.new output
+    fp.open('w') do |f|
+      f.puts doc
+    end
+  end
+  0
+rescue StandardError => e
+  aargh([ e, "Failed to write output: #{output || 'stdout'}" ], error_return)
+end

data/template/internal.yaml

@@ -18,4 +18,4 @@ sizes:
     $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+IDphdHRyKSB1bmxlc3MgdXJsLm5pbD8KICBsaW5lcyA9IG5vZGUuZmV0Y2goJ2xhYmVsJywgJycpLnNwbGl0KCJcbiIpCiAgeTAgPSB5CiAgbGluZXMuZWFjaCBkbyB8bGFiZWx8CiAgICBsYWJlbC5lbmNvZGUhKDp4bWwgPT4gOnRleHQpCiAgICBpZiB1cmwubmlsPwogICAgICBvdXQucHVzaCglKDx0ZXh0ICN7dGV4dHN0eWxlfSB4PSIje3h9IiB5PSIje3kwfSI+I3tsYWJlbH08L3RleHQ+KSkKICAgIGVsc2UKICAgICAgb3V0LnB1c2goJSg8YSB4bGluazpocmVmPSN7dXJsfSB0YXJnZXQ9Il9wYXJlbnQiPjx0ZXh0ICN7bGlua3N0eWxlfSB4PSIje3h9IiB5PSIje3kwfSI+I3tsYWJlbH08L3RleHQ+PC9hPikpCiAgICBlbmQKICAgIHkwICs9IGxoICMgU2hpZnQgYmFzZWxpbmUgYnkgZnVsbCBsaW5lICsgc3BhY2luZyBoZWlnaHQuCiAgZW5kCmVuZAokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBwYXRoID0gZWRnZS5mZXRjaCgncGF0aCcsIG5pbCkKICBuZXh0IGlmIHBhdGgubmlsPwogIHBhdGguZWFjaCBkbyB8cHwKICAgIHBbJ3hvJ10gPSBwWyd4byddLnRvX2kudG9fcwogICAgcFsneW8nXSA9IChoaCAtIHBbJ3lvJ10pLnRvX2kudG9fcwogIGVuZAogIGlmIHBhdGguc2l6ZSA9PSAyCiAgICBvdXQucHVzaCglKDxsaW5lICN7bGluZXN0eWxlfSB4MT0iI3twYXRoWzBdWyd4byddfSIgeDI9IiN7cGF0aFsxXVsneG8nXX0iIHkxPSIje3BhdGhbMF1bJ3lvJ119IiB5Mj0iI3twYXRoWzFdWyd5byddfSIvPikpCiAgZWxzZQogICAgcHRzID0gcGF0aC5tYXAgeyB8cHwgIiN7cFsneG8nXX0sI3twWyd5byddfSIgfQogICAgb3V0LnB1c2goJSg8cG9seWxpbmUgI3tsaW5lc3R5bGV9IHBvaW50cz0iI3twdHMuam9pbignICcpfSIvPikpCiAgZW5kCmVuZApvdXQuam9pbigiXG4iKQolPgo8L3N2Zz4K
+base64template: PD94bWwgdmVyc2lvbj0iMS4wIj8+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpobSA9ICRyZW5kZXIuZGVmYXVsdHMuaGVpZ2h0X21hcmdpbgpoaCArPSBobQptYSA9ICRyZW5kZXIuZGVmYXVsdHMuZm9udC5tYXhfYXNjZW5kCmZzID0gJHJlbmRlci5kZWZhdWx0cy5mb250LnNpemUKbGggPSBmcyArICRyZW5kZXIuZGVmYXVsdHMuZm9udC5saW5lX3NwYWNpbmcKd20gPSAkcmVuZGVyLmRlZmF1bHRzLndpZHRoX21hcmdpbgpzdyA9ICRyZW5kZXIuZ2V0X2RlZmF1bHQoJ3N0cm9rZV93aWR0aCcsIDUpCmxpbmVzdHlsZSA9ICUoZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwMDAwIiBzdHJva2Utd2lkdGg9IiN7c3d9IikKdGV4dHN0eWxlID0gJShmaWxsPSIjMDAwMDAwIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iIzAwMDAwMCIgc3Ryb2tlLXdpZHRoPSIwIiB4bWw6c3BhY2U9InByZXNlcnZlIikKbGlua3N0eWxlID0gJShmaWxsPSIjMjAyMGZmIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iIzIwMjBmZiIgc3Ryb2tlLXdpZHRoPSIwIiB4bWw6c3BhY2U9InByZXNlcnZlIikKCm91dCA9IFsKICAlKDxzdmcgd2lkdGg9IiN7dyArICRyZW5kZXIuZGVmYXVsdHMud2lkdGhfbWFyZ2lufSIgaGVpZ2h0PSIje2hofSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIj4pCl0KJHJlbmRlci5kb2MuZmV0Y2goJ25vZGVzJywgW10pLmVhY2ggZG8gfG5vZGV8CiAgdyA9IG5vZGVbJHJlbmRlci5kZWZhdWx0cy53aWR0aF9rZXldLnRvX2kKICBoID0gbm9kZVskcmVuZGVyLmRlZmF1bHRzLmhlaWdodF9rZXldLnRvX2kKICB4ID0gbm9kZVsneG8nXS50b19pCiAgeSA9IGhoIC0gbm9kZVsneW8nXS50b19pIC0gaAogIG5vZGVzdHlsZSA9ICUoZmlsbD0iI3tub2RlLmZldGNoKCdmaWxsJywgJyNmZmZmZmYnKX0iIHN0cm9rZT0iIzAwMDAwMCIgc3Ryb2tlLXdpZHRoPSIje3N3fSIpCiAgb3V0LnB1c2goJSg8cmVjdCAje25vZGVzdHlsZX0gaGVpZ2h0PSIje2h9IiB3aWR0aD0iI3t3fSIgeD0iI3t4fSIgeT0iI3t5fSIvPikpCiAgeCArPSB3bQogIHkgKz0gaG0gKyBtYSAjIEJhc2VsaW5lIGZvciBmaXJzdCBsaW5lLgogIHVybCA9IG5vZGUuZmV0Y2goJ3VybCcsIG5pbCkKICB1cmwuZW5jb2RlISg6eG1sID0+IDphdHRyKSB1bmxlc3MgdXJsLm5pbD8KICB5MCA9IHkKICBub2RlWydsYWJlbCddLmVhY2ggZG8gfGxpbmV8CiAgICBsaW5lLmVuY29kZSEoOnhtbCA9PiA6dGV4dCkKICAgIGlmIHVybC5uaWw/CiAgICAgIG91dC5wdXNoKCUoPHRleHQgI3t0ZXh0c3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PikpCiAgICBlbHNlCiAgICAgIG91dC5wdXNoKCUoPGEgeGxpbms6aHJlZj0je3VybH0gdGFyZ2V0PSJfcGFyZW50Ij48dGV4dCAje2xpbmtzdHlsZX0geD0iI3t4fSIgeT0iI3t5MH0iPiN7bGluZX08L3RleHQ+PC9hPikpCiAgICBlbmQKICAgIHkwICs9IGxoICMgU2hpZnQgYmFzZWxpbmUgYnkgZnVsbCBsaW5lICsgc3BhY2luZyBoZWlnaHQuCiAgZW5kCmVuZAokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBwYXRoID0gZWRnZS5mZXRjaCgncGF0aCcsIG5pbCkKICBuZXh0IGlmIHBhdGgubmlsPwogIHBhdGguZWFjaCBkbyB8cHwKICAgIHBbJ3hvJ10gPSBwWyd4byddLnRvX2kudG9fcwogICAgcFsneW8nXSA9IChoaCAtIHBbJ3lvJ10pLnRvX2kudG9fcwogIGVuZAogIGlmIHBhdGguc2l6ZSA9PSAyCiAgICBvdXQucHVzaCglKDxsaW5lICN7bGluZXN0eWxlfSB4MT0iI3twYXRoWzBdWyd4byddfSIgeDI9IiN7cGF0aFsxXVsneG8nXX0iIHkxPSIje3BhdGhbMF1bJ3lvJ119IiB5Mj0iI3twYXRoWzFdWyd5byddfSIvPikpCiAgZWxzZQogICAgcHRzID0gcGF0aC5tYXAgeyB8cHwgIiN7cFsneG8nXX0sI3twWyd5byddfSIgfQogICAgb3V0LnB1c2goJSg8cG9seWxpbmUgI3tsaW5lc3R5bGV9IHBvaW50cz0iI3twdHMuam9pbignICcpfSIvPikpCiAgZW5kCmVuZApvdXQuam9pbigiXG4iKQolPgo8L3N2Zz4K

data/template/svg_1.1.erb

@@ -26,14 +26,13 @@ $render.doc.fetch('nodes', []).each do |node|
   y += hm + ma # Baseline for first line.
   url = node.fetch('url', nil)
   url.encode!(:xml => :attr) unless url.nil?
-  lines = node.fetch('label', '').split("\n")
   y0 = y
-  lines.each do |label|
-    label.encode!(:xml => :text)
+  node['label'].each do |line|
+    line.encode!(:xml => :text)
     if url.nil?
-      out.push(%(<text #{textstyle} x="#{x}" y="#{y0}">#{label}</text>))
+      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}">#{label}</text></a>))
+      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

metadata

@@ -1,21 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies: []
 description: |2
 
   Generates diagrams in SVG format from input material. Split into multiple
   programs that each perform one stage.
-
-  Licensed under Universal Permissive License, see LICENSE.txt.
 email: ismokarkkainen@icloud.com
 executables:
 - diagrammatron-get
@@ -54,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="