doc: rename main.tex into manual.tex to simplify scripts

GNUmakefile

@@ -141,9 +141,9 @@ package: clean
 	@ cp -r doc $(PACKAGE)
 	@ echo '\gdef\menhirversion{$(DATE)}' > $(PACKAGE)/doc/version.tex
 	@ make -C $(PACKAGE)/doc clean all
-	@ mv $(PACKAGE)/doc/main.pdf $(PACKAGE)/manual.pdf
-	@ mv $(PACKAGE)/doc/main.html $(PACKAGE)/manual.html
-	@ mv $(PACKAGE)/doc/manual-figure*.png $(PACKAGE)/
+	@ mv $(PACKAGE)/doc/manual.pdf $(PACKAGE)/manual.pdf
+	@ mv $(PACKAGE)/doc/manual.html $(PACKAGE)/manual.html
+	@ mv $(PACKAGE)/doc/manual*.png $(PACKAGE)/
 	@ mv $(PACKAGE)/doc/menhir.1 $(PACKAGE)/
 # Include a copy of the sources of the documentation,
 # as Debian requires this for the PDF to be included
@@ -216,7 +216,7 @@ export:
 	$(RSYNC) \
 	  $(TARBALL) \
 	  $(PACKAGE)/manual.pdf \
-	  $(PACKAGE)/manual.html $(PACKAGE)/manual-figure*.png \
+	  $(PACKAGE)/manual.html $(PACKAGE)/manual*.png \
 	  $(TARGET)
 # Mettre  jour la page Web de Menhir avec le nouveau numro de version.
 	cd $(PAGE) && \

doc/.gitignore

@@ -7,9 +7,9 @@
 *.toc
 *.fdb_latexmk
 *.fls
-main.pdf
+manual.pdf
 *.haux
 *.htoc
-main.image.tex
-main[0-9][0-9][0-9].png
-main.html
+manual.image.tex
+manual[0-9][0-9][0-9].png
+manual.html

doc/Makefile

@@ -6,7 +6,7 @@ DEPS = $(wildcard *.tex) $(wildcard *.bib) $(wildcard *.sty) $(wildcard *.mly)
 
 SED := $(shell if hash gsed 2>/dev/null ; then echo gsed ; else echo sed ; fi)
 
-all: main.pdf main.html
+all: manual.pdf manual.html
 
 %.pdf: %.tex $(DEPS)
 	pdflatex $*
@@ -14,8 +14,8 @@ all: main.pdf main.html
 	pdflatex $*
 	pdflatex $*
 
-main.html: main.tex $(DEPS) $(wildcard *.hva)
-	hevea -fix main.tex
+manual.html: manual.tex $(DEPS) $(wildcard *.hva)
+	hevea -fix manual.tex
 #
 # Hevea interprets 'tabbing' environment in a way
 # that creates spacing errors in the rendered output
@@ -23,15 +23,10 @@ main.html: main.tex $(DEPS) $(wildcard *.hva)
 # asks for (padding:0px;) while the TeX rendering
 # inserts spacing between columns. Change this
 # to {padding:1px;}
-	$(SED) -i -e "s/cellpadding0/cellpadding1/" main.html
+	$(SED) -i -e "s/cellpadding0/cellpadding1/" manual.html
 #
-# Hevea generates images main00{1,2,3}.png for the tikz pictures
-# present in the manual. Rename them into manual-figure00{1,2,3}.png
-# for consistency with the naming scheme of the deployed manual files.
-	for f in 1 2 3; do \
-	  mv main00$$f.png manual-figure00$$f.png; \
-	done
-	$(SED) --in-place 's/<img src="main/<img src="manual-figure/g' main.html
+# Note: hevea generates images manual00{1,2,3}.png for the tikz pictures
+# present in the manual.
 
 loop:
 	latexmk -pdf -pvc main