fontisan 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215de38977d0c94ac54def7b0aef0cc200e326172fd71b30912f6484ae122320
-  data.tar.gz: da89a4c238f617179e0da73377b83ae088d292c9e337cbc5c18832308864d970
+  metadata.gz: f84b59fae400f9db9dd05b2ddebce11bedb865138026f7a3a6d1b7ce0b3d8f2a
+  data.tar.gz: 563b27ed9dc91412fb83d7769a72a0d618109e3a6394236c7648524a60ad4fb6
 SHA512:
-  metadata.gz: 5e18eef08d7be3ddd02e465497971cc020c7c5b03f40e4d92f02cf1c696d6553c9aa75b75cbea5ce4a5e43f0a7d683e57d7f1efada42b8d02b0b55da91837221
-  data.tar.gz: '02830dec034211c50cad0d5ebef7c771276808f815e5487e0a012bf08cd0b820eac0570befc0eb5a1b0bc518f5f906b5bfa3012de5d13ebe20a67cd42fb79a7c'
+  metadata.gz: 7f2d94e40b9444414113ebf842a4a84e2188199829b4caf8b9e707bea6bca89c07b5e11fa04ba2f4aff1ce7ea658004385a5e2ae2ae4b4d4094d5bb90c4d5345
+  data.tar.gz: becf5ccba115f938caeb23d29e3cc0685edc9e0cb8452f8b1ed8b7e76cc8e742adcf3f9d1f5c8b1f01c1631fcb28a4ff2305068ce6b9677ef339d8f5fb4765b9

data/.rubocop.yml

@@ -114,3 +114,9 @@ Layout/LineEndStringConcatenationIndentation:
 # Bitwise AND checks with != 0 are clearer for font bitmasks
 Style/BitwisePredicate:
   Enabled: false
+
+# Allow short math-conventional parameter names in font geometry code.
+# Point#x / Point#y are domain-standard coordinate names; renaming to
+# x_coord/y_coord adds noise without aiding readers.
+Naming/MethodParameterName:
+  AllowedNames: ["x", "y", "cp", "gid", "n"]

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-06-24 11:12:20 UTC using RuboCop version 1.86.1.
+# on 2026-06-29 07:08:46 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -12,13 +12,77 @@ Gemspec/RequiredRubyVersion:
     - 'docs/node_modules/speakingurl/speakingurl-rails.gemspec'
     - 'fontisan.gemspec'
 
-# Offense count: 1606
+# Offense count: 21
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'lib/fontisan/cldr/unicode_set_parser.rb'
+    - 'lib/fontisan/hints.rb'
+    - 'lib/fontisan/models.rb'
+    - 'lib/fontisan/pipeline.rb'
+    - 'lib/fontisan/pipeline/strategies.rb'
+    - 'lib/fontisan/tables.rb'
+    - 'lib/fontisan/tables/cff.rb'
+    - 'spec/fontisan/cldr/config_spec.rb'
+    - 'spec/fontisan/cldr/unicode_set_parser_spec.rb'
+    - 'spec/fontisan/cli/cldr_cli_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith.
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
+  Exclude:
+    - 'lib/fontisan/cldr/unicode_set_parser.rb'
+    - 'spec/fontisan/cldr/index_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Layout/BlockEndNewline:
+  Exclude:
+    - 'lib/fontisan/cldr/unicode_set_parser.rb'
+    - 'spec/fontisan/cldr/index_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLines:
+  Exclude:
+    - 'lib/fontisan/cli.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
+# SupportedStylesAlignWith: start_of_line, relative_to_receiver
+Layout/IndentationWidth:
+  Exclude:
+    - 'lib/fontisan/cldr/unicode_set_parser.rb'
+    - 'spec/fontisan/cldr/index_spec.rb'
+
+# Offense count: 1641
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
+# Offense count: 21
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/fontisan/cldr/unicode_set_parser.rb'
+    - 'lib/fontisan/hints.rb'
+    - 'lib/fontisan/models.rb'
+    - 'lib/fontisan/pipeline.rb'
+    - 'lib/fontisan/pipeline/strategies.rb'
+    - 'lib/fontisan/tables.rb'
+    - 'lib/fontisan/tables/cff.rb'
+    - 'spec/fontisan/cldr/config_spec.rb'
+    - 'spec/fontisan/cldr/unicode_set_parser_spec.rb'
+    - 'spec/fontisan/cli/cldr_cli_spec.rb'
+
 # Offense count: 2
 Lint/CopDirectiveSyntax:
   Exclude:
