RubyGems - diagrammatron - Versions diffs - 0.4.2 → 0.5.0 - Mend

diagrammatron 0.4.2 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

data/lib/edges.yaml ADDED Viewed

@@ -0,0 +1,45 @@
+type: object
+properties:
+  edges:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      $ref: "#/$defs/Edge"
+  nodes:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      $ref: "#/$defs/Node"
+additionalProperties: true
+$defs:
+  Node:
+    type: object
+    required:
+    - label
+    - sid
+    - xo
+    - yo
+    properties:
+      label:
+        type: string
+      sid:
+        type: integer
+      xo:
+        type: integer
+      yo:
+        type: integer
+    additionalProperties: true
+  Edge:
+    type: object
+    required:
+    - between
+    properties:
+      between:
+        type: array
+        items:
+          type: string
+        minItems: 2
+        maxItems: 2
+    additionalProperties: true

data/lib/nodes.yaml ADDED Viewed

@@ -0,0 +1,36 @@
+type: object
+properties:
+  edges:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      $ref: "#/$defs/Edge"
+  nodes:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      $ref: "#/$defs/Node"
+additionalProperties: true
+$defs:
+  Node:
+    type: object
+    required:
+    - label
+    properties:
+      label:
+        type: string
+    additionalProperties: true
+  Edge:
+    type: object
+    required:
+    - between
+    properties:
+      between:
+        type: array
+        items:
+          type: string
+        minItems: 2
+        maxItems: 2
+    additionalProperties: true

data/lib/place.yaml ADDED Viewed

@@ -0,0 +1,65 @@
+type: object
+properties:
+  edges:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      $ref: "#/$defs/Edge"
+  nodes:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      $ref: "#/$defs/Node"
+additionalProperties: true
+$defs:
+  Node:
+    type: object
+    required:
+    - label
+    - sid
+    - xo
+    - yo
+    properties:
+      label:
+        type: string
+      sid:
+        type: integer
+      xo:
+        type: integer
+      yo:
+        type: integer
+    additionalProperties: true
+  Edge:
+    type: object
+    required:
+    - between
+    - path
+    - sid
+    properties:
+      between:
+        type: array
+        items:
+          type: string
+        minItems: 2
+        maxItems: 2
+      path:
+        type: array
+        items:
+          $ref: "#/$defs/Position"
+        minItems: 2
+      sid:
+        type: integer
+    additionalProperties: true
+  Position:
+    type: object
+    required:
+    - xo
+    - yo
+    properties:
+      xo:
+        type: number
+      yo:
+        type: number

data/lib/render.yaml ADDED Viewed

@@ -0,0 +1,111 @@
+type: object
+properties:
+  diagram:
+    type: object
+    default: {}
+    properties:
+      style:
+        $ref: "#/$defs/Style"
+        default: 'default'
+  edges:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      $ref: "#/$defs/Edge"
+  nodes:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      $ref: "#/$defs/Node"
+  styles:
+    type: object
+    properties:
+      node:
+        type: object
+        properties:
+          default:
+            type: object
+            default: {}
+        additionalProperties: true
+      edge:
+        type: object
+        default: {}
+        properties:
+          default:
+            type: object
+            default: {}
+        additionalProperties: true
+      diagram:
+        type: object
+        default: {}
+        properties:
+          default:
+            type: object
+            default: {}
+        additionalProperties: true
+    additionalProperties: true
+additionalProperties: true
+$defs:
+  Node:
+    type: object
+    required:
+    - label
+    - sid
+    - xo
+    - yo
+    properties:
+      label:
+        type: string
+      sid:
+        type: integer
+      xo:
+        type: integer
+      yo:
+        type: integer
+      style:
+        $ref: "#/$defs/Style"
+        default: 'default'
+    additionalProperties: true
+  Edge:
+    type: object
+    required:
+    - between
+    - path
+    - sid
+    properties:
+      between:
+        type: array
+        items:
+          type: string
+        minItems: 2
+        maxItems: 2
+      path:
+        type: array
+        items:
+          $ref: "#/$defs/Position"
+        minItems: 2
+      sid:
+        type: integer
+      style:
+        $ref: "#/$defs/Style"
+        default: 'default'
+    additionalProperties: true
+  Position:
+    type: object
+    required:
+    - xo
+    - yo
+    properties:
+      xo:
+        type: number
+      yo:
+        type: number
+  Style:
+    oneOf:
+    - type: string
+    - type: array
+      items:
+        type: string

data/lib/subset.yaml ADDED Viewed

