gbranden pushed a commit to branch master
in repository groff.
commit 30444af175f5a772209cbd73d491e92dbe822f4d
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Fri Jul 12 14:56:54 2024 -0500
Revert "[grohtml]: Fix Savannah #65961 (quieten pnmcrop)."
This reverts commit 2d71ea4cb3583385f3ff7c017a5bb6d5b0ae14dc.
These error messages are diagnosing a real problem; images of rendered
tables are going missing in grohtml.
See follow-up comments to <https://savannah.gnu.org/bugs/?65961>.
---
ChangeLog | 16 ----------------
m4/groff.m4 | 18 ++++--------------
src/preproc/html/pre-html.cpp | 2 +-
3 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ae9784a70..8f2cf5e06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -167,22 +167,6 @@
Fixes <https://savannah.gnu.org/bugs/?65967>.
-2024-07-09 G. Branden Robinson <g.branden.robin...@gmail.com>
-
- [grohtml]: Pass `-blank-image=pass` to pnmcrop(1) if supported
- by the installed version of Netpbm.
-
- * m4/groff.m4 (GROFF_PNMTOOLS_CAN_BE_QUIET): Set up an
- Autoheader template for the C/C++ preprocessor symbol
- `PNMCROP_PASS`. Report the detected option (if any) as the
- result of this configuration test. Get the expansion into the
- "config.h" file with `AC_DEFINE_UNQUOTED`.
- * src/preproc/html/pre-html.cpp (imageList::createImage): Use
- the preprocessor symbol.
-
- Fixes <https://savannah.gnu.org/bugs/?65961>. Thanks to Bjarni
- Ingi Gislason for the report.
-
2024-07-09 G. Branden Robinson <g.branden.robin...@gmail.com>
Actually use the detected Netpbm option for quieting output in
diff --git a/m4/groff.m4 b/m4/groff.m4
index 347091deb..fd4545b8c 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -447,19 +447,16 @@ AC_DEFUN([GROFF_URW_FONTS_NOTICE], [
])
-# See how to make Netpbm commands quiet where we need them to be.
+# Check whether the pnm tools accept the -quiet option.
-dnl Any macro that tests $pnmtools_quiet or $pnmcrop_pass should
-dnl AC_REQUIRE this.
+dnl Any macro that tests $pnmtools_quiet should AC_REQUIRE this.
AC_DEFUN([GROFF_PNMTOOLS_CAN_BE_QUIET], [
AC_REQUIRE([GROFF_CHECK_GROHTML_PROGRAMS])
AH_TEMPLATE([PNMTOOLS_QUIET], [Command-line option to quiet Netpnm.])
- AH_TEMPLATE([PNMCROP_PASS], [Command-line option to quiet pnmcrop.])
pnmtools_quiet=
- pnmcrop_pass=
if test "$use_grohtml" = yes
then
@@ -468,22 +465,15 @@ AC_DEFUN([GROFF_PNMTOOLS_CAN_BE_QUIET], [
then
pnmtools_quiet=-quiet
fi
- if echo P2 2 2 255 0 1 2 0 | pnmcrop "$pnmtools_quiet" \
- -blank-image=pass > /dev/null 2>&1
+ if test -n "$pnmtools_quiet"
then
- pnmcrop_pass=-blank-image=pass
- fi
- if test -n "$pnmtools_quiet$pnmcrop_pass"
- then
- AC_MSG_RESULT([$pnmtools_quiet $pnmcrop_pass])
+ AC_MSG_RESULT([$pnmtools_quiet])
else
AC_MSG_RESULT([(none)])
fi
fi
AC_SUBST([pnmtools_quiet])
- AC_SUBST([pnmcrop_pass])
AC_DEFINE_UNQUOTED([PNMTOOLS_QUIET], ["$pnmtools_quiet"])
- AC_DEFINE_UNQUOTED([PNMCROP_PASS], ["$pnmcrop_pass"])
])
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 90a93510e..751cba78e 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -1007,7 +1007,7 @@ void imageList::createImage(imageItem *i)
+ 1 + IMAGE_BORDER_PIXELS;
if (createPage(i->pageNo) == 0) {
s = make_string("pamcut%s %d %d %d %d < %s "
- "| pnmcrop%s " PNMTOOLS_QUIET " " PNMCROP_PASS
+ "| pnmcrop%s " PNMTOOLS_QUIET
"| pnmtopng%s " PNMTOOLS_QUIET " %s"
"> %s\n",
EXE_EXT,
_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit
