manimpango 0.2.6__tar.gz → 0.3.1__tar.gz

{ManimPango-0.2.6 → ManimPango-0.3.1}/ManimPango.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: ManimPango
-Version: 0.2.6
+Version: 0.3.1
 Summary: Bindings for Pango for using with Manim.
 Home-page: https://manimpango.manim.community/
 Author: Naveen M K
 Author-email: naveen@syrusdark.website
 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.2.6 → ManimPango-0.3.1}/ManimPango.egg-info/SOURCES.txt

@@ -36,7 +36,6 @@ tests/_manim.py
 tests/conftest.py
 tests/svg_tester.py
 tests/test_fonts.py
-tests/test_import.py
 tests/test_list_fonts.py
 tests/test_markup.py
 tests/test_utils.py
@@ -45,4 +44,4 @@ tests/fonts/AdobeVFPrototype.ttf
 tests/fonts/BungeeColor-Regular_colr_Windows.ttf
 tests/fonts/BungeeOutline-Regular.ttf
 tests/fonts/LICENSE.txt
-tests/fonts/NotoNastaliqUrdu-Regular.ttf
+tests/fonts/MaShanZheng-Regular.ttf

{ManimPango-0.2.6 → ManimPango-0.3.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: ManimPango
-Version: 0.2.6
+Version: 0.3.1
 Summary: Bindings for Pango for using with Manim.
 Home-page: https://manimpango.manim.community/
 Author: Naveen M K
 Author-email: naveen@syrusdark.website
 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.2.6 → ManimPango-0.3.1}/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.2.6 → ManimPango-0.3.1}/manimpango/_version.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.2.6"
+__version__ = "0.3.1"

{ManimPango-0.2.6 → ManimPango-0.3.1}/manimpango/cmanimpango.pyx

