rsyntaxtree 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22d15ae9e17b8312dc6fdc9c37c4fe942e981854eb69589eb4b117acd1d781b
-  data.tar.gz: 983152369ea224f73372c0e7f7754bc5db36e65fab6d20eec235757dde5a44b0
+  metadata.gz: 0e09c9414509d88c6bb4d1bc9b8acdb5384094e642a1fb4765c62a4ffe6a4ba0
+  data.tar.gz: c4f617a630db5edf5373ceeeb4c03b889cc84d548201a4746f448386db2efebe
 SHA512:
-  metadata.gz: 7d754218424e09ebf23c84471f192f5f3192dd0a94e1b277e3c28bfed2cdcd5ca5e0cb4785fd19f37584811943cd09e0eb9a22595f2b0c321add4d417bda08c3
-  data.tar.gz: 024f6fd854639fee40d7377509b2f36b00cab56c86929c6d2c1b833aab7c0ad77b6a519a5506a679fa315c69c8b1fe7c16bf1665e425ac4747cb6714feb67c2a
+  metadata.gz: 3d1e620f2662c43e3c1c66b55750ae252fa90e978ddfebed0fc5937cc8265014f3fc02aed3ee3627b4a2de264709c58e2e076884c1f0c869c8868db9dcf42237
+  data.tar.gz: 7f6f5d8ccb8b0f3f50363e5e1809ec32461e677458ec4b53bfbe383ef48889ed6ff8f2fda1edfc47fafcf4747857fcf260a1007d083733e20aeb4eefaf987b00

data/.github/FUNDING.yml

@@ -0,0 +1,6 @@
+# These are supported funding model platforms
+
+github: [yohasebe]
+ko_fi: yohasebe
+buy_me_a_coffee: yohasebe
+# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

data/.gitignore

@@ -18,3 +18,4 @@ tags
 .rubocop_todo.yml
 .solargraph.yml
 
+CLAUDE.md

data/.ruby-version

@@ -0,0 +1 @@
+4.0.0

data/CHANGELOG.md

@@ -0,0 +1,34 @@
+# Changelog
+
+## [1.4.0] - 2026-01
+
+### Added
+- Per-node coloring with `@color:` syntax (named colors and hex colors)
+- Penn Treebank format support with escaped parentheses (`\(`, `\)`)
+- Standard input support for piping tree data
+- Configuration file support (`.rsyntaxtreerc`)
+- Config file validation with helpful error messages
+
+### Fixed
+- Triangle connector now correctly draws from parent to child (not child to grandchild)
+
+### Documentation
+- Added TikZ output limitations section
+- Improved README with Features section
+- Added examples for per-node coloring (054, 055, 056)
+
+## [1.3.2] - 2024
+
+- Garbage collection friendly implementation
+
+## [1.3.1] - 2024
+
+- Bug fixes and improvements
+
+## [1.3.0] - 2024
+
+- TikZ/forest LaTeX output support
+
+## Previous versions
+
+See commit history for earlier changes.

data/Gemfile

@@ -6,3 +6,9 @@ gem "optimist"
 gem "parslet"
 gem "rmagick"
 gem "rsvg2"
+
+group :development, :test do
+  gem "minitest"
+  gem "nokogiri"
+  gem "rake"
+end

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2007-2026 Yoichiro Hasebe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,26 +1,76 @@
 <img src='https://github.com/yohasebe/rsyntaxtree/blob/master/img/rsyntaxtree.png?raw=true' style='width: 256px;' />
 
-**RSyntaxTree** is a graphical syntax tree generator for linguistic research 
+**RSyntaxTree** is a graphical syntax tree generator for linguistic research.
 
-## Documentation
+<p>
+  <a href="https://yohasebe.com/rsyntaxtree"><strong>Web App</strong></a> ·
+  <a href="https://yohasebe.github.io/rsyntaxtree/examples"><strong>Example Gallery</strong></a> ·
+  <a href="https://yohasebe.github.io/rsyntaxtree/documentation"><strong>Documentation</strong></a>
+</p>
 
-Documentation is currently available in the following languages:
+## Features
 
