Fix single-line color generation

Looks like awk has actually added a `-s` flag in the last ten years, breaking this code! Amazing.

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

diff --git a/doc/infosrc/Makefile b/doc/infosrc/Makefile
index dad08681a5639b48932dbfe1c11d711347e8bb0b..39b1974f14019508bfd5ab4fa8bc55bc5aebba0e 100644 (file)
--- a/doc/infosrc/Makefile
+++ b/doc/infosrc/Makefile
@@ -128,7 +128,7 @@ svg_colors.html : mkcolors.awk svg.awk ../../lib/common/svgcolor_names
 brewer_colors.html : mkcolors.awk brewer.awk ../../lib/common/brewer_colors
        mkdir -p colortmp
        awk -f brewer.awk ../../lib/common/brewer_colors
-       (for f in $$(ls colortmp); do awk -f mkcolors.awk -s colortmp/$$f; done) > brewer_colors.html
+       (for f in $$(ls colortmp); do awk -f mkcolors.awk --single-line colortmp/$$f; done) > brewer_colors.html
        rm -rf colortmp
 
 colors.html : mkcolors.py x11_colors.html svg_colors.html brewer_colors.html

diff --git a/doc/infosrc/mkcolors.awk b/doc/infosrc/mkcolors.awk
index a6a470799b82e0e7d3320dac5097baa86b0f6313..9945cfa154acf3b892acc3890c0700a326b1c351 100644 (file)
--- a/doc/infosrc/mkcolors.awk
+++ b/doc/infosrc/mkcolors.awk
@@ -15,7 +15,7 @@ function putColor (n, r, g, b, v)
 }
 BEGIN {
   colorsPerRow = 5;
-  if (ARGV[1] == "-s") {
+  if (ARGV[1] == "--single-line") {
     ARGV[1] = "";
     name = ARGV[2];
     singleRow = 1;