@@ -97,7 +161,7 @@ Lint/UselessConstantScoping:
     - 'lib/fontisan/conversion_options.rb'
     - 'lib/fontisan/type1/charstrings.rb'
 
-# Offense count: 552
+# Offense count: 557
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Enabled: false
@@ -120,12 +184,12 @@ Metrics/CollectionLiteralLength:
     - 'lib/fontisan/type1/agl.rb'
     - 'lib/fontisan/type1/encodings.rb'
 
-# Offense count: 304
+# Offense count: 308
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 844
+# Offense count: 849
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 135
@@ -136,22 +200,16 @@ Metrics/ParameterLists:
   Max: 39
   MaxOptionalParameters: 4
 
-# Offense count: 229
+# Offense count: 231
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Enabled: false
 
-# Offense count: 24
+# Offense count: 166
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
-  Exclude:
-    - 'lib/fontisan/optimizers/subroutine_optimizer.rb'
-    - 'lib/fontisan/tables/cff2/blend_operator.rb'
-    - 'lib/fontisan/tables/glyf/curve_converter.rb'
-    - 'lib/fontisan/type1/seac_expander.rb'
-    - 'lib/fontisan/type1/ttf_to_type1_converter.rb'
-    - 'lib/fontisan/variation/optimizer.rb'
+  Enabled: false
 
 # Offense count: 13
 # Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
@@ -229,7 +287,7 @@ RSpec/DescribeMethod:
     - 'spec/fontisan/type1/seac_expander_spec.rb'
     - 'spec/fontisan/type1_real_fonts_spec.rb'
 
-# Offense count: 1446
+# Offense count: 1458
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 66
@@ -306,7 +364,7 @@ RSpec/MultipleDescribes:
     - 'spec/fontisan/utils/thread_pool_spec.rb'
     - 'spec/fontisan/variation/cache_spec.rb'
 
-# Offense count: 1868
+# Offense count: 1902
 RSpec/MultipleExpectations:
   Max: 19
 
@@ -338,7 +396,7 @@ RSpec/RepeatedExample:
     - 'spec/fontisan/metrics_calculator_spec.rb'
     - 'spec/fontisan/tables/os2_spec.rb'
 
-# Offense count: 22
+# Offense count: 23
 # Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
 # SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
@@ -374,6 +432,18 @@ Security/Open:
   Exclude:
     - 'Rakefile'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# AllowedMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'lib/fontisan/cldr/unicode_set_parser.rb'
+    - 'spec/fontisan/cldr/index_spec.rb'
+
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 Style/ComparableClamp:
@@ -408,6 +478,12 @@ Style/HashLikeCase:
     - 'lib/fontisan/commands/unpack_command.rb'
     - 'lib/fontisan/models/validation_report.rb'
 
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+Style/MultilineIfModifier:
+  Exclude:
+    - 'lib/fontisan/cldr/unicode_set_parser.rb'
+
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?

data/CHANGELOG.md

@@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
+### Removed
+
+- Audit subsystem (`Fontisan::Audit`, `Fontisan::Commands::Audit*`,
+  `Formatters::AuditTextRenderer` / `AuditDiffTextRenderer` /
+  `LibrarySummaryTextRenderer`, `Models::Audit::*`) — moved to ucode.
+  Never had external consumers.
+- UCD/UCDXML subsystem (`Fontisan::Ucd`, `config/ucd.yml`) — moved to
+  ucode. Never released in a published gem version.
+- `fontisan audit` and `fontisan ucd` CLI subcommands.
+
+### Added (documentation)
 - Comprehensive documentation for WOFF/WOFF2 format support
 - Color fonts documentation (COLR/CPAL, sbix, SVG tables)
 - Font validation framework documentation
@@ -16,7 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated font hinting documentation
 - Enhanced README with all v0.2.1-v0.2.7 features
 
-### Changed
+### Changed (documentation)
 - Improved documentation organization with dedicated feature guides
 - Added more examples for command-line and Ruby API usage
 

data/README.adoc

@@ -61,7 +61,7 @@ Color fonts and collections::
 * Font collection validation with per-font reporting (see link:docs/COLLECTION_VALIDATION.adoc[Collection Validation Guide])
 
 Font analysis and information::
