manimpango 0.3.0__tar.gz → 0.4.0__tar.gz

{ManimPango-0.3.0 → ManimPango-0.4.0}/MANIFEST.in

@@ -5,3 +5,4 @@ prune docs/_build
 include *.md
 include *.txt
 include .coveragerc
+include LICENSE*

{ManimPango-0.3.0 → ManimPango-0.4.0}/ManimPango.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: ManimPango
-Version: 0.3.0
+Version: 0.4.0
 Summary: Bindings for Pango for using with Manim.
 Home-page: https://manimpango.manim.community/
 Author: Naveen M K
-Author-email: naveen@syrusdark.website
+Author-email: naveen@manim.community
 Maintainer: The Manim Community Developers
-License: UNKNOWN
+License: GPL-3.0-or-later
 Project-URL: Documentation, https://manimpango.manim.community/
 Project-URL: Source, https://github.com/ManimCommunity/manimpango
 Project-URL: Release notes, https://github.com/ManimCommunity/ManimPango/releases/
@@ -193,14 +193,14 @@ Platform: Linux
 Platform: macOS
 Platform: Windows
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
-Classifier: Development Status :: 3 - Alpha
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Cython
-Requires-Python: >=3.6
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown

{ManimPango-0.3.0 → ManimPango-0.4.0}/ManimPango.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ tests/__init__.py
 tests/_manim.py
 tests/conftest.py
 tests/svg_tester.py
+tests/test_colors.py
 tests/test_fonts.py
 tests/test_list_fonts.py
 tests/test_markup.py

{ManimPango-0.3.0 → ManimPango-0.4.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: ManimPango
-Version: 0.3.0
+Version: 0.4.0
 Summary: Bindings for Pango for using with Manim.
 Home-page: https://manimpango.manim.community/
 Author: Naveen M K
-Author-email: naveen@syrusdark.website
+Author-email: naveen@manim.community
 Maintainer: The Manim Community Developers
-License: UNKNOWN
+License: GPL-3.0-or-later
 Project-URL: Documentation, https://manimpango.manim.community/
 Project-URL: Source, https://github.com/ManimCommunity/manimpango
 Project-URL: Release notes, https://github.com/ManimCommunity/ManimPango/releases/
@@ -193,14 +193,14 @@ Platform: Linux
 Platform: macOS
 Platform: Windows
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
-Classifier: Development Status :: 3 - Alpha
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Cython
-Requires-Python: >=3.6
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown

{ManimPango-0.3.0 → ManimPango-0.4.0}/docs/RELEASE.rst

@@ -31,13 +31,18 @@ This means older version would have a backport of bugs fixes.
     Here, ``-s`` is used to sign the tag with gpg so that users
     can later verify it, and a tag shouldn't be created with
     signing because Github shows it unverified.
+
 .. important::
 
     The message should include the changelog of the release.
+    There is a github actions which will creates a draft `release`_
+    with the changelog. You can edit them and copy it to the tag you
+    create.
 
 8. Push the tag to remote.
 
 9. Go to `Github`_, and `draft a new release`_ with the same tag pushed.
+   You can copy the same changelog you copied when you created the tag.
 
 10. Check whether the CI uploads the wheels and the ``.tar.gz`` file to
     PyPi.
@@ -50,3 +55,4 @@ This means older version would have a backport of bugs fixes.
 .. _Github: https://github.com
 .. _draft a new release: https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/managing-releases-in-a-repository#creating-a-release
 .. _PyPi: https://pypi.org/project/manimpango/
+.. _release: https://github.com/ManimCommunity/ManimPango/releases

{ManimPango-0.3.0 → ManimPango-0.4.0}/manimpango/_version.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.3.0"
+__version__ = "0.4.0"

{ManimPango-0.3.0 → ManimPango-0.4.0}/manimpango/cmanimpango.pyx

@@ -13,14 +13,17 @@ class TextSetting:
         font:str,
         slant,
         weight,
-        line_num=-1
+        line_num=-1,
+        color: str=None,
     ):
         self.start = start
         self.end = end
