rsyntaxtree 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32cc6cec6f19c5fe62dc9a6de16493d6db35680f72e40b6bbd36f0b1e98add96
-  data.tar.gz: b6f928fd6919bb289765fac684ae3e98f7988103985deebcb6f73e7f8836e939
+  metadata.gz: '0804e9119e0ebb089b4109ae05c9353180362bd6e86fddbf2e4da00db3b08e18'
+  data.tar.gz: '01867ffda61d7f81fd3d81a9f6ad44ba83eda4f7d89d1b3b05d53b196bc23fa1'
 SHA512:
-  metadata.gz: 50d8b1e91e3c71286406bf45e5e5cdeb2d8170f98a513a6662f0b593a7e077b7af2650057e6d9670469ed937b6ddc7c0073868df6833721c2ba3c81a8f691c46
-  data.tar.gz: 92df8d83ddbabcdd3cbeaa30f26868da4a13c168d5f97600475f552a197f7ebba70a80cc6ab272f98e2a68c1b8bd9d9a9094d3b01235ec556790f4a944337fee
+  metadata.gz: 990e4522fe0e0694d009eddebc2b3b2af98e5beda1f3e2daf9fbf1250199cef31b981215d1ae7db3b711d0030826e2445c7011f427223f8e081bffb8d76451ae
+  data.tar.gz: fe620d8c1fe64c289b18d853d6663ceaae5ea8a7486a5f0cf0ce578f8c0e9073e48251f0d7a933d0c7afa9ee7fce896dd6cbf00f3499c8d5314278e9cc0e0b57

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [1.13.1] - 2026-08
+
+### Fixed
+- `^` at the head of a leaf draws the triangle it asks for. The mark may be
+  written on the node's label or on the leaf's own text — `[^NP cats]` and
+  `[NP ^cats]` — and the documentation, the notation reference and the gallery
+  all use both, but only the first was drawn: the second lost its caret to the
+  parser and then a bar was drawn under it. The two now produce the same figure
+  in every connector style, and LSIF records the edge as a triangle. Three
+  gallery figures change accordingly, each toward what it was written to show.
+- An option given as an empty string is read as an option not given, rather
+  than as a value no list contains. An HTML form posts a field for every
+  control it carries, and a control with nothing selected posts the empty
+  string, so a form that has outlived one of its own controls sends that field
+  empty alongside the rest. Since option validation arrived in 1.11.0 that
+  failed the whole request: the web UI's Download buttons answered 500 for
+  every input, because the form still read a `format` select the page no longer
+  had. A value that is actually wrong is still rejected.
+
 ## [1.13.0] - 2026-08
 
 ### Added

data/lib/rsyntaxtree/base_graph.rb

@@ -221,7 +221,12 @@ module RSyntaxTree
       else
         parent = @element_list.get_id(target.parent)
 
-        vertical_indent = if !target.triangle &&
+        # A leaf with nothing drawn over it is pulled up against its node; one
+        # with a triangle over it needs the room the triangle takes. Which is
+        # which is the same question the connector asks, so it is asked the same
+        # way — reading only the leaf's own mark left `[^NP cats]` a triangle
+        # squashed into a gap that had been closed.
+        vertical_indent = if !triangle_asked_for?(parent, target) &&
                              (@leafstyle == "nothing" || @leafstyle == "none") &&
                              ETYPE_LEAF == target.type && parent.children.size == 1
                             if @direction == "ltr"
@@ -395,6 +400,22 @@ module RSyntaxTree
       end
     end
 
+    # Whether a `^` has asked for a triangle over this leaf. It may be written
+    # at the head of the node's label or at the head of the leaf's own text —
+    # `[^NP cats]` and `[NP ^cats]` — and both forms are in the gallery. Only
+    # the first was honoured here, and the second was dropped without a word:
+    # the caret vanished from the text and a bar was drawn, so an example named
+    # for its triangles had none. The rest of the layout already reads the
+    # leaf's own flag — a leaf marked this way keeps the gap a triangle needs
+    # even when connectors are off — which is what left the two sides of one
+    # rule disagreeing.
+    #
+    # Asked of a leaf only. A `^` on an internal node is that node's own mark,
+    # and it is honoured when that node is in turn the parent here.
+    def triangle_asked_for?(parent, child)
+      parent.triangle || (ETYPE_LEAF == child.type && child.triangle)
+    end
+
     def draw_connector(id = 1)
       parent = @element_list.get_id(id)
       children = parent.children.map { |c| @element_list.get_id(c) }
@@ -410,21 +431,22 @@ module RSyntaxTree
 
       if children.size == 1
         child = children[0]
+        forced = triangle_asked_for?(parent, child)
         case @leafstyle
         when "auto"
-          if parent.triangle || child.contains_phrase
+          if forced || child.contains_phrase
             triangle_to_parent(parent, child)
           else
             line_to_parent(parent, child)
           end
         when "bar"
-          if parent.triangle
+          if forced
             triangle_to_parent(parent, child)
           else
             line_to_parent(parent, child)
           end
         when "nothing", "none"
-          if parent.triangle
+          if forced
             triangle_to_parent(parent, child)
           elsif ETYPE_LEAF != child.type
             line_to_parent(parent, child)

