diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | INSTALL.extra | 2 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | doc/doc.am | 11 | ||||
| -rw-r--r-- | doc/fixinfo.sh | 49 | ||||
| -rw-r--r-- | doc/groff.texi | 2 | ||||
| -rw-r--r-- | doc/webpage.ms | 4 | ||||
| -rw-r--r-- | m4/groff.m4 | 11 |
8 files changed, 32 insertions, 70 deletions
@@ -1,5 +1,24 @@ 2020-04-11 G. Branden Robinson <g.branden.robinson@gmail.com> + Require Texinfo 5.0 (February 2013) at a minimum. + + * m4/groff.m4 (GROFF_MAKEINFO): Check for version 5.0 (increased + from 4.8). Update diagnostics and comments. + + * INSTALL.extra: + * README: + * doc/groff.texi: + * doc/webpage.ms: Document updated requirement. + + * doc/fixinfo.sh: Delete; it is no longer necessary to work + around Texinfo 4.x bugs. + + * doc/doc.am (EXTRA_DIST): Stop shipping fixinfo.sh. + (.texi.html): Remove makeinfo < 5.0 version check and consequent + execution of fixinfo.sh. Update comment. + +2020-04-11 G. Branden Robinson <g.branden.robinson@gmail.com> + Enable backtracing across process/file boundaries when errors or non-ignored warnings are encountered. diff --git a/INSTALL.extra b/INSTALL.extra index d7bb2fd0a..021177471 100644 --- a/INSTALL.extra +++ b/INSTALL.extra @@ -135,7 +135,7 @@ to display the groff(1) man page with the `less' pager. To get a DVI, PDF, or HTML version of the groff texinfo manual, say `make groff.dvi', `make groff.pdf', or `make groff.html', respectively, in the `doc' subdirectory (after configuring the groff package). Note -that you need texinfo version 4.8 as a prerequisite. +that you need texinfo version 5.0 as a prerequisite. If you have problems, read the PROBLEMS file. If this doesn't help and you need support, please contact the `groff' mailing list. If you @@ -58,14 +58,14 @@ following tools to build `groff' directly from its source: ghostscript the psutils package the netpbm package - texinfo 4.8 + texinfo 5.0 bison >= 1.875b or byacc Note that `texinfo' and `bison' or `byacc' are required only for building from repository sources (either a checked out working copy, or a commit snapshot). They are not required for building from a stable release tarball. Also note that the version numbers stated are -the minimum supported. No version of `texinfo' < 4.8 works, and the +the minimum supported. No version of `texinfo' < 5.0 works, and the original release of `bison' 1.875 is known not to work; you *may* find that `bison' releases < 1.875 work, but in case of difficulty, please update to a later version *before* posting a bug report. diff --git a/doc/doc.am b/doc/doc.am index a3a2ff0bd..cbfd608a7 100644 --- a/doc/doc.am +++ b/doc/doc.am @@ -117,7 +117,6 @@ MOSTLYCLEANFILES += doc/examples.stamp EXTRA_DIST += \ doc/gnu.xpm \ - doc/fixinfo.sh \ doc/txi-en.tex SUFFIXES += .me .ms .ps .html .txt .texi .dvi .pdf .xhtml @@ -355,10 +354,7 @@ else endif # This will generate both html split into several files and html doc -# in a single file. If texinfo version < 5.0, we process the resulting -# (mono) .html file with fixinfo.sh du to a problem with blockquote -# closing (for example 5.6.1 Setting Registers, the 'Request' -# blockquote is not properly closed, see fixinfo.sh for more details +# in a single file. .texi.html: @$(MKDIR_P) $(doc_builddir)/ LANG=C \ @@ -369,11 +365,6 @@ endif LC_ALL=C \ $(MAKEINFO) --html -I $(doc_srcdir) --no-split \ -o $@ $< - if test "$(makeinfo_version_numeric)" -lt 5000; then \ - echo "patching $@ with fixinfo.sh"; \ - $(SHELL) $(doc_srcdir)/fixinfo.sh \ - doc/`basename $@`.mono/`basename $@`; \ - fi # Targets to make all the doc in all formats. These doc are not built # by default. pdf, dvi, ps, html and their install equivalent diff --git a/doc/fixinfo.sh b/doc/fixinfo.sh deleted file mode 100644 index 47127f824..000000000 --- a/doc/fixinfo.sh +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/sh -# -# Fix a problem with HTML output produced by makeinfo -# (tested with versions 4.8 and 4.13). -# -# groff.texi uses (after macro expansion) something like -# -# @deffn ... -# @XXindex ... -# @deffnx ... -# -# which has worked with earlier versions (using an undocumented feature -# of the implementation of @deffn and @deffnx). Version 4.8 has new -# code for generating HTML, and the above construction produces wrong -# HTML output: It starts a new <blockquote> without closing it properly. -# The very problem is that, according to the documentation, the @deffnx -# must immediately follow the @deffn line, making it impossible to add -# entries into user-defined indices if supplied with macro wrappers around -# @deffn and @deffnx. -# -# Note that this script is a quick hack and tightly bound to the current -# groff.texi macro code. Hopefully, a new texinfo version makes it -# unnecessary. -# -# 09-2014: no more problem with texinfo 5.0 or higher -# -t=${TMPDIR-.}/gro$$.tmp - -cat $1 | sed ' -1 { - N - N -} -:b -$b -N -/^<blockquote>\n *<p>.*\n\n \—/ { - s/^<blockquote>\n *<p>\(.*\n\)\n \—/\1\—/ - n - N - N - bb -} -$b -P -D -' > $t -rm $1 -mv $t $1 diff --git a/doc/groff.texi b/doc/groff.texi index 57171943a..23087ab04 100644 --- a/doc/groff.texi +++ b/doc/groff.texi @@ -4,7 +4,7 @@ @c Please convert this manual with `texi2dvi -e groff.texi' due to @c problems in texinfo regarding expansion of user-defined macros. @c -@c You need texinfo 4.8 or newer to format this document! +@c You need texinfo 5.0 or newer to format this document! @c @c %**start of header (This is for running Texinfo on a region.) diff --git a/doc/webpage.ms b/doc/webpage.ms index e3755316c..c34112cbb 100644 --- a/doc/webpage.ms +++ b/doc/webpage.ms @@ -183,7 +183,7 @@ perl \[>=] v5.6.1 (see macro GROFF_PERL in file `m4/groff.m4') ghostscript the psutils package the netpbm package -texinfo 4.8 +texinfo 5.0 bison \[>=] 1.875b or byacc .fi .in @@ -193,7 +193,7 @@ from repository sources (either a checked out working copy, or a commit snapshot). They are not required for building from a stable release tarball. Also note that the version numbers stated are the minimum supported. -No version of `texinfo' < 4.8 works, and the original release of `bison' +No version of `texinfo' < 5.0 works, and the original release of `bison' 1.875 is known not to work; you \fImay\fP find that `bison' releases < 1.875 work, but in case of difficulty, please update to a later version \fIbefore\fP posting a bug report. diff --git a/m4/groff.m4 b/m4/groff.m4 index 5343f22f5..1868e2db9 100644 --- a/m4/groff.m4 +++ b/m4/groff.m4 @@ -152,11 +152,12 @@ AC_DEFUN([GROFF_DOC_CHECK], AC_SUBST([make_uninstall_examples])]) -# We need makeinfo 4.8 or newer. +# We need makeinfo from Texinfo 5.0 or newer, for @codequoteundirected. +# The minor version checking logic is present for future needs. AC_DEFUN([GROFF_MAKEINFO], # By default automake will set MAKEINFO to MAKEINFO = ${SHELL} <top - # src dir>/build-aux/missing makeinfo.As we need a more precise + # src dir>/build-aux/missing makeinfo. As we need a more precise # check of makeinfo version, we don't use it. [MAKEINFO= if test $docadd_info = yes; then @@ -175,7 +176,7 @@ AC_DEFUN([GROFF_MAKEINFO], makeinfo_version_minor=`IFS=.; set x $makeinfo_version; echo 0${3}` makeinfo_version_numeric=` expr ${makeinfo_version_major}000 \+ ${makeinfo_version_minor}` - if test $makeinfo_version_numeric -lt 4008; then + if test $makeinfo_version_numeric -lt 5000; then missing="'makeinfo' is too old." fi fi @@ -186,10 +187,10 @@ AC_DEFUN([GROFF_MAKEINFO], if test ! -f ${infofile} \ || test ${srcdir}/doc/groff.texi -nt ${infofile}; then AC_MSG_ERROR($missing -[Get the 'texinfo' package version 4.8 or newer.]) +[Get the 'texinfo' package version 5.0 or newer.]) else AC_MSG_WARN($missing -[Get the 'texinfo' package version 4.8 or newer if you want to convert +[Get the 'texinfo' package version 5.0 or newer if you want to convert 'groff.texi' into a PDF or HTML document.]) fi fi |