From: Mark Hansen <mark@markhansen.co.nz>
Date: Mon, 1 Mar 2021 10:52:58 +0000 (+0000)
Subject: Merge branch 'lang' into 'master'
X-Git-Tag: 2.47.0~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72bef242e530f3f25ad530810ff26997deb800e6;p=graphviz

Merge branch 'lang' into 'master'

Generate lang.html with a template

See merge request graphviz/graphviz!1817
---

72bef242e530f3f25ad530810ff26997deb800e6
diff --cc doc/infosrc/Makefile
index cab642db7,b26ed1132..9ff42dc18
--- a/doc/infosrc/Makefile
+++ b/doc/infosrc/Makefile
@@@ -136,16 -145,12 +136,14 @@@ shapes : shapelist mkshapes.s
  	./mkshapes.sh
  	touch shapes
   
 -shapes.html : shapes mkshhtml.py html.html record.gif record2.gif sdlshapes.png templates/shapes.html.j2 shapelist
 -	./mkshhtml.py html.html < shapelist > shapes.html
 +shapes.html : shapes mkshhtml.py record.gif record2.gif sdlshapes.png templates/shapes.html.j2 shapelist html_grammar html1.gif html2.gif html3.gif html4.gif mklang
 +	./mklang html_grammar gramtmp
 +	./mkshhtml.py gramtmp html1.dot < shapelist > shapes.html
 +	rm gramtmp
  
- lang.html : grammar lang.1 lang.2 mklang
+ lang.html : grammar mklang mklang.py
  	./mklang grammar gramtmp
- 	cat lang.1 > lang.html
- 	cat gramtmp >> lang.html
- 	cat lang.2 >> lang.html
+ 	./mklang.py gramtmp > lang.html
  	rm gramtmp
  
  arrows.html : arrow_grammar arrows.1 arrows.2 mkarrowtbl.sh mklang $(AGIF) $(A2GIF)