data/lib/rsyntaxtree/lsif_graph.rb

@@ -82,21 +82,22 @@ module RSyntaxTree
 
       if children.size == 1
         child = children[0]
+        forced = triangle_asked_for?(parent, child)
         case @leafstyle
         when "auto"
-          if parent.triangle || child.contains_phrase
+          if forced || child.contains_phrase
             triangle_to_parent(parent, child)
           else
             line_to_parent(parent, child)
           end
         when "bar"
-          if parent.triangle
+          if forced
             triangle_to_parent(parent, child)
           else
             line_to_parent(parent, child)
           end
         when "nothing", "none"
-          if parent.triangle
+          if forced
             triangle_to_parent(parent, child)
           elsif ETYPE_LEAF != child.type
             line_to_parent(parent, child)

data/lib/rsyntaxtree/notation_examples.md

@@ -1,4 +1,4 @@
-RSyntaxTree examples: 75 trees, every one verified to draw.
+RSyntaxTree examples: 76 trees, every one verified to draw.
 
 Each is the input behind a figure in the gallery at https://yohasebe.github.io/rsyntaxtree/examples.
 The settings line names the options the gallery records for that figure;
@@ -279,21 +279,36 @@ Source: Radford 2004
 ## 011 — CCG derivation: forward and backward application
 
 Category: Combinatory Categorial Grammar
-Settings: color=none derivation=on direction=btt fontstyle=noto-serif leafstyle=nothing tidy=low vheight=0.7
+Settings: color=none derivation=on direction=btt fontstyle=noto-serif hspacing=2.0 leafstyle=nothing tidy=low vheight=0.5
 Source: Steedman 2000
 
 ```
-[S\t< [NP\t> [NP/N the] [N dog]] [S\\NP\t> [(S\\NP)/NP bit] [NP John]]]
+[S\t<
+  [NP\t>
+    [NP/N the]
+    [N dog]]
+  [S\\NP\t>
+    [(S\\NP)/NP bit]
+    [NP John]]]
 ```
 
 ## 012 — CCG derivation: a relative clause
 
 Category: Combinatory Categorial Grammar
-Settings: color=none derivation=on direction=btt fontstyle=noto-serif leafstyle=nothing tidy=low vheight=0.7
+Settings: color=none derivation=on direction=btt fontstyle=noto-serif hspacing=2.0 leafstyle=nothing tidy=low vheight=0.5
 Source: Steedman 2000
 
 ```
-[NP\t> [NP/N the] [N\t< [N man] [N\\N\t> [(N\\N)/(S/NP) that] [S/NP\t>B [S/(S\\NP)\t>T [NP Mary]] [(S\\NP)/NP saw]]]]]
+[NP\t>
+  [NP/N the]
+  [N\t<
+    [N man]
+    [N\\N\t>
+      [(N\\N)/(S/NP) that]
+      [S/NP\t>B
+        [S/(S\\NP)\t>T
+          [NP Mary]]
+        [(S\\NP)/NP saw]]]]]
 ```
 
 ## 013 — HPSG sample
@@ -2485,3 +2500,24 @@ Settings: fontstyle=noto-serif tidy=low vheight=1.0
     [V [<> [<> sat]]]
     [PP [P [<> on]] [NP [D the] [N mat]]]]]
 ```
+
+## 081 — CCG derivation: right node raising
+
+Category: Combinatory Categorial Grammar
+Settings: color=none derivation=on direction=btt fontstyle=noto-serif hspacing=2.0 leafstyle=nothing tidy=low vheight=0.5
+Source: Steedman 2000
+
+```
+[S\t>
+  [S/NP\t<Φ>
+    [S/NP\t>B
+      [S/(S\\NP)\t>T
+        [NP Mary]]
+      [(S\\NP)/NP likes]]
+    [conj and]
+    [S/NP\t>B
+      [S/(S\\NP)\t>T
+        [NP Bill]]
+      [(S\\NP)/NP hates]]]
+  [NP London]]
+```

data/lib/rsyntaxtree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSyntaxTree
-  VERSION = "1.13.0"
+  VERSION = "1.13.1"
 end

data/lib/rsyntaxtree.rb

@@ -151,6 +151,18 @@ module RSyntaxTree
       fontset = {}
       params.each do |keystr, value|
         key = keystr.to_sym
+        # An option given as an empty string is an option not given. An HTML
+        # form posts a field for every control it carries, and a control with
+        # nothing selected posts the empty string — so a form that has outlived
+        # one of its own controls sends `format=` and every other option along
+        # with it. Read as a value, that is a choice nobody can have made, and
+        # it failed the whole request: the web UI's three Download buttons
+        # returned 500 for every input, with the reason nowhere the user could
+        # see it. Read as silence, the default stands, which is what the sender
+        # meant.
+        next if (OPTION_VALUES.key?(key) || NUMERIC_RANGES.key?(key)) &&
+                (value.nil? || value.to_s.strip.empty?)
+
         if OPTION_VALUES.key?(key) && !OPTION_VALUES[key].include?(value.to_s)
           raise RSTError.new(+"Error: invalid value for option '#{key}': #{value.inspect}",
                              code: :invalid_option,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Yoichiro Hasebe