-- [Documentation in English](https://yohasebe.github.io/rsyntaxtree/documentation)
-- [日本語ドキュメント](https://yohasebe.github.io/rsyntaxtree/documentation_ja)
+RSyntaxTree provides a rich set of features for creating publication-quality syntax trees:
+
+### Basic Syntax
+
+Use bracket notation to define tree structures:
+
+```text
+[S [NP the cat] [VP [V sleeps]]]
+```
+
+### Text Decoration
+
+Apply various text styles to node labels:
+
+- **Bold**: `**text**`
+- *Italic*: `*text*`
+- Subscript: `_text_`
+- Superscript: `__text__`
+- Overline/Underline/Strikethrough: `=text=`, `-text-`, `~text~`
+
+### Per-Node Coloring
+
+Apply custom colors to individual nodes using `@color:` syntax:
+
+```text
+[S [@red:NP the cat] [@blue:VP sleeps]]
+```
+
+Supports named colors (`red`, `blue`, `green`, etc.) and hex colors (`@#FF5733:`).
+
+### Enclosures and Triangles
+
+- **Brackets**: `[#NP text]` → draws brackets around the node
+- **Rectangle**: `[##NP text]` → draws a rectangle around the node
+- **Triangle**: `[^NP the quick fox]` → draws a triangle connector
+
+Combine with colors: `[#@red:NP text]`, `[^@blue:VP phrase]`
+
+### Path Drawing
+
+Connect nodes with lines or arrows:
+
+```text
+[S [NP+1 text] [VP [V+>1 connects]]]
+```
+
+### Multiple Output Formats
+
+Generate trees in PNG, SVG, PDF, JPG, or GIF format.
 
-- [Example Gallery](https://yohasebe.github.io/rsyntaxtree/examples)
 ## Web Interface
 
 <img src='https://github.com/yohasebe/rsyntaxtree/blob/master/img/rsyntaxtree-web-screenshot.png?raw=true' width='700px'/>
 
-See updates and a working web interface available at <https://yohasebe.com/rsyntaxtree>.
+A working web interface is available at <https://yohasebe.com/rsyntaxtree>.
 
-You can run RSyntaxTree's web interface on your local machine using Docker Desktop. See [RSyntaxTree Web UI](https://github.com/yohasebe/rsyntaxtree_web)
+You can also run RSyntaxTree's web interface on your local machine using Docker Desktop. See [RSyntaxTree Web UI](https://github.com/yohasebe/rsyntaxtree_web).
 
 ## Examples
 
-See [RSyntaxTree Example Gallery](https://yohasebe.github.io/rsyntaxtree/examples) page for examples for
+See [RSyntaxTree Example Gallery](https://yohasebe.github.io/rsyntaxtree/examples) for examples covering:
 
 - Generative Grammar
 - Combinatory Categorial Grammar
@@ -29,9 +79,7 @@ See [RSyntaxTree Example Gallery](https://yohasebe.github.io/rsyntaxtree/example
 - Construction Grammar
 - Pragmatics
 - Phonology
-- etc.
-
-**NOTE**: Some tree structures in the example gallery are experimental in the sense that they are not drawn according to conventions of the field.
+- and more
 
 **Input text**
 
@@ -56,65 +104,99 @@ See [RSyntaxTree Example Gallery](https://yohasebe.github.io/rsyntaxtree/example
 
 ## Installation
 
-`# gem install rsyntaxtree`
+```bash
+gem install rsyntaxtree
+```
 
-**NOTE**: Currently, installation of the gem package on macOS is not recommended. Please use the [Docker image](https://hub.docker.com/r/yohasebe/rsyntaxtree) or the [web interface](https://yohasebe.com/rsyntaxtree).
+### macOS Installation Notice
 
-## Usage
+**Important for macOS users:** If you encounter build errors for native extensions (`gobject-introspection`, `cairo-gobject`, `gio2`), run the following commands before installing RSyntaxTree:
 
-For the web interface, see Usage section of <https://yohasebe.com/rsyntaxtree>.
+```bash
+gem install gobject-introspection -- --with-ldflags="-Wl,-undefined,dynamic_lookup"
+gem install cairo-gobject -- --with-ldflags="-Wl,-undefined,dynamic_lookup"
+gem install gio2 -- --with-ldflags="-Wl,-undefined,dynamic_lookup"
+```
 
-For the command-line interface, type `$rsyntaxtree -h` after installation. Here's what you get:
+Then install RSyntaxTree:
 
-```text
-RSyntaxTree, (linguistic) syntax tree generator written in Ruby.
+```bash
+gem install rsyntaxtree
+```
+
+Alternatively, use the [Docker image](https://hub.docker.com/r/yohasebe/rsyntaxtree) or the [web interface](https://yohasebe.com/rsyntaxtree).
+
+## Usage
+
+### Command Line
 
+```text
 Usage:
-       1) rsyntaxtree [options] "[VP [VP [V set] [NP bracket notation]] [ADV here]]"
-       2) rsyntaxtree [options] "/path/to/text/file"
-where [options] are:
-  -o, --outdir=<s>                     Output directory (default: ./)
-  -u, --outfilename=<s>                Output file base name (default: syntree)
-  -f, --format=<s>                     Output format: png, gif, jpg, pdf, or svg (default: png)
-  -l, --leafstyle=<s>                  visual style of tree leaves: auto, triangle, bar, or nothing (default: auto)
-  -n, --fontstyle=<s>                  Font style (available when ttf font is specified): sans, serif, cjk, mono (default: sans)
-  -t, --font=<s>                       Path to a ttf font used to generate tree (optional)
-  -s, --fontsize=<i>                   Size: 8-26 (default: 16)
-  -i, --linewidth=<i>                  Size: 1-5 (default: 1)
-  -v, --vheight=<f>                    Connector Height: 0.5-5.0 (default: 2.0)
-  -c, --color=<s>                      Color text and bars: modern, traditional, or off (default: modern)
-  -y, --symmetrize=<s>                 Generate radically symmetrical, balanced tree: on or off (default: off)
-  -r, --transparent=<s>                Make background transparent: on or off (default: off)
-  -p, --polyline=<s>                   draw polyline connectors: on or off (default: off)
-  -d, --hide-default-connectors=<s>    make default connectors transparent: on or off (default: off)
-  -h, --help                           This is a custom help message
-  -e, --version                        Print version and exit
+       1) rsyntaxtree [options] "[S [NP text] [VP here]]"
+       2) rsyntaxtree [options] "(S (NP text) (VP here))"  # Penn Treebank format
+       3) rsyntaxtree [options] "/path/to/text/file"
+       4) echo "[S [NP text] [VP here]]" | rsyntaxtree [options]
 ```
 
-See the [documentation](https://yohasebe.github.io/rsyntaxtree/documentation) for more detailed info about the syntax.
+### Options
 
-## References
+| Option | Description | Default |
+|--------|-------------|---------|
+| `-o, --outdir` | Output directory | `./` |
+| `-f, --format` | Output format: png, gif, jpg, pdf, svg | `png` |
+| `-l, --leafstyle` | Leaf style: auto, triangle, bar, nothing | `auto` |
+| `-n, --fontstyle` | Font style: sans, serif, cjk, mono | `sans` |
+| `-s, --fontsize` | Font size: 8-26 | `16` |
+| `-c, --color` | Color mode: modern, traditional, off | `modern` |
+| `-y, --symmetrize` | Symmetrical tree: on, off | `off` |
+| `-p, --polyline` | Polyline connectors: on, off | `off` |
+
+Run `rsyntaxtree -h` for the full list of options.
+
+### Input Formats
 
-Please use the following BibTeX entry when referring to RSyntaxTree.
+- **Bracket notation**: `[S [NP text] [VP here]]`
+- **Penn Treebank format**: `(S (NP text) (VP here))` - automatically converted
+- **Standard input**: `echo "[S [NP text]]" | rsyntaxtree`
 
+### Configuration File
+
+RSyntaxTree supports configuration files (`.rsyntaxtreerc`) in YAML format. Place the file in your home directory or current working directory.
+
+```yaml
+# ~/.rsyntaxtreerc
+format: svg
+color: modern
+fontsize: 18
 ```
-@misc{rsyntaxtree_2024,
+
+CLI options override config file settings.
+
+## Documentation
+
+For detailed documentation on syntax and markup:
+
+- [Documentation in English](https://yohasebe.github.io/rsyntaxtree/documentation)
+- [日本語ドキュメント](https://yohasebe.github.io/rsyntaxtree/documentation_ja)
+- [Example Gallery](https://yohasebe.github.io/rsyntaxtree/examples)
+
+## References
+
+Please use the following BibTeX entry when citing RSyntaxTree:
+
+```bibtex
+@misc{rsyntaxtree,
   author = {Yoichiro Hasebe},
-  title = {RSyntaxTree: A graphical syntax tree image generator}
+  title = {RSyntaxTree: A graphical syntax tree image generator},
   url = {https://yohasebe.com/rsyntaxtree},
-  year = {2024}
+  year = {2026}
 }
 ```
 
-## Development
-
-For the latest updates and downloads please visit <http://github.com/yohasebe/rsyntaxtree>
-
 ## Author
 
-Yoichiro Hasebe <yohasebe@gmail.com>
+Yoichiro Hasebe (<yohasebe@gmail.com>)
 
 ## License
 
 RSyntaxTree is distributed under the [MIT License](http://www.opensource.org/licenses/mit-license.php).
-

data/Rakefile

@@ -9,24 +9,58 @@ require_relative 'lib/rsyntaxtree/utils'
 # task default: "test"
 
 Rake::TestTask.new do |task|
-  task.pattern = "test/*_test.rb"
-  task.warning = false
+    task.pattern = "test/*_test.rb"
+    task.warning = false
 end
 
 desc "Generate SVG and PNG example images locally"
 task :generate do
-  require_relative "dev/generate_examples"
+    require_relative "dev/generate_examples"
 end
 
 desc "Docker image Build"
 task :docker_build do
-  `docker build ./ -t rsyntaxtree_devel`
+    `docker build ./ -t rsyntaxtree_devel`
 end
 
 desc "Generate SVG and PNG example images using Docker image"
 task :docker_generate do
-  docpath = File.expand_path(File.join(__dir__, "docs"))
-  `docker build ./ -t rsyntaxtree_devel`
-  `docker run --rm -v #{docpath}:/rsyntaxtree/hostdocs rsyntaxtree_devel ruby /rsyntaxtree/dev/generate_examples.rb /rsyntaxtree/hostdocs`
-  `cat #{docpath}/generate_examples.log`
+    docpath = File.expand_path(File.join(__dir__, "docs"))
+    `docker build ./ -t rsyntaxtree_devel`
+    `docker run --rm -v #{docpath}:/rsyntaxtree/hostdocs rsyntaxtree_devel ruby /rsyntaxtree/dev/generate_examples.rb /rsyntaxtree/hostdocs`
+    `cat #{docpath}/generate_examples.log`
+end
+
+# Add new task for macOS environment configuration
+
+desc "Configure Bundler build options for macOS"
+task :setup_macos do
+    require "rbconfig"
+    host_os = RbConfig::CONFIG['host_os']
+
+    # Check if the host OS is macOS (Darwin)
+
+    if host_os =~ /darwin/
+        puts "macOS detected. Setting up build options for native extensions..."
+
+        gems_with_options = {
+            "gobject-introspection" => '--with-ldflags=-Wl,-undefined,dynamic_lookup',
+            "cairo-gobject"         => '--with-ldflags=-Wl,-undefined,dynamic_lookup',
+            "gio2"                  => '--with-ldflags=-Wl,-undefined,dynamic_lookup'
+        }
+
+        # Configure each gem with the necessary ldflags option using Bundler config command
+
+        gems_with_options.each do |gem_name, flags|
+            command = "bundle config build.#{gem_name} \"#{flags}\""
+            puts "Executing: #{command}"
+            unless system(command)
+                abort("Failed to execute command: #{command}")
+            end
+        end
+
+        puts "macOS setup complete. Please run 'bundle install' after this."
+    else
+        puts "This setup task is intended for macOS environments. Current OS: #{host_os}"
+    end
 end

data/bin/rsyntaxtree

@@ -2,9 +2,85 @@
 # frozen_string_literal: true
 
 require 'optimist'
+require 'yaml'
 
 require_relative '../lib/rsyntaxtree'
 require_relative '../lib/rsyntaxtree/utils'
+require_relative '../lib/rsyntaxtree/format_converter'
+
+# Valid configuration keys and their validators
+CONFIG_VALIDATORS = {
+  outdir: ->(v) { FileTest.directory?(v) ? nil : "must be an existing directory path" },
+  outfilename: ->(v) { v.is_a?(String) ? nil : "must be a string" },
+  format: ->(v) { /\A(png|jpg|gif|pdf|svg)\z/ =~ v.to_s ? nil : "must be png, jpg, gif, pdf, or svg" },
+  leafstyle: ->(v) { /\A(auto|triangle|bar|nothing)\z/ =~ v.to_s ? nil : "must be auto, triangle, bar, or nothing" },
+  fontstyle: ->(v) { /\A(sans|serif|cjk|mono)\z/ =~ v.to_s ? nil : "must be sans, serif, cjk, or mono" },
+  font: ->(v) { v.nil? || File.exist?(v) ? nil : "must be path to an existing ttf font" },
+  fontsize: ->(v) { v.is_a?(Integer) && v >= 8 && v <= 26 ? nil : "must be in the range of 8-26" },
+  linewidth: ->(v) { v.is_a?(Integer) && v >= 1 && v <= 5 ? nil : "must be in the range of 1-5" },
+  vheight: ->(v) { v.is_a?(Numeric) && v >= 0.5 && v <= 5.0 ? nil : "must be in the range of 0.5-5.0" },
+  color: ->(v) { /\A(modern|traditional|on|off|true|false)\z/ =~ v.to_s ? nil : "must be modern, traditional, or off" },
+  symmetrize: ->(v) { /\A(on|off|true|false)\z/ =~ v.to_s ? nil : "must be on or off" },
+  transparent: ->(v) { /\A(on|off|true|false)\z/ =~ v.to_s ? nil : "must be on or off" },
+  polyline: ->(v) { /\A(on|off|true|false)\z/ =~ v.to_s ? nil : "must be on or off" },
+  hide_default_connectors: ->(v) { /\A(on|off|true|false)\z/ =~ v.to_s ? nil : "must be on or off" }
+}.freeze
+
+# Validate configuration and return errors/warnings
+def validate_config(config, source_path)
+  errors = []
+  warnings = []
+
+  config.each do |key, value|
+    key_sym = key.to_sym
+    if CONFIG_VALIDATORS.key?(key_sym)
+      error_msg = CONFIG_VALIDATORS[key_sym].call(value)
+      if error_msg
+        errors << "Error in #{source_path}: '#{key}' #{error_msg} (got: #{value.inspect})"
+      end
+    else
+      warnings << "Warning: unknown option '#{key}' in #{source_path}"
+    end
+  end
+
+  { errors: errors, warnings: warnings }
+end
+
+# Load configuration from .rsyntaxtreerc files
+def load_config
+  config = {}
+  all_errors = []
+  all_warnings = []
+
+  config_files = [
+    File.join(Dir.home, '.rsyntaxtreerc'),
+    File.join(Dir.pwd, '.rsyntaxtreerc')
+  ]
+
+  config_files.each do |path|
+    if File.exist?(path)
+      file_config = YAML.safe_load(File.read(path), symbolize_names: true) || {}
+      validation = validate_config(file_config, path)
+      all_errors.concat(validation[:errors])
+      all_warnings.concat(validation[:warnings])
+      config.merge!(file_config)
+    end
+  end
+
+  { config: config, errors: all_errors, warnings: all_warnings }
+end
+
+loaded = load_config
+file_config = loaded[:config]
+
+# Show warnings for unknown keys
+loaded[:warnings].each { |w| warn w }
+
+# Exit with errors for invalid values
+unless loaded[:errors].empty?
+  loaded[:errors].each { |e| warn e }
+  exit 1
+end
 
 opts = Optimist.options do
   version "RSyntaxTree #{RSyntaxTree::VERSION} (c) 2024 Yoichiro Hasebe"
@@ -12,14 +88,16 @@ opts = Optimist.options do
     RSyntaxTree, (linguistic) syntax tree generator written in Ruby.
 
     Usage:
-           1) rsyntaxtree [options] "[VP [VP [V set] [NP bracket notation]] [ADV here]]"
-           2) rsyntaxtree [options] "/path/to/text/file"
+           1) rsyntaxtree [options] "[S [NP text] [VP here]]"
+           2) rsyntaxtree [options] "(S (NP text) (VP here))"  # Penn TreeBank format
+           3) rsyntaxtree [options] "/path/to/text/file"
+           4) echo "[S [NP text] [VP here]]" | rsyntaxtree [options]
     where [options] are:
   BANNER
 
   opt :outdir, "Output directory", default: "./"
   opt :outfilename, "Output file base name", default: "syntree"