-* Comprehensive per-face font audit (replaces `otfinfo`) covering identity, style, metrics, codepoint coverage, licensing, hinting, color capabilities, variable-font detail, OpenType layout features, UCD block/script aggregation, and CLDR language coverage — plus `--compare` mode and whole-library `--recursive --summary` mode
+* Comprehensive per-face font metadata extraction (replaces `otfinfo`) covering identity, style, metrics, codepoint coverage, licensing, hinting, color capabilities, variable-font detail, and OpenType layout features
 * Bidirectional font hint conversion (see link:docs/FONT_HINTING.adoc[Font Hinting Guide])
 * Extract comprehensive font metadata (name, version, designer, license, etc.)
 * Brief mode for fast font indexing (5x faster, metadata-only loading)
@@ -107,215 +107,11 @@ Export and interfaces::
 
 == Font audit
 
-=== General
-
-The `audit` command produces a complete per-face font audit report —
-the successor to `otfinfo`, covering everything `otfinfo` reports plus
-codepoint coverage, licensing, hinting, color capabilities, variable-font
-detail, OpenType layout, UCD block/script aggregation, and CLDR language
-coverage. It also supports collections, `--compare` mode, and whole-
-library `--recursive --summary` mode.
-
-For each face, audit reports:
-
-Identity & provenance:: `family_name`, `subfamily_name`, `full_name`,
-  `postscript_name`, `version`, `font_revision`, `source_sha256`,
-  `source_format`, `fontisan_version`, `generated_at`.
-Style:: `weight_class` (+ human label), `width_class`, `bold`, `italic`,
-  `panose`, `fs_selection_flags`.
-Coverage:: `total_codepoints`, `total_glyphs`, `cmap_subtables`,
-  `codepoint_ranges` (compact by default; `--all-codepoints` for the
-  flat list).
-Licensing:: `license_url`, `license_description`, `embedding_type`
-  (decoded `fsType`).
-Metrics:: `units_per_em`, ascender/descender/etc., x-height, cap height,
-  `metrics_consistent?` flag.
-Hinting:: `has_fpgm`, `has_prep`, `gasp_ranges`, TrueType vs PostScript
-  hint presence.
-Color capabilities:: COLR/CPAL, sbix, CBDT/CBLC, SVG table presence.
-Variable-font detail:: axes (`fvar`), named instances.
-OpenType layout:: scripts/features in GSUB and GPOS.
-Aggregations (UCD):: per-block coverage rows, per-script roll-up.
-Language coverage (opt-in via `--with-language-coverage`):: per-language
-  coverage % using CLDR exemplar sets.
-
-[source,shell]
-----
-$ fontisan audit PATH [--compare LEFT RIGHT] [--recursive] [--summary]
-                     [--brief] [--all-codepoints]
-                     [--ucd-version VERSION] [--with-language-coverage]
-                     [--cldr-version VERSION]
-                     [--font-index N] [--output PATH] [--format FORMAT]
-----
-
-Where,
-
-`PATH`:: Path to a font file (single-face audit), collection
-  (`TTC`/`OTC`/`dfont` — one report per face), or directory
-  (library mode with `--recursive`/`--summary`).
-`--compare`:: Diff two inputs (each is a font file or a saved
-  `.yaml`/`.yml`/`.json` audit report). Requires exactly two paths.
-`--recursive`:: Library mode: walk subdirectories.
-`--summary`:: Library mode: produce a `LibrarySummary`.
-`--brief`:: Fast inventory: skip metrics, hinting, color, variation,
-  OpenType layout, and UCD/CLDR aggregation. Note: distinct from
-  `info --brief` — `audit --brief` still loads the full font.
-`--all-codepoints`:: Include the full per-codepoint list (default is a
-  compact range view).
-`--ucd-version VERSION`:: Aggregate against this UCD version
-  (`latest` probes upstream).
-`--with-language-coverage`:: Compute CLDR per-language coverage %
-  (auto-downloads CLDR on first use).
-`--cldr-version VERSION`:: CLDR version (`latest` probes upstream).
-`--font-index N`:: Audit only face N of a collection.
-`--output PATH`:: Write to a directory (collection/library), file
-  (single/compare), or stdout.
-`--format FORMAT`:: `text` (default), `yaml`, or `json`.
-
-=== Command-line usage
-
-Single face:
-
-[source,shell]
-----
-$ fontisan audit NotoSans-Regular.ttf
-$ fontisan audit NotoSans-Regular.ttf --format yaml
-$ fontisan audit NotoSans-Regular.ttf --brief
-$ fontisan audit NotoSans-Regular.ttf --with-language-coverage
-----
-
-Collection (one report per face):
-
-[source,shell]
-----
-$ fontisan audit Family.ttc
-$ fontisan audit Family.ttc --font-index 2
-$ fontisan audit Family.ttc --output reports/
-----
-
-Compare two fonts or saved reports:
-
-[source,shell]
-----
-$ fontisan audit --compare a.ttf b.ttf
-$ fontisan audit --compare baseline.yaml new.ttf
-$ fontisan audit --compare v1.yaml v2.yaml --output diff.yaml
-----
-
-Library summary:
-
-[source,shell]
-----
-$ fontisan audit lib/ --summary
-$ fontisan audit lib/ --recursive --summary
-$ fontisan audit lib/ --recursive --summary --format yaml --output library.yaml
-----
-
-The library summary includes:
-
-* `root_path`, `total_files`, `total_faces`, `scanned_extensions`
-* `aggregate_metrics` — summed codepoints/glyphs/bytes
-* `script_coverage` — per-script face counts and face lists
-* `duplicate_groups` — files grouped by `source_sha256` (size > 1)
-* `license_distribution` — face counts per `license_url`
-* `per_face_reports` — the full per-face reports
-
-Files that fail to load (corrupt, unsupported) are reported on stderr
-as `skipped <path>` and excluded from the summary.
-
-UCD/CLDR cache management:
-
-[source,shell]
-----
-$ fontisan ucd status
-$ fontisan ucd list
-$ fontisan ucd download 17.0.0
-$ fontisan cldr status
-$ fontisan cldr list
-$ fontisan cldr download 45
-----
-
-=== Ruby API usage
-
-Single face:
-
-[source,ruby]
-----
-require "fontisan"
-
-# Returns an AuditReport for a single font, or an Array<AuditReport>
-# for a collection (one per face, in source order).
-report = Fontisan::Commands::AuditCommand.new(
-  "NotoSans-Regular.ttf", ucd_version: "17.0.0"
-).run
-
-report.family_name                # => "Noto Sans"
-report.licensing.license_url      # => "https://scripts.sil.org/OFL"
-report.blocks.first.fill_ratio    # => 0.742
-report.opentype_layout.features   # => ["c2sc", "calt", "case", ...]
-----
-
-Compare:
-
-[source,ruby]
-----
-diff = Fontisan::Commands::AuditCompareCommand.new(
-  "baseline.yaml", "new.ttf", ucd_version: "17.0.0"
-).run
-
-diff.field_changes.each { |c| puts "#{c.field}: #{c.left} -> #{c.right}" }
-puts "added codepoints: #{diff.codepoints.added_count}"
-----
-
-Library summary:
-
-[source,ruby]
-----
-cmd = Fontisan::Commands::AuditLibraryCommand.new(
-  "lib/", recursive: true, options: { ucd_version: "17.0.0" }
-)
-summary = cmd.run
-cmd.skipped.each { |path| warn "skipped #{path}" }
-
-summary.script_coverage.each do |row|
-  puts "#{row.script}: #{row.face_count} faces"
-end
-
-summary.duplicate_groups.each do |group|
-  puts "duplicate #{group.source_sha256[0, 8]}: #{group.files.join(', ')}"
-end
-----
-
-Brief mode (note the `audit_brief:` key — `brief:` would trigger
-metadata-only font loading via `BaseCommand`):
-
-[source,ruby]
-----
-report = Fontisan::Commands::AuditCommand.new(
-  "NotoSans-Regular.ttf", audit_brief: true, ucd_version: "17.0.0"
-).run
-----
-
-=== Architecture
-
-Each audit concern is implemented as a small extractor class
-registered in `Fontisan::Audit::Registry`. `AuditCommand` builds an
-`Audit::Context` and iterates the registry, merging each extractor's
-output into a single `Models::Audit::AuditReport`. Adding a new field
-group means adding one extractor class and one line in the registry —
-`AuditCommand` itself never changes (open/closed).
-
-Two extractor sets are defined:
-
-* `ORDERED_EXTRACTORS` — the full set (default).
-* `BRIEF_EXTRACTORS` — a cheap subset for `--brief` (provenance,
-  identity, style, licensing, coverage).
-
-Sub-models (`Licensing`, `Metrics`, `Hinting`, `ColorCapabilities`,
-`VariationDetail`, `OpenTypeLayout`, `CodepointRange`, `AuditBlock`,
-`NamedInstance`, `AuditAxis`, `ScriptFeatures`) group related fields
-on `AuditReport` (MECE). Compare mode produces an `AuditDiff`; library
-mode produces a `LibrarySummary`.
+[NOTE]
+====
+The `audit` and `ucd` subsystems have moved to the `ucode` gem. See
+the `ucode` documentation for the equivalent commands.
+====
 
 
 == Font information

