rsyntaxtree 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3b753fd33f6df5903c6df87d02bf7c7ac45de57e1ba18da51f03fe391ab45f
-  data.tar.gz: 3f53988bbb1ccd64b75792b822ccb04eca2d7f209500d881610cf2295ced3ce7
+  metadata.gz: 4b011905bb833561ebbc545ce04c4c6cf104290298fc6b2018d09f8c9ef58383
+  data.tar.gz: 7f35db88fa0d6585f6832d6d6621b527e830c5d7772ddb3282ccf1341b990c16
 SHA512:
-  metadata.gz: 66e9a66413e457d4de55902743cc9ad61861c4b7fcdb4d9951d79966893e0665f5fea1e369ec69bbf058104627fc156250c841e2213f22b55b1c5b306991f311
-  data.tar.gz: 94ff87d7fab49605087c81bc98639c86fe768c1842048438c87381d22ebbf4d651cc0b5b6cadc16acf169cdee9021b694a8239777bc6088a4d3eb3d5f985d248
+  metadata.gz: 7d96fe35d241eb21bb3248dd9b566a5dd0603bbed8f7118579f915ef9eecb3d875f10508dbdb4ec09f8fffa53ec2a86cb7d9d3d7458dba86f799ff1505f70fd0
+  data.tar.gz: 9e2298a797787e12407e57d0dc05e59cbb444b6b0792c6be1447190ef99fae4899a2ead1df2d40e80f26615d268ce0e3287029db002c02c1344aceed2a5d7bf5

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [1.7.0] - 2026-08
+
+### Changed
+- Text measurement now uses Pango, the same engine (and the same fontconfig
+  font-fallback resolution) librsvg uses to render the output, instead of
+  RMagick with the bundled font files. Labels in any script are measured with
+  the font that actually draws them, which fixes off-center labels for scripts
+  the bundled fonts do not cover (e.g. Khmer, #14) without bundling per-script
+  fonts. Horizontal dimensions of the output may change slightly.
+- Vertical rhythm is now derived deterministically from the font size
+  (1.4 x size, matching the previous Latin line height) and is identical
+  across scripts; the old engine spaced Japanese text 1.5x and WenQuanYi
+  1.25x, so mixed-language documents had inconsistent spacing.
+- The font-family lists used in the SVG output and in measurement are now
+  defined in a single place (`FONT_FAMILIES` / `FontFamily`).
+
+### Added
+- Runtime dependency on the `pango` gem (ruby-gnome). No new system
+  requirements: librsvg already depends on Pango.
+
 ## [1.6.3] - 2026-07
 
 ### Fixed

data/CITATION.cff

@@ -0,0 +1,21 @@
+cff-version: 1.2.0
+message: "If you use RSyntaxTree in your research, please cite it as below."
+type: software
+title: "RSyntaxTree: A graphical syntax tree image generator"
+authors:
+  - family-names: "Hasebe"
+    given-names: "Yoichiro"
+    email: "yohasebe@gmail.com"
+url: "https://yohasebe.com/rsyntaxtree"
+repository-code: "https://github.com/yohasebe/rsyntaxtree"
+# Concept DOI: always resolves to the latest archived version on Zenodo
+doi: "10.5281/zenodo.21916150"
+license: MIT
+version: 1.7.0
+date-released: "2026-08-13"
+keywords:
+  - linguistics
+  - syntax tree
+  - syntactic analysis
+  - visualization
+  - Ruby

data/Dockerfile

@@ -5,7 +5,7 @@ WORKDIR $WORKSPACE
 RUN apk update && \
     apk upgrade && \
     apk add --no-cache linux-headers libxml2-dev make gcc libc-dev bash && \
-    apk add --no-cache librsvg librsvg-dev imagemagick imagemagick-dev xz-dev libbz2 && \
+    apk add --no-cache librsvg librsvg-dev pango-dev imagemagick imagemagick-dev xz-dev libbz2 && \
     apk add --no-cache gobject-introspection gobject-introspection-dev && \
     apk add --no-cache -t .build-packages --no-cache build-base curl-dev wget gcompat
 

data/Gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "optimist"
+gem "pango"
 gem "parslet"
 gem "rmagick"
 gem "rsvg2"

data/README.md

@@ -189,16 +189,20 @@ For detailed documentation on syntax and markup:
 - [日本語ドキュメント](https://yohasebe.github.io/rsyntaxtree/documentation_ja)
 - [Example Gallery](https://yohasebe.github.io/rsyntaxtree/examples)
 
-## References
+## How to Cite
 
-Please use the following BibTeX entry when citing RSyntaxTree:
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.21916150.svg?v=1)](https://doi.org/10.5281/zenodo.21916150)
+
+If you use RSyntaxTree in your research, please cite it. You can use the "Cite this repository" button on GitHub (powered by [CITATION.cff](CITATION.cff)), or the following BibTeX entry (adjust `version` to the one you used):
 
 ```bibtex
-@misc{rsyntaxtree,
-  author = {Yoichiro Hasebe},
-  title = {RSyntaxTree: A graphical syntax tree image generator},
-  url = {https://yohasebe.com/rsyntaxtree},
-  year = {2026}
+@software{hasebe_rsyntaxtree,
+  author  = {Hasebe, Yoichiro},
+  title   = {RSyntaxTree: A graphical syntax tree image generator},
+  url     = {https://yohasebe.com/rsyntaxtree},
+  doi     = {10.5281/zenodo.21916150},
+  version = {1.7.0},
+  year    = {2026}
 }
 ```
 

data/docs/assets/svg/000.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-  <svg width="919.2000000000002" height="813.375" viewBox="-15.200000000000001, 0, 934.4000000000002, 824.625" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <svg width="919.0000000000001" height="809.76" viewBox="-15.200000000000001, 0, 934.2000000000002, 820.96" version="1.1" xmlns="http://www.w3.org/2000/svg">
   <defs>
     <marker id="arrow" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="10" refY="5" markerWidth="15.200000000000001" markerHeight="15.200000000000001" orient="auto">
       <path d="M 0 0 L 10 5 L 0 10" fill="#CC79A7"/>
@@ -24,51 +24,51 @@
       <line x1="0" y="0" x2="0" y2="10" stroke="#009E73" stroke-width="4"></line>
     </pattern>
   </defs>
-<rect x="-15.200000000000001" y="0" width="934.4000000000002" height="824.625" stroke="none" fill="white" />"
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='335.15000000000003' y='67.5'><tspan x='335.15000000000003' y='67.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">S</tspan>
+<rect x="-15.200000000000001" y="0" width="934.2000000000002" height="820.96" stroke="none" fill="white" />"
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='333.9375' y='67.19999999999999'><tspan x='333.9375' y='67.19999999999999' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">S</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='113.19999999999999' y='238.5'><tspan x='113.19999999999999' y='238.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">NP</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='113.59999999999997' y='237.43999999999997'><tspan x='113.59999999999997' y='237.43999999999997' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">NP</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='15.199999999999989' y='409.5'><tspan x='27.69999999999999' y='409.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">R</tspan>
-<tspan x='60.19999999999999' y='409.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif"><tspan style='fill:none;'>￭</tspan></tspan>
-<tspan x='77.19999999999999' y='409.5' style="font-weight: bold; fill: #D55E00; " text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">SyntaxTree</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='15.199999999999989' y='407.67999999999995'><tspan x='27.599999999999987' y='407.67999999999995' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">R</tspan>
+<tspan x='59.999999999999986' y='407.67999999999995' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif"><tspan style='fill:none;'>￭</tspan></tspan>
+<tspan x='76.99999999999999' y='407.67999999999995' style="font-weight: bold; fill: #D55E00; " text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">SyntaxTree</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='533.6' y='238.5'><tspan x='533.6' y='238.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">VP</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='532.775' y='237.43999999999997'><tspan x='532.775' y='237.43999999999997' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">VP</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='376.0' y='409.5'><tspan x='376.0' y='409.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">V</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='375.79999999999995' y='407.67999999999995'><tspan x='375.79999999999995' y='407.67999999999995' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">V</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='316.0' y='580.5'><tspan x='316.0' y='580.5' style="font-style: italic; " text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">generates</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='315.29999999999995' y='577.92'><tspan x='315.29999999999995' y='577.92' style="font-style: italic; " text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">generates</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='698.2' y='409.5'><tspan x='698.2' y='409.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">NP</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='698.75' y='407.67999999999995'><tspan x='698.75' y='407.67999999999995' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">NP</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='591.3' y='580.5'><tspan x='591.3' y='580.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">Adj</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='591.6' y='577.92'><tspan x='591.6' y='577.92' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">Adj</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='516.8000000000001' y='751.5'><tspan x='516.8000000000001' y='751.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">+multilingual</tspan>
-<tspan x='516.8000000000001' y='796.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">+beautiful</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='516.6' y='748.16'><tspan x='516.6' y='748.16' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">+multilingual</tspan>
+<tspan x='516.6' y='792.9599999999999' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">+beautiful</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='802.6000000000001' y='580.5'><tspan x='802.6000000000001' y='580.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">NP</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='803.4000000000001' y='577.92'><tspan x='803.4000000000001' y='577.92' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">NP</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='775.6000000000001' y='751.5'><tspan x='775.6000000000001' y='751.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">syntax</tspan>
-<tspan x='786.6000000000001' y='796.5' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">trees</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='775.4000000000001' y='748.16'><tspan x='775.4000000000001' y='748.16' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">syntax</tspan>
+<tspan x='786.4000000000001' y='792.9599999999999' style="" text-decoration="" font-family="'Noto Sans', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">trees</tspan>
 </text>
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='135.2' y1='182.25' x2='344.15000000000003' y2='95.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='553.1' y1='182.25' x2='344.15000000000003' y2='95.625' />
-<polygon style='fill: none; stroke: black; stroke-width:2; stroke-linejoin:round;stroke-linecap:round;' points='15.199999999999989 353.25 255.2 353.25 135.2 266.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='386.0' y1='353.25' x2='553.1' y2='266.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='720.2' y1='353.25' x2='553.1' y2='266.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='386.0' y1='524.25' x2='386.0' y2='437.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='615.8' y1='524.25' x2='720.2' y2='437.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='824.6000000000001' y1='524.25' x2='720.2' y2='437.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='615.8000000000001' y1='695.25' x2='615.8' y2='608.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='824.6000000000001' y1='695.25' x2='824.6000000000001' y2='608.625' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='134.09999999999997' y1='181.43999999999997' x2='342.9375' y2='95.19999999999999' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='551.775' y1='181.43999999999997' x2='342.9375' y2='95.19999999999999' />
+<polygon style='fill: none; stroke: black; stroke-width:2; stroke-linejoin:round;stroke-linecap:round;' points='15.199999999999989 351.67999999999995 254.0 351.67999999999995 134.09999999999997 265.44' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='384.29999999999995' y1='351.67999999999995' x2='551.775' y2='265.44' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='719.25' y1='351.67999999999995' x2='551.775' y2='265.44' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='384.79999999999995' y1='521.92' x2='384.29999999999995' y2='435.67999999999995' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='615.6' y1='521.92' x2='719.25' y2='435.67999999999995' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='823.9000000000001' y1='521.92' x2='719.25' y2='435.67999999999995' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='615.6' y1='692.16' x2='615.6' y2='605.92' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='824.4000000000001' y1='692.16' x2='823.9000000000001' y2='605.92' />
 <rect style='stroke: #009E73; stroke-linejoin:round; stroke-width:2;'
-                        x='15.199999999999989' y='373.5'
-                        width='45.0' height='45.0'
+                        x='15.199999999999989' y='371.84'
+                        width='44.8' height='44.8'
                         fill='none' />
 
 <polyline style='stroke:#009E73; stroke-width:2; fill:none; stroke-linejoin:round; stroke-linecap:round;'
-                            points='516.8000000000001,700.875 509.20000000000005,700.875 509.20000000000005,819.0 516.8000000000001,819.0' />
+                            points='516.6,697.7599999999999 509.0,697.7599999999999 509.0,815.3599999999999 516.6,815.3599999999999' />
 
 <polyline style='stroke:#009E73; stroke-width:2; fill:none; stroke-linejoin:round; stroke-linecap:round;'
-                            points='714.8000000000001,700.875 722.4000000000001,700.875 722.4000000000001,819.0 714.8000000000001,819.0' />
+                            points='714.6,697.7599999999999 722.2,697.7599999999999 722.2,815.3599999999999 714.6,815.3599999999999' />
 </svg>

data/docs/assets/svg/001.svg

@@ -1,17 +1,17 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-  <svg width="367.6000000000001" height="336.375" viewBox="-17.6, 0, 385.2000000000001, 347.625" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <svg width="353.80000000000007" height="334.88000000000005" viewBox="-16.8, 0, 370.6000000000001, 346.08000000000004" version="1.1" xmlns="http://www.w3.org/2000/svg">
   <defs>
-    <marker id="arrow" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="10" refY="5" markerWidth="17.6" markerHeight="17.6" orient="auto">
+    <marker id="arrow" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="10" refY="5" markerWidth="16.8" markerHeight="16.8" orient="auto">
       <path d="M 0 0 L 10 5 L 0 10" fill="#CC79A7"/>
     </marker>
-    <marker id="arrowBackward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="17.6" markerHeight="17.6" orient="auto">
+    <marker id="arrowBackward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="16.8" markerHeight="16.8" orient="auto">
       <path d="M 0 0 L 10 5 L 0 10 z" fill="#CC79A7"/>
     </marker>
-    <marker id="arrowForward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="17.6" markerHeight="17.6" orient="auto">
+    <marker id="arrowForward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="16.8" markerHeight="16.8" orient="auto">
       <path d="M 10 0 L 0 5 L 10 10 z" fill="#CC79A7"/>
     </marker>
-    <marker id="arrowBothways" markerUnits="userSpaceOnUse" viewBox="0 0 30 10" refX="15" refY="5" markerWidth="52.800000000000004" markerHeight="17.6" orient="auto">
+    <marker id="arrowBothways" markerUnits="userSpaceOnUse" viewBox="0 0 30 10" refX="15" refY="5" markerWidth="50.400000000000006" markerHeight="16.8" orient="auto">
       <path d="M 0 5 L 10 0 L 10 5 L 20 5 L 20 0 L 30 5 L 20 10 L 20 5 L 10 5 L 10 10 z" fill="#CC79A7"/>
     </marker>
     <pattern id="hatchBlack" x="10" y="10" width="10" height="10" patternUnits="userSpaceOnUse" patternTransform="rotate(45)">
@@ -24,25 +24,25 @@
       <line x1="0" y="0" x2="0" y2="10" stroke="#009E73" stroke-width="4"></line>
     </pattern>
   </defs>
-<rect x="-17.6" y="0" width="385.2000000000001" height="347.625" stroke="none" fill="white" />"
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='155.20000000000002' y='67.5'><tspan x='155.20000000000002' y='67.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">A</tspan>
+<rect x="-16.8" y="0" width="370.6000000000001" height="346.08000000000004" stroke="none" fill="white" />"
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='148.60000000000002' y='67.19999999999999'><tspan x='148.60000000000002' y='67.19999999999999' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">A</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='65.30000000000001' y='193.5'><tspan x='65.30000000000001' y='193.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">B</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='62.400000000000006' y='192.63999999999996'><tspan x='62.400000000000006' y='192.63999999999996' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">B</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='17.599999999999994' y='319.5'><tspan x='17.599999999999994' y='319.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">D</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='17.30000000000001' y='318.08000000000004'><tspan x='17.30000000000001' y='318.08000000000004' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">D</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='112.0' y='319.5'><tspan x='112.0' y='319.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">E</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='107.0' y='318.08000000000004'><tspan x='107.0' y='318.08000000000004' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">E</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='247.60000000000002' y='193.5'><tspan x='247.60000000000002' y='193.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">C</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='237.3' y='192.63999999999996'><tspan x='237.3' y='192.63999999999996' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">C</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='202.40000000000003' y='319.5'><tspan x='202.40000000000003' y='319.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">F</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='194.70000000000002' y='318.08000000000004'><tspan x='194.70000000000002' y='318.08000000000004' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">F</tspan>
 </text>
-<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='291.80000000000007' y='319.5'><tspan x='291.80000000000007' y='319.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">G</tspan>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; storoke-width: 0; font-size: 32px;' x='280.90000000000003' y='318.08000000000004'><tspan x='280.90000000000003' y='318.08000000000004' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">G</tspan>
 </text>
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='75.80000000000001' y1='137.25' x2='166.70000000000002' y2='95.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='257.6' y1='137.25' x2='166.70000000000002' y2='95.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='29.599999999999994' y1='263.25' x2='75.80000000000001' y2='221.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='122.00000000000001' y1='263.25' x2='75.80000000000001' y2='221.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='211.90000000000003' y1='263.25' x2='257.6' y2='221.625' />
-<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='303.30000000000007' y1='263.25' x2='257.6' y2='221.625' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='71.9' y1='136.64' x2='159.10000000000002' y2='95.19999999999999' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='247.3' y1='136.64' x2='159.10000000000002' y2='95.19999999999999' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='27.80000000000001' y1='262.08' x2='71.9' y2='220.63999999999996' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='117.0' y1='262.08' x2='71.9' y2='220.63999999999996' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='203.20000000000002' y1='262.08' x2='247.3' y2='220.63999999999996' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='291.40000000000003' y1='262.08' x2='247.3' y2='220.63999999999996' />
 </svg>