-  opt :format, "Output format: png, pdf, or svg", default: "png"
+  opt :format, "Output format: png, jpg, gif, pdf, or svg", default: "png"
   opt :leafstyle, "visual style of tree leaves: auto, triangle, bar, or nothing", default: "auto"
   opt :fontstyle, "Font style (available when ttf font is specified): sans, serif, cjk, mono", default: "sans"
   opt :font, "Path to a ttf font used to generate tree (optional)", type: String
@@ -48,17 +126,38 @@ Optimist.die :transparent, "must be either on or off" unless /\A(on|off|true|fal
 Optimist.die :polyline, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:polyline]
 Optimist.die :hide_default_connectors, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:hide_default_connectors]
 
+# Merge config file options with CLI options (CLI takes precedence)
 string_opts = {}
+
+# First, apply config file defaults
+file_config.each do |key, value|
+  string_opts[key.to_sym] = value
+end
+
+# Then, apply CLI options (overrides config file)
 opts.each do |key, value|
-  string_opts[key.to_sym] = value unless key == :font && !value
+  key_sym = key.to_sym
+  # Skip internal optimist keys and nil font
+  next if key.to_s.start_with?('_') || (key == :font && !value)
+  # Only override if explicitly given on CLI or not in config
+  if opts[:"#{key}_given"] || !file_config.key?(key_sym)
+    string_opts[key_sym] = value
+  end
 end
 
 data = if ARGV[0] && File.exist?(File.expand_path(ARGV[0]))
          File.read ARGV[0]
