LangSC 2.2.2__tar.gz → 2.3.0__tar.gz

{langsc-2.2.2 → langsc-2.3.0}/LangSC/__version__.py

@@ -2,6 +2,6 @@
 # Keep __version__ a plain string literal: setup.cfg reads it statically via
 # `version = attr: LangSC.__version__.__version__`, so it must stay AST-parseable
 # (no computed expression) to avoid importing the package at build time.
-__version__ = "2.2.2"
+__version__ = "2.3.0"
 
 VERSION = tuple(int(x) for x in __version__.split("."))

{langsc-2.2.2 → langsc-2.3.0}/LangSC/gpf.py

@@ -95,16 +95,17 @@ class GPF:
 
         if OS == "Windows":
             self.dll_close = win32api.FreeLibrary
-            cfg_file_DOTExe = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'Graph/dot.exe')
-        elif OS == "Linux":
+        else:
+            # Linux / macOS：通过 libc 的 dlclose 释放句柄
             try:
                 stdlib = CDLL("")
             except OSError:
-                stdlib = CDLL("libc.so")
+                stdlib = CDLL("libc.so" if OS == "Linux" else "libc.dylib")
             self.dll_close = stdlib.dlclose
             self.dll_close.argtypes = [c_void_p]
-            cfg_file_DOTExe = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'Graph/dot')
-        self.DotExe = cfg_file_DOTExe
+        # 绘图默认字体：Graphviz 渲染中文需宿主机存在对应 CJK 字体。
+        # Windows 自带“仿宋/fangsong”；Linux 若缺中文字体会显示方框，
+        # 需安装 CJK 字体（如 fonts-wqy-zenhei / Noto Sans CJK）。
         self._init_gpf_data(dataPath)
 
     def __del__(self):
@@ -653,6 +654,26 @@ class GPF:
             return True
         return False
 
+    def _render_dot(self, dot_source, img, fmt=None):
+        """用 pygraphviz（wheel 自带 Graphviz 二进制）将 DOT 渲染为图片。
+
+        跨 Windows / Linux / macOS，无需系统另装 Graphviz，替代原先只在
+        Windows 可用的 Graph/dot.exe 子进程调用。渲染中文需宿主机安装对应
+        CJK 字体（模板默认 fontname="fangsong"），否则中文会显示为方框。
+        """
+        try:
+            import pygraphviz as pgv
+        except ImportError as e:
+            raise ImportError(
+                "绘图需要 pygraphviz（自带 Graphviz，跨平台）。"
+                "请执行: pip install pygraphviz"
+            ) from e
+        if fmt is None:
+            ext = os.path.splitext(img)[1].lstrip(".").lower()
+            fmt = ext if ext else "png"
+        g = pgv.AGraph(string=dot_source)
+        g.draw(img, format=fmt, prog="dot")
+
     # --- Index ---
 
     def IndexFSA(self, rule_filename):
@@ -934,12 +955,7 @@ class GPF:
         elif Type == "Tree":
             DotInfo = self.ShowTree(Json)
 
-        Out = open("./tmp.dot", "w", encoding="utf-8")
-        print(DotInfo, file=Out)
-        Out.close()
-        Cmd = self.DotExe + " -Tpng " + " ./tmp.dot -o " + Img
-        os.system(Cmd)
-        os.remove("./tmp.dot")
+        self._render_dot(DotInfo, Img)
 
     def UnitInfo(self, Unit):
         Ret = Unit
@@ -968,12 +984,7 @@ class GPF:
             Script += self.UnitInfo(Unit) + "->" + self.UnitInfo(K) + '[ label=" ' + K + ' "]' + "\n"
 
         Script += '}' + "\n"
-        Out = open("./tmp.dot", "w", encoding="utf-8")
-        print(Script, file=Out)
-        Out.close()
-        Cmd = self.DotExe + " -Tpng " + " ./tmp.dot -o " + Img
-        os.system(Cmd)
-        os.remove("./tmp.dot")
+        self._render_dot(Script, Img)
 
     def ShowRelation(self, Img="./gpf.png"):
         self.ShowGrid(Img, True, True)
@@ -1022,12 +1033,7 @@ class GPF:
                         else:
                             Script += self.UnitInfo(U) + "->" + self.UnitInfo(H) + '[ label=" ' + Rel + ' "]' + "\n"
         Script += '}' + "\n"
-        Out = open("./tmp.dot", "w", encoding="utf-8")
-        print(Script, file=Out)
-        Out.close()
-        Cmd = self.DotExe + " -Tpng " + " ./tmp.dot -o " + Img
-        os.system(Cmd)
-        os.remove("./tmp.dot")
+        self._render_dot(Script, Img)
 
     def GetJSUnitInfo(self, JS):
         Att = ""

{langsc-2.2.2 → langsc-2.3.0/LangSC.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LangSC
-Version: 2.2.2
+Version: 2.3.0
 Summary: Language Structure Computation - GPF, BCC, and JSS unified package
 Author: endongxun
 Author-email: xunendong@gmail.com
@@ -12,10 +12,11 @@ Classifier: Operating System :: MacOS
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.6
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pywin32; platform_system == "Windows"
+Requires-Dist: pygraphviz
 Requires-Dist: wordcloud
 Requires-Dist: requests
 Requires-Dist: chardet

langsc-2.3.0/LangSC.egg-info/SOURCES.txt

@@ -0,0 +1,35 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+setup.cfg
+setup.py
+LangSC/BCCconfig.txt
+LangSC/GPFconfig.txt
+LangSC/Parser.lua
+LangSC/Segment.dat
+LangSC/__init__.py
+LangSC/__version__.py
+LangSC/_utils.py
+LangSC/base.lex
+LangSC/bcc.py
+LangSC/bcclib.dll
+LangSC/gpf.py
+LangSC/gpflib.dll
+LangSC/idxPOS.dat
+LangSC/jss.py
+LangSC/jsslib.dll
+LangSC/libbcclib.dylib
+LangSC/libbcclib.so
+LangSC/libgpflib.dylib
+LangSC/libgpflib.so
+LangSC/libjsslib.dylib
+LangSC/libjsslib.so
+LangSC.egg-info/PKG-INFO
+LangSC.egg-info/SOURCES.txt
+LangSC.egg-info/dependency_links.txt
+LangSC.egg-info/not-zip-safe
+LangSC.egg-info/requires.txt
+LangSC.egg-info/top_level.txt
+tests/test_gpf_threadsafe.py
+tests/test_win_smoke.py

{langsc-2.2.2 → langsc-2.3.0}/LangSC.egg-info/requires.txt

@@ -1,3 +1,4 @@
+pygraphviz
 wordcloud
 requests
 chardet

{langsc-2.2.2/LangSC.egg-info → langsc-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LangSC
-Version: 2.2.2
+Version: 2.3.0
 Summary: Language Structure Computation - GPF, BCC, and JSS unified package
 Author: endongxun
 Author-email: xunendong@gmail.com
@@ -12,10 +12,11 @@ Classifier: Operating System :: MacOS
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.6
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pywin32; platform_system == "Windows"
+Requires-Dist: pygraphviz
 Requires-Dist: wordcloud
 Requires-Dist: requests
 Requires-Dist: chardet

{langsc-2.2.2 → langsc-2.3.0}/setup.cfg

@@ -22,15 +22,14 @@ include_package_data = True
 packages = find:
 install_requires = 
 	pywin32; platform_system == "Windows"
+	pygraphviz
 	wordcloud
 	requests
 	chardet
-python_requires = >= 3.6
+python_requires = >= 3.10
 
 [options.package_data]
 LangSC = 
-	Graph/*.*
-	Graph/config6
 	gpflib.dll
 	bcclib.dll
 	jsslib.dll

langsc-2.2.2/LangSC/Graph/config6

@@ -1,273 +0,0 @@
-# This file was generated by "dot -c" at time of install.
-
-# You may temporarily disable a plugin by removing or commenting out
-# a line in this file, or you can modify its "quality" value to affect
-# default plugin selection.
-
-# Manual edits to this file **will be lost** on upgrade.
-
-gvplugin_core.dll core {
-	device {
-		dot:dot 1
-		gv:dot 1
-		canon:dot 1
-		plain:dot 1
-		plain-ext:dot 1
-		xdot:xdot 1
-		xdot1.2:xdot 1
-		xdot1.4:xdot 1
-	}
-	device {
-		fig:fig 1
-	}
-	device {
-		ismap:map 1
-		cmap:map 1
-		imap:map 1
-		cmapx:map 1
-		imap_np:map 1
-		cmapx_np:map 1
-	}
-	device {
-		ps:ps 1
-		ps2:ps 1
-		eps:ps 1
-	}
-	device {
-		svg:svg 1
-		svgz:svg 1
-	}
-	device {
-		tk:tk 1
-	}
-	device {
-		vml:vml 1
-		vmlz:vml 1
-	}
-	device {
-		pic:pic -1
-	}
-	device {
-		pov:pov 1
-	}
-	render {
-		dot 1
-		xdot 1
-	}
-	render {
-		fig 1
-	}
-	render {
-		map 1
-	}
-	render {
-		ps 1
-	}
-	render {
-		svg 1
-	}
-	render {
-		tk 1
-	}
-	render {
-		vml 1
-	}
-	render {
-		pic -1
-	}
-	render {
-		pov 1
-	}
-	loadimage {
-		png:svg 1
-		gif:svg 1
-		jpeg:svg 1
-		jpe:svg 1
-		jpg:svg 1
-		png:fig 1
-		gif:fig 1
-		jpeg:fig 1
-		jpe:fig 1
-		jpg:fig 1
-		png:vrml 1
-		gif:vrml 1
-		jpeg:vrml 1
-		jpe:vrml 1
-		jpg:vrml 1
-		eps:ps 1
-		ps:ps 1
-		(lib):ps 1
-		png:map 1
-		gif:map 1
-		jpeg:map 1
-		jpe:map 1
-		jpg:map 1
-		ps:map 1
-		eps:map 1
-		svg:map 1
-		png:dot 1
-		gif:dot 1
-		jpeg:dot 1
-		jpe:dot 1
-		jpg:dot 1
-		ps:dot 1
-		eps:dot 1
-		svg:dot 1
-		png:xdot 1
-		gif:xdot 1
-		jpeg:xdot 1
-		jpe:xdot 1
-		jpg:xdot 1
-		ps:xdot 1
-		eps:xdot 1
-		svg:xdot 1
-		svg:svg 1
-		png:vml 1
-		gif:vml 1
-		jpeg:vml 1
-		jpe:vml 1
-		jpg:vml 1
-		gif:tk 1
-	}
-}
-gvplugin_dot_layout.dll dot_layout {
-	layout {
-		dot 0
-	}
-}
-gvplugin_gd.dll gd {
-	render {
-		gd 1
-	}
-	render {
-		vrml 1
-	}
-	textlayout {
-		textlayout 2
-	}
-	loadimage {
-		gd:gd 1
-		gd2:gd 1
-		gif:gd 1
-		jpeg:gd 1
-		jpe:gd 1
-		jpg:gd 1
-		png:gd 1
-		gd:ps 1
-#FAILS		gd:lasi 1
-		gd2:ps 1
-#FAILS		gd2:lasi 1
-		gif:ps 1
-#FAILS		gif:lasi 1
-		jpeg:ps 1
-		jpg:ps 1
-		jpe:ps 1
-#FAILS		jpeg:lasi 1
-#FAILS		jpg:lasi 1
-#FAILS		jpe:lasi 1
-		png:ps 1
-#FAILS		png:lasi 1
-		gd:cairo 1
-		gd2:cairo 1
-		gif:cairo 1
-		jpeg:cairo 1
-		jpg:cairo 1
-		jpe:cairo 1
-		png:cairo -1
-	}
-	device {
-		gif:cairo 10
-		wbmp:cairo 5
-		jpe:cairo 5
-		jpeg:cairo 5
-		jpg:cairo 5
-		png:cairo 5
-		gd:cairo 5
-		gd2:cairo 5
-	}
-	device {
-		gif:gd 1
-		wbmp:gd 1
-		jpe:gd 1
-		jpeg:gd 1
-		jpg:gd 1
-		png:gd 1
-		gd:gd 1
-		gd2:gd 1
-	}
-	device {
-		vrml:vrml 1
-	}
-}
-gvplugin_gdiplus.dll gdiplus {
-	render {
-		gdiplus 1
-	}
-	textlayout {
-		textlayout 8
-	}
-	loadimage {
-		bmp:gdiplus 8
-		gif:gdiplus 8
-		jpe:gdiplus 8
-		jpeg:gdiplus 8
-		jpg:gdiplus 8
-		png:gdiplus 8
-	}
-	device {
-		metafile:gdiplus 8
-		bmp:gdiplus 8
-		emf:gdiplus 8
-		emfplus:gdiplus 8
-		gif:gdiplus 8
-		jpe:gdiplus 8
-		jpeg:gdiplus 8
-		jpg:gdiplus 8
-		png:gdiplus 8
-		tif:gdiplus 8
-		tiff:gdiplus 8
-	}
-	device {
-		bmp:cairo 8
-		gif:cairo 8
-		jpe:cairo 8
-		jpeg:cairo 8
-		jpg:cairo 8
-		png:cairo 8
-		tif:cairo 8
-		tiff:cairo 8
-	}
-}
-gvplugin_neato_layout.dll neato_layout {
-	layout {
-		neato 0
-		fdp 0
-		sfdp 0
-		twopi 0
-		circo 0
-		patchwork 0
-		osage 0
-		nop 0
-		nop1 0
-		nop2 0
-	}
-}
-gvplugin_pango.dll cairo {
-	render {
-		cairo 10
-	}
-	textlayout {
-		textlayout 10
-	}
-	loadimage {
-		png:cairo 1
-#FAILS		png:lasi 2
-		png:ps 2
-	}
-	device {
-		png:cairo 10
-		ps:cairo -10
-		pdf:cairo 10
-		svg:cairo -10
-	}
-}

langsc-2.2.2/LangSC.egg-info/SOURCES.txt

@@ -1,72 +0,0 @@
-LICENSE
-MANIFEST.in
-README.md
-pyproject.toml
-setup.cfg
-setup.py
-LangSC/BCCconfig.txt
-LangSC/GPFconfig.txt
-LangSC/Parser.lua
-LangSC/Segment.dat
-LangSC/__init__.py
-LangSC/__version__.py
-LangSC/_utils.py
-LangSC/base.lex
-LangSC/bcc.py
-LangSC/bcclib.dll
-LangSC/gpf.py
-LangSC/gpflib.dll
-LangSC/idxPOS.dat
-LangSC/jss.py
-LangSC/jsslib.dll
-LangSC/libbcclib.dylib
-LangSC/libbcclib.so
-LangSC/libgpflib.dylib
-LangSC/libgpflib.so
-LangSC/libjsslib.dylib
-LangSC/libjsslib.so
-LangSC.egg-info/PKG-INFO
-LangSC.egg-info/SOURCES.txt
-LangSC.egg-info/dependency_links.txt
-LangSC.egg-info/not-zip-safe
-LangSC.egg-info/requires.txt
-LangSC.egg-info/top_level.txt
-LangSC/Graph/Pathplan.dll
-LangSC/Graph/cdt.dll
-LangSC/Graph/cgraph.dll
-LangSC/Graph/config6
-LangSC/Graph/dot.exe
-LangSC/Graph/fontconfig.dll
-LangSC/Graph/fontconfig_fix.dll
-LangSC/Graph/freetype6.dll
-LangSC/Graph/gvc.dll
-LangSC/Graph/gvplugin_core.dll
-LangSC/Graph/gvplugin_dot_layout.dll
-LangSC/Graph/gvplugin_gd.dll
-LangSC/Graph/gvplugin_pango.dll
-LangSC/Graph/iconv.dll
-LangSC/Graph/intl.dll
-LangSC/Graph/jpeg62.dll
-LangSC/Graph/libcairo-2.dll
-LangSC/Graph/libexpat-1.dll
-LangSC/Graph/libexpat.dll
-LangSC/Graph/libfontconfig-1.dll
-LangSC/Graph/libfreetype-6.dll
-LangSC/Graph/libgdk_pixbuf-2.0-0.dll
-LangSC/Graph/libglade-2.0-0.dll
-LangSC/Graph/libglib-2.0-0.dll
-LangSC/Graph/libgmodule-2.0-0.dll
-LangSC/Graph/libgobject-2.0-0.dll
-LangSC/Graph/libgthread-2.0-0.dll
-LangSC/Graph/libgtkglext-win32-1.0-0.dll
-LangSC/Graph/libpango-1.0-0.dll
-LangSC/Graph/libpangocairo-1.0-0.dll
-LangSC/Graph/libpangoft2-1.0-0.dll
-LangSC/Graph/libpangowin32-1.0-0.dll
-LangSC/Graph/libpng14-14.dll
-LangSC/Graph/librsvg-2-2.dll
-LangSC/Graph/libxml2.dll
-LangSC/Graph/ltdl.dll
-LangSC/Graph/zlib1.dll
-tests/test_gpf_threadsafe.py
-tests/test_win_smoke.py