song: Support merging with combining characters to the left

marcan · marcan · commit aa7ac0084040 · 2021-04-20T03:14:57.000+09:00
diff --git a/blitzloop/layout.py b/blitzloop/layout.py
@@ -119,11 +119,14 @@ def add(self, molecule, get_atom_time, style, font, ruby_font):
         for atom in molecule.atoms:
             atom_x, atom_y = self.px, self.py
             edge_px = None
+            edge_l_px = None
             glyphs = []
             # add the atom's base text as glyphs
             for i,c in enumerate(atom.text):
                 if atom.particle_edge is not None and i == atom.particle_edge:
                     edge_px = self.px
+                if atom.particle_edge_l is not None and i == atom.particle_edge_l:
+                    edge_l_px = self.px
                 self.text += c
                 glyph = font.get_glyph(c)
                 gi = GlyphInstance(glyph, self.px, self.py, style)
@@ -180,6 +183,8 @@ def add(self, molecule, get_atom_time, style, font, ruby_font):
                     par_step += particle.steps
                     ruby_glyphs += par_glyphs
                 # center the ruby text over the atom
+                if edge_l_px is not None:
+                    atom_x = edge_l_px
                 if edge_px is not None:
                     atom_width = edge_px - atom_x
                 else:
diff --git a/blitzloop/song.py b/blitzloop/song.py
@@ -46,6 +46,7 @@ def __init__(self, text):
         Particle.__init__(self, text)
         self.particles = None
         self.particle_edge = None
+        self.particle_edge_l = None
 
     @property
     def steps(self):
@@ -84,14 +85,15 @@ def __unicode__(self):
         return "Molecule<[%r]" % self.steps + " ".join(map(str, self.atoms)) + ">"
 
 class JapaneseMolecule(Molecule):
-    COMBINE_CHARS = "&#12353;&#12355;&#12357;&#12359;&#12361;&#12419;&#12421;&#12423;&#12449;&#12451;&#12453;&#12455;&#12457;&#12515;&#12517;&#12519; &#12288;&#65311;&#65281;?!&hellip;&#12290;&#12289;.,-&#12300;&#12301;&#8213;-&#9671;&#12539;&rdquo;\""
+    COMBINE_CHARS = "&#12353;&#12355;&#12357;&#12359;&#12361;&#12419;&#12421;&#12423;&#12449;&#12451;&#12453;&#12455;&#12457;&#12515;&#12517;&#12519; &#12288;&#65311;&#65281;?!&hellip;&#12290;&#12289;.,-&#12300;&#12301;&#12302;&#12303;&#12304;&#12305;&#12296;&#12297;&#65288;&#65289;&#65339;&#65341;&#12298;&#12299;&#8213;-&#9671;&#12539;&rdquo;\""
     SPACE = "&#12288;"
 
     def parse(self, source):
         self.atoms = []
         in_furi = False
         in_particle = False
         in_escape = False
+        first_combinable = True
 
         self.break_before = self.break_after = False
         self.row = None
@@ -123,8 +125,12 @@ def parse(self, source):
                     in_particle = False
                     if in_furi:
                         self.atoms[-1].particles.append(Particle(particle_text))
+                    elif first_combinable and self.atoms:
+                        self.atoms[-1].particle_edge_l = len(self.atoms[-1].text)
+                        self.atoms[-1].text += particle_text
                     else:
                         self.atoms.append(Atom(particle_text))
+                    first_combinable = False
                     continue
                 elif c in "(&#65288;":
                     if in_furi:
@@ -139,20 +145,28 @@ def parse(self, source):
                 elif c in ")&#65289;" and in_furi:
                     self.atoms[-1].particle_edge = len(self.atoms[-1].text)
                     in_furi = False
+                    first_combinable = False
                     continue
-            else:
-                in_escape = False
             if in_particle:
                 particle_text += c
             elif c in self.COMBINE_CHARS and not in_escape and self.atoms:
                 if in_furi:
                     self.atoms[-1].particles[-1].text += c
                 else:
                     self.atoms[-1].text += c
+            elif first_combinable and self.atoms:
+                self.atoms[-1].particle_edge_l = len(self.atoms[-1].text)
+                self.atoms[-1].text += c
+                first_combinable = c in self.COMBINE_CHARS
             elif in_furi:
                 self.atoms[-1].particles.append(Particle(c))
             else:
                 self.atoms.append(Atom(c))
+                if c not in self.COMBINE_CHARS or in_escape:
+                    first_combinable = False
+            in_escape = False
+            assert not (first_combinable and len(self.atoms) > 1)
+
         if in_particle:
             raise ParseError("Incomplete particle")
         if in_furi:
