mpl-richtext 0.1.5__tar.gz → 0.1.7__tar.gz

{mpl_richtext-0.1.5 → mpl_richtext-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpl-richtext
-Version: 0.1.5
+Version: 0.1.7
 Summary: Rich text rendering for Matplotlib with multi-color and multi-style support
 Home-page: https://github.com/ra8in/mpl-richtext
 Author: Rabin Katel

{mpl_richtext-0.1.5 → mpl_richtext-0.1.7}/mpl_richtext/core.py

@@ -25,6 +25,26 @@ def _needs_complex_shaping(text: str) -> bool:
             return True
     return False
 
+def _resolve_font_path(kwargs: Dict[str, Any]) -> Optional[str]:
+    """Helper to resolve font file path from text kwargs."""
+    fp = kwargs.get('fontproperties')
+    if fp:
+        return findfont(fp)
+        
+    font = kwargs.get('fontfamily') or kwargs.get('family')
+    if not font:
+        # Fallback to default
+        font = plt.rcParams['font.family'][0]
+    
+    if isinstance(font, list):
+        font = font[0]
+        
+    try:
+        fp = FontProperties(family=font)
+        return findfont(fp)
+    except Exception:
+        return None
+
 def richtext(
     x: float,
     y: float,
@@ -352,17 +372,11 @@ def _get_text_metrics(text: str, ax: Axes, renderer, **text_kwargs) -> tuple:
     kwargs.pop('underline', None)
     
     # Try shaping if available
-    if HAS_HARFBUZZ:
-        font = kwargs.get('fontfamily') or kwargs.get('family')
+    # Only use HarfBuzz measurement if the text actually needs complex shaping.
+    # Otherwise, trust Matplotlib's native measurement which handles font fallback (e.g. lists of fonts) better.
+    if HAS_HARFBUZZ and _needs_complex_shaping(text):
+        path = _resolve_font_path(kwargs)
         try:
-            if not font:
-                font = plt.rcParams['font.family'][0]
-            if isinstance(font, list):
-                font = font[0]
-                
-            fp = FontProperties(family=font)
-            path = findfont(fp)
-            
             if path:
                 fontsize = kwargs.get('fontsize') or kwargs.get('size') or plt.rcParams['font.size']
                 shaper = HarfbuzzShaper(path)
@@ -411,30 +425,29 @@ def _get_text_height(text: str, ax: Axes, renderer, **text_kwargs) -> float:
     # Try shaping-based height for Devanagari fonts
     # This avoids measuring with Latin chars that the font might not have
     if HAS_HARFBUZZ:
+        path = _resolve_font_path(kwargs)
         try:
-            font = kwargs.get('fontfamily') or kwargs.get('family')
-            if not font:
-                font = plt.rcParams['font.family'][0]
-            if isinstance(font, list):
-                font = font[0]
+            # Check if this is a known Devanagari font (simplified check via path for now? 
+            # Or assume if resolving worked and contained Devanagari chars earlier...
+            # Actually valid logic: if we are here and path resolves, we trust it?
+            # But the original code restricted it to known fonts.
+            # Let's keep it generally open if path is found, OR check font name.
             
-            # Check if this is a known Devanagari font
-            devanagari_fonts = ['Noto Sans Devanagari', 'Kalimati', 'Mangal', 'Lohit Devanagari', 'Madan']
-            if font and any(df.lower() in str(font).lower() for df in devanagari_fonts):
-                fp = FontProperties(family=font)
-                path = findfont(fp)
+            if path:
+                # Optional: check for Devanagari-likeness if needed, but path resolution implies intent.
+                # However, for height specifically we only wanted this for specific fonts to avoid 'Hg'.
+                # Let's be permissive if path is found since we use shaper now.
                 
-                if path:
-                    fontsize = kwargs.get('fontsize') or kwargs.get('size') or plt.rcParams['font.size']
-                    shaper = HarfbuzzShaper(path)
-                    height_points = shaper.get_font_height(fontsize)
-                    
-                    # Convert points -> pixels -> data
-                    pixels = renderer.points_to_pixels(height_points)
-                    from matplotlib.transforms import Bbox
-                    bbox_display = Bbox.from_bounds(0, 0, 0, pixels)
-                    bbox_data = bbox_display.transformed(ax.transData.inverted())
-                    return bbox_data.height
+                fontsize = kwargs.get('fontsize') or kwargs.get('size') or plt.rcParams['font.size']
+                shaper = HarfbuzzShaper(path)
+                height_points = shaper.get_font_height(fontsize)
+                
+                # Convert points -> pixels -> data
+                pixels = renderer.points_to_pixels(height_points)
+                from matplotlib.transforms import Bbox
+                bbox_display = Bbox.from_bounds(0, 0, 0, pixels)
+                bbox_data = bbox_display.transformed(ax.transData.inverted())
+                return bbox_data.height
         except Exception:
             pass  # Fallback to native
 
@@ -581,15 +594,7 @@ def _draw_lines(
             
             if HAS_HARFBUZZ and _needs_complex_shaping(word):
                 try:
-                    font = text_kwargs.get('fontfamily') or text_kwargs.get('family')
-                    if not font:
-                        font = plt.rcParams['font.family'][0]
-                    if isinstance(font, list):
-                        font = font[0]
-                        
-                    fp = FontProperties(family=font)
-                    path = findfont(fp)
-                    
+                    path = _resolve_font_path(text_kwargs)
                     if path:
                         t = ShapedText(current_x, baseline_y, word, font_path=path, **text_kwargs)
                         ax.add_artist(t)

{mpl_richtext-0.1.5 → mpl_richtext-0.1.7}/mpl_richtext/shaping.py

@@ -281,7 +281,9 @@ class ShapedText(Text):
             
             glyph_trans = Affine2D().translate(gx, gy) + base_transform + align_transform + placement_transform
             
-            renderer.draw_path(gc, path, glyph_trans)
+            from matplotlib.colors import to_rgba
+            rgba_color = to_rgba(self.get_color(), alpha=self.get_alpha())
+            renderer.draw_path(gc, path, glyph_trans, rgbFace=rgba_color)
             
         gc.restore()
 

mpl_richtext-0.1.7/mpl_richtext/version.py

@@ -0,0 +1 @@
+__version__ = '0.1.7'

{mpl_richtext-0.1.5 → mpl_richtext-0.1.7}/mpl_richtext.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpl-richtext
-Version: 0.1.5
+Version: 0.1.7
 Summary: Rich text rendering for Matplotlib with multi-color and multi-style support
 Home-page: https://github.com/ra8in/mpl-richtext
 Author: Rabin Katel

mpl_richtext-0.1.5/mpl_richtext/version.py

@@ -1 +0,0 @@
-__version__ = '0.1.5'