@knowvah/dot-engine 2.8.1 → 2.9.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 (335) hide show
  1. package/dist/common/graph-init.d.ts.map +1 -1
  2. package/dist/common/poly-gencode.d.ts.map +1 -1
  3. package/dist/common/poly-init.d.ts +3 -2
  4. package/dist/common/poly-init.d.ts.map +1 -1
  5. package/dist/common/safefile.d.ts +23 -0
  6. package/dist/common/safefile.d.ts.map +1 -0
  7. package/dist/common/shapes.d.ts +6 -6
  8. package/dist/common/shapes.d.ts.map +1 -1
  9. package/dist/gvc/device.d.ts.map +1 -1
  10. package/dist/gvc/image-type.d.ts +41 -0
  11. package/dist/gvc/image-type.d.ts.map +1 -0
  12. package/dist/gvc/render-usershape.d.ts +8 -0
  13. package/dist/gvc/render-usershape.d.ts.map +1 -1
  14. package/dist/gvc/usershape.d.ts +23 -1
  15. package/dist/gvc/usershape.d.ts.map +1 -1
  16. package/dist/index.js +8328 -6979
  17. package/dist/index.js.map +4 -4
  18. package/dist/layout/neato/__fixtures__/quad-prog-vpsc.d.ts +118 -0
  19. package/dist/layout/neato/__fixtures__/quad-prog-vpsc.d.ts.map +1 -0
  20. package/dist/layout/neato/__fixtures__/stress-models.d.ts +39 -0
  21. package/dist/layout/neato/__fixtures__/stress-models.d.ts.map +1 -0
  22. package/dist/layout/neato/circuit.d.ts +10 -0
  23. package/dist/layout/neato/circuit.d.ts.map +1 -0
  24. package/dist/layout/neato/init.d.ts +3 -2
  25. package/dist/layout/neato/init.d.ts.map +1 -1
  26. package/dist/layout/neato/ipsep-opts.d.ts +19 -0
  27. package/dist/layout/neato/ipsep-opts.d.ts.map +1 -0
  28. package/dist/layout/neato/lu.d.ts +35 -0
  29. package/dist/layout/neato/lu.d.ts.map +1 -0
  30. package/dist/layout/neato/matinv.d.ts +8 -0
  31. package/dist/layout/neato/matinv.d.ts.map +1 -0
  32. package/dist/layout/neato/quad-prog-vpsc-overlap.d.ts +35 -0
  33. package/dist/layout/neato/quad-prog-vpsc-overlap.d.ts.map +1 -0
  34. package/dist/layout/neato/quad-prog-vpsc.d.ts +110 -0
  35. package/dist/layout/neato/quad-prog-vpsc.d.ts.map +1 -0
  36. package/dist/layout/neato/start.d.ts +5 -4
  37. package/dist/layout/neato/start.d.ts.map +1 -1
  38. package/dist/layout/neato/stress-cola.d.ts +65 -0
  39. package/dist/layout/neato/stress-cola.d.ts.map +1 -0
  40. package/dist/layout/neato/stress-kernel.d.ts +0 -2
  41. package/dist/layout/neato/stress-kernel.d.ts.map +1 -1
  42. package/dist/layout/neato/stress-models.d.ts +48 -0
  43. package/dist/layout/neato/stress-models.d.ts.map +1 -0
  44. package/dist/layout/neato/vpsc-adjust.d.ts +7 -8
  45. package/dist/layout/neato/vpsc-adjust.d.ts.map +1 -1
  46. package/dist/render/color-resolve.d.ts +14 -0
  47. package/dist/render/color-resolve.d.ts.map +1 -1
  48. package/dist/render/dot/edge-draw.d.ts.map +1 -1
  49. package/dist/render/svg-arrow-ops.d.ts +21 -4
  50. package/dist/render/svg-arrow-ops.d.ts.map +1 -1
  51. package/dist/render/svg-edge-arrows.d.ts +3 -3
  52. package/dist/render/svg-edge-arrows.d.ts.map +1 -1
  53. package/dist/render/svg-helpers.d.ts +1 -1
  54. package/dist/render/svg-helpers.d.ts.map +1 -1
  55. package/dist/render/svg.d.ts.map +1 -1
  56. package/dist/render.js +8318 -6969
  57. package/dist/render.js.map +4 -4
  58. package/package.json +1 -1
  59. package/src/common/graph-init.ts +4 -2
  60. package/src/common/poly-gencode.ts +2 -1
  61. package/src/common/poly-init.ts +21 -12
  62. package/src/common/safefile.ts +74 -0
  63. package/src/common/shapes.ts +43 -22
  64. package/src/gvc/__fixtures__/p7/colors/98-point.gv +1 -0
  65. package/src/gvc/__fixtures__/p7/colors/98-point.json +54 -0
  66. package/src/gvc/__fixtures__/p7/colors/98-point.json.stderr +1 -0
  67. package/src/gvc/__fixtures__/p7/colors/98-point.svg +17 -0
  68. package/src/gvc/__fixtures__/p7/colors/98-point.svg.stderr +1 -0
  69. package/src/gvc/__fixtures__/p7/colors/98-point.xdot +13 -0
  70. package/src/gvc/__fixtures__/p7/colors/98-point.xdot.stderr +1 -0
  71. package/src/gvc/__fixtures__/p7/colors/99-edge-color.gv +1 -0
  72. package/src/gvc/__fixtures__/p7/colors/99-edge-color.json +150 -0
  73. package/src/gvc/__fixtures__/p7/colors/99-edge-color.json.stderr +1 -0
  74. package/src/gvc/__fixtures__/p7/colors/99-edge-color.svg +30 -0
  75. package/src/gvc/__fixtures__/p7/colors/99-edge-color.svg.stderr +1 -0
  76. package/src/gvc/__fixtures__/p7/colors/99-edge-color.xdot +22 -0
  77. package/src/gvc/__fixtures__/p7/colors/99-edge-color.xdot.stderr +1 -0
  78. package/src/gvc/__fixtures__/p7/colors/99-edge-red-colon.gv +1 -0
  79. package/src/gvc/__fixtures__/p7/colors/99-edge-red-colon.json +149 -0
  80. package/src/gvc/__fixtures__/p7/colors/99-edge-red-colon.json.stderr +0 -0
  81. package/src/gvc/__fixtures__/p7/colors/99-edge-red-colon.svg +30 -0
  82. package/src/gvc/__fixtures__/p7/colors/99-edge-red-colon.svg.stderr +0 -0
  83. package/src/gvc/__fixtures__/p7/colors/99-edge-red-colon.xdot +21 -0
  84. package/src/gvc/__fixtures__/p7/colors/99-edge-red-colon.xdot.stderr +0 -0
  85. package/src/gvc/__fixtures__/p7/colors/99-edge.gv +1 -0
  86. package/src/gvc/__fixtures__/p7/colors/99-edge.json +149 -0
  87. package/src/gvc/__fixtures__/p7/colors/99-edge.json.stderr +1 -0
  88. package/src/gvc/__fixtures__/p7/colors/99-edge.svg +30 -0
  89. package/src/gvc/__fixtures__/p7/colors/99-edge.svg.stderr +1 -0
  90. package/src/gvc/__fixtures__/p7/colors/99-edge.xdot +21 -0
  91. package/src/gvc/__fixtures__/p7/colors/99-edge.xdot.stderr +1 -0
  92. package/src/gvc/__fixtures__/p7/images/100-rotate.gv +1 -0
  93. package/src/gvc/__fixtures__/p7/images/100-rotate.svg +19 -0
  94. package/src/gvc/__fixtures__/p7/images/100-rotate.svg.stderr +0 -0
  95. package/src/gvc/__fixtures__/p7/images/101-bad.cmapx +2 -0
  96. package/src/gvc/__fixtures__/p7/images/101-bad.cmapx.stderr +2 -0
  97. package/src/gvc/__fixtures__/p7/images/101-bad.dot +8 -0
  98. package/src/gvc/__fixtures__/p7/images/101-bad.dot.stderr +2 -0
  99. package/src/gvc/__fixtures__/p7/images/101-bad.gv +1 -0
  100. package/src/gvc/__fixtures__/p7/images/101-bad.json +68 -0
  101. package/src/gvc/__fixtures__/p7/images/101-bad.json.stderr +2 -0
  102. package/src/gvc/__fixtures__/p7/images/101-bad.plain +3 -0
  103. package/src/gvc/__fixtures__/p7/images/101-bad.plain.stderr +2 -0
  104. package/src/gvc/__fixtures__/p7/images/101-bad.svg +18 -0
  105. package/src/gvc/__fixtures__/p7/images/101-bad.svg.stderr +2 -0
  106. package/src/gvc/__fixtures__/p7/images/101-bad.xdot +13 -0
  107. package/src/gvc/__fixtures__/p7/images/101-bad.xdot.stderr +2 -0
  108. package/src/gvc/__fixtures__/p7/images/101-gif.cmapx +2 -0
  109. package/src/gvc/__fixtures__/p7/images/101-gif.cmapx.stderr +0 -0
  110. package/src/gvc/__fixtures__/p7/images/101-gif.dot +8 -0
  111. package/src/gvc/__fixtures__/p7/images/101-gif.dot.stderr +0 -0
  112. package/src/gvc/__fixtures__/p7/images/101-gif.gv +1 -0
  113. package/src/gvc/__fixtures__/p7/images/101-gif.json +70 -0
  114. package/src/gvc/__fixtures__/p7/images/101-gif.json.stderr +1 -0
  115. package/src/gvc/__fixtures__/p7/images/101-gif.plain +3 -0
  116. package/src/gvc/__fixtures__/p7/images/101-gif.plain.stderr +0 -0
  117. package/src/gvc/__fixtures__/p7/images/101-gif.svg +19 -0
  118. package/src/gvc/__fixtures__/p7/images/101-gif.svg.stderr +0 -0
  119. package/src/gvc/__fixtures__/p7/images/101-gif.xdot +13 -0
  120. package/src/gvc/__fixtures__/p7/images/101-gif.xdot.stderr +0 -0
  121. package/src/gvc/__fixtures__/p7/images/101-jpg.cmapx +2 -0
  122. package/src/gvc/__fixtures__/p7/images/101-jpg.cmapx.stderr +0 -0
  123. package/src/gvc/__fixtures__/p7/images/101-jpg.dot +8 -0
  124. package/src/gvc/__fixtures__/p7/images/101-jpg.dot.stderr +0 -0
  125. package/src/gvc/__fixtures__/p7/images/101-jpg.gv +1 -0
  126. package/src/gvc/__fixtures__/p7/images/101-jpg.json +70 -0
  127. package/src/gvc/__fixtures__/p7/images/101-jpg.json.stderr +1 -0
  128. package/src/gvc/__fixtures__/p7/images/101-jpg.plain +3 -0
  129. package/src/gvc/__fixtures__/p7/images/101-jpg.plain.stderr +0 -0
  130. package/src/gvc/__fixtures__/p7/images/101-jpg.svg +19 -0
  131. package/src/gvc/__fixtures__/p7/images/101-jpg.svg.stderr +0 -0
  132. package/src/gvc/__fixtures__/p7/images/101-jpg.xdot +13 -0
  133. package/src/gvc/__fixtures__/p7/images/101-jpg.xdot.stderr +0 -0
  134. package/src/gvc/__fixtures__/p7/images/101-png.cmapx +2 -0
  135. package/src/gvc/__fixtures__/p7/images/101-png.cmapx.stderr +0 -0
  136. package/src/gvc/__fixtures__/p7/images/101-png.dot +8 -0
  137. package/src/gvc/__fixtures__/p7/images/101-png.dot.stderr +0 -0
  138. package/src/gvc/__fixtures__/p7/images/101-png.gv +1 -0
  139. package/src/gvc/__fixtures__/p7/images/101-png.json +70 -0
  140. package/src/gvc/__fixtures__/p7/images/101-png.json.stderr +1 -0
  141. package/src/gvc/__fixtures__/p7/images/101-png.plain +3 -0
  142. package/src/gvc/__fixtures__/p7/images/101-png.plain.stderr +0 -0
  143. package/src/gvc/__fixtures__/p7/images/101-png.svg +19 -0
  144. package/src/gvc/__fixtures__/p7/images/101-png.svg.stderr +0 -0
  145. package/src/gvc/__fixtures__/p7/images/101-png.xdot +13 -0
  146. package/src/gvc/__fixtures__/p7/images/101-png.xdot.stderr +0 -0
  147. package/src/gvc/__fixtures__/p7/images/101-svg.cmapx +2 -0
  148. package/src/gvc/__fixtures__/p7/images/101-svg.cmapx.stderr +0 -0
  149. package/src/gvc/__fixtures__/p7/images/101-svg.dot +8 -0
  150. package/src/gvc/__fixtures__/p7/images/101-svg.dot.stderr +0 -0
  151. package/src/gvc/__fixtures__/p7/images/101-svg.gv +1 -0
  152. package/src/gvc/__fixtures__/p7/images/101-svg.json +70 -0
  153. package/src/gvc/__fixtures__/p7/images/101-svg.json.stderr +1 -0
  154. package/src/gvc/__fixtures__/p7/images/101-svg.plain +3 -0
  155. package/src/gvc/__fixtures__/p7/images/101-svg.plain.stderr +0 -0
  156. package/src/gvc/__fixtures__/p7/images/101-svg.svg +19 -0
  157. package/src/gvc/__fixtures__/p7/images/101-svg.svg.stderr +0 -0
  158. package/src/gvc/__fixtures__/p7/images/101-svg.xdot +13 -0
  159. package/src/gvc/__fixtures__/p7/images/101-svg.xdot.stderr +0 -0
  160. package/src/gvc/__fixtures__/p7/images/101-svgbare.cmapx +2 -0
  161. package/src/gvc/__fixtures__/p7/images/101-svgbare.cmapx.stderr +2 -0
  162. package/src/gvc/__fixtures__/p7/images/101-svgbare.dot +8 -0
  163. package/src/gvc/__fixtures__/p7/images/101-svgbare.dot.stderr +2 -0
  164. package/src/gvc/__fixtures__/p7/images/101-svgbare.gv +1 -0
  165. package/src/gvc/__fixtures__/p7/images/101-svgbare.json +68 -0
  166. package/src/gvc/__fixtures__/p7/images/101-svgbare.json.stderr +2 -0
  167. package/src/gvc/__fixtures__/p7/images/101-svgbare.plain +3 -0
  168. package/src/gvc/__fixtures__/p7/images/101-svgbare.plain.stderr +2 -0
  169. package/src/gvc/__fixtures__/p7/images/101-svgbare.svg +18 -0
  170. package/src/gvc/__fixtures__/p7/images/101-svgbare.svg.stderr +2 -0
  171. package/src/gvc/__fixtures__/p7/images/101-svgbare.xdot +13 -0
  172. package/src/gvc/__fixtures__/p7/images/101-svgbare.xdot.stderr +2 -0
  173. package/src/gvc/__fixtures__/p7/images/102-ip-abs.gv +1 -0
  174. package/src/gvc/__fixtures__/p7/images/102-ip-abs.svg +18 -0
  175. package/src/gvc/__fixtures__/p7/images/102-ip-abs.svg.stderr +2 -0
  176. package/src/gvc/__fixtures__/p7/images/102-ip-abs.xdot +14 -0
  177. package/src/gvc/__fixtures__/p7/images/102-ip-abs.xdot.stderr +2 -0
  178. package/src/gvc/__fixtures__/p7/images/102-ip-found.gv +1 -0
  179. package/src/gvc/__fixtures__/p7/images/102-ip-found.svg +19 -0
  180. package/src/gvc/__fixtures__/p7/images/102-ip-found.svg.stderr +0 -0
  181. package/src/gvc/__fixtures__/p7/images/102-ip-found.xdot +14 -0
  182. package/src/gvc/__fixtures__/p7/images/102-ip-found.xdot.stderr +0 -0
  183. package/src/gvc/__fixtures__/p7/images/102-ip-missing.gv +1 -0
  184. package/src/gvc/__fixtures__/p7/images/102-ip-missing.svg +18 -0
  185. package/src/gvc/__fixtures__/p7/images/102-ip-missing.svg.stderr +2 -0
  186. package/src/gvc/__fixtures__/p7/images/102-ip-missing.xdot +14 -0
  187. package/src/gvc/__fixtures__/p7/images/102-ip-missing.xdot.stderr +2 -0
  188. package/src/gvc/__fixtures__/p7/images/102-ip-shapefile.gv +1 -0
  189. package/src/gvc/__fixtures__/p7/images/102-ip-shapefile.svg +18 -0
  190. package/src/gvc/__fixtures__/p7/images/102-ip-shapefile.svg.stderr +2 -0
  191. package/src/gvc/__fixtures__/p7/images/102-ip-shapefile.xdot +15 -0
  192. package/src/gvc/__fixtures__/p7/images/102-ip-shapefile.xdot.stderr +2 -0
  193. package/src/gvc/__fixtures__/p7/images/102-ip-two.gv +1 -0
  194. package/src/gvc/__fixtures__/p7/images/102-ip-two.svg +19 -0
  195. package/src/gvc/__fixtures__/p7/images/102-ip-two.svg.stderr +0 -0
  196. package/src/gvc/__fixtures__/p7/images/102-ip-two.xdot +14 -0
  197. package/src/gvc/__fixtures__/p7/images/102-ip-two.xdot.stderr +0 -0
  198. package/src/gvc/__fixtures__/p7/images/97-custom.gv +1 -0
  199. package/src/gvc/__fixtures__/p7/images/97-custom.svg +18 -0
  200. package/src/gvc/__fixtures__/p7/images/97-custom.svg.stderr +1 -0
  201. package/src/gvc/__fixtures__/p7/images/97-custom.xdot +13 -0
  202. package/src/gvc/__fixtures__/p7/images/97-custom.xdot.stderr +1 -0
  203. package/src/gvc/__fixtures__/p7/images/97-nosuch-image.gv +1 -0
  204. package/src/gvc/__fixtures__/p7/images/97-nosuch-image.svg +19 -0
  205. package/src/gvc/__fixtures__/p7/images/97-nosuch-image.svg.stderr +1 -0
  206. package/src/gvc/__fixtures__/p7/images/97-nosuch-image.xdot +14 -0
  207. package/src/gvc/__fixtures__/p7/images/97-nosuch-image.xdot.stderr +1 -0
  208. package/src/gvc/__fixtures__/p7/images/bad.png +1 -0
  209. package/src/gvc/__fixtures__/p7/images/d/r.png +0 -0
  210. package/src/gvc/__fixtures__/p7/images/d2/r.png +0 -0
  211. package/src/gvc/__fixtures__/p7/images/g.gif +0 -0
  212. package/src/gvc/__fixtures__/p7/images/graphs-val_val.gv +10 -0
  213. package/src/gvc/__fixtures__/p7/images/graphs-val_val.svg +25 -0
  214. package/src/gvc/__fixtures__/p7/images/graphs-val_val.svg.stderr +3 -0
  215. package/src/gvc/__fixtures__/p7/images/graphs-val_val.xdot +30 -0
  216. package/src/gvc/__fixtures__/p7/images/graphs-val_val.xdot.stderr +3 -0
  217. package/src/gvc/__fixtures__/p7/images/j.jpg +0 -0
  218. package/src/gvc/__fixtures__/p7/images/r.png +0 -0
  219. package/src/gvc/__fixtures__/p7/images/s.svg +2 -0
  220. package/src/gvc/__fixtures__/p7/images/sb.svg +1 -0
  221. package/src/gvc/__fixtures__/p7/images/t.png +0 -0
  222. package/src/gvc/__fixtures__/p7/regen.sh +23 -0
  223. package/src/gvc/device.ts +11 -4
  224. package/src/gvc/image-type.ts +122 -0
  225. package/src/gvc/render-usershape.ts +52 -1
  226. package/src/gvc/usershape.ts +40 -1
  227. package/src/layout/neato/__fixtures__/ipsep/big-dired.gv +243 -0
  228. package/src/layout/neato/__fixtures__/ipsep/big-dired.trace +55 -0
  229. package/src/layout/neato/__fixtures__/ipsep/big-dired.xdot +1832 -0
  230. package/src/layout/neato/__fixtures__/ipsep/big-dired.xdot.stderr +0 -0
  231. package/src/layout/neato/__fixtures__/ipsep/cluster.gv +1 -0
  232. package/src/layout/neato/__fixtures__/ipsep/cluster.trace +95 -0
  233. package/src/layout/neato/__fixtures__/ipsep/cluster.xdot +58 -0
  234. package/src/layout/neato/__fixtures__/ipsep/cluster.xdot.stderr +0 -0
  235. package/src/layout/neato/__fixtures__/ipsep/dired-hier-levelsgap.gv +1 -0
  236. package/src/layout/neato/__fixtures__/ipsep/dired-hier-levelsgap.trace +40 -0
  237. package/src/layout/neato/__fixtures__/ipsep/dired-hier-levelsgap.xdot +72 -0
  238. package/src/layout/neato/__fixtures__/ipsep/dired-hier-levelsgap.xdot.stderr +0 -0
  239. package/src/layout/neato/__fixtures__/ipsep/dired-hier-sep.gv +1 -0
  240. package/src/layout/neato/__fixtures__/ipsep/dired-hier-sep.trace +43 -0
  241. package/src/layout/neato/__fixtures__/ipsep/dired-hier-sep.xdot +72 -0
  242. package/src/layout/neato/__fixtures__/ipsep/dired-hier-sep.xdot.stderr +0 -0
  243. package/src/layout/neato/__fixtures__/ipsep/dired-hier.gv +1 -0
  244. package/src/layout/neato/__fixtures__/ipsep/dired-hier.trace +43 -0
  245. package/src/layout/neato/__fixtures__/ipsep/dired-hier.xdot +71 -0
  246. package/src/layout/neato/__fixtures__/ipsep/dired-hier.xdot.stderr +0 -0
  247. package/src/layout/neato/__fixtures__/ipsep/dired-true.gv +1 -0
  248. package/src/layout/neato/__fixtures__/ipsep/dired-true.trace +51 -0
  249. package/src/layout/neato/__fixtures__/ipsep/dired-true.xdot +71 -0
  250. package/src/layout/neato/__fixtures__/ipsep/dired-true.xdot.stderr +0 -0
  251. package/src/layout/neato/__fixtures__/ipsep/ipsep-grid.gv +1 -0
  252. package/src/layout/neato/__fixtures__/ipsep/ipsep-grid.trace +41 -0
  253. package/src/layout/neato/__fixtures__/ipsep/ipsep-grid.xdot +77 -0
  254. package/src/layout/neato/__fixtures__/ipsep/ipsep-grid.xdot.stderr +0 -0
  255. package/src/layout/neato/__fixtures__/ipsep/ipsep-k6.gv +1 -0
  256. package/src/layout/neato/__fixtures__/ipsep/ipsep-k6.trace +41 -0
  257. package/src/layout/neato/__fixtures__/ipsep/ipsep-k6.xdot +68 -0
  258. package/src/layout/neato/__fixtures__/ipsep/ipsep-k6.xdot.stderr +0 -0
  259. package/src/layout/neato/__fixtures__/ipsep/ipsep-rand-len.gv +1 -0
  260. package/src/layout/neato/__fixtures__/ipsep/ipsep-rand-len.trace +42 -0
  261. package/src/layout/neato/__fixtures__/ipsep/ipsep-rand-len.xdot +110 -0
  262. package/src/layout/neato/__fixtures__/ipsep/ipsep-rand-len.xdot.stderr +0 -0
  263. package/src/layout/neato/__fixtures__/ipsep/ipsep-rand.gv +1 -0
  264. package/src/layout/neato/__fixtures__/ipsep/ipsep-rand.trace +49 -0
  265. package/src/layout/neato/__fixtures__/ipsep/ipsep-rand.xdot +108 -0
  266. package/src/layout/neato/__fixtures__/ipsep/ipsep-rand.xdot.stderr +0 -0
  267. package/src/layout/neato/__fixtures__/ipsep/ipsep-tree.gv +1 -0
  268. package/src/layout/neato/__fixtures__/ipsep/ipsep-tree.trace +43 -0
  269. package/src/layout/neato/__fixtures__/ipsep/ipsep-tree.xdot +83 -0
  270. package/src/layout/neato/__fixtures__/ipsep/ipsep-tree.xdot.stderr +0 -0
  271. package/src/layout/neato/__fixtures__/ipsep/kd-ipsep-len.gv +1 -0
  272. package/src/layout/neato/__fixtures__/ipsep/kd-ipsep-len.trace +49 -0
  273. package/src/layout/neato/__fixtures__/ipsep/kd-ipsep-len.xdot +48 -0
  274. package/src/layout/neato/__fixtures__/ipsep/kd-ipsep-len.xdot.stderr +0 -0
  275. package/src/layout/neato/__fixtures__/ipsep/kd-ipsep.gv +1 -0
  276. package/src/layout/neato/__fixtures__/ipsep/kd-ipsep.trace +45 -0
  277. package/src/layout/neato/__fixtures__/ipsep/kd-ipsep.xdot +47 -0
  278. package/src/layout/neato/__fixtures__/ipsep/kd-ipsep.xdot.stderr +0 -0
  279. package/src/layout/neato/__fixtures__/ipsep/len-dired.gv +1 -0
  280. package/src/layout/neato/__fixtures__/ipsep/len-dired.trace +44 -0
  281. package/src/layout/neato/__fixtures__/ipsep/len-dired.xdot +66 -0
  282. package/src/layout/neato/__fixtures__/ipsep/len-dired.xdot.stderr +0 -0
  283. package/src/layout/neato/__fixtures__/ipsep/model-circuit.gv +1 -0
  284. package/src/layout/neato/__fixtures__/ipsep/model-circuit.trace +46 -0
  285. package/src/layout/neato/__fixtures__/ipsep/model-circuit.xdot +83 -0
  286. package/src/layout/neato/__fixtures__/ipsep/model-circuit.xdot.stderr +0 -0
  287. package/src/layout/neato/__fixtures__/ipsep/model-mds-len.gv +1 -0
  288. package/src/layout/neato/__fixtures__/ipsep/model-mds-len.trace +52 -0
  289. package/src/layout/neato/__fixtures__/ipsep/model-mds-len.xdot +72 -0
  290. package/src/layout/neato/__fixtures__/ipsep/model-mds-len.xdot.stderr +0 -0
  291. package/src/layout/neato/__fixtures__/ipsep/model-mds.gv +1 -0
  292. package/src/layout/neato/__fixtures__/ipsep/model-mds.trace +52 -0
  293. package/src/layout/neato/__fixtures__/ipsep/model-mds.xdot +83 -0
  294. package/src/layout/neato/__fixtures__/ipsep/model-mds.xdot.stderr +2 -0
  295. package/src/layout/neato/__fixtures__/ipsep/model-subset.gv +1 -0
  296. package/src/layout/neato/__fixtures__/ipsep/model-subset.trace +49 -0
  297. package/src/layout/neato/__fixtures__/ipsep/model-subset.xdot +83 -0
  298. package/src/layout/neato/__fixtures__/ipsep/model-subset.xdot.stderr +0 -0
  299. package/src/layout/neato/__fixtures__/ipsep/overlap-ipsep.gv +1 -0
  300. package/src/layout/neato/__fixtures__/ipsep/overlap-ipsep.trace +211 -0
  301. package/src/layout/neato/__fixtures__/ipsep/overlap-ipsep.xdot +60 -0
  302. package/src/layout/neato/__fixtures__/ipsep/overlap-ipsep.xdot.stderr +0 -0
  303. package/src/layout/neato/__fixtures__/ipsep/overlap-vpsc.gv +1 -0
  304. package/src/layout/neato/__fixtures__/ipsep/overlap-vpsc.trace +50 -0
  305. package/src/layout/neato/__fixtures__/ipsep/overlap-vpsc.xdot +60 -0
  306. package/src/layout/neato/__fixtures__/ipsep/overlap-vpsc.xdot.stderr +0 -0
  307. package/src/layout/neato/__fixtures__/ipsep/start-self-dired.gv +1 -0
  308. package/src/layout/neato/__fixtures__/ipsep/start-self-dired.trace +51 -0
  309. package/src/layout/neato/__fixtures__/ipsep/start-self-dired.xdot +72 -0
  310. package/src/layout/neato/__fixtures__/ipsep/start-self-dired.xdot.stderr +0 -0
  311. package/src/layout/neato/__fixtures__/ipsep/start-self.gv +1 -0
  312. package/src/layout/neato/__fixtures__/ipsep/start-self.trace +43 -0
  313. package/src/layout/neato/__fixtures__/ipsep/start-self.xdot +84 -0
  314. package/src/layout/neato/__fixtures__/ipsep/start-self.xdot.stderr +0 -0
  315. package/src/layout/neato/__fixtures__/quad-prog-vpsc.ts +109 -0
  316. package/src/layout/neato/__fixtures__/stress-models.ts +64 -0
  317. package/src/layout/neato/circuit.ts +31 -0
  318. package/src/layout/neato/index.ts +2 -2
  319. package/src/layout/neato/init.ts +25 -34
  320. package/src/layout/neato/ipsep-opts.ts +158 -0
  321. package/src/layout/neato/lu.ts +189 -0
  322. package/src/layout/neato/matinv.ts +37 -0
  323. package/src/layout/neato/quad-prog-vpsc-overlap.ts +365 -0
  324. package/src/layout/neato/quad-prog-vpsc.ts +416 -0
  325. package/src/layout/neato/start.ts +9 -24
  326. package/src/layout/neato/stress-cola.ts +497 -0
  327. package/src/layout/neato/stress-kernel.ts +1 -17
  328. package/src/layout/neato/stress-models.ts +212 -0
  329. package/src/layout/neato/vpsc-adjust.ts +35 -66
  330. package/src/render/color-resolve.ts +25 -2
  331. package/src/render/dot/edge-draw.ts +7 -4
  332. package/src/render/svg-arrow-ops.ts +35 -19
  333. package/src/render/svg-edge-arrows.ts +7 -6
  334. package/src/render/svg-helpers.ts +19 -11
  335. package/src/render/svg.ts +15 -3
