Merge branch 'main' into consistent-enum

Makefile

@@ -97,6 +97,7 @@ COMMONATTRIBOPTS = -a revdate="$(SPECDATE)" \
  -a stem=latexmath \
  -a generated=$(GENERATED) \
  -a sectnumlevels=5 \
+ -a nofooter \
  -a refprefix
 
 ATTRIBOPTS = -a revnumber="$(SPECREVISION)" \
@@ -513,10 +514,12 @@ $(MANHTMLDIR)/intro.html: $(REFPATH)/intro.txt $(MANCOPYRIGHT)
 REGISTRY = $(ROOTDIR)/xml
 APIXML = $(REGISTRY)/cl.xml
 CFEATURES = c/features.txt
+CFUNCTIONS = c/functions.txt
 GENSCRIPT = $(SCRIPTS)/gencl.py
 DICTSCRIPT = $(SCRIPTS)/gen_dictionaries.py
 VERSIONSCRIPT = $(SCRIPTS)/gen_version_notes.py
-CFEATSCRIPT = $(SCRIPTS)/gen_c_feature_dictionary.py
+CFEATSCRIPT = $(SCRIPTS)/gen_dictionary_from_file.py
+CFUNCSCRIPT = $(SCRIPTS)/gen_dictionary_from_file.py
 GENSCRIPTOPTS = $(VERSIONOPTIONS) $(EXTOPTIONS) $(GENSCRIPTEXTRA) -registry $(APIXML)
 GENSCRIPTEXTRA =
 
@@ -542,7 +545,8 @@ extinc: $(METADEPEND)
 $(METADEPEND): $(APIXML) $(GENSCRIPT)
  $(QUIET)$(MKDIR) $(METAPATH)
  $(QUIET)$(PYTHON) $(GENSCRIPT) $(GENSCRIPTOPTS) -o $(METAPATH) extinc
- $(QUIET)$(PYTHON) $(CFEATSCRIPT) -features $(CFEATURES) -o $(METAPATH)/c-feature-dictionary.asciidoc
+ $(QUIET)$(PYTHON) $(CFEATSCRIPT) -i $(CFEATURES) -o $(METAPATH)/c-feature-dictionary.asciidoc
+ $(QUIET)$(PYTHON) $(CFUNCSCRIPT) -i $(CFUNCTIONS) -o $(METAPATH)/c-function-dictionary.asciidoc
 
 # This generates a single file containing asciidoc attributes for each
 # extension in the spec being built.