summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorptmcg <ptmcg@austin.rr.com>2023-04-12 22:26:54 -0500
committerptmcg <ptmcg@austin.rr.com>2023-04-12 22:26:54 -0500
commit498adfa547b504bb90ac5a2ec5a8bfb57ccb5ec2 (patch)
treea49e273f6a3d9b76f760349870cc3b593dbe7e12
parent6f6e1db97662b66c1670e53e69e2f488cd299607 (diff)
downloadpyparsing-git-498adfa547b504bb90ac5a2ec5a8bfb57ccb5ec2.tar.gz
Make create_diagram() code compatible with latest version of railroad-diagrams; fixes #477
-rw-r--r--CHANGES7
-rw-r--r--pyparsing/__init__.py4
-rw-r--r--pyparsing/diagram/__init__.py5
3 files changed, 13 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 3f46af4..a30c42a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,13 @@ help from Devin J. Pohly in structuring the code to enable this peaceful transit
Version 3.2.0 will also discontinue support for Python versions 3.6 and 3.7.
+Version 3.1.0b2 - (in development)
+----------------------------------
+- Updated create_diagram() code to be compatible with railroad-diagrams package
+ version 3.0. Fixes Issue #477 (railroad diagrams generated with black bars),
+ reported by Sam Morley-Short.
+
+
Version 3.1.0b1 - April, 2023
-----------------------------
- Added support for Python 3.12.
diff --git a/pyparsing/__init__.py b/pyparsing/__init__.py
index d4a88e3..c14913f 100644
--- a/pyparsing/__init__.py
+++ b/pyparsing/__init__.py
@@ -120,8 +120,8 @@ class version_info(NamedTuple):
return f"{__name__}.{type(self).__name__}({', '.join('{}={!r}'.format(*nv) for nv in zip(self._fields, self))})"
-__version_info__ = version_info(3, 1, 0, "beta", 1)
-__version_time__ = "08 Apr 2023 05:16 UTC"
+__version_info__ = version_info(3, 1, 0, "beta", 2)
+__version_time__ = "13 Apr 2023 03:01 UTC"
__version__ = __version_info__.__version__
__versionTime__ = __version_time__
__author__ = "Paul McGuire <ptmcg.gm+pyparsing@gmail.com>"
diff --git a/pyparsing/diagram/__init__.py b/pyparsing/diagram/__init__.py
index f180152..ccad1c5 100644
--- a/pyparsing/diagram/__init__.py
+++ b/pyparsing/diagram/__init__.py
@@ -144,7 +144,10 @@ def railroad_to_html(diagrams: List[NamedDiagram], embed=False, **kwargs) -> str
if diagram.diagram is None:
continue
io = StringIO()
- diagram.diagram.writeSvg(io.write)
+ try:
+ diagram.diagram.writeStandalone(io.write)
+ except AttributeError:
+ diagram.diagram.writeSvg(io.write)
title = diagram.name
if diagram.index == 0:
title += " (root)"