@@ -0,0 +1,212 @@
1
+ // SPDX-License-Identifier: EPL-2.0
2
+
3
+ /**
4
+ * The subset and circuit distance models of stress majorization, plus the
5
+ * three kkutils.c neighbour-vector helpers they use (kept here because
6
+ * kkutils.ts is outside the porting task that added them).
7
+ *
8
+ * `Dij` is C `float` (Float32Array); the circuit matrices are C `double`.
9
+ * C `NULL` ewgts is the port's empty array.
10
+ *
11
+ * @see lib/neatogen/stress.c
12
+ * @see lib/neatogen/kkutils.c
13
+ */
14
+
15
+ import type { VtxData } from './dijkstra.js';
16
+ import { computeApspPacked, computeWeightedApspPacked } from './bfs.js';
17
+ import { solveCircuit } from './circuit.js';
18
+ import { newArray } from './lu.js';
19
+ import { fmaxf } from './quad-prog-solve.js';
20
+
21
+ /** 2^64: C `size_t` arithmetic wraps modulo this. */
22
+ const SIZE_T_MODULUS = 2 ** 64;
23
+
24
+ // ---------------------------------------------------------------------------
25
+ // kkutils.c helpers
26
+ // ---------------------------------------------------------------------------
27
+
28
+ /**
29
+ * Count the neighbours of `u` marked in `vVector`.
30
+ * @see lib/neatogen/kkutils.c:common_neighbors
31
+ */
32
+ export function commonNeighbors(graph: readonly VtxData[], u: number, vVector: Int32Array): number {
33
+ // count number of common neighbors of 'v_vector' and 'u'
34
+ let numSharedNeighbors = 0;
35
+ for (let j = 1; j < graph[u]!.nedges; j++) {
36
+ const neighbor = graph[u]!.edges[j]!;
37
+ if (vVector[neighbor]! > 0) {
38
+ // a shared neighbor
39
+ numSharedNeighbors++;
40
+ }
41
+ }
42
+ return numSharedNeighbors;
43
+ }
44
+
45
+ /**
46
+ * Mark the neighbours of `vtx` (a node is NOT a neighbour of itself).
47
+ * @see lib/neatogen/kkutils.c:fill_neighbors_vec_unweighted
48
+ */
49
+ export function fillNeighborsVecUnweighted(graph: readonly VtxData[], vtx: number, vtxVec: Int32Array): void {
50
+ for (let j = 1; j < graph[vtx]!.nedges; j++) {
51
+ vtxVec[graph[vtx]!.edges[j]!] = 1;
52
+ }
53
+ }
54
+
55
+ /**
56
+ * Clear the marks set by `fillNeighborsVecUnweighted`.
57
+ * @see lib/neatogen/kkutils.c:empty_neighbors_vec
58
+ */
59
+ export function emptyNeighborsVec(graph: readonly VtxData[], vtx: number, vtxVec: Int32Array): void {
60
+ for (let j = 1; j < graph[vtx]!.nedges; j++) {
61
+ vtxVec[graph[vtx]!.edges[j]!] = 0;
62
+ }
63
+ }
64
+
65
+ // ---------------------------------------------------------------------------
66
+ // circuitModel
67
+ // ---------------------------------------------------------------------------
68
+
69
+ /**
70
+ * Distances from the resistor circuit: Dij = Ginv[i][i] + Ginv[j][j] -
71
+ * 2 Ginv[i][j] over the inverted conductance matrix; `null` (C `NULL`) when
72
+ * `solveCircuit` fails, e.g. on a disconnected graph.
73
+ * @see lib/neatogen/stress.c:circuitModel
74
+ */
75
+ export function circuitModel(graph: readonly VtxData[], nG: number): Float32Array | null {
76
+ let Dij: Float32Array | null = new Float32Array((nG * (nG + 1)) / 2);
77
+ const Gm = newArray(nG, nG, 0.0);
78
+ const GmInv = newArray(nG, nG, 0.0);
79
+
80
+ /* set non-diagonal entries */
81
+ if (graph[0]!.ewgts.length !== 0) {
82
+ for (let i = 0; i < nG; i++) {
83
+ for (let e = 1; e < graph[i]!.nedges; e++) {
84
+ const j = graph[i]!.edges[e]!;
85
+ /* conductance is 1/resistance; ewgts is C float */
86
+ Gm[i]![j] = Gm[j]![i] = -1.0 / Math.fround(graph[i]!.ewgts[e]!); /* negate */
87
+ }
88
+ }
89
+ } else {
90
+ for (let i = 0; i < nG; i++) {
91
+ for (let e = 1; e < graph[i]!.nedges; e++) {
92
+ const j = graph[i]!.edges[e]!;
93
+ /* conductance is 1/resistance */
94
+ Gm[i]![j] = Gm[j]![i] = -1.0; /* ewgts are all 1 */
95
+ }
96
+ }
97
+ }
98
+
99
+ const rv = solveCircuit(nG, Gm, GmInv);
100
+
101
+ if (rv) {
102
+ circuitDistances(GmInv, nG, Dij);
103
+ } else {
104
+ Dij = null;
105
+ }
106
+ return Dij;
107
+ }
108
+
109
+ /**
110
+ * Fill the packed `Dij` from the inverted conductance matrix.
111
+ * @see lib/neatogen/stress.c:circuitModel (stress.c:197-209)
112
+ */
113
+ function circuitDistances(GmInv: readonly Float64Array[], nG: number, Dij: Float32Array): void {
114
+ let count = 0;
115
+ for (let i = 0; i < nG; i++) {
116
+ for (let j = i; j < nG; j++) {
117
+ // the Float32Array store is C's (float) cast
118
+ Dij[count++] = i === j ? 0.0 : GmInv[i]![i]! + GmInv[j]![j]! - 2.0 * GmInv[i]![j]!;
119
+ }
120
+ }
121
+ }
122
+
123
+ // ---------------------------------------------------------------------------
124
+ // compute_apsp_artificial_weights_packed
125
+ // ---------------------------------------------------------------------------
126
+
127
+ /**
128
+ * The artificial weight of edge (i, neighbor): `deg_i + deg_j - 2 * common`
129
+ * in C `size_t`, so a negative value (only possible with duplicate
130
+ * neighbours) wraps modulo 2^64 before the (float) cast.
131
+ * @see lib/neatogen/stress.c:compute_apsp_artificial_weights_packed (stress.c:735-736, 752-753)
132
+ */
133
+ function artificialWeight(graph: readonly VtxData[], degI: number, neighbor: number, vtxVec: Int32Array): number {
134
+ const degJ = graph[neighbor]!.nedges - 1;
135
+ const w = degI + degJ - 2 * commonNeighbors(graph, neighbor, vtxVec);
136
+ return Math.fround(w < 0 ? w + SIZE_T_MODULUS : w);
137
+ }
138
+
139
+ /**
140
+ * Weighted branch: each weight is fmaxf(artificial, the caller's ewgts[j]),
141
+ * read from graph[i].ewgts before graph[i].ewgts is reassigned.
142
+ * @see lib/neatogen/stress.c:compute_apsp_artificial_weights_packed (stress.c:730-743)
143
+ */
144
+ function weightGraphKeepingLengths(graph: VtxData[], n: number, vtxVec: Int32Array): void {
145
+ for (let i = 0; i < n; i++) {
146
+ const weights = new Array<number>(graph[i]!.nedges).fill(0);
147
+ fillNeighborsVecUnweighted(graph, i, vtxVec);
148
+ const degI = graph[i]!.nedges - 1;
149
+ for (let j = 1; j <= degI; j++) {
150
+ const neighbor = graph[i]!.edges[j]!;
151
+ weights[j] = fmaxf(artificialWeight(graph, degI, neighbor, vtxVec), Math.fround(graph[i]!.ewgts[j]!));
152
+ }
153
+ emptyNeighborsVec(graph, i, vtxVec);
154
+ graph[i]!.ewgts = weights;
155
+ }
156
+ }
157
+
158
+ /**
159
+ * Unweighted branch: graph[i].ewgts is pointed at the new weights first.
160
+ * @see lib/neatogen/stress.c:compute_apsp_artificial_weights_packed (stress.c:745-758)
161
+ */
162
+ function weightGraph(graph: VtxData[], n: number, vtxVec: Int32Array): void {
163
+ for (let i = 0; i < n; i++) {
164
+ const weights = new Array<number>(graph[i]!.nedges).fill(0);
165
+ graph[i]!.ewgts = weights;
166
+ fillNeighborsVecUnweighted(graph, i, vtxVec);
167
+ const degI = graph[i]!.nedges - 1;
168
+ for (let j = 1; j <= degI; j++) {
169
+ const neighbor = graph[i]!.edges[j]!;
170
+ weights[j] = artificialWeight(graph, degI, neighbor, vtxVec);
171
+ }
172
+ emptyNeighborsVec(graph, i, vtxVec);
173
+ }
174
+ }
175
+
176
+ /**
177
+ * All-pairs shortest paths after weighting every edge so that high-degree
178
+ * nodes sit far apart: Dijkstra when the graph carries ewgts, else bfs over
179
+ * the (int-truncated) artificial weights.
180
+ *
181
+ * The C allocates one buffer of sum(nedges) floats and walks a pointer
182
+ * through it; the port allocates each vertex's slice. On return
183
+ * graph[0].ewgts is NULL; when the caller had ewgts every vertex gets its
184
+ * original array back, otherwise graph[1..n-1].ewgts keep the artificial
185
+ * weights (C: dangling pointers into the freed buffer).
186
+ * @see lib/neatogen/stress.c:compute_apsp_artificial_weights_packed
187
+ */
188
+ export function computeApspArtificialWeightsPacked(graph: VtxData[], n: number): Float32Array {
189
+ /* compute all-pairs-shortest-path-length while weighting the graph */
190
+ /* so high-degree nodes are distantly located */
191
+ const oldWeights = graph[0]!.ewgts;
192
+ // C walks old_weights by graph[i].nedges; the port keeps each vertex's array
193
+ const savedWeights = graph.slice(0, n).map((v) => v.ewgts);
194
+ const vtxVec = new Int32Array(n);
195
+
196
+ let Dij: Float32Array;
197
+ if (graph[0]!.ewgts.length !== 0) {
198
+ weightGraphKeepingLengths(graph, n, vtxVec);
199
+ Dij = computeWeightedApspPacked(graph, n);
200
+ } else {
201
+ weightGraph(graph, n, vtxVec);
202
+ Dij = computeApspPacked(graph, n);
203
+ }
204
+
205
+ graph[0]!.ewgts = []; // free(graph[0].ewgts); graph[0].ewgts = NULL
206
+ if (oldWeights.length !== 0) {
207
+ for (let i = 0; i < n; i++) {
208
+ graph[i]!.ewgts = savedWeights[i]!;
209
+ }
210
+ }
211
+ return Dij;
212
+ }
@@ -4,90 +4,59 @@
4
4
  * `overlap=vpsc`: the VPSC adjuster of removeOverlapWith, moved out of
