expressir 2.4.60-x86_64-linux → 2.4.61-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1842449a26993ce58d415dbc1f525ef65a2f04baabf723be60fba33fa5e4b0c
-  data.tar.gz: d452b99ecb213b20a364f1317e97af8ed3061ebbace7a324cd19db95746e5c88
+  metadata.gz: ccb519e045100f342f46658905598b0088af92f87b24fa6ce5e8ea086073529e
+  data.tar.gz: 41f5614285a677e79dc413947ae058675bc257e51a0e90e095f5254ccaf7875a
 SHA512:
-  metadata.gz: 2ac5a8573061ba2e6c9383ed7ff5a1a1711fce4488da5ac5c4fdaf7d6f5bf9e005fd16c44328a86a7ead4981faaca241552bcfa8f8b295932785f5c8e6a03f18
-  data.tar.gz: 8ec14a01674464bacff9e7cc9cc3241d89044ac7842ba50e5843ba0756167e28b562eb0f09715b0b7ab2cdc0deb473543edf598c666edafc0868749c95c2e41f
+  metadata.gz: 59ca648b47265fca2c4529ce84778e35a876e73cba98834f440f48d78b9588bdccb9d668297b7c5f64f42f4817addefd4f009e5ed40f6d92a028feb0dacfb624
+  data.tar.gz: 1be0878d27cb58aafa0fe72c28cb5f13ad60751e04109a47abc3f0c9f792d428fa6dcbe65671f69b120ca4e3b8bb265bb8a281650d89b991a56e9885d3ebad6b

data/lib/expressir/express/formatters/declarations_formatter.rb

@@ -619,7 +619,10 @@ module Expressir
                  "",
                ]
              end,
-            *format_remark_items(node),
+            # A blank line before each remark-item child, mirroring the
+            # core-lane schema emitter — the two lanes must render
+            # remark.exp byte-identically for the formatter golden.
+            *format_remark_items(node).flat_map { |x| ["", x] },
             [
               "END_SCHEMA",
               ";",

data/lib/expressir/express/formatters/remark_item_formatter.rb

@@ -29,15 +29,22 @@ module Expressir
             tag = tag.delete_prefix(prefix) if prefix && tag.start_with?(prefix)
           end
 
-          # One line per remark. Single-line remarks take the tail form
-          # (the dominant inline convention); multi-line text takes the
-          # block form, which a tail line cannot express.
+          # Remark items are WG12 annotation blocks: the embedded form,
+          # a block per remark, matching the source convention of the
+          # annotated corpora (the conservation pairs are embedded, so
+          # tail-form emission reads as phantom gains). Rule-context
+          # owners keep the historic bare-tag tail form.
+          if rule_context
+            return node.remarks
+                .map { |remark| "--\"#{tag}\" #{remark}" }
+                .join("\n")
+          end
           node.remarks.map do |remark|
             remark = remark.to_s
             if remark.include?("\n")
               "(*\"#{tag}\"\n#{remark}\n*)"
             else
-              "--\"#{tag}\" #{remark}"
+              "(*\"#{tag}\" #{remark} *)"
             end
           end.join("\n")
         end

data/lib/expressir/version.rb

@@ -3,6 +3,6 @@ module Expressir
   # autoload it (Ruby autoload only works for module/class constants, not
   # for string constants like `Expressir::VERSION`).
   module Version
-    VERSION = "2.4.60".freeze
+    VERSION = "2.4.61".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.60
+  version: 2.4.61
 platform: x86_64-linux
 authors:
 - Ribose Inc.