ea 0.6.20 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4414e6921d37d619d953382395e7ecf9c8ddb19da4cca389e57177eb7a4ab398
-  data.tar.gz: 3365590f62c21b9855d18d70656515b361c4c93def5fe1d8341af944ed01822c
+  metadata.gz: 548d074902dd1fa399222eecf7bce3890790951fdd62f8d1d5e4c054e602e680
+  data.tar.gz: 95bc0204957914b6451a505b29adb96d8ad4906229b488406d3cb1b2efcc6f53
 SHA512:
-  metadata.gz: 87930fec1aeee29cae1c4352527bcb896147f971427c78a1f58c053b3496d891b82d78afd5aadd7e43a6356534ac9393c21c405cdb991d2703d228706077c01b
-  data.tar.gz: 2d0bce26c6aad8b83004004b86e156306847331b2e357c1599793dfce22ce8f953ee179fae02dde2a327f2c408faf347bbfeab5f3551f520954bccd801b9e56a
+  metadata.gz: 71b2b781fbfdc1839b5211aa3d193be4b7daa035fbfa6b1947d8339d71acb8075a80aede566df22cd0709029904be2508203bd726811a27dd9d9be74fd5c2a99
+  data.tar.gz: 4844d29466fe899fcb10900455dcfcc5f2aecf6f7d77ab25243a78f7ef61f9d85e64db4a1d0432aa13f39d473c38f7452b3738aeb95917dacadc994b747222c4

data/lib/ea/svg/ea_emitter/compartment/enum_literals.rb

@@ -25,14 +25,48 @@ module Ea
           def render_literals_block(context)
             line_h = context.size + LITERAL_LINE_OFFSET
             text_blocks = []
+            row_y = context.geometry.enum_literal_first_y
+            # EA renders a centered italic "literals" caption above
+            # the rows when the literals carry stored code values
+            # (t_attribute.Default); bare literal lists render the
+            # rows directly. Corpus-verified (PT_TypeOfSA:
+            # "literals" caption + "ServingParcel = SP" rows;
+            # CV_SequenceType: bare rows, no caption).
+            if caption?(context)
+              text_blocks << caption_text(context, row_y)
+              row_y += line_h
+            end
             context.enum_literals.each_with_index do |literal, idx|
-              y = context.geometry.enum_literal_first_y + (idx * line_h)
+              y = row_y + (idx * line_h)
               text_blocks << visibility_placeholder(context, y)
               text_blocks << literal_name_text(context, literal, y)
             end
             wrap_group(text_blocks, context.theme.text_color)
           end
 
+          def caption?(context)
+            context.enum_literals.any? do |l|
+              value = l.value.to_s
+              !value.empty? && value != l.name.to_s
+            end
+          end
+
+          def caption_text(context, y)
+            content = "literals"
+            len = TextRenderer.estimate_width(content, context.size, nil,
+                                              family: context.family).round
+            x = (context.bounds.x + (context.bounds.width - len) / 2.0).floor
+            TextRenderer.new(
+              content: content,
+              x: x, y: y,
+              family: context.family, size: context.size, size_unit: context.size_unit,
+              fill: context.theme.text_color,
+              stroke_in_text: context.theme.stroke_in_text_color,
+              width_factor: context.theme.text_width_factor,
+              style: "italic"
+            ).to_svg
+          end
+
           def visibility_placeholder(context, y)
             TextRenderer.new(
               content: " ",
@@ -46,8 +80,9 @@ module Ea
           end
 
           def literal_name_text(context, literal, y)
+            content = literal_display(literal)
             TextRenderer.new(
-              content: literal.name.to_s,
+              content: content,
               x: context.bounds.x + (context.theme.attribute_spec.content_x_offset || 26),
               y: y,
               family: context.family, size: context.size, size_unit: context.size_unit,
@@ -57,6 +92,15 @@ module Ea
             ).to_svg
           end
 
+          # EA shows "Name = Code" for literals with a stored
+          # default value; bare names otherwise.
+          def literal_display(literal)
+            value = literal.value.to_s
+            return literal.name.to_s if value.empty? || value == literal.name.to_s
+
+            "#{literal.name} = #{value}"
+          end
+
           def wrap_group(text_blocks, text_color)
             style = "stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel; " \
                     "fill:#{text_color};fill-opacity:1.00; " \

data/lib/ea/svg/ea_emitter/elements.rb

@@ -87,7 +87,7 @@ module Ea
                                            header_lines,
                                            constraints_count: constraints_for(classifier).size,
                                            marker_count: marker_lines_for(classifier).size,
-                                           enum_literals_count: enum_literals_for(classifier).size)
+                                           enum_literals_count: enum_row_count_for(classifier))
           # EA suppresses the whole attribute compartment when its
           # rows do not fit the stored box height (never truncates
           # rows) - the AOS box on CityFurniture hides its
@@ -103,7 +103,7 @@ module Ea
                                              header_lines,
                                              constraints_count: constraints_for(classifier).size,
                                            marker_count: marker_lines_for(classifier).size,
-                                           enum_literals_count: enum_literals_for(classifier).size)
+                                           enum_literals_count: enum_row_count_for(classifier))
           end
           # EA suppresses the operations compartment when its rows
           # overflow the stored box height (same rule as attributes).
@@ -115,7 +115,7 @@ module Ea
                                              header_lines,
                                              constraints_count: constraints_for(classifier).size,
                                            marker_count: marker_lines_for(classifier).size,
-                                           enum_literals_count: enum_literals_for(classifier).size)
+                                           enum_literals_count: enum_row_count_for(classifier))
           end
           RenderContext.new(
             element: element,
@@ -196,6 +196,14 @@ module Ea
           classifier.literals || []
         end
 
+        # The "literals" caption occupies a row slot when any
+        # literal carries a stored code value.
+        def enum_row_count_for(classifier)
+          literals = enum_literals_for(classifier)
+          caption = literals.any? { |l| !l.value.to_s.empty? && l.value.to_s != l.name.to_s }
+          literals.size + (caption ? 1 : 0)
+        end
+
         def tagged_values_for(classifier)
           return [] unless classifier.is_a?(Ea::Model::Classifier)
 

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.20"
+  VERSION = "0.6.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - Ribose Inc.