expressir 2.4.59-arm-linux → 2.4.61-arm-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b2c4faa26ba40f3ffabb5bb70ac0a5ecbc2ba72cfc891747d9fbd5ee1cedc3
-  data.tar.gz: 8b17373bd40394ed1f2e9376206642c0f2ab838460055f2b885c0ecd137d43b7
+  metadata.gz: eed4408f7187afa171995f1e6efea55425822a5b3acb33ae7ed7b659532bf5c0
+  data.tar.gz: a62e05ed6102e8374d51b1d6c0b387983daefe5f4aa606e0f7f8c853f68caade
 SHA512:
-  metadata.gz: 1c7d02e4374a96ea2729e8551563dd9f25f5becbf967dda7945490bf393f8504125d3af5564ad7eb6405d7fc59472f5a8c5c38bea6c076346b21a267e060fd4d
-  data.tar.gz: c82f9f444d570194ecf30baba70a2458fb2b8c5cbca6aa2dffafb925e9912b35745f4992bce11becb33b49dc3784c902e0ec2f300b16ec7f6718aabfc2c5abc7
+  metadata.gz: c9d3045425d53fd50a3388c8832d06b83f6268e96f0ce07bf97a7e04fbcb21f11c1e5a68e13166b69a2a1cfa511db0542f2ca2662e5c58c5357d1337ce99c547
+  data.tar.gz: 6aabee62b6b20af41a8a99e5576e0a24f0778f5bcde82b3d3027dc67d7e8a199f57c32d5e89eb060b3c3a844df069b233bbf1162a1aff49531e67a6b1703ba09

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

@@ -10,27 +10,43 @@ module Expressir
         def format_remark_item(node)
           return "" unless node.remarks&.any?
 
-          # Check if any remark contains newlines
-          has_newlines = node.remarks.any? { |r| r.to_s.include?("\n") }
-          remarks_text = node.remarks.join("\n")
-
-          # The tag is the schema-relative EXPRESS path: node.path is
-          # rooted at the ExpFile, whose id is the file path — drop that
-          # leading segment so the tag reads like the source form
+          # The tag form follows the owner: items in rule contexts
+          # (WHERE/UNIQUE/IP) historically carry bare tags
+          # (`--"unusual_placement" text`), WG12-style items carry the
+          # schema-relative path. node.path is rooted at the ExpFile,
+          # whose id is the file path — drop that leading segment
           # (expressir#603).
-          tag = node.path.to_s
-          root = node
-          root = root.parent while root.respond_to?(:parent) && root.parent
-          prefix = "#{root.id}." if root.respond_to?(:id) && root.id
-          tag = tag.delete_prefix(prefix) if prefix && tag.start_with?(prefix)
-
-          if has_newlines || node.remarks.length > 1
-            # Multi-line format: (*"path" remarks *)
-            "(*\"#{tag}\"\n#{remarks_text}\n*)"
+          rule_context = node.parent.is_a?(Model::Declarations::WhereRule) ||
+            node.parent.is_a?(Model::Declarations::UniqueRule) ||
+            node.parent.is_a?(Model::Declarations::InformalPropositionRule)
+          if rule_context
+            tag = node.id.to_s
           else
-            # Single-line format: --"path" text
-            "--\"#{tag}\" #{remarks_text}"
+            tag = node.path.to_s
+            root = node
+            root = root.parent while root.respond_to?(:parent) && root.parent
+            prefix = "#{root.id}." if root.respond_to?(:id) && root.id
+            tag = tag.delete_prefix(prefix) if prefix && tag.start_with?(prefix)
+          end
+
+          # 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} *)"
+            end
+          end.join("\n")
         end
       end
     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.59".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.59
+  version: 2.4.61
 platform: arm-linux
 authors:
 - Ribose Inc.