Fix gml2gv style and width parsing

Fixes https://gitlab.com/graphviz/graphviz/-/issues/1869.

Also removes 2 -Wtautological-overlap-compare warnings.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db845ee95a522480dd32d772a2374a0c9280d50a..61bbb7715ef8869b239caed63de962fa75973a94 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fdp crash #1865
 - Graphviz always crash with this simple dot file #167
 - Seg fault in dot #1771
+- gml2gv doesn't handle some attributes correctly #1869
 
 ## [2.44.1] - 2020-06-29
 

diff --git a/cmd/tools/gmlparse.y b/cmd/tools/gmlparse.y
index c3e3bde86aa263fbc595663c48adcbfdfcfc1514..ff1f11ed62e221e8d23fb2602a710ac43455d3a1 100644 (file)
--- a/cmd/tools/gmlparse.y
+++ b/cmd/tools/gmlparse.y
@@ -589,10 +589,10 @@ addNodeGraphics (Agnode_t* np, Dt_t* alist, agxbuf* xb, agxbuf* unk)
        else if (ap->sort == OUTLINE) {
            agsafeset (np, "pencolor", ap->u.value, "");
        }
-       else if ((ap->sort == WIDTH) && (ap->sort == OUTLINEWIDTH )) {
+       else if ((ap->sort == WIDTH) || (ap->sort == OUTLINEWIDTH )) {
            agsafeset (np, "penwidth", ap->u.value, "");
        }
-       else if ((ap->sort == OUTLINESTYLE) && (ap->sort == OUTLINEWIDTH )) {
+       else if ((ap->sort == STYLE) || (ap->sort == OUTLINESTYLE )) {
            agsafeset (np, "style", ap->u.value, "");
        }
        else {