5
5
  * neato/index.ts so every engine reaches it through the shared dispatch.
6
6
  *
7
- * C works on `float` coordinates (`float *coords[2]`), so positions are rounded
8
- * to float on entry and after each pass: that decides exact-touch verdicts
9
- * between the x and y passes.
7
+ * C works on `float` coordinates (`float *coords[2]`): positions are rounded
8
+ * to float on entry, and `removeoverlaps` stores each pass's result as float,
9
+ * which decides exact-touch verdicts between the x and y passes.
10
10
  *
11
11
  * @see lib/neatogen/adjust.c:vpscAdjust
12
- * @see lib/neatogen/quad_prog_vpsc.c:removeoverlaps
13
12
  */
14
13
 
15
14
  import type { Graph } from '../../model/graph.js';
16
- import {
17
- newVariable,
18
- deleteVariable,
19
- deleteVPSC,
20
- deleteConstraints,
21
- solveVPSC,
22
- genXConstraints,
23
- genYConstraints,
24
- VPSC,
25
- Rectangle,
26
- type Variable,
27
- } from '../../vpsc/index.js';
28
15
  import { sepFactor, DFLT_MARGIN } from './sep-factor.js';
16
+ import type { ClusterData, IpsepOptions } from './quad-prog-vpsc.js';
17
+ import { removeoverlaps } from './quad-prog-vpsc-overlap.js';
29
18
 