@@ -0,0 +1,55 @@
+type: object
+properties:
+  expressions:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      type: object
+      required:
+      - name
+      properties:
+        name:
+          type: string
+        expression:
+          type: string
+          default: ''
+  sets:
+    type: array
+    items:
+      $ref: "#/$defs/SetRules"
+    minItems: 0
+    default: []
+$defs:
+  SetRules:
+    type: object
+    required:
+    - name
+    properties:
+      name:
+        type: string
+      nodes:
+        $ref: "#/$defs/Rules"
+      edges:
+        $ref: "#/$defs/Rules"
+      any:
+        $ref: "#/$defs/Rules"
+  Rules:
+    type: array
+    items:
+      $ref: "#/$defs/FieldRules"
+    minItems: 0
+    default: []
+  FieldRules:
+    type: object
+    required:
+    - name
+    - rules
+    properties:
+      name:
+        type: string
+      rules:
+        type: array
+        items:
+          type: string
+        minItems: 0

data/template/internal.yaml CHANGED Viewed

@@ -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+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpoaCArPSAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnaGVpZ2h0X21hcmdpbicpCgpvdXQgPSBbCiAgJSg8c3ZnIHdpZHRoPSIje3cgKyAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnd2lkdGhfbWFyZ2luJyl9IiBoZWlnaHQ9IiN7aGh9IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiPikKXQokcmVuZGVyLmRvYy5mZXRjaCgnZWRnZXMnLCBbXSkuZWFjaCBkbyB8ZWRnZXwKICBsaW5lc3R5bGUgPSAlKGZpbGw9Im5vbmUiIHN0cm9rZT0iI3tlZGdlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tlZGdlWydzdHJva2Vfd2lkdGgnXX0iKQogIHBhdGggPSBlZGdlLmZldGNoKCdwYXRoJywgbmlsKQogIG5leHQgaWYgcGF0aC5uaWw/CiAgcGF0aC5lYWNoIGRvIHxwfAogICAgcFsneG8nXSA9IHBbJ3hvJ10udG9faS50b19zCiAgICBwWyd5byddID0gKGhoIC0gcFsneW8nXSkudG9faS50b19zCiAgZW5kCiAgaWYgcGF0aC5zaXplID09IDIKICAgIG91dC5wdXNoKCUoPGxpbmUgI3tsaW5lc3R5bGV9IHgxPSIje3BhdGhbMF1bJ3hvJ119IiB4Mj0iI3twYXRoWzFdWyd4byddfSIgeTE9IiN7cGF0aFswXVsneW8nXX0iIHkyPSIje3BhdGhbMV1bJ3lvJ119Ii8+KSkKICBlbHNlCiAgICBwdHMgPSBwYXRoLm1hcCB7IHxwfCAiI3twWyd4byddfSwje3BbJ3lvJ119IiB9CiAgICBvdXQucHVzaCglKDxwb2x5bGluZSAje2xpbmVzdHlsZX0gcG9pbnRzPSIje3B0cy5qb2luKCcgJyl9Ii8+KSkKICBlbmQKZW5kCiRyZW5kZXIuZG9jLmZldGNoKCdub2RlcycsIFtdKS5lYWNoIGRvIHxub2RlfAogIHcgPSBub2RlWyd3J10udG9faQogIGggPSBub2RlWydoJ10udG9faQogIHggPSBub2RlWyd4byddLnRvX2kKICB5ID0gaGggLSBub2RlWyd5byddLnRvX2kgLSBoCiAgbm9kZXN0eWxlID0gJShmaWxsPSIje25vZGVbJ2ZpbGwnXX0iIHN0cm9rZT0iI3tub2RlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tub2RlWydzdHJva2Vfd2lkdGgnXX0iKQogIG91dC5wdXNoKCUoPHJlY3QgI3tub2Rlc3R5bGV9IGhlaWdodD0iI3tofSIgd2lkdGg9IiN7d30iIHg9IiN7eH0iIHk9IiN7eX0iLz4pKQogIHggKz0gbm9kZVsnd2lkdGhfbWFyZ2luJ10KICBmcyA9IG5vZGVbJ2ZvbnRfc2l6ZSddCiAgbGggPSBmcyAqICgxICsgbm9kZVsnZm9udF9saW5lX3NwYWNpbmcnXSkKICB5ICs9IG5vZGVbJ2hlaWdodF9tYXJnaW4nXSArIGZzICogbm9kZVsnZm9udF9hc2NlbmQnXSAjIEJhc2VsaW5lIGZvciBmaXJzdCBsaW5lLgogIHVybCA9IG5vZGUuZmV0Y2goJ3VybCcsIG5pbCkKICB1cmwuZW5jb2RlISg6eG1sID0+IDphdHRyKSB1bmxlc3MgdXJsLm5pbD8KICB5MCA9IHkKICB0ZXh0c3R5bGUgPSAlKGZpbGw9IiN7bm9kZVsnZm9udF9maWxsJ119IiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iI3tub2RlWydmb250X2ZpbGwnXX0iIHN0cm9rZS13aWR0aD0iMCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIpCiAgbGlua3N0eWxlID0gJShmaWxsPSIje25vZGVbJ3VybF9maWxsJ119IiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iI3tub2RlWyd1cmxfZmlsbCddfSIgc3Ryb2tlLXdpZHRoPSIwIiB4bWw6c3BhY2U9InByZXNlcnZlIikKICBub2RlWyd0ZXh0J10uZWFjaCBkbyB8bGluZXwKICAgIGxpbmUuZW5jb2RlISg6eG1sID0+IDp0ZXh0KQogICAgaWYgdXJsLm5pbD8KICAgICAgb3V0LnB1c2goJSg8dGV4dCAje3RleHRzdHlsZX0geD0iI3t4fSIgeT0iI3t5MH0iPiN7bGluZX08L3RleHQ+KSkKICAgIGVsc2UKICAgICAgb3V0LnB1c2goJSg8YSB4bGluazpocmVmPSN7dXJsfSB0YXJnZXQ9Il9wYXJlbnQiPjx0ZXh0ICN7bGlua3N0eWxlfSB4PSIje3h9IiB5PSIje3kwfSI+I3tsaW5lfTwvdGV4dD48L2E+KSkKICAgIGVuZAogICAgeTAgKz0gbGggIyBTaGlmdCBiYXNlbGluZSBieSBmdWxsIGxpbmUgKyBzcGFjaW5nIGhlaWdodC4KICBlbmQKZW5kCm91dC5qb2luKCJcbiIpCiU+Cjwvc3ZnPgo=
+      depth: 0
+base64template: PD94bWwgdmVyc2lvbj0iMS4wIj8+CjwlPQp3LCBoaCA9ICRyZW5kZXIuZGltZW5zaW9ucwpoaCArPSAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnaGVpZ2h0X21hcmdpbicpCgpvdXQgPSBbCiAgJSg8c3ZnIHdpZHRoPSIje3cgKyAkcmVuZGVyLmRvYy5kaWcoJ2RpYWdyYW0nLCAnd2lkdGhfbWFyZ2luJyl9IiBoZWlnaHQ9IiN7aGh9IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiPikKXQokcmVuZGVyLmRvY1snYWxsJ10uZWFjaCBkbyB8aXRlbXwKICBpZiBpdGVtWydraW5kJ10gPT0gJ25vZGUnCiAgICBub2RlID0gaXRlbVsnaXRlbSddCiAgICB3ID0gbm9kZVsndyddLnRvX2kKICAgIGggPSBub2RlWydoJ10udG9faQogICAgeCA9IG5vZGVbJ3hvJ10udG9faQogICAgeSA9IGhoIC0gbm9kZVsneW8nXS50b19pIC0gaAogICAgbm9kZXN0eWxlID0gJShmaWxsPSIje25vZGVbJ2ZpbGwnXX0iIHN0cm9rZT0iI3tub2RlWydzdHJva2UnXX0iIHN0cm9rZS13aWR0aD0iI3tub2RlWydzdHJva2Vfd2lkdGgnXX0iKQogICAgb3V0LnB1c2goJSg8cmVjdCAje25vZGVzdHlsZX0gaGVpZ2h0PSIje2h9IiB3aWR0aD0iI3t3fSIgeD0iI3t4fSIgeT0iI3t5fSIvPikpCiAgICB4ICs9IG5vZGVbJ3dpZHRoX21hcmdpbiddCiAgICBmcyA9IG5vZGVbJ2ZvbnRfc2l6ZSddCiAgICBsaCA9IGZzICogKDEgKyBub2RlWydmb250X2xpbmVfc3BhY2luZyddKQogICAgeSArPSBub2RlWydoZWlnaHRfbWFyZ2luJ10gKyBmcyAqIG5vZGVbJ2ZvbnRfYXNjZW5kJ10gIyBCYXNlbGluZSBmb3IgZmlyc3QgbGluZS4KICAgIHVybCA9IG5vZGUuZmV0Y2goJ3VybCcsIG5pbCkKICAgIHVybC5lbmNvZGUhKDp4bWwgPT4gOmF0dHIpIHVubGVzcyB1cmwubmlsPwogICAgeTAgPSB5CiAgICB0ZXh0c3R5bGUgPSAlKGZpbGw9IiN7bm9kZVsnZm9udF9maWxsJ119IiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iI3tmc30iIHN0cm9rZT0iI3tub2RlWydmb250X2ZpbGwnXX0iIHN0cm9rZS13aWR0aD0iMCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIpCiAgICBsaW5rc3R5bGUgPSAlKGZpbGw9IiN7bm9kZVsndXJsX2ZpbGwnXX0iIGZvbnQtZmFtaWx5PSJzZXJpZiIgZm9udC1zaXplPSIje2ZzfSIgc3Ryb2tlPSIje25vZGVbJ3VybF9maWxsJ119IiBzdHJva2Utd2lkdGg9IjAiIHhtbDpzcGFjZT0icHJlc2VydmUiKQogICAgbm9kZVsndGV4dCddLmVhY2ggZG8gfGxpbmV8CiAgICAgIGxpbmUuZW5jb2RlISg6eG1sID0+IDp0ZXh0KQogICAgICBpZiB1cmwubmlsPwogICAgICAgIG91dC5wdXNoKCUoPHRleHQgI3t0ZXh0c3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PikpCiAgICAgIGVsc2UKICAgICAgICBvdXQucHVzaCglKDxhIHhsaW5rOmhyZWY9I3t1cmx9IHRhcmdldD0iX3BhcmVudCI+PHRleHQgI3tsaW5rc3R5bGV9IHg9IiN7eH0iIHk9IiN7eTB9Ij4je2xpbmV9PC90ZXh0PjwvYT4pKQogICAgICBlbmQKICAgICAgeTAgKz0gbGggIyBTaGlmdCBiYXNlbGluZSBieSBmdWxsIGxpbmUgKyBzcGFjaW5nIGhlaWdodC4KICAgIGVuZAogIGVsc2UKICAgIGVkZ2UgPSBpdGVtWydpdGVtJ10KICAgIGxpbmVzdHlsZSA9ICUoZmlsbD0ibm9uZSIgc3Ryb2tlPSIje2VkZ2VbJ3N0cm9rZSddfSIgc3Ryb2tlLXdpZHRoPSIje2VkZ2VbJ3N0cm9rZV93aWR0aCddfSIpCiAgICBwYXRoID0gZWRnZS5mZXRjaCgncGF0aCcsIG5pbCkKICAgIG5leHQgaWYgcGF0aC5uaWw/CiAgICBwYXRoLmVhY2ggZG8gfHB8CiAgICAgIHBbJ3hvJ10gPSBwWyd4byddLnRvX2kudG9fcwogICAgICBwWyd5byddID0gKGhoIC0gcFsneW8nXSkudG9faS50b19zCiAgICBlbmQKICAgIGlmIHBhdGguc2l6ZSA9PSAyCiAgICAgIG91dC5wdXNoKCUoPGxpbmUgI3tsaW5lc3R5bGV9IHgxPSIje3BhdGhbMF1bJ3hvJ119IiB4Mj0iI3twYXRoWzFdWyd4byddfSIgeTE9IiN7cGF0aFswXVsneW8nXX0iIHkyPSIje3BhdGhbMV1bJ3lvJ119Ii8+KSkKICAgIGVsc2UKICAgICAgcHRzID0gcGF0aC5tYXAgeyB8cHwgIiN7cFsneG8nXX0sI3twWyd5byddfSIgfQogICAgICBvdXQucHVzaCglKDxwb2x5bGluZSAje2xpbmVzdHlsZX0gcG9pbnRzPSIje3B0cy5qb2luKCcgJyl9Ii8+KSkKICAgIGVuZAogIGVuZAplbmQKb3V0LmpvaW4oIlxuIikKJT4KPC9zdmc+Cg==

