diagrammatron 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d1116130a55f28418c67f0522150a80ab39e275e0a473518052758a3b6959c7
-  data.tar.gz: 16447cd371aa60d1834356d7f712356400e2ae649124fa46ee6cef683072bc86
+  metadata.gz: ec55e1ae9f1ad84dd5ee189215011bb6e84fde797d229d7c2965294c4330004a
+  data.tar.gz: bf3c4dd72c1ba1d60d978309a00bfeef09c8e6b55ab449d56b1d6bd9ee48af31
 SHA512:
-  metadata.gz: 07c0d08e9244fcb9f05910a0513c9efe33e2dab58fa3860d7b168d06e53c8fbda3261aeca58258ec5e00f48568495cec99f5106bedefabe5d04ba59e7b80eaff
-  data.tar.gz: fbe5b2147cb128c398bdae0ca4e3afc681683947601d0f2b0034dfa26b253cc26be3328c3c526dcc17ef00f2024e9870dd345f048f093e194ec1b56c1c76f4eb
+  metadata.gz: b2afa0026ce65f039d1db74bffe5f9dd3d6e85ce8879760d66c44260fac26b5a6f2876af3135ef3ad5086f898f505d9da2834a742531a0645cf9b28952b97136
+  data.tar.gz: eb2f854603ca55a6d1bb14c73e7bc55ab319bacb894fe605cb1264a0fd1a2b1494e5a4abf8987a307a1088f1b7b7da67cbd8b4e5fec0fde7a0e3e31fe43a1f7d

data/LICENSE.txt

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

data/bin/diagrammatron-edges

@@ -153,6 +153,7 @@ def segment(x0, y0, x1, y1)
   Segment.new(vert, cc, range, 0, [false, false], 0)
 end
 
+# side_index is 0 up, 1 right, 2 down, 3 left.
 Connection = Struct.new(:node_index, :side_index)
 
 $paths = {}
@@ -576,6 +577,7 @@ def place_edges(work)
     $insignificant = 0.1 / (splits.values.max + 1)
     splits = nil
 
+    # Ordering of segments in gaps between nodes.
     gaps = {
       false => {},
       true => {}

data/bin/diagrammatron-nodes

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Copyright © 2021-2023 Ismo Kärkkäinen
+# Copyright © 2021-2024 Ismo Kärkkäinen
 # Licensed under Universal Permissive License. See LICENSE.txt.
 
 require_relative '../lib/common'
@@ -9,12 +9,27 @@ require 'optparse'
 require 'set'
 
 
+def horizontal(work)
+  count = {}
+  work[:nodes].each_index do |k|
+    node = work[:nodes][k]
+    c = count.fetch(node[:yo], 0)
+    node[:xo] = c
+    node[:yo] = 0 unless node.key?(:yo)
+    node[:sid] = 0
+    count[node[:yo]] = c + 1
+  end
+end
+
 def vertical(work)
+  count = {}
   work[:nodes].each_index do |k|
     node = work[:nodes][k]
-    node[:xo] = 0
-    node[:yo] = k
+    c = count.fetch(node[:xo], 0)
+    node[:xo] = 0 unless node.key?(:xo)
+    node[:yo] = c
     node[:sid] = 0
+    count[node[:xo]] = c + 1
   end
 end
 
@@ -269,7 +284,8 @@ end
 
 $algorithms = {
   'pathlength' => method(:pathlength2coordinates),
-  'vertical' => method(:vertical)
+  'vertical' => method(:vertical),
+  'horizontal' => method(:horizontal)
 }
 
 def work_copy(src, quiet)
@@ -296,6 +312,11 @@ def work_copy(src, quiet)
   nodes.each_index do |k|
     work[:nodes].push({ idx: k })
     node = nodes[k]
+    # Retain xo, yo if present.
+    %i[xo yo].each do |s|
+      sk = s.to_s
+      work[:nodes].last[s] = node[sk] if node.key?(sk)
+    end
     label = node['label']
     if label2idx.key?(label) && edge_nodes.member?(label)
       aargh "Edge-referred label used twice: #{label}"
@@ -361,7 +382,7 @@ def main
     opts.on('-h', '--help', 'Print this help and exit.') do
       $stdout.puts opts
       $stdout.puts %(
-Algorithm names are: #{$algorithms.keys.sort.join(' ')}
+Algorithm names are: #{$algorithms.keys.sort!.join(' ')}
 
 Input YAML file schema is returned by:
 diagrammatron-schema #{input_schema}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer