daidai 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38b5d131989c0801d446ed50e9ab3399fef4813bb017a62304a0fed9629922a1
-  data.tar.gz: c5eafa61481b4291fc945ce43354a221c6093a9dd44a68d2535e6a2d6b2c8ba0
+  metadata.gz: 9753915b3a898b4c12330ac07c319cb213259d7e71c6ff88d9351796885500d8
+  data.tar.gz: 79ac3b04d8362a91f4cd9cb4c5347a1dc5ee5ebfafdeb54674ef03d191d4ad3d
 SHA512:
-  metadata.gz: f307a1904436405e4a06298a583fe7638b8578d57d68a7e4535457437417f8713b7c1ea71b4d54e5a6c0806c801f86719e494a42ba84dc71871db4857b29bf04
-  data.tar.gz: 45cc7171d85e261559e9074945274bd6d9e16ac3a435f6a5a0ea4b77b5248c2272545547b4ebce19d05974528a6cd67f6c7b7f09ec94a9864aa5a5eef5c2786d
+  metadata.gz: 5c4b2c9ea1fb7b4066530257c54563324a3ecff9d0e64b1e3cb3b91ffd9760bffbff1ab85b3db9760a71260c24bb4b109e94e771dff46f379c1462b71a4309db
+  data.tar.gz: df3af68ca1fa55f8980c6133a4fb407c1c07dc6b58aaef8634f0e69890f11fd08c17fd51a2a4a4d04922da48c5926ff62571b7d429eb6dc1d39a928acb68381f

data/CHANGELOG.md

@@ -6,6 +6,30 @@ follow [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.4.0] - 2026-09-09
+
+### Added
+
+- Na-adjective adverbial forms, including 静かに, with an `adverbial` conjugation and deinflection label.
+
+### Fixed
+
+- Copula past and polite forms report their grammatical chains instead of the suru-verb label. The te-form で resolves to the copula だ without conjugating the past auxiliary.
+
+- Written humble forms such as 言って差し上げた and 読んで差し上げた deinflect to their main verb, just like their kana spellings.
+
+- Honorific imperatives such as ください and 下さい deinflect to their irregular verb bases, including the kana and kanji spellings of the honorific family.
+
+- Na-adjective conjugation includes the adverbial form, such as 静かに, with its reading.
+
+- Copula で deinflects to だ as a te-form without treating the past auxiliary as a copula.
+- Copula deinflection chains label past and politeness correctly instead of
+  calling だった and でした suru verbs.
+
+- Automatic honorific resolution preserves kana and kanji spellings, including
+  下さる and おっしゃる, and recovers inflected spellings such as 仰有います
+  before accepting a tokenizer split.
+
 ## [0.3.0] - 2026-09-07
 
 ### Added

data/lib/daidai/conjugator.rb

@@ -47,6 +47,10 @@ module Daidai
         return nil if kanji.nil? && reading.empty?
 
         forms = build(strat, kanji, reading)
+        if strat[:kind] == :na_adjective
+          forms << Form.new(name: :adverbial, negative: false, polite: false, onum: 1,
+                            kanji: kanji && "#{kanji}に", reading: reading.empty? ? nil : "#{reading}に")
+        end
         forms.empty? ? nil : Word.new(word: kanji || reading, pos: code, kind: strat[:kind], forms: forms)
       end
 

data/lib/daidai/deinflector.rb

@@ -80,7 +80,7 @@ module Daidai
       "potential" => "potential", "potential or passive" => "potential / passive",
       "causative" => "causative", "short causative" => "short causative",
       "volitional" => "volitional", "volitional slang" => "volitional (slang)",
-      "imperative" => "imperative", "continuative" => "continuative",
+      "imperative" => "imperative", "continuative" => "continuative", "adverbial" => "adverbial (-ni)",
       "-たい" => "desiderative (-tai)", "-たら" => "conditional (-tara)",
       "-たり" => "representative (-tari)", "-ば" => "provisional (-ba)",
       "-ゃ" => "conditional contraction (-ya)", "-ちゃ" => "contracted (-cha)",

data/lib/daidai/kabosu.rb

@@ -36,19 +36,29 @@ module Daidai
 
     # Dictionary-form overrides for verbs whose JMdict subclass Sudachi's 活用型
     # can't distinguish (irregular okurigana inside an otherwise-regular row).
+    HONORIFIC_READINGS = {
+      "くださる" => "くださる", "下さる" => "くださる",
+      "なさる" => "なさる", "為さる" => "なさる",
+      "いらっしゃる" => "いらっしゃる",
+      "おっしゃる" => "おっしゃる", "仰る" => "おっしゃる", "仰有る" => "おっしゃる",
+      "ござる" => "ござる", "御座る" => "ござる"
+    }.freeze
+
     LEMMA_POS = {
       "行く" => "v5k-s", "逝く" => "v5k-s", "往く" => "v5k-s",
       "有る" => "v5r-i", "在る" => "v5r-i", "ある" => "v5r-i",
       "問う" => "v5u-s",
-      "くださる" => "v5aru", "なさる" => "v5aru", "いらっしゃる" => "v5aru",
       "いい" => "adj-ix"
-    }.freeze
+    }.merge(HONORIFIC_READINGS.transform_values { "v5aru" }).freeze
 
     class << self
       # Resolve `text` to { word:, pos:, reading: } from its first inflecting
       # morpheme, or nil when nothing conjugatable is found. Raises
       # MissingDependency when kabosu/a dictionary isn't installed.
       def resolve(text)
+        honorific = honorific_entry(text)
+        return honorific if honorific
+
         morphemes = tokenizer.tokenize(text).to_a
         index = morphemes.index { |m| inflecting?(m.part_of_speech) }
         return nil unless index
@@ -82,6 +92,16 @@ module Daidai
 
       private
 
+      def honorific_entry(text)
+        lemma = text if HONORIFIC_READINGS.key?(text)
+        if !lemma && HONORIFIC_READINGS.keys.any? { |word| text.start_with?(word.delete_suffix("る")) }
+          lemma = Daidai.deinflect(text).find do |candidate|
+            HONORIFIC_READINGS.key?(candidate.term) && candidate.matches_pos?([ "v5aru" ])
+          end&.term
+        end
+        { word: lemma, pos: "v5aru", reading: HONORIFIC_READINGS.fetch(lemma) } if lemma
+      end
+
       def from_conjugation_type(pos)
         case pos[0]
         when "動詞"

data/lib/daidai/resources/japanese-transforms.json

@@ -147,6 +147,18 @@
     }
   },
   "transforms": {
+    "adverbial": {
+      "name": "adverbial",
+      "rules": [
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": ["adj-na"],
+          "inflected": "に",
+          "deinflected": ""
+        }
+      ]
+    },
     "-なら": {
       "name": "-なら",
       "rules": [
@@ -162,35 +174,6 @@
     "suru": {
       "name": "suru",
       "rules": [
-        {
-          "type": "suffix",
-          "conditionsIn": [
-            "copula"
-          ],
-          "conditionsOut": [
-            "copula"
-          ],
-          "inflected": "です",
-          "deinflected": "だ"
-        },
-        {
-          "type": "suffix",
-          "conditionsIn": [],
-          "conditionsOut": [
-            "copula"
-          ],
-          "inflected": "だった",
-          "deinflected": "だ"
-        },
-        {
-          "type": "suffix",
-          "conditionsIn": [],
-          "conditionsOut": [
-            "copula"
-          ],
-          "inflected": "でした",
-          "deinflected": "です"
-        },
         {
           "type": "suffix",
           "conditionsIn": ["vs"],
@@ -2680,6 +2663,13 @@
       "name": "-て",
       "description": "て-form.\nIt has a myriad of meanings. Primarily, it is a conjunctive particle that connects two clauses together.\nUsage: Attach て to the continuative form (連用形) of verbs after euphonic change form, くて to the stem of i-adjectives.",
       "rules": [
+        {
+          "type": "suffix",
+          "conditionsIn": ["-て"],
+          "conditionsOut": ["copula"],
+          "inflected": "で",
+          "deinflected": "だ"
+        },
         {
           "type": "suffix",
           "conditionsIn": [
@@ -4812,6 +4802,96 @@
       "name": "imperative",
       "description": "1. To give orders.\n2. (As あれ) Represents the fact that it will never change no matter the circumstances.\n3. Express a feeling of hope.",
       "rules": [
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "ください",
+          "deinflected": "くださる"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "下さい",
+          "deinflected": "下さる"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "なさい",
+          "deinflected": "なさる"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "為さい",
+          "deinflected": "為さる"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "いらっしゃい",
+          "deinflected": "いらっしゃる"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "おっしゃい",
+          "deinflected": "おっしゃる"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "仰い",
+          "deinflected": "仰る"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "仰有い",
+          "deinflected": "仰有る"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "ござい",
+          "deinflected": "ござる"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": [
+            "v5"
+          ],
+          "inflected": "御座い",
+          "deinflected": "御座る"
+        },
         {
           "type": "suffix",
           "conditionsIn": [],
@@ -5793,6 +5873,20 @@
       "name": "-た",
       "description": "1. Indicates a reality that has happened in the past.\n2. Indicates the completion of an action.\n3. Indicates the confirmation of a matter.\n4. Indicates the speaker's confidence that the action will definitely be fulfilled.\n5. Indicates the events that occur before the main clause are represented as relative past.\n6. Indicates a mild imperative/command.\nUsage: Attach た to the continuative form (連用形) of verbs after euphonic change form, かった to the stem of i-adjectives.",
       "rules": [
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": ["copula"],
+          "inflected": "だった",
+          "deinflected": "だ"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [],
+          "conditionsOut": ["copula"],
+          "inflected": "でした",
+          "deinflected": "です"
+        },
         {
           "type": "suffix",
           "conditionsIn": [
@@ -6229,6 +6323,13 @@
       "name": "-ます",
       "description": "Polite conjugation of verbs and adjectives.\nUsage: Attach ます to the continuative form (連用形) of verbs.",
       "rules": [
+        {
+          "type": "suffix",
+          "conditionsIn": ["copula"],
+          "conditionsOut": ["copula"],
+          "inflected": "です",
+          "deinflected": "だ"
+        },
         {
           "type": "suffix",
           "conditionsIn": [
@@ -11572,6 +11673,28 @@
           ],
           "inflected": "でさしあげる",
           "deinflected": "で"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [
+            "v1"
+          ],
+          "conditionsOut": [
+            "-て"
+          ],
+          "inflected": "て差し上げる",
+          "deinflected": "て"
+        },
+        {
+          "type": "suffix",
+          "conditionsIn": [
+            "v1"
+          ],
+          "conditionsOut": [
+            "-て"
+          ],
+          "inflected": "で差し上げる",
+          "deinflected": "で"
         }
       ]
     },

data/lib/daidai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Daidai
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/daidai/word.rb

@@ -16,7 +16,8 @@ module Daidai
     imperative: "Imperative",
     conditional: "Conditional (~tara)",
     alternative: "Alternative (~tari)",
-    stem: "Continuative (~i)"
+    stem: "Continuative (~i)",
+    adverbial: "Adverbial"
   }.freeze
 
   # conjo.csv conjugation id (1..13) => form name, in the same order as FORMS.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daidai
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - davafons
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-07 00:00:00.000000000 Z
+date: 2026-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv