Merge pull request #2 from moi15moi/Correct-macOS-system-version-check-and-some-doc

Correct mac os system version check and some doc

Author: moi15moi

find_system_fonts_filename/__init__.py

@@ -1,4 +1,4 @@
 from .fonts_filename import get_system_fonts_filename
 from .exceptions import FontConfigNotFound, OSNotSupported
 
-__version__ = "0.0.3"
+__version__ = "0.0.4"

find_system_fonts_filename/linux_fonts.py

@@ -82,7 +82,6 @@ def get_system_fonts_filename() -> Set[str]:
 
         return fonts_filename
 
-
     @staticmethod
     def _load_font_config_library():
         font_config_library_name = util.find_library("fontconfig")
@@ -92,17 +91,22 @@ def _load_font_config_library():
 
         LinuxFonts._font_config = cdll.LoadLibrary(font_config_library_name)
 
+        # https://www.freedesktop.org/software/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html
         LinuxFonts._font_config.FcInitLoadConfigAndFonts.restype = c_void_p
         LinuxFonts._font_config.FcInitLoadConfigAndFonts.argtypes = []
 
+        # https://www.freedesktop.org/software/fontconfig/fontconfig-devel/fcpatterncreate.html
         LinuxFonts._font_config.FcPatternCreate.restype = c_void_p
         LinuxFonts._font_config.FcPatternCreate.argtypes = []
 
+        # https://www.freedesktop.org/software/fontconfig/fontconfig-devel/fcobjectsetbuild.html
         LinuxFonts._font_config.FcObjectSetBuild.restype = c_void_p
         LinuxFonts._font_config.FcObjectSetBuild.argtypes = [c_char_p, c_void_p]
 
+        # https://www.freedesktop.org/software/fontconfig/fontconfig-devel/fcfontlist.html
         LinuxFonts._font_config.FcFontList.restype = POINTER(FcFontSet)
         LinuxFonts._font_config.FcFontList.argtypes = [c_void_p, c_void_p, c_void_p]
 
+        # https://www.freedesktop.org/software/fontconfig/fontconfig-devel/fcpatternget-type.html
         LinuxFonts._font_config.FcPatternGetString.restype = FC_RESULT
         LinuxFonts._font_config.FcPatternGetString.argtypes = [c_void_p, c_char_p, c_int, POINTER(c_char_p)]

find_system_fonts_filename/mac_fonts.py

@@ -65,18 +65,23 @@ def _load_core_library():
 
         CFIndex = c_long
 
+        # https://developer.apple.com/documentation/corefoundation/1521153-cfrelease
         MacFonts._core_foundation.CFRelease.restype = c_void_p
         MacFonts._core_foundation.CFRelease.argtypes = [c_void_p]
 
+        # https://developer.apple.com/documentation/corefoundation/1388772-cfarraygetcount?language=objc
         MacFonts._core_foundation.CFArrayGetCount.restype = CFIndex
         MacFonts._core_foundation.CFArrayGetCount.argtypes = [c_void_p]
 
+        # https://developer.apple.com/documentation/corefoundation/1388767-cfarraygetvalueatindex?language=objc
         MacFonts._core_foundation.CFArrayGetValueAtIndex.restype = c_void_p
         MacFonts._core_foundation.CFArrayGetValueAtIndex.argtypes = [c_void_p, CFIndex]
 
+        # https://developer.apple.com/documentation/corefoundation/1541515-cfurlgetfilesystemrepresentation?language=objc
         MacFonts._core_foundation.CFURLGetFileSystemRepresentation.restype = c_bool
         MacFonts._core_foundation.CFURLGetFileSystemRepresentation.argtypes = [c_void_p, c_bool, c_char_p, CFIndex]
 
+        # https://developer.apple.com/documentation/coretext/1499478-ctfontmanagercopyavailablefontur?language=objc
         MacFonts._core_text.CTFontManagerCopyAvailableFontURLs.restype = c_void_p
         MacFonts._core_text.CTFontManagerCopyAvailableFontURLs.argtypes = []
 
@@ -97,4 +102,4 @@ def is_mac_version_or_greater(minimum_major: int, minimum_minor: int) -> bool:
         system_major = int(system_major)
         system_minor = int(system_minor)
 
-        return minimum_major > system_major or (system_major == minimum_major and system_minor >= minimum_minor)
+        return system_major > minimum_major or (system_major == minimum_major and system_minor >= minimum_minor)

find_system_fonts_filename/windows_fonts.py

@@ -23,7 +23,7 @@ class DWRITE_FONT_FILE_TYPE(IntEnum):
     DWRITE_FONT_FILE_TYPE_TYPE1_PFB = 5
     DWRITE_FONT_FILE_TYPE_VECTOR = 6
     DWRITE_FONT_FILE_TYPE_BITMAP = 7
-    DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION = 8
+    DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION = DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION
 
 
 class IDWriteFontFileLoader(IUnknown):
@@ -367,7 +367,6 @@ def _get_fonts_filename_windows_vista_sp2_or_more() -> Set[str]:
                     fonts_filename.add(buffer.value)
 
         return fonts_filename
-    
 
     @staticmethod
     def _load_DWriteCreateFactory():