data/template/root.yaml CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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('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']}"/>))
+$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
   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
-  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>))
+    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
-      out.push(%(<a xlink:href=#{url} target="_parent"><text #{linkstyle} x="#{x}" y="#{y0}">#{line}</text></a>))
+      pts = path.map { |p| "#{p['xo']},#{p['yo']}" }
+      out.push(%(<polyline #{linestyle} points="#{pts.join(' ')}"/>))
     end
-    y0 += lh # Shift baseline by full line + spacing height.
   end
 end
 out.join("\n")

metadata CHANGED Viewed

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
-dependencies: []
+date: 2023-12-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json_schemer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: |2
   Generates diagrams in SVG format from input material. Split into multiple
@@ -22,6 +42,8 @@ executables:
 - diagrammatron-place
 - diagrammatron-prune
 - diagrammatron-render
+- diagrammatron-schema
+- diagrammatron-subset
 - diagrammatron-template
 - dot_json2diagrammatron
 extensions: []
@@ -34,16 +56,24 @@ files:
 - bin/diagrammatron-place
 - bin/diagrammatron-prune
 - bin/diagrammatron-render
+- bin/diagrammatron-schema
+- bin/diagrammatron-subset
 - bin/diagrammatron-template
 - bin/dot_json2diagrammatron
 - lib/common.rb
+- lib/edges.yaml
+- lib/nodes.yaml
+- lib/place.yaml
+- lib/render.yaml
+- lib/subset.yaml
 - template/internal.yaml
 - template/root.yaml
 - template/svg_1.1.erb
 homepage: https://xn--ismo-krkkinen-gfbd.fi/diagrammatron/index.html
 licenses:
 - UPL-1.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -52,14 +82,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Generates diagrams from input graph.