Bruno Haible via Gnulib discussion list <[email protected]> writes: > Hi, > > Now that the GNU standards don't require DVI-format documentation any more > [0][1][2], here's a proposed patch to change 'gendocs.sh' to no longer > produce DVI-format documentation any more. > > Any objections?
Looks great to me, thanks for follwing through on this. Is it still appropriate to use 'texi2dvi --pdf'? Why not use 'texi2pdf' instead? Eventually the texi2dvi tool could fade away into deprecation... this code would be a good sanity check to make sure that the 'texi2pdf' tool is available everywhere where we want it to be. /Simon > [0] https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00127.html > [1] https://lists.gnu.org/archive/html/bug-standards/2025-07/msg00011.html > [2] https://lists.gnu.org/archive/html/bug-standards/2025-09/msg00005.html > > From d52aad5a31fe14e07053c4d01200e082e9db70a8 Mon Sep 17 00:00:00 2001 > From: Bruno Haible <[email protected]> > Date: Tue, 30 Sep 2025 09:48:07 +0200 > Subject: [PATCH] gendocs: Don't produce a DVI-format manual any more. > > * doc/gendocs_template: Remove link to DVI file. > * doc/gendocs_template_min: Likewise. > * build-aux/gendocs.sh: Document that --tex and --no-tex apply to the > PDF output only. Don't invoke TEXI2DVI without option --pdf any more. > Don't substitute DVI_GZ_SIZE. > --- > ChangeLog | 9 +++++++++ > build-aux/gendocs.sh | 16 +++------------- > doc/gendocs_template | 2 -- > doc/gendocs_template_min | 2 -- > 4 files changed, 12 insertions(+), 17 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index b358ac895a..bf4dcf9971 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,12 @@ > +2025-09-30 Bruno Haible <[email protected]> > + > + gendocs: Don't produce a DVI-format manual any more. > + * doc/gendocs_template: Remove link to DVI file. > + * doc/gendocs_template_min: Likewise. > + * build-aux/gendocs.sh: Document that --tex and --no-tex apply to the > + PDF output only. Don't invoke TEXI2DVI without option --pdf any more. > + Don't substitute DVI_GZ_SIZE. > + > 2025-09-28 Collin Funk <[email protected]> > > xsetenv: Revert the previous change. > diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh > index b5e4cfb193..6b21ea64ad 100755 > --- a/build-aux/gendocs.sh > +++ b/build-aux/gendocs.sh > @@ -98,10 +98,10 @@ Options: > --no-ascii skip generating the plain text output. > --no-html skip generating the html output. > --no-info skip generating the info output. > - --no-tex skip generating the dvi and pdf output. > + --no-tex skip generating the pdf output. > --source ARG include ARG in tar archive of sources. > --split HOW make split HTML by node, section, chapter; default node. > - --tex ARG pass ARG to texi2dvi for DVI and PDF, instead of -t @finalout. > + --tex ARG pass ARG to texi2dvi for PDF, instead of -t @finalout. > > --texi2html use texi2html to make HTML target, with all split versions. > --docbook convert through DocBook too (xml, txt, html, pdf). > @@ -303,22 +303,13 @@ fi # end info > > # > if $generate_tex; then > - cmd="$SETLANG $TEXI2DVI $dirargs $texarg \"$srcfile\"" > - printf "\nGenerating dvi... (%s)\n" "$cmd" > - eval "$cmd" > - # compress/finish dvi: > - gzip -f -9 $PACKAGE.dvi > - dvi_gz_size=`calcsize $PACKAGE.dvi.gz` > - mv $PACKAGE.dvi.gz "$outdir/" > - ls -l "$outdir/$PACKAGE.dvi.gz" > - > cmd="$SETLANG $TEXI2DVI --pdf $dirargs $texarg \"$srcfile\"" > printf "\nGenerating pdf... (%s)\n" "$cmd" > eval "$cmd" > pdf_size=`calcsize $PACKAGE.pdf` > mv $PACKAGE.pdf "$outdir/" > ls -l "$outdir/$PACKAGE.pdf" > -fi # end tex (dvi + pdf) > +fi # end tex (pdf) > > # > if $generate_ascii; then > @@ -537,7 +528,6 @@ sed \ > -e "s!%%HTML_SECTION_TGZ_SIZE%%!$html_section_tgz_size!g" \ > -e "s!%%HTML_CHAPTER_TGZ_SIZE%%!$html_chapter_tgz_size!g" \ > -e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \ > - -e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \ > -e "s!%%PDF_SIZE%%!$pdf_size!g" \ > -e "s!%%ASCII_SIZE%%!$ascii_size!g" \ > -e "s!%%ASCII_GZ_SIZE%%!$ascii_gz_size!g" \ > diff --git a/doc/gendocs_template b/doc/gendocs_template > index 9069a54787..f342613739 100644 > --- a/doc/gendocs_template > +++ b/doc/gendocs_template > @@ -58,8 +58,6 @@ without any warranty. > (%%ASCII_SIZE%%K bytes)</a>.</li> > <li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed > (%%ASCII_GZ_SIZE%%K bytes gzipped)</a>.</li> > -<li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file > - (%%DVI_GZ_SIZE%%K bytes gzipped)</a>.</li> > <li><a href="%%PACKAGE%%.pdf">PDF file > (%%PDF_SIZE%%K bytes)</a>.</li> > <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source > diff --git a/doc/gendocs_template_min b/doc/gendocs_template_min > index d4968a249a..fb58adffae 100644 > --- a/doc/gendocs_template_min > +++ b/doc/gendocs_template_min > @@ -69,8 +69,6 @@ without any warranty. > (%%ASCII_SIZE%%K bytes)</a>.</li> > <li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed > (%%ASCII_GZ_SIZE%%K bytes gzipped)</a>.</li> > -<li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file > - (%%DVI_GZ_SIZE%%K bytes gzipped)</a>.</li> > <li><a href="%%PACKAGE%%.pdf">PDF file > (%%PDF_SIZE%%K bytes)</a>.</li> > <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
signature.asc
Description: PGP signature
