Simplify flow of draw_text_woven.

anntzer · anntzer · commit 959eeae65ef5 · 2019-07-25T09:37:23.000+02:00
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -2176,43 +2176,46 @@ def draw_text_woven(chunks):
                              -math.sin(a), math.cos(a),
                              x, y, Op.concat_matrix)
 
-            # Output all the 1-byte characters in a BT/ET group, then
-            # output all the 2-byte characters.
-            for mode in (1, 2):
-                newx = oldx = 0
-                # Output a 1-byte character chunk
-                if mode == 1:
-                    self.file.output(Op.begin_text,
-                                     self.file.fontName(prop),
-                                     fontsize,
-                                     Op.selectfont)
-
-                for chunk_type, chunk in chunks:
-                    if mode == 1 and chunk_type == 1:
-                        self._setup_textpos(newx, 0, 0, oldx, 0, 0)
-                        self.file.output(self.encode_string(chunk, fonttype),
-                                         Op.show)
-                        oldx = newx
-
-                    for char_idx, newx in _text_layout.layout(
-                            chunk, font, x0=newx, kern_mode=KERNING_UNFITTED):
-
-                        if mode == 2 and chunk_type == 2:
-                            glyph_name = font.get_glyph_name(char_idx)
-                            self.file.output(Op.gsave)
-                            self.file.output(0.001 * fontsize, 0,
-                                             0, 0.001 * fontsize,
-                                             newx, 0, Op.concat_matrix)
-                            name = self.file._get_xobject_symbol_name(
-                                font.fname, glyph_name)
-                            self.file.output(Name(name), Op.use_xobject)
-                            self.file.output(Op.grestore)
-                        newx += (
-                            font.load_glyph(char_idx, flags=LOAD_NO_HINTING)
-                            .linearHoriAdvance / 65536)
-
-                if mode == 1:
-                    self.file.output(Op.end_text)
+            # Output all the 1-byte characters in a BT/ET group.
+            self.file.output(Op.begin_text,
+                             self.file.fontName(prop),
+                             fontsize,
+                             Op.selectfont)
+            newx = oldx = 0
+            for chunk_type, chunk in chunks:
+                if chunk_type == 1:
+                    self._setup_textpos(newx, 0, 0, oldx, 0, 0)
+                    self.file.output(self.encode_string(chunk, fonttype),
+                                     Op.show)
+                    oldx = newx
+                # Update newx to include the advance from this chunk,
+                # regardless of its mode...
+                for char_idx, char_x in _text_layout.layout(
+                        chunk, font, x0=newx, kern_mode=KERNING_UNFITTED):
+                    pass
+                newx = char_x + (  # ... including the last character's advance
+                    font.load_glyph(char_idx, flags=LOAD_NO_HINTING)
+                    .linearHoriAdvance / 65536)
+            self.file.output(Op.end_text)
+
+            # Then output all the 2-byte characters.
+            newx = 0
+            for chunk_type, chunk in chunks:
+                for char_idx, char_x in _text_layout.layout(
+                        chunk, font, x0=newx, kern_mode=KERNING_UNFITTED):
+                    if chunk_type == 2:
+                        glyph_name = font.get_glyph_name(char_idx)
+                        self.file.output(Op.gsave)
+                        self.file.output(0.001 * fontsize, 0,
+                                         0, 0.001 * fontsize,
+                                         char_x, 0, Op.concat_matrix)
+                        name = self.file._get_xobject_symbol_name(
+                            font.fname, glyph_name)
+                        self.file.output(Name(name), Op.use_xobject)
+                        self.file.output(Op.grestore)
+                newx = char_x + (  # ... including the last character's advance
+                    font.load_glyph(char_idx, flags=LOAD_NO_HINTING)
+                    .linearHoriAdvance / 65536)
 
             self.file.output(Op.grestore)
 