@@ -134,9 +134,39 @@ def text2svg(
 
 class MarkupUtils:
     @staticmethod
-    def validate(text: str) -> bool:
-        text_bytes = text.encode("utf-8")
-        return pango_parse_markup(text_bytes, -1, 0, NULL, NULL, NULL, NULL)
+    def validate(markup: str) -> str:
+        """Validates whether markup is a valid Markup
+        and return the error's if any.
+
+        Parameters
+        ==========
+        markup : :class:`str`
+            The markup which should be checked.
+
+        Returns
+        =======
+        :class:`str`
+            Returns empty string if markup is valid. If markup
+            contains error it return the error message.
+
+        """
+        cdef GError *err = NULL
+        text_bytes = markup.encode("utf-8")
+        res = pango_parse_markup(
+            text_bytes,
+            -1,
+            0,
+            NULL,
+            NULL,
+            NULL,
+            &err
+        )
+        if res:
+            return ""
+        else:
+            message = <bytes>err.message
+            g_error_free(err)
+            return message.decode('utf-8')
 
     @staticmethod
     def text2svg(

{ManimPango-0.2.6 → ManimPango-0.3.1}/manimpango/glib.pxd

@@ -4,5 +4,10 @@ cdef extern from "glib.h":
     ctypedef unsigned int guint
     ctypedef gint gboolean
     ctypedef unsigned short guint16
+    ctypedef char gchar
+    ctypedef struct GError:
+        gint code
+        gchar *message
+    void g_error_free (GError *error)
     void g_object_unref(gpointer object)
     void g_free(gpointer mem)

{ManimPango-0.2.6 → ManimPango-0.3.1}/manimpango/register_font.pxd

@@ -1,15 +1,17 @@
-IF UNAME_SYSNAME == "Linux":
-    cdef extern from "fontconfig/fontconfig.h":
-        ctypedef int FcBool
-        ctypedef struct FcConfig:
-            pass
-        FcBool FcConfigAppFontAddFile(
-            FcConfig* config,
-            const unsigned char* file_name
-        )
-        FcConfig* FcConfigGetCurrent()
-        void FcConfigAppFontClear(void *)
-ELIF UNAME_SYSNAME == "Windows":
+
+cdef extern from "fontconfig/fontconfig.h":
+    ctypedef int FcBool
+    ctypedef struct FcConfig:
+        pass
+    FcBool FcConfigAppFontAddFile(
+        FcConfig* config,
+        const unsigned char* file_name
+    )
+    FcConfig* FcConfigGetCurrent()
+    void FcConfigAppFontClear(void *)
+
+# Windows and macOS specific API's
+IF UNAME_SYSNAME == "Windows":
     cdef extern from "windows.h":
         ctypedef Py_UNICODE WCHAR
         ctypedef const WCHAR* LPCWSTR

{ManimPango-0.2.6 → ManimPango-0.3.1}/manimpango/register_font.pyx

@@ -1,61 +1,74 @@
 from pathlib import Path
 from pango cimport *
 import copy
-IF UNAME_SYSNAME == "Linux":
-    cpdef bint register_font(str font_path):
-        """This function registers the font file using ``fontconfig`` so that
-        it is available for use by Pango.
-        Parameters
-        ==========
-        font_path : :class:`str`
-            Relative or absolute path to font file.
-        Returns
-        =======
-        :class:`bool`
-                True means it worked without any error.
-                False means there was an unknown error
-        Examples
-        --------
-        >>> register_font("/home/roboto.tff")
-        1
-        Raises
-        ------
-        AssertionError
-            Font is missing.
-        """
-        a=Path(font_path)
-        assert a.exists(), f"font doesn't exist at {a.absolute()}"
-        font_path = str(a.absolute())
-        font_path_bytes=font_path.encode('utf-8')
-        cdef const unsigned char* fontPath = font_path_bytes
-        fontAddStatus = FcConfigAppFontAddFile(FcConfigGetCurrent(), fontPath)
-        if fontAddStatus:
-            return True
-        else:
-            return False
-    cpdef bint unregister_font(str font_path):
-        """This function unregisters(removes) the font file using
-        ``fontconfig``. It is mostly optional to call this.
-        Mainly used in tests.
-        Note:
-        The API for Windows is different that this.
-
-        Parameters
-        ==========
 
-        font_path: :class:`str`
-            For compatibility with the windows function.
+cpdef bint fc_register_font(str font_path):
+    """This function registers the font file using ``fontconfig`` so that
+    it is available for use by Pango. On Linux it is aliased to
+    :func:`register_font` and on Windows and macOS this would work only when
+    using ``fontconfig`` backend.
 
-        Returns
-        =======
-        :class:`bool`
-                True means it worked without any error.
-                False means there was an unknown error
+    Parameters
+    ==========
+    font_path : :class:`str`
+        Relative or absolute path to font file.
+    Returns
+    =======
+    :class:`bool`
+            True means it worked without any error.
+            False means there was an unknown error
+    Examples
+    --------
+    >>> register_font("/home/roboto.tff")
+    True
 
-        """
-        FcConfigAppFontClear(NULL)
+    Raises
+    ------
+    AssertionError
+        Font is missing.
+    """
+    a=Path(font_path)
+    assert a.exists(), f"font doesn't exist at {a.absolute()}"
+    font_path = str(a.absolute())
+    font_path_bytes=font_path.encode('utf-8')
+    cdef const unsigned char* fontPath = font_path_bytes
+    fontAddStatus = FcConfigAppFontAddFile(FcConfigGetCurrent(), fontPath)
+    if fontAddStatus:
         return True
-IF UNAME_SYSNAME == "Windows":
+    else:
+        return False
+
+
+cpdef bint fc_unregister_font(str font_path):
+    """This function unregisters(removes) the font file using
+    ``fontconfig``. It is mostly optional to call this.
+    Mainly used in tests. On Linux it is aliased to
+    :func:`unregister_font` and on Windows and macOS this
+    would work only when using ``fontconfig`` backend.
+
+    Parameters
+    ==========
+
+    font_path: :class:`str`
+        For compatibility with the windows function.
+
+    Returns
+    =======
+    :class:`bool`
+            True means it worked without any error.
+            False means there was an unknown error
+
+    """
+    FcConfigAppFontClear(NULL)
+    return True
+
+
+IF UNAME_SYSNAME == "Linux":
+    register_font = fc_register_font
+    unregister_font = fc_unregister_font
+
+
+ELIF UNAME_SYSNAME == "Windows":
     cpdef bint register_font(str font_path):
         """This function registers the font file using native windows API
         so that it is available for use by Pango.
@@ -72,7 +85,7 @@ IF UNAME_SYSNAME == "Windows":
         Examples
         --------
         >>> register_font("C:/home/roboto.tff")
-        1
+        True
         Raises
         ------
         AssertionError
@@ -90,6 +103,8 @@ IF UNAME_SYSNAME == "Windows":
             return True
         else:
             return False
+
+
     cpdef bint unregister_font(str font_path):
         """This function unregisters(removes) the font file using
         native Windows API. It is mostly optional to call this.
@@ -116,6 +131,8 @@ IF UNAME_SYSNAME == "Windows":
             FR_PRIVATE,
             0
         )
+
+
 ELIF UNAME_SYSNAME == "Darwin":
     cpdef bint register_font(str font_path):
         """This function registers the font file using ``CoreText`` API so that
@@ -132,7 +149,7 @@ ELIF UNAME_SYSNAME == "Darwin":
         Examples
         --------
         >>> register_font("/home/roboto.tff")
-        1
+        True
         Raises
         ------
         AssertionError
@@ -149,6 +166,8 @@ ELIF UNAME_SYSNAME == "Darwin":
             kCTFontManagerScopeProcess,
             NULL
         )
+
+
     cpdef bint unregister_font(str font_path):
         """This function unregisters(removes) the font file using
         native ``CoreText`` API. It is mostly optional to call this.
@@ -179,6 +198,7 @@ ELIF UNAME_SYSNAME == "Darwin":
             NULL
         )
 
