common: increase the size of mark to handle more clusters

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1541d01431dde5218dd556b8cfb2d403d178aa73..245a1368be2c04bd73e5f64444e06c4ea6d8c82f 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased (3.0.1)]
+## [Unreleased (4.0.0)]
 
 ### Changed
 
+- **Breaking**: The `mark` field of the `Agnodeinfo_t` struct is now a
+  `size_t` instead of a `char`.
 - the `mingle`, `diffimg`, and `edgepaint` binaries are now included in the
   CMake build system
 - the `vimdot` script is now installed by the CMake build system on operating
@@ -29,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - output formats canon, dot, and xdot are not completely faithful to input #2184
 - gvpr index function produces wrong results #2211. This was a regression in
   Graphviz 2.47.0.
+- Error on more than 128 cluster subgraphs #2080
 
 ### Removed
 

diff --git a/lib/common/types.h b/lib/common/types.h
index dabe0c6eb7f552bb60c6013ecd8f235b14223f81..38aef87af8cbdb70bb9689f82a1adfaa47bf0215 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -440,7 +440,7 @@ typedef enum {NATIVEFONTS,PSFONTS,SVGFONTS} fontname_kind;
 
        /* fast graph */
        char node_type;
-       char mark;
+       size_t mark;
        char onstack;
        char ranktype;
        char weight_class;

diff --git a/lib/dotgen/decomp.c b/lib/dotgen/decomp.c
index 3d7a961ebdf26700139364dddf94194ce7feb820..739e3175674398cc6bf4cc74455f0f7ef3a845d0 100644 (file)
--- a/lib/dotgen/decomp.c
+++ b/lib/dotgen/decomp.c
@@ -20,7 +20,7 @@
 #include <dotgen/dot.h>
 
 static node_t *Last_node;
-static char Cmark;
+static size_t Cmark;
 
 static void 
 begin_component(graph_t* g)

diff --git a/tests/regression_tests/large/test_large_graphs.py b/tests/regression_tests/large/test_large_graphs.py
index 6d79dc5b5894c28832c9dd7457950769cb37020d..d43bcf4302e9834d4f05a0bfdc540fffed8737ba 100644 (file)
--- a/tests/regression_tests/large/test_large_graphs.py
+++ b/tests/regression_tests/large/test_large_graphs.py
@@ -36,7 +36,6 @@ def test_long_chain():
     "dot", "-Tsvg", "-O", os.devnull\r
   ])\r
 \r
-@pytest.mark.xfail(strict = True)\r
 def test_wide_clusters():\r
   """\r
   A simple regression test for https://gitlab.com/graphviz/graphviz/-/issues/2080#\r