Simplify notation

Author: codevalley

sur-cli/sur/models.py

@@ -79,6 +79,7 @@ def __str__(self) -> str:
 class Beat:
     """A beat in a composition, containing one or more elements"""
     elements: List[Element] = field(default_factory=list)
+    bracketed: bool = False  # Track if this beat was originally in brackets
 
     def __str__(self) -> str:
         """Format the beat for display"""
@@ -89,13 +90,11 @@ def __str__(self) -> str:
         if len(self.elements) == 1:
             return str(self.elements[0])
 
-        # If all elements are just notes (no lyrics), compact them
-        if all(not e.lyrics and e.note for e in self.elements):
-            return "".join(str(e) for e in self.elements)
+        # Format the elements - use spaces only if bracketed
+        formatted = (" ".join if self.bracketed else "".join)(str(e) for e in self.elements if str(e))
 
-        # Multiple elements with at least one lyrics - use brackets
-        formatted = " ".join(str(e) for e in self.elements if str(e))
-        return f"[{formatted}]" if formatted else ""
+        # Add brackets only if this was originally bracketed
+        return f"[{formatted}]" if self.bracketed else formatted
 
 @dataclass
 class Section:

sur-cli/sur/parser.py

@@ -106,9 +106,12 @@ def _elements_to_beats(self, elements: List[Element]) -> List[Beat]:
         in_bracket = False
         last_was_separator = True  # Start true to handle first element
 
-        def create_beat(elems):
+        def create_beat(elems, bracketed=False):
             if elems:
-                beats.append(Beat(elements=[e for e in elems if e.type == ElementType.NORMAL]))
+                beats.append(Beat(
+                    elements=[e for e in elems if e.type == ElementType.NORMAL],
+                    bracketed=bracketed
+                ))
 
         for element in elements:
             if element.type == ElementType.SEPARATOR:
@@ -127,7 +130,7 @@ def create_beat(elems):
                 in_bracket = False
                 # Create beat from bracketed elements
                 if bracket_elements:
-                    beats.append(Beat(elements=[e for e in bracket_elements if e.type == ElementType.NORMAL]))
+                    create_beat(bracket_elements, bracketed=True)
                 bracket_elements = []
                 last_was_separator = True
             else:  # Normal element