+
 cpdef list list_fonts():
     """Lists the fonts available to Pango.
     This is usually same as system fonts but it also

ManimPango-0.3.1/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.3.1/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.2.6 → ManimPango-0.3.1}/setup.py

@@ -63,6 +63,7 @@ NEEDED_LIBS = [
     "intl",
     "harfbuzz",
     "cairo",
+    "fontconfig",
 ]
 
 
@@ -89,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,
             )
@@ -190,10 +191,15 @@ def update_dict(dict1: dict, dict2: dict):
 
 ext = ".pyx" if USE_CYTHON else ".c"
 base_file = Path(__file__).parent / "manimpango"
-_pkg_config = PKG_CONFIG("pangocairo")
-_pkg_config.check_min_version(MINIMUM_PANGO_VERSION)
-returns = _pkg_config.setuptools_args
-if not _pkg_config.check_pkgconfig:
+_pkg_config_pangocairo = PKG_CONFIG("pangocairo")
+_pkg_config_fontconfig = PKG_CONFIG("pangofc")
+if _pkg_config_pangocairo.check_pkgconfig:
+    _pkg_config_pangocairo.check_min_version(MINIMUM_PANGO_VERSION)
+    returns = update_dict(
+        _pkg_config_pangocairo.setuptools_args, _pkg_config_fontconfig.setuptools_args
+    )
+else:
+    returns = {}
     returns["libraries"] = NEEDED_LIBS
 if sys.platform == "win32":
     returns["libraries"] += ["Gdi32"]
@@ -245,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.2.6 → ManimPango-0.3.1}/tests/__init__.py

@@ -31,11 +31,3 @@ set_dll_search_path()
 delete_media_dir()
 CASES_DIR = Path(Path(__file__).parent, "cases").absolute()
 FONT_DIR = Path(__file__).parent / "fonts"
-
-import manimpango  # noqa: E402
-
-font = str((FONT_DIR / "BungeeOutline-Regular.ttf").absolute())
-orig = manimpango.list_fonts()
-assert manimpango.register_font(font)
-final = manimpango.list_fonts()
-main_font = list(set(final) - set(orig))[0]