30
19
  const POINTS_PER_INCH = 72;
31
- /** Widen nodes in the x pass so a horizontally resolved pair does not count as
32
- * vertically overlapping. @see quad_prog_vpsc.c:generateNonoverlapConstraints */
33
- const X_PASS_SCALE = Math.fround(1.0001);
34
20
 
35
- interface Gap { x: number; y: number }
36
- interface VpscBox { w: number; h: number }
37
- type Coords = readonly [Float32Array, Float32Array];
38
-
39
- /** One Rectangle per node: size scaled by `scale`, plus half the gap per side.
40
- * @see lib/neatogen/quad_prog_vpsc.c:generateNonoverlapConstraints */
41
- function buildRects(c: Coords, size: VpscBox[], gap: Gap, scale: number): Rectangle[] {
42
- return size.map((s, i) => {
43
- const hw = (scale * s.w) / 2.0 + gap.x / 2.0;
44
- const hh = (scale * s.h) / 2.0 + gap.y / 2.0;
45
- return new Rectangle(c[0][i]! - hw, c[0][i]! + hw, c[1][i]! - hh, c[1][i]! + hh);
46
- });
47
- }
48
-
49
- /** Solve one axis and store the result (rounded to float) into `c[axis]`.
50
- * @see lib/neatogen/quad_prog_vpsc.c:removeoverlaps */
51
- function solveAxis(c: Coords, size: VpscBox[], gap: Gap, axis: 0 | 1): void {
52
- const rects = buildRects(c, size, gap, axis === 0 ? X_PASS_SCALE : 1);
53
- const vars: Variable[] = size.map((_, i) => newVariable(i, 1.0, 1.0));
54
- const cs = axis === 0 ? genXConstraints(rects, vars, true) : genYConstraints(rects, vars);
55
- const vpsc = new VPSC(vars, cs);
56
- solveVPSC(vpsc);
57
- // solveVPSC places every variable in a block. @see quad_prog_vpsc.c:568 getVariablePos
58
- vars.forEach((v, i) => {
59
- c[axis][i] = v.position();
60
- });
61
- deleteVPSC(vpsc);
62
- deleteConstraints(cs);
63
- for (const v of vars) deleteVariable(v);
21
+ /** `(cluster_data){0}`. @see lib/neatogen/adjust.c:vpscAdjust */
22
+ function noClusters(): ClusterData {
23
+ return {
24
+ nvars: 0, nclusters: 0, clustersizes: new Int32Array(0), clusters: [],
25
+ ntoplevel: 0, toplevel: new Int32Array(0), bb: [],
26
+ };
64
27
  }
65
28
 
66
29
  /**
67
- * Remove overlaps with two VPSC passes (x then y). The gap handed to
68
- * removeoverlaps is twice the separation margin (opt.gap is the gap size, not
69
- * the margin): `2 * sep` when `sep` is additive, else twice DFLT_MARGIN.
70
- * Returns 0 as C does.
30
+ * Remove overlaps with `removeoverlaps` (two VPSC passes, x then y). The gap
31
+ * is twice the separation margin (opt.gap is the gap size, not the margin):
32
+ * `2 * sep` when `sep` is additive, else twice DFLT_MARGIN. Returns 0 as C
33
+ * does.
71
34
  * @see lib/neatogen/adjust.c:vpscAdjust
72
35
  */
73
36
  export function vpscAdjust(g: Graph): number {
74
- const margin = sepFactor(g);
75
- const gap: Gap = {
76
- x: (2 * (margin.doAdd ? margin.x : DFLT_MARGIN)) / POINTS_PER_INCH,
77
- y: (2 * (margin.doAdd ? margin.y : DFLT_MARGIN)) / POINTS_PER_INCH,
78
- };
79
37
  const nodes = Array.from(g.nodes.values());
80
- const c: Coords = [new Float32Array(nodes.length), new Float32Array(nodes.length)];
38
+ const coords = [new Float32Array(nodes.length), new Float32Array(nodes.length)];
81
39
  // Layout has set ND_pos and node init ND_width/ND_height before any adjuster.
82
- nodes.forEach((n, i) => {
83
- c[0][i] = n.info.pos![0];
84
- c[1][i] = n.info.pos![1];
40
+ nodes.forEach((n, j) => {
41
+ coords[0]![j] = n.info.pos![0];
42
+ coords[1]![j] = n.info.pos![1];
85
43
  });
86
- const size = nodes.map((n) => ({ w: n.info.width!, h: n.info.height! }));
87
- solveAxis(c, size, gap, 0);
88
- solveAxis(c, size, gap, 1);
89
- nodes.forEach((n, i) => {
90
- n.info.pos = [c[0][i]!, c[1][i]!];
44
+ const margin = sepFactor(g);
45
+ /* Multiply by 2 since opt.gap is the gap size, not the margin */
46
+ const opt: IpsepOptions = {
47
+ diredges: 0,
48
+ edgeGap: 0,
49
+ noverlap: 2,
50
+ clusters: noClusters(),
51
+ gap: {
52
+ x: 2.0 * ((margin.doAdd ? margin.x : DFLT_MARGIN) / POINTS_PER_INCH),
53
+ y: 2.0 * ((margin.doAdd ? margin.y : DFLT_MARGIN) / POINTS_PER_INCH),
54
+ },
55
+ nsize: nodes.map((n) => ({ x: n.info.width!, y: n.info.height! })),
56
+ };
57
+ removeoverlaps(nodes.length, coords, opt);
58
+ nodes.forEach((n, j) => {
59
+ n.info.pos = [coords[0]![j]!, coords[1]![j]!];
91
60
  });
92
61
  return 0;
93
62
  }
@@ -132,8 +132,31 @@ export function resolveRenderColor(raw: string, report = true): GVColor {
132
132
  * @see lib/gvc/gvrender.c:456 gvrender_set_fillcolor
133
133
  */
134
134
  export function resolveFillColorName(raw: string, report = true): GVColor {
135
- if (raw === 'none') return { type: 'none' };
136
- return resolveColorName(raw, report);
135
+ // A colour list is cut at the first ':' for the lookup; a known name keeps
136
+ // its stored pointer into the (restored) full string, so svg (the renderer
137
+ // with a known-colors list) prints "red:"; xdot translates the cut name.
138
+ const colon = raw.indexOf(':');
139
+ const name = colon < 0 ? raw : raw.slice(0, colon);
140
+ if (name === 'none') return { type: 'none' };
141
+ const color = resolveColorName(name, report);
142
+ return color.type === 'string' && rendererColors.hasKnownList ? { type: 'string', s: raw } : color;
143
+ }
144
+
145
+ /**
146
+ * The edge fill colour emit_edge_graphics hands to gvrender_set_fillcolor, or
147
+ * undefined for the semicolon multicolor path (which `goto done`s before any
148
+ * fill is chosen and fills each segment with its own colour). `color` is the
149
+ * edge's color attribute ("" when unset); the fill is `late_nnstring(e,
150
+ * E_fillcolor, color)`, and an empty result is DEFAULT_COLOR. `report` is
151
+ * false when no fill was set and `color` is a list (that name is only used
152
+ * piecewise, by the per-segment pen colours).
153
+ * @see lib/common/emit.c:2397-2434,2541-2547 emit_edge_graphics
154
+ */
155
+ export function edgeFillName(color: string, fillcolor: string | undefined): { name: string; report: boolean } | undefined {
156
+ if (color.includes(';') && color.includes(':')) return undefined;
157
+ const set = fillcolor !== undefined && fillcolor !== '';
158
+ const name = set ? fillcolor : color;
159
+ return { name: name === '' ? 'black' : name, report: set || !color.includes(':') };
137
160
  }
138
161
 
139
162
  function resolveColorName(raw: string, report: boolean): GVColor {
@@ -41,14 +41,14 @@ const DEFAULT_LINE_STYLE: readonly string[] = ['solid', 'setlinewidth(1)'];
41
41
  * the four cases and their `filled` variants are exactly arrow_gen's.
42
42
  * @see lib/common/arrows.c arrow_gen
43
43
  */
44
- function emitArrowOp(buf: string[], op: ArrowDrawOp, pen: GVColor): void {
44
+ function emitArrowOp(buf: string[], op: ArrowDrawOp, fill: GVColor): void {
45
45
  switch (op.kind) {
46
46
  case 'polygon':
47
- if (op.filled) buf.push(xdotFillColor(pen));
47
+ if (op.filled) buf.push(xdotFillColor(fill));
48
48
  buf.push(xdotPoints(op.filled ? 'P' : 'p', op.points));
49
49
  break;
50
50
  case 'ellipse':
51
- if (op.filled) buf.push(xdotFillColor(pen));
51
+ if (op.filled) buf.push(xdotFillColor(fill));
52
52
  buf.push(
53
53
  (op.filled ? 'E ' : 'e ') + xdotPoint(op.center) +
54
54
  xdotNum(op.rx) + ' ' + xdotNum(op.ry) + ' ',
@@ -217,6 +217,9 @@ export abstract class EdgeDrawBase extends DotWriterBase {
217
217
  const pen = penOverride !== undefined
218
218
  ? resolveRenderColor(penOverride)
219
219
  : job.obj?.penColor ?? { type: 'string', s: 'black' };
220
+ // arrow_gen paints with the current fillcolor: the segment colour on the
221
+ // multicolor paths (penOverride), else emit_edge_graphics' edge fill.
222
+ const fill = penOverride !== undefined ? pen : job.obj?.fillColor ?? pen;
220
223
  const pw = job.obj?.penWidth ?? 1;
221
224
  for (const op of ops) {
222
225
  if (Math.abs(pw - this.penwidth[state]!) >= 0.0005) {
@@ -225,7 +228,7 @@ export abstract class EdgeDrawBase extends DotWriterBase {
225
228
  }
226
229
  buf.push(xdotStrOp('S ', 'solid'));
227
230
  buf.push(xdotPenColor(pen));
228
- emitArrowOp(buf, op, pen);
231
+ emitArrowOp(buf, op, fill);
229
232
  }
230
233
  }
231
234
  }
@@ -31,14 +31,21 @@ function emitArrowOpacity(job: RenderJob, attr: string, opacity: string | null):
31
31
  if (opacity !== null) job.write(' ' + attr + '="' + opacity + '"');
32
32
  }
33
33
 
34
+ /**
35
+ * The paint an arrow primitive is drawn with: the stroke (pen) and the fill
36
+ * colour with their stringified alphas (null when opaque).
37
+ * @see lib/common/arrows.c:arrow_gen
38
+ */
39
+ export interface ArrowInk { pen: string; penOpacity: string | null; fill: string; fillOpacity: string | null }
40
+
34
41
  /** `<polygon>` with Adobe first-point repetition (matches svg_polygon). */
35
- function emitPolygonOp(points: Point[], filled: boolean, penColor: string, job: RenderJob, pw: number, opacity: string | null): void {
42
+ function emitPolygonOp(points: Point[], filled: boolean, ink: ArrowInk, job: RenderJob, pw: number): void {
36
43
  const pts = points.map((p) => transformPoint(p, job));
37
- job.write('<polygon fill="' + (filled ? penColor : 'none') + '"');
38
- if (filled) emitArrowOpacity(job, 'fill-opacity', opacity);
39
- job.write(' stroke="' + penColor + '"');
44
+ job.write('<polygon fill="' + (filled ? ink.fill : 'none') + '"');
45
+ if (filled) emitArrowOpacity(job, 'fill-opacity', ink.fillOpacity);
46
+ job.write(' stroke="' + ink.pen + '"');
40
47
  emitArrowPenWidth(job, pw);
41
- emitArrowOpacity(job, 'stroke-opacity', opacity);
48
+ emitArrowOpacity(job, 'stroke-opacity', ink.penOpacity);
42
49
  job.write(' points="');
43
50
  emitPoints(job, pts);
44
51
  if (pts.length > 0) {
@@ -55,13 +62,13 @@ function emitPolygonOp(points: Point[], filled: boolean, penColor: string, job:
55
62
  interface EllipseOp { center: Point; rx: number; ry: number; filled: boolean }
56
63
 
57
64
  /** `<ellipse>` (dot/odot). rx/ry are emitted in layout units (device scale 1). */
58
- function emitEllipseOp(op: EllipseOp, penColor: string, job: RenderJob, pw: number, opacity: string | null): void {
65
+ function emitEllipseOp(op: EllipseOp, ink: ArrowInk, job: RenderJob, pw: number): void {
59
66
  const c = transformPoint(op.center, job);
60
- job.write('<ellipse fill="' + (op.filled ? penColor : 'none') + '"');
61
- if (op.filled) emitArrowOpacity(job, 'fill-opacity', opacity);
62
- job.write(' stroke="' + penColor + '"');
67
+ job.write('<ellipse fill="' + (op.filled ? ink.fill : 'none') + '"');
68
+ if (op.filled) emitArrowOpacity(job, 'fill-opacity', ink.fillOpacity);
69
+ job.write(' stroke="' + ink.pen + '"');
63
70
  emitArrowPenWidth(job, pw);
64
- emitArrowOpacity(job, 'stroke-opacity', opacity);
71
+ emitArrowOpacity(job, 'stroke-opacity', ink.penOpacity);
65
72
  job.write(' cx="');
66
73
  job.printDouble(c.x);
67
74
  job.write('" cy="');
@@ -96,18 +103,27 @@ function emitBezierOp(points: Point[], penColor: string, job: RenderJob, pw: num
96
103
  }
97
104
 
98
105
  /**
99
- * Emit one edge end's arrowhead draw-ops, in order, with the given pen color.
100
- * `opacity` is the stringified alpha (`colorOpacity`) or null when the pen color
101
- * is opaque; it drives the SVG fill/stroke-opacity attributes (e.g. an edge
102
- * color="#rrggbbaa"). @see lib/common/arrows.c:arrow_gen
106
+ * Emit one edge end's arrowhead draw-ops, in order, with the given ink.
107
+ * @see lib/common/arrows.c:arrow_gen
103
108
  */
104
- export function emitArrowOps(ops: ArrowDrawOp[], penColor: string, job: RenderJob, pw: number, opacity: string | null = null): void {
109
+ export function emitArrowOpsInk(ops: ArrowDrawOp[], ink: ArrowInk, job: RenderJob, pw: number): void {
105
110
  for (const op of ops) {
106
111
  switch (op.kind) {
107
- case 'polygon': emitPolygonOp(op.points, op.filled, penColor, job, pw, opacity); break;
108
- case 'ellipse': emitEllipseOp(op, penColor, job, pw, opacity); break;
109
- case 'polyline': emitPolylineOp(op.points, penColor, job, pw, opacity); break;
110
- case 'bezier': emitBezierOp(op.points, penColor, job, pw, opacity); break;
112
+ case 'polygon': emitPolygonOp(op.points, op.filled, ink, job, pw); break;
113
+ case 'ellipse': emitEllipseOp(op, ink, job, pw); break;
114
+ case 'polyline': emitPolylineOp(op.points, ink.pen, job, pw, ink.penOpacity); break;
115
+ case 'bezier': emitBezierOp(op.points, ink.pen, job, pw, ink.penOpacity); break;
111
116
  }
112
117
  }
113
118
  }
119
+
120
+ /**
121
+ * {@link emitArrowOpsInk} with the pen colour also as the fill (the multicolor
122
+ * paths set fill = segment colour). `opacity` is the stringified alpha
123
+ * (`colorOpacity`) or null when the pen color is opaque; it drives the SVG
124
+ * fill/stroke-opacity attributes (e.g. an edge color="#rrggbbaa").
125
+ * @see lib/common/arrows.c:arrow_gen
126
+ */
127
+ export function emitArrowOps(ops: ArrowDrawOp[], penColor: string, job: RenderJob, pw: number, opacity: string | null = null): void {
128
+ emitArrowOpsInk(ops, { pen: penColor, penOpacity: opacity, fill: penColor, fillOpacity: opacity }, job, pw);
129
+ }
@@ -9,10 +9,11 @@ import type { Edge } from '../model/edge.js';
9
9
  import type { Bezier } from '../model/geom.js';
10
10
  import type { RenderJob } from '../gvc/job.js';
11
11
  import { bezierEndOps } from '../common/bezier-arrows.js';
12
- import { emitArrowOps } from './svg-arrow-ops.js';
12
+ import { emitArrowOpsInk } from './svg-arrow-ops.js';
13
+ import type { ArrowInk } from './svg-arrow-ops.js';
13
14
 
14
- /** The edge pen an arrow is drawn with. */
15
- export interface ArrowPaint { job: RenderJob; penColor: string; opacity: string | null; pw: number }
15
+ /** The edge pen and fill an arrow is drawn with. */
16
+ export interface ArrowPaint { job: RenderJob; ink: ArrowInk; pw: number }
16
17
 
17
18
  /** Which ends have drawn their edge-level arrow. */
18
19
  export interface ArrowsDone { tailDone: boolean; headDone: boolean }
@@ -32,7 +33,7 @@ export function emitBezierEndArrow(
32
33
  const ops = bezierEndOps(e, bz, end)
33
34
  ?? (flag !== 0 && !done && edgeOps?.length ? edgeOps : undefined);
34
35
  if (ops === undefined) return;
35
- emitArrowOps(ops, p.penColor, p.job, p.pw, p.opacity);
36
+ emitArrowOpsInk(ops, p.ink, p.job, p.pw);
36
37
  if (tail) st.tailDone = true;
37
38
  else st.headDone = true;
38
39
  }
@@ -46,9 +47,9 @@ export function emitBezierEndArrow(
46
47
  */
47
48
  export function emitRemainingArrows(e: Edge, st: ArrowsDone, p: ArrowPaint): void {
48
49
  if (!st.tailDone && e.info.tailArrowOps?.length) {
49
- emitArrowOps(e.info.tailArrowOps, p.penColor, p.job, p.pw, p.opacity);
50
+ emitArrowOpsInk(e.info.tailArrowOps, p.ink, p.job, p.pw);
50
51
  }
51
52
  if (!st.headDone && e.info.headArrowOps?.length) {
52
- emitArrowOps(e.info.headArrowOps, p.penColor, p.job, p.pw, p.opacity);
53
+ emitArrowOpsInk(e.info.headArrowOps, p.ink, p.job, p.pw);
53
54
  }
54
55
  }
@@ -32,7 +32,8 @@ import { colorPaint, colorOpacity, textFillAttrs } from './color-resolve.js';
32
32
  import { PenType, FillType } from '../gvc/context.js';
33
33
  import { emitLinearGradient, emitRadialGradient, gradientId } from './svg-gradient.js';
34
34
  import { transformPoint } from '../gvc/device.js';
35
- import { emitArrowOps } from './svg-arrow-ops.js';
35
+ import { emitArrowOpsInk } from './svg-arrow-ops.js';
36
+ import type { ArrowInk } from './svg-arrow-ops.js';
36
37
 
37
38
  // ---------------------------------------------------------------------------
38
39
  // Module-level constants
@@ -444,11 +445,7 @@ export function svgEdgePath(e: Edge, job: RenderJob): void {
444
445
  if (spl === undefined || spl.size === 0) return;
445
446
  const obj = job.obj;
446
447
  const stroke = obj !== null ? paintStr(obj, false) : 'black';
447
- const paint: ArrowPaint = {
448
- job, penColor: stroke,
449
- opacity: obj !== null ? colorOpacity(obj.penColor) : null,
450
- pw: obj !== null ? obj.penWidth : 1.0,
451
- };
448
+ const paint: ArrowPaint = { job, ink: edgeArrowInk(obj), pw: obj !== null ? obj.penWidth : 1.0 };
452
449
  const st = { tailDone: false, headDone: false };
453
450
  for (let si = 0; si < spl.size; si++) {
454
451
  const bz = spl.list[si] as Bezier | undefined;
@@ -563,21 +560,32 @@ export function emitArrowPolygon(rawPts: Point[], penColor: string, job: RenderJ
563
560
  job.write('"/>\n');
564
561
  }
565
562
 
563
+ /**
564
+ * The edge's arrow ink: stroke = pen colour, fill = the edge fill colour.
565
+ * @see lib/common/emit.c:2397-2434,2541-2547 emit_edge_graphics
566
+ */
567
+ function edgeArrowInk(obj: ObjState | null): ArrowInk {
568
+ if (obj === null) return { pen: 'black', penOpacity: null, fill: 'black', fillOpacity: null };
569
+ return {
570
+ pen: paintStr(obj, false), penOpacity: colorOpacity(obj.penColor),
571
+ fill: paintStr(obj, true), fillOpacity: colorOpacity(obj.fillColor),
572
+ };
573
+ }
574
+
566
575
  /**
567
576
  * Emit arrowhead polygon(s) for a routed edge (tail first, then head).
568
- * Arrow fill and stroke use the edge pen color from job.obj (AD1).
577
+ * Arrow stroke is the edge pen colour and fill the edge fill colour (AD1).
569
578
  * @see plugin/core/gvrender_core_svg.c:svg_polygon (arrowhead case)
570
579
  * @see lib/common/arrows.c:arrow_type_normal
571
580
  */
572
581
  export function svgArrowPolygons(e: Edge, job: RenderJob): void {
573
582
  const obj = job.obj;
574
- const penColor = obj !== null ? paintStr(obj, false) : 'black';
575
- const opacity = obj !== null ? colorOpacity(obj.penColor) : null;
583
+ const ink = edgeArrowInk(obj);
576
584
  const pw = obj !== null ? obj.penWidth : 1.0;
577
585
  const tailOps = e.info.tailArrowOps;
578
- if (tailOps?.length) emitArrowOps(tailOps, penColor, job, pw, opacity);
586
+ if (tailOps?.length) emitArrowOpsInk(tailOps, ink, job, pw);
579
587
  const headOps = e.info.headArrowOps;
580
- if (headOps?.length) emitArrowOps(headOps, penColor, job, pw, opacity);
588
+ if (headOps?.length) emitArrowOpsInk(headOps, ink, job, pw);
581
589
  }
582
590
 
583
591
  // ---------------------------------------------------------------------------
package/src/render/svg.ts CHANGED
@@ -248,9 +248,21 @@ export class SvgRenderer implements RendererPlugin {
248
248
  const found = findImageBytes(src, job.imageResolver);
249
249
  if (found !== null) href = toDataUri(found.bytes, found.mime);
250
250
  }
251
- job.write('<image xlink:href="' + escapeXml(href) + '" width="' + g(width)
252
- + 'px" height="' + g(height) + 'px" preserveAspectRatio="xMinYMin meet" x="'
253
- + g(originx) + '" y="' + g(-originy) + '"/>\n');
251
+ job.write('<image xlink:href="' + escapeXml(href));
252
+ if (job.rotation !== 0) {
253
+ // FIXME - this is messed up >>>
254
+ job.write('" width="' + g(height) + 'px" height="' + g(width)
255
+ + 'px" preserveAspectRatio="xMidYMid meet" x="' + g(originx)
256
+ + '" y="' + g(-originy) + '"');
257
+ job.write(' transform="rotate(' + String(Math.trunc(job.rotation)) + ' '
258
+ + g(originx) + ' ' + g(-originy) + ')"');
259
+ // <<<
260
+ } else {
261
+ job.write('" width="' + g(width) + 'px" height="' + g(height)
262
+ + 'px" preserveAspectRatio="xMinYMin meet" x="' + g(originx)
263
+ + '" y="' + g(-originy) + '"');
264
+ }
265
+ job.write('/>\n');
254
266
  }
255
267
 
256
268
  comment(text: string, job: RenderJob): void { svgComment(text, job); }