-        self.font = font.encode('utf-8')
+        self.font = font
         self.slant = slant
         self.weight = weight
         self.line_num = line_num
+        self.color = color
+
 
 def text2svg(
     settings:list,
@@ -79,11 +82,11 @@ def text2svg(
         pango_layout_set_width(layout, pango_units_from_double(pango_width))
 
     for setting in settings:
-        family = setting.font
+        family = setting.font.encode('utf-8')
         style = PangoUtils.str2style(setting.slant)
         weight = PangoUtils.str2weight(setting.weight)
+        color = setting.color
         text_str = orig_text[setting.start : setting.end].replace("\n", " ")
-        text = text_str.encode('utf-8')
         font_desc = pango_font_description_new()
         if font_desc==NULL:
             cairo_destroy(cr)
@@ -103,13 +106,17 @@ def text2svg(
         cairo_move_to(cr,START_X + offset_x,START_Y + line_spacing * setting.line_num)
 
         pango_cairo_update_layout(cr,layout)
+        markup = escape(text_str)
+        if color:
+            markup = (f"<span color='{color}'>{markup}</span>")
+            if MarkupUtils.validate(markup):
+                cairo_destroy(cr)
+                cairo_surface_destroy(surface)
+                g_object_unref(layout)
+                raise ValueError(f"Pango cannot recognize your color '{color}' for text '{text_str}'.")
         if disable_liga:
-            text_bytes = escape(text.decode('utf-8'))
-            markup = f"<span font_features='liga=0,dlig=0,clig=0,hlig=0'>{text_bytes}</span>"
-            markup_bytes = markup.encode('utf-8')
-            pango_layout_set_markup(layout, markup_bytes, -1)
-        else:
-            pango_layout_set_text(layout,text,-1)
+            markup = f"<span font_features='liga=0,dlig=0,clig=0,hlig=0'>{markup}</span>"
+        pango_layout_set_markup(layout, markup.encode('utf-8'), -1)
         pango_cairo_show_layout(cr, layout)
         pango_layout_get_size(layout,&temp_width,NULL)
         offset_x += pango_units_to_double(temp_width)

ManimPango-0.4.0/pyproject.toml

@@ -0,0 +1,11 @@
+[build-system]
+requires = ["setuptools", "wheel", "Cython>=0.27"]
+
+[tool.isort]
+# from https://black.readthedocs.io/en/stable/compatible_configs.html
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+line_length = 88

ManimPango-0.4.0/requirements-dev.txt

@@ -0,0 +1,4 @@
+pytest-cov==2.12.0
+pytest==6.2.4
+Cython==0.29.24
+coverage==5.5

{ManimPango-0.3.0 → ManimPango-0.4.0}/setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 license_files = 
 	LICENSE
-	LICENSE.win32
+	LICENSE.*
 
 [flake8]
 max-line-length = 88

{ManimPango-0.3.0 → ManimPango-0.4.0}/setup.py

@@ -90,8 +90,8 @@ class PKG_CONFIG:
             return True
         except Exception:
             warnings.warn(
-                f"{self.pkg_config} doesn't exists or doesn't seem to work"
-                "We assume that you give the compiler flags using"
+                f"{self.pkg_config} doesn't exists or doesn't seem to work\n"
+                "We assume that you give the compiler flags using\n"
                 "corresponding environment variables.",
                 RuntimeWarning,
             )
@@ -243,7 +243,7 @@ setup(
     name=NAME,
     version=MANIMPANGO_VERSION,
     author="Naveen M K",
-    author_email="naveen@syrusdark.website",
+    author_email="naveen@manim.community",
     maintainer="The Manim Community Developers",
     url="https://manimpango.manim.community/",
     description="Bindings for Pango for using with Manim.",
@@ -251,18 +251,19 @@ setup(
     zip_safe=False,
     long_description_content_type="text/markdown",
     packages=["manimpango"],
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     platforms=["Linux", "macOS", "Windows"],
     keywords=["cython", "pango", "cairo", "manim"],
+    license="GPL-3.0-or-later",
     classifiers=[
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
-        "Development Status :: 3 - Alpha",
+        "Programming Language :: Python :: 3.10",
+        "Development Status :: 4 - Beta",
         "Programming Language :: Python :: 3 :: Only",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
         "Operating System :: OS Independent",
         "Programming Language :: Cython",
     ],

ManimPango-0.4.0/tests/_manim.py

@@ -0,0 +1,278 @@
+# -*- coding: utf-8 -*-
+"""This file contains helpers for the tests copied and modified
+from Manim.
+"""
+import copy
+import os
+import re
+from pathlib import Path
+from typing import Sequence
+
+from manimpango import Alignment, MarkupUtils, TextSetting, text2svg
+
+
+class MarkupText:
+    def __init__(
+        self,
+        text: str,
+        *,
+        size: int = 1,
+        line_spacing: int = None,
+        font: str = None,
+        slant: str = "NORMAL",
+        weight: str = "NORMAL",
+        tab_width: int = 4,
+        disable_ligatures: bool = False,
+        justify: bool = None,
+        indent: float = None,
+        alignment: Alignment = None,
+        # for the tests
+        filename: str = "test.svg",
+        wrap_text: bool = True,
+        **kwargs,
+    ):
+        self.text = text
+        self.size = size
+        self.line_spacing = line_spacing
+        self.font = font
+        self.slant = slant
+        self.weight = weight
+        self.tab_width = tab_width
+        self.filename = filename
+        self.original_text = text
+        self.disable_ligatures = disable_ligatures
+
+        self.justify = justify
+        self.indent = indent
+        self.alignment = alignment
+        self.wrap_text = wrap_text
+        if MarkupUtils.validate(self.text):
+            raise ValueError(
+                f"Pango cannot parse your markup in {self.text}. "
+                "Please check for typos, unmatched tags or unescaped "
+                "special chars like < and &."
+            )
+        self.text2svg()
+
+    def text2svg(self):
+        """Convert the text to SVG using Pango."""
+        size = self.size * 10
+        dir_name = Path(self.filename).parent
+        disable_liga = self.disable_ligatures
+        if not os.path.exists(dir_name):
+            os.makedirs(dir_name)
+        file_name = self.filename
+        if self.wrap_text:
+            return MarkupUtils.text2svg(
+                f"{self.text}",
+                self.font,
+                self.slant,
+                self.weight,
+                size,
+                True,  # stray positional argument
+                disable_liga,
+                file_name,
+                20,
+                20,
+                600,  # width
+                400,  # height
+                justify=self.justify,
+                indent=self.indent,
+                line_spacing=self.line_spacing,
+                alignment=self.alignment,
+            )
+        else:
+            return MarkupUtils.text2svg(
+                f"{self.text}",
+                self.font,
+                self.slant,
+                self.weight,
+                size,
+                True,  # stray positional argument
+                disable_liga,
+                file_name,
+                20,
+                20,
+                600,  # width
+                400,  # height
+                justify=self.justify,
+                indent=self.indent,
+                line_spacing=self.line_spacing,
+                alignment=self.alignment,
+                pango_width=-1,
+            )
+            # -1 for no wrapping
+            # default is full width and then wrap.
+
+    def __repr__(self):
+        return f"MarkupText({repr(self.original_text)})"
+
+
+class Text:
+    def __init__(
+        self,
+        text: str,
+        fill_opacity: float = 1.0,
+        stroke_width: int = 0,
+        size: int = 1,
+        line_spacing: int = -1,
+        font: str = "",
+        slant: str = "NORMAL",
+        weight: str = "NORMAL",
+        gradient: tuple = None,
+        tab_width: int = 4,
+        disable_ligatures: bool = False,
+        filename: str = "text.svg",
+        color: str = "white",
+        **kwargs,
+    ) -> None:
+        self.color = color
+        self.size = size
+        self.filename = filename
+        self.line_spacing = line_spacing
+        self.font = font
+        self.slant = slant
+        self.weight = weight
+        self.gradient = gradient
+        self.tab_width = tab_width
+        self.original_text = text
+        self.disable_ligatures = disable_ligatures
+        text_without_tabs = text
+        self.t2f = self.t2s = self.t2w = self.t2c = {}
+        if text.find("\t") != -1:
+            text_without_tabs = text.replace("\t", " " * self.tab_width)
+        self.text = text_without_tabs
+        if self.line_spacing == -1:
+            self.line_spacing = self.size + self.size * 0.3
+        else:
+            self.line_spacing = self.size + self.size * self.line_spacing
+        self.text2svg()
+
+    def _merge_settings(
+        self, left_setting: TextSetting, right_setting: TextSetting, args: Sequence[str]
+    ) -> TextSetting:
+        contained = right_setting.end < left_setting.end
+        new_setting = copy.copy(left_setting) if contained else copy.copy(right_setting)
+
+        new_setting.start = right_setting.end if contained else left_setting.end
+        left_setting.end = right_setting.start
+        if not contained:
+            right_setting.end = new_setting.start
+
+        for arg in args:
+            left = getattr(left_setting, arg)
+            right = getattr(right_setting, arg)
+            default = getattr(self, arg)
+            if left != default and getattr(right_setting, arg) != default:
+                raise ValueError(
+                    "Ambiguous style for text"
+                    f"'{self.text[right_setting.start:right_setting.end]}':"
+                    f"'{arg}' cannot be both '{left}' and '{right}'."
+                )
+            setattr(right_setting, arg, left if left != default else right)
+        return new_setting
+
+    def text2settings(self):
+        """Internally used function. Converts the texts and styles
+        to a setting for parsing."""
+        settings = []
+        t2xs = [
+            (self.t2f, "font"),
+            (self.t2s, "slant"),
+            (self.t2w, "weight"),
+            (self.t2c, "color"),
+        ]
+        t2xwords = {
+            *self.t2f.keys(),
+            *self.t2s.keys(),
+            *self.t2w.keys(),
+            *self.t2c.keys(),
+        }
+        for word in t2xwords:
+            setting_args = {
+                arg: t2x[word] if word in t2x else getattr(self, arg)
+                for t2x, arg in t2xs
+            }
+
+            for start, end in self.find_indexes(word, self.text):
+                settings.append(TextSetting(start, end, **setting_args))
+
+        # Handle overlaps
+        setting_args = {arg: getattr(self, arg) for _, arg in t2xs}
+
+        settings.sort(key=lambda setting: setting.start)
+        index = 0
+        for setting in settings:
+            index += 1
+            if index == len(settings):
+                break
+
+            next_setting = settings[index]
+            if setting.end > next_setting.start:
+                new_setting = self._merge_settings(setting, next_setting, setting_args)
+                new_index = index
+                while (
+                    new_index < len(settings)
+                    and settings[new_index].start < new_setting.start
+                ):
+                    new_index += 1
+                settings.insert(new_index, new_setting)
+
+        # Set all text settings (default font, slant, weight)
+        temp_settings = settings.copy()
+        start = 0
+        for setting in settings:
+            if setting.start != start:
+                temp_settings.append(TextSetting(start, setting.start, **setting_args))
+            start = setting.end
+        if start != len(self.text):
+            temp_settings.append(TextSetting(start, len(self.text), **setting_args))
+        settings = sorted(temp_settings, key=lambda setting: setting.start)
+
+        if re.search(r"\n", self.text):
+            line_num = 0
+            for start, end in self.find_indexes("\n", self.text):
+                for setting in settings:
+                    if setting.line_num == -1:
+                        setting.line_num = line_num
+                    if start < setting.end:
+                        line_num += 1
+                        new_setting = copy.copy(setting)
+                        setting.end = end
+                        new_setting.start = end
+                        new_setting.line_num = line_num
+                        settings.append(new_setting)
+                        settings.sort(key=lambda setting: setting.start)
+                        break
+        for setting in settings:
+            if setting.line_num == -1:
+                setting.line_num = 0
+        return settings
+
+    def text2svg(self):
+        """Internally used function.
+        Convert the text to SVG using Pango
+        """
+        size = self.size * 10
+        line_spacing = self.line_spacing * 10
+        dir_name = Path(self.filename).parent
+        disable_liga = self.disable_ligatures
+        if not os.path.exists(dir_name):
+            os.makedirs(dir_name)
+        file_name = self.filename
+        settings = self.text2settings()
+        width = 600
+        height = 400
+
+        return text2svg(
+            settings,
+            size,
+            line_spacing,
+            disable_liga,
+            file_name,
+            30,
+            30,
+            width,
+            height,
+            self.text,
+        )

ManimPango-0.4.0/tests/test_colors.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from pathlib import Path
+
+import pytest
+
+from . import CASES_DIR
+from ._manim import Text
+from .svg_tester import SVGStyleTester
+
+
+def test_invalid_color_fail(tmpdir):
+    loc = Path(tmpdir, "test.svg")
+    assert not loc.exists()
+    with pytest.raises(ValueError):
+        Text("color", color="invalid", filename=str(loc))
+
+
+def test_colors(tmpdir):
+    expected = Path(CASES_DIR, "color_red.svg")
+    loc = Path(tmpdir, "test.svg")
+    assert not loc.exists()
+    Text("color", color="red", filename=str(loc))
+    assert loc.exists()
+    s = SVGStyleTester(gotSVG=loc, expectedSVG=expected)
+    assert len(s.got_svg_style) == len(s.expected_svg_style)
+    assert s.got_svg_style == s.expected_svg_style

{ManimPango-0.3.0 → ManimPango-0.4.0}/tests/test_fonts.py

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
+import os
+import subprocess
 import sys
+import textwrap
+from contextlib import contextmanager
 from pathlib import Path
 from shutil import copyfile
 
-import manim
 import pytest
 
 import manimpango
@@ -11,13 +14,31 @@ import manimpango
 from . import FONT_DIR
 from ._manim import MarkupText
 
-font_lists = {
-    (FONT_DIR / "AdobeVFPrototype.ttf").absolute(): "Adobe Variable Font Prototype",
-    (
-        FONT_DIR / "BungeeColor-Regular_colr_Windows.ttf"
-    ).absolute(): "Bungee Color Regular",
-    (FONT_DIR / "MaShanZheng-Regular.ttf").absolute(): "Ma Shan Zheng",
-}
+
+@contextmanager
+def register_font(font_file: Path):
+    font_file = os.fspath(font_file)
+    init = manimpango.list_fonts()
+    assert manimpango.register_font(font_file), "Invalid Font possibly."
+    final = manimpango.list_fonts()
+    yield list(set(final) - set(init))[0]
+    assert manimpango.unregister_font(font_file), "Can't unregister Font"
+
+
+def font_list():
+    _t = [
+        (FONT_DIR / "AdobeVFPrototype.ttf").absolute(),
+        (FONT_DIR / "BungeeColor-Regular_colr_Windows.ttf").absolute(),
+        (FONT_DIR / "MaShanZheng-Regular.ttf").absolute(),
+    ]
+    _d = {}
+    for i in _t:
+        with register_font(i) as f:
+            _d[i] = f
+    return _d
+
+
+font_lists_dict = font_list()
 
 
 def test_unicode_font_name(tmpdir):
@@ -27,46 +48,54 @@ def test_unicode_font_name(tmpdir):
     assert manimpango.unregister_font(final_font)
 
 
-@pytest.mark.parametrize("font_name", font_lists)
-def test_register_font(font_name):
+@pytest.mark.parametrize("font_name", font_lists_dict)
+def test_register_and_unregister_font(font_name):
     intial = manimpango.list_fonts()
     assert manimpango.register_font(str(font_name)), "Invalid Font possibly."
     final = manimpango.list_fonts()
     assert intial != final
-
-
-@pytest.mark.parametrize("font_name", font_lists.values())
-def test_warning(capfd, font_name):
-    print(font_name)
-    manim.Text("Testing", font=font_name)
-    captured = capfd.readouterr()
-    assert "Pango-WARNING **" not in captured.err, "Looks like pango raised a warning?"
-
-
-@pytest.mark.skipif(
-    sys.platform.startswith("linux"), reason="unsupported api for linux"
-)
-@pytest.mark.parametrize("font_name", font_lists)
-def test_unregister_font(font_name):
-    intial = manimpango.list_fonts()
-    assert manimpango.unregister_font(str(font_name)), "Failed to unregister the font"
-    final = manimpango.list_fonts()
-    assert intial != final
+    assert manimpango.unregister_font(os.fspath(font_name)), "Can't unregister font."
+    assert intial == manimpango.list_fonts()
 
 
 @pytest.mark.skipif(
-    sys.platform.startswith("linux"), reason="unsupported api for linux"
+    sys.platform.startswith("linux"), reason="no warning are raised for linux"
 )
-@pytest.mark.parametrize("font_name", font_lists)
-def test_register_and_unregister_font(font_name):
-    assert manimpango.register_font(str(font_name)), "Invalid Font possibly."
-    assert manimpango.unregister_font(str(font_name)), "Failed to unregister the font"
+@pytest.mark.parametrize("font_file,font_name", font_lists_dict.items())
+def test_warning(font_file, font_name):
+    # this tests need to be run in a separate subprocess because
+    # of fontmap cache in Pango.
+    command = textwrap.dedent(
+        f"""\
+            from tests import set_dll_search_path
+            set_dll_search_path() # this is needed on Windows to run
+            import manimpango
+            import os
+            from tests._manim import Text
+            font_file = r'{os.fspath(font_file)}'
+            font_name = r'{font_name}'
+            intial = manimpango.list_fonts()
+            manimpango.register_font(os.fspath(font_file))
+            final = manimpango.list_fonts()
+            assert intial != final
+            Text("Testing", font=font_name)
+            manimpango.unregister_font(os.fspath(font_file))
+        """
+    )
+    a = subprocess.run(
+        [sys.executable, "-c", command],
+        check=True,
+        stderr=subprocess.PIPE,
+        cwd=Path(__file__).parent.parent,
+    )
+    captured = a.stderr.decode()
+    assert "Pango-WARNING **" not in captured, "Looks like Pango raised a warning?"
 
 
 @pytest.mark.skipif(
     sys.platform.startswith("linux"), reason="unsupported api for linux"
 )
-@pytest.mark.parametrize("font_name", font_lists)
+@pytest.mark.parametrize("font_name", font_lists_dict)
 @pytest.mark.skipif(sys.platform.startswith("darwin"), reason="always returns true")
 def test_fail_just_unregister(font_name):
     assert not manimpango.unregister_font(
@@ -78,7 +107,7 @@ def test_fail_just_unregister(font_name):
     sys.platform.startswith("win32"), reason="unsupported api for win32"
 )
 @pytest.mark.skipif(sys.platform.startswith("darwin"), reason="unsupported api for mac")
-def test_unregister_linux():
+def test_unregister_not_fail_linux():
     assert manimpango.unregister_font("random")
 
 
@@ -90,6 +119,7 @@ def test_adding_dummy_font(tmpdir):
     with open(dummy, "wb") as f:
         f.write(b"dummy")
     assert not manimpango.register_font(str(dummy)), "Registered a dummy font?"
+    assert not manimpango.fc_register_font(str(dummy)), "Registered a dummy font?"
 
 
 def test_simple_fonts_render(tmpdir):
@@ -106,7 +136,7 @@ def test_both_fc_and_register_font_are_same():
     assert manimpango.fc_unregister_font == manimpango.unregister_font
 
 
-@pytest.mark.parametrize("font_file", font_lists)
+@pytest.mark.parametrize("font_file", font_lists_dict)
 def test_fc_font_register(setup_fontconfig, font_file):
     intial = manimpango.list_fonts()
     assert manimpango.fc_register_font(str(font_file)), "Invalid Font possibly."

{ManimPango-0.3.0 → ManimPango-0.4.0}/tests/test_list_fonts.py

@@ -5,7 +5,7 @@ import pytest
 
 import manimpango
 
-from .test_fonts import font_lists
+from .test_fonts import font_lists_dict as font_lists
 
 
 def test_whether_list():

ManimPango-0.3.0/pyproject.toml

@@ -1,2 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel","Cython>=0.27"]

ManimPango-0.3.0/requirements-dev.txt

@@ -1,5 +0,0 @@
-pytest-cov
-pytest
-Cython
-coverage
-manim>0.2.0

ManimPango-0.3.0/tests/_manim.py

@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-"""This file contains helpers for the tests copied and modified
-from Manim.
-"""
-
-import os
-from pathlib import Path
-
-from manimpango import Alignment, MarkupUtils
-
-
-class MarkupText:
-    def __init__(
-        self,
-        text: str,
-        *,
-        size: int = 1,
-        line_spacing: int = None,
-        font: str = None,
-        slant: str = "NORMAL",
-        weight: str = "NORMAL",
-        tab_width: int = 4,
-        disable_ligatures: bool = False,
-        justify: bool = None,
-        indent: float = None,
-        alignment: Alignment = None,
-        # for the tests
-        filename: str = "test.svg",
-        wrap_text: bool = True,
-        **kwargs,
-    ):
-        self.text = text
-        self.size = size
-        self.line_spacing = line_spacing
-        self.font = font
-        self.slant = slant
-        self.weight = weight
-        self.tab_width = tab_width
-        self.filename = filename
-        self.original_text = text
-        self.disable_ligatures = disable_ligatures
-
-        self.justify = justify
-        self.indent = indent
-        self.alignment = alignment
-        self.wrap_text = wrap_text
-        if MarkupUtils.validate(self.text):
-            raise ValueError(
-                f"Pango cannot parse your markup in {self.text}. "
-                "Please check for typos, unmatched tags or unescaped "
-                "special chars like < and &."
-            )
-        self.text2svg()
-
-    def text2svg(self):
-        """Convert the text to SVG using Pango."""
-        size = self.size * 10
-        dir_name = Path(self.filename).parent
-        disable_liga = self.disable_ligatures
-        if not os.path.exists(dir_name):
-            os.makedirs(dir_name)
-        file_name = self.filename
-        if self.wrap_text:
-            return MarkupUtils.text2svg(
-                f"{self.text}",
-                self.font,
-                self.slant,
-                self.weight,
-                size,
-                True,  # stray positional argument
-                disable_liga,
-                file_name,
-                20,
-                20,
-                600,  # width
-                400,  # height
-                justify=self.justify,
-                indent=self.indent,
-                line_spacing=self.line_spacing,
-                alignment=self.alignment,
-            )
-        else:
-            return MarkupUtils.text2svg(
-                f"{self.text}",
-                self.font,
-                self.slant,
-                self.weight,
-                size,
-                True,  # stray positional argument
-                disable_liga,
-                file_name,
-                20,
-                20,
-                600,  # width
-                400,  # height
-                justify=self.justify,
-                indent=self.indent,
-                line_spacing=self.line_spacing,
-                alignment=self.alignment,
-                pango_width=-1,
-            )
-            # -1 for no wrapping
-            # default is full width and then wrap.
-
-    def __repr__(self):
-        return f"MarkupText({repr(self.original_text)})"