data/fontisan.gemspec

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative "lib/fontisan/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "fontisan"
+  spec.version = Fontisan::VERSION
+  spec.authors = ["Ribose Inc."]
+  spec.email = ["open.source@ribose.com"]
+
+  spec.summary = "Font analysis tools and utilities for OpenType fonts"
+  spec.description = <<~HEREDOC
+    Fontisan provides font analysis tools and utilities. It is
+    designed as a pure Ruby implementation with full object-oriented architecture,
+    supporting extraction of information from OpenType and TrueType fonts (OTF, TTF, OTC, TTC).
+
+    The gem provides both a Ruby library API and a command-line interface,
+    with structured output formats (YAML, JSON, text).
+  HEREDOC
+
+  spec.homepage = "https://github.com/fontist/fontisan"
+  spec.license = "BSD-2-Clause"
+  spec.required_ruby_version = ">= 3.0.0"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/fontist/fontisan"
+  spec.metadata["changelog_uri"] = "https://github.com/fontist/fontisan/blob/main/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "base64"
+  spec.add_dependency "bindata", "~> 2.5"
+  spec.add_dependency "brotli", "~> 0.5"
+  spec.add_dependency "logger"
+  spec.add_dependency "lutaml-model", "~> 0.8"
+  spec.add_dependency "nokogiri", "~> 1.16"
+  spec.add_dependency "thor", "~> 1.3"
+end

