attrs.html: Rename 'kind' to 'types'.

Matches the title of the table, and colloquial use.

diff --git a/doc/infosrc/attrs b/doc/infosrc/attrs
index c3c4605a0bb41fb769f684b38917077f6e3df58f..c3707d26114a62090ef809315325a37a8205a4d3 100644 (file)
--- a/doc/infosrc/attrs
+++ b/doc/infosrc/attrs
@@ -2,15 +2,15 @@
 # Each item consist of a header line, followed by a description in HTML.
 #
 # The header line has the format
-#    :name:uses:kind[:dflt[:minv]];  [notes]
+#    :name:used_by:types[:dflt[:minv]];  [notes]
 # where
 #  name has the format name1[/namei]*[ notes]
 #    the note can be used as a comment
 #
-#  uses is a string consisting of G,C,N,E, indicating that the attribute
+#  used_by is a string consisting of G,C,N,E, indicating that the attribute
 #    applies to graphs, clusters, nodes and edges, respectively.
 #
-#  kind has the format type[/typei]*
+#  types has the format type[/typei]*
 #    type can be int, bool, string, double, or a special <typename>.
 #    In the last case, we assume there is an entry for <typename> in
 #    the types file.

diff --git a/doc/infosrc/mkattrs.py b/doc/infosrc/mkattrs.py
index fa461612442550df7db818bea0abe5d385717e61..afdfe22f207c662f2baece747be62492726ed65c 100755 (executable)
--- a/doc/infosrc/mkattrs.py
+++ b/doc/infosrc/mkattrs.py
@@ -20,7 +20,7 @@ class Attribute:
     name: str
     # use string : this is a string formed of G,N,C,E
     used_by: str
-    kinds: List[str]
+    types: List[str]
     flags: List[str]
     html_description: str
     defaults: List[str]
@@ -41,14 +41,14 @@ with open(sys.argv[1]) as attrs_in:
 
         if line.startswith(':'):
             # This is a header line. Grab out the values.
-            #    :name:used_by:kind[:dflt[:minv]];  [notes]
+            #    :name:used_by:types[:dflt[:minv]];  [notes]
             headers, _, flags = line.rpartition(';')
             parts = headers.split(':')
 
             attr = Attribute(
                 name=parts[1],
                 used_by=parts[2],
-                kinds=parts[3].split('/'),
+                types=parts[3].split('/'),
                 flags=[flag for flag in flags.strip().split(',') if flag],
                 # Set an empty string html description, ready to append to.
                 html_description='',

diff --git a/doc/infosrc/templates/attrs.html.j2 b/doc/infosrc/templates/attrs.html.j2
index 7e90421d57b353242c9e8a23b24d10fe80b2c44d..55066fea896c6cfddfa07f7c10e624eb81bde8ce 100644 (file)
--- a/doc/infosrc/templates/attrs.html.j2
+++ b/doc/infosrc/templates/attrs.html.j2
@@ -94,11 +94,11 @@ of the layout programs.
   <TD><A ID="{{ attr.a_anchor }}" HREF="#{{ attr.d_anchor }}">{{ attr.name }}</A></TD>
   <TD>{{ attr.used_by }}</TD>
   <TD>
-  {%- for kind in attr.kinds -%}
+  {%- for type in attr.types -%}
     {%- if not loop.first -%}
     <BR>
     {%- endif -%}
-    <A HREF="#k:{{kind}}">{{kind}}</A>
+    <A HREF="#k:{{type}}">{{type}}</A>
   {%- endfor -%}
   </TD>
   <TD ALIGN="CENTER">