-       else
+       elsif ARGV[0]
          ARGV[0]
+       elsif !$stdin.tty?
+         $stdin.read
+       else
+         nil
        end
 
+# Auto-convert Penn TreeBank format to bracket notation
+data = RSyntaxTree::FormatConverter.to_bracket(data) if data
+
 begin
   RSyntaxTree::RSGenerator.check_data(data)
 rescue RSTError => e
@@ -72,20 +171,9 @@ begin
   ext = string_opts[:format]
   outfilename = string_opts[:outfilename] || "syntree"
   filepath = File.expand_path(string_opts[:outdir]) + "/#{outfilename}." + ext
-  case ext
-  when "pdf"
-    outfile = File.new(filepath, "wb")
-    outfile.write rsg.draw_pdf
-    outfile.close
-  when "png"
-    outfile = File.new(filepath, "wb")
-    outfile.write rsg.draw_png
-    outfile.close
-  when "svg"
-    outfile = File.new(filepath, "wb")
-    outfile.write rsg.draw_svg
-    outfile.close
-  end
+  draw_method = "draw_#{ext}"
+  output = rsg.send(draw_method)
+  File.binwrite(filepath, output)
 rescue RSTError => e
   puts e
   exit

data/docs/_examples/016.md

@@ -1,6 +1,6 @@
 ---
 name: "016"