data/lib/fontisan/cldr/unicode_set_parser.rb

@@ -28,7 +28,10 @@ module Fontisan
       # @param set_string [String] bracketed ICU UnicodeSet, e.g. "[a-zà]"
       # @return [Array<Integer>] sorted, deduplicated codepoints
       def call(set_string)
-        raise ParseError, "input must be bracketed" unless set_string.start_with?("[") && set_string.end_with?("]")
+        unless set_string.start_with?("[") && set_string.end_with?("]")
+          raise ParseError,
+                "input must be bracketed"
+        end
 
         body = set_string[1..-2]
         negate = body.start_with?("^")
@@ -125,8 +128,13 @@ module Fontisan
         return nil unless chars[start + 2] == "{"
 
         # \u{XXX...} variable hex
-        end_idx = (start + 3..).find { |j| j >= chars.length || chars[j] == "}" }
-        raise ParseError, "unclosed \\u{ escape" if end_idx.nil? || chars[end_idx] != "}"
+        end_idx = (start + 3..).find do |j|
+          j >= chars.length || chars[j] == "}"
+        end
+        if end_idx.nil? || chars[end_idx] != "}"
+          raise ParseError,
+                "unclosed \\u{ escape"
+        end
 
         hex = chars[(start + 3)...end_idx].join
         cp = hex.to_i(16)
@@ -139,10 +147,16 @@ module Fontisan
       def four_hex(chars, start, marker)
         # \uXXXX — exactly 4 hex digits
         hex = chars[(start + 2), 4]&.join
-        raise ParseError, "truncated \\#{marker} escape" if hex.nil? || hex.length < 4
+        if hex.nil? || hex.length < 4
+          raise ParseError,
+                "truncated \\#{marker} escape"
+        end
 
         cp = hex.to_i(16)
-        raise ParseError, "\\#{marker} escape with non-hex digits" if cp.zero? && !hex.match?(/\A0+\z/)
+        if cp.zero? && !hex.match?(/\A0+\z/)
+          raise ParseError,
+                "\\#{marker} escape with non-hex digits"
+        end
 
         [cp, 6]
       end
@@ -154,7 +168,10 @@ module Fontisan
         raise ParseError, "truncated \\U escape" if hex.nil? || hex.length < 8
 
         cp = hex.to_i(16)
-        raise ParseError, "\\U escape with non-hex digits" if cp.zero? && !hex.match?(/\A0+\z/)
+        if cp.zero? && !hex.match?(/\A0+\z/)
+          raise ParseError,
+                "\\U escape with non-hex digits"
+        end
 
         [cp, 10]
       end

data/lib/fontisan/cldr/version_resolver.rb

@@ -9,7 +9,7 @@ module Fontisan
   module Cldr
     # Resolves a user-supplied version intent to a concrete CLDR version.
     #
-    # Mirrors {Ucd::VersionResolver}. Three input modes:
+    # Three input modes:
     #
     #   resolve(nil)           # default_version from config
     #   resolve(:default)      # default_version from config