-caption: "Tick-tac-toe"
+caption: "Tic-tac-toe"
 color: "off"
 category: "Miscellaneous"
 polyline: "off"

data/docs/_examples/053.md

@@ -13,29 +13,22 @@ font: "Noto Serif"
 ---
 ```
 [expr
-  [id x
-  
-  ]
+  [id x]
   [suffix
     \[
-    [id 2
-    
-    ]
+    [id 2 ]
     \]
     [suffix
       \[
-      [id 3
-      
-      ]
+      [id 3 ]
       \]
       [suffix
         \[
-        [id 4
-        
-        ]
+        [id 4 ]
         \]
       ]
     ]
   ]
 ]
+  
 ```

data/docs/_examples/054.md

@@ -0,0 +1,22 @@
+---
+name: "054"
+color: "on"
+caption: "Per-node coloring (named colors)"
+category: "Miscellaneous"
+polyline: "off"
+symmetrization: "off"
+connector: "auto"
+connector_height: "2.0"
+linewidth: "1"
+hide_default_connectors: "off"
+font: "Noto Sans"
+---
+```
+[S
+  [@red:NP the dog]
+  [@blue:VP
+    [@green:V runs]
+    [@orange:Adv quickly]
+  ]
+]
+```

data/docs/_examples/055.md

@@ -0,0 +1,24 @@
+---
+name: "055"
+color: "on"
+caption: "Per-leaf coloring (hex colors)"
+category: "Miscellaneous"
+polyline: "off"
+symmetrization: "off"
+connector: "auto"
+connector_height: "2.0"
+linewidth: "1"
+hide_default_connectors: "off"
+font: "Noto Sans"
+---
+```
+[S
+  [NP
+    [Det @#E63946:the]
+    [N @#457B9D:cat]
+  ]
+  [VP
+    [V @#2A9D8F:sleeps]
+  ]
+]
+```