[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 21/30: [grohtml]: Fix Savannah #65960 (s/pnmcut/pamcut/).
|
From: |
G. Branden Robinson |
|
Subject: |
[groff] 21/30: [grohtml]: Fix Savannah #65960 (s/pnmcut/pamcut/). |
|
Date: |
Wed, 10 Jul 2024 03:03:10 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit 23bf6da47b0f526307807ead2c21b52405fa7fa5
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Jul 9 08:04:23 2024 -0500
[grohtml]: Fix Savannah #65960 (s/pnmcut/pamcut/).
Search for and use pamcut(1), not pnmcut(1). Per upstream, the former
was introduced 23 years ago and the latter withdrawn 15 years ago. And
we just got the memo!
* m4/groff.m4 (GROFF_CHECK_GROHTML_PROGRAMS):
* src/preproc/html/pre-html.cpp (imageList::createImage): Do it.
* src/roff/groff/tests/html_works_with_grn_and_eqn.sh:
* src/roff/groff/tests/smoke-test_html_device.sh: Update tests.
* NEWS:
* README.MinGW:
* src/devices/grohtml/grohtml.1.man (Dependencies): Document it.
Fixes <https://savannah.gnu.org/bugs/?65960>. Thanks to Bjarni Ingi
Gislason for the report.
In principle, to support really old systems we could parameterize the
name of the p*mcut executable. But I don't want to add that complexity
until and unless sufficient demand is evident.
---
ChangeLog | 19 +++++++++++++++++++
NEWS | 4 ++++
README.MinGW | 2 +-
m4/groff.m4 | 2 +-
src/devices/grohtml/grohtml.1.man | 2 +-
src/preproc/html/pre-html.cpp | 2 +-
src/roff/groff/tests/html_works_with_grn_and_eqn.sh | 2 +-
src/roff/groff/tests/smoke-test_html_device.sh | 2 +-
8 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9300ab8d8..372cd65a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2024-07-09 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ Search for and use pamcut(1), not pnmcut(1). Per upstream, the
+ former was introduced 23 years ago and the latter withdrawn 15
+ years ago. And we just got the memo!
+
+ * m4/groff.m4 (GROFF_CHECK_GROHTML_PROGRAMS):
+ * src/preproc/html/pre-html.cpp (imageList::createImage): Do it.
+
+ * src/roff/groff/tests/html_works_with_grn_and_eqn.sh:
+ * src/roff/groff/tests/smoke-test_html_device.sh: Update tests.
+
+ * NEWS:
+ * README.MinGW:
+ * src/devices/grohtml/grohtml.1.man (Dependencies): Document it.
+
+ Fixes <https://savannah.gnu.org/bugs/?65960>. Thanks to Bjarni
+ Ingi Gislason for the report.
+
2024-07-09 G. Branden Robinson <g.branden.robinson@gmail.com>
* src/roff/troff/input.cpp: Slightly refactor.
diff --git a/NEWS b/NEWS
index 5da00dd71..9b9a0ae39 100644
--- a/NEWS
+++ b/NEWS
@@ -423,6 +423,10 @@ o grog(1) no longer supports the `--ligatures` and `--run`
options.
o The minimum version of Perl required to build groff is now 5.8 (18
July 2002), incremented from 5.6.1.
+o groff now looks for the Netpbm program pamcut(1) rather than
+ pnmcut(1). Per upstream, the former was introduced 23 years ago and
+ the latter withdrawn 15 years ago.
+
o The groff_diff(7) man page no longer contains examples. They remain
in groff's Texinfo manual.
diff --git a/README.MinGW b/README.MinGW
index 412597a95..6787b5703 100644
--- a/README.MinGW
+++ b/README.MinGW
@@ -219,7 +219,7 @@
netpbm.dll
pnmcrop.exe
- pnmcut.exe
+ pamcut.exe
pnmtopng.exe
pnmtops.exe
diff --git a/m4/groff.m4 b/m4/groff.m4
index 0e3613a18..881c1dd21 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -182,7 +182,7 @@ AC_DEFUN([GROFF_CHECK_GROHTML_PROGRAMS], [
missing=
m4_foreach([groff_prog],
dnl Keep this list of programs in sync with grohtml test scripts.
- [[pnmcrop], [pnmcut], [pnmtopng], [pnmtops], [psselect]], [
+ [[pnmcrop], [pamcut], [pnmtopng], [pnmtops], [psselect]], [
AC_CHECK_PROG(groff_prog, groff_prog, [found], [missing])
if test $[]groff_prog = missing
then
diff --git a/src/devices/grohtml/grohtml.1.man
b/src/devices/grohtml/grohtml.1.man
index 963b98c18..2e097e4a2 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -307,8 +307,8 @@ picture is encountered in the input.
therefore may run several commands as part of its operation.
.
These include the \%Netpbm tools
+.IR \%pamcut ,
.IR \%pnmcrop ,
-.IR \%pnmcut ,
and
.IR \%pnmtopng ;
\%Ghostscript
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index cbcc2ccda..193385ba3 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -1006,7 +1006,7 @@ void imageList::createImage(imageItem *i)
+ max(i->Y1, i->Y2) * image_res / postscriptRes
+ 1 + IMAGE_BORDER_PIXELS;
if (createPage(i->pageNo) == 0) {
- s = make_string("pnmcut%s %d %d %d %d < %s "
+ s = make_string("pamcut%s %d %d %d %d < %s "
"| pnmcrop%s -quiet | pnmtopng%s -quiet %s"
"> %s\n",
EXE_EXT,
diff --git a/src/roff/groff/tests/html_works_with_grn_and_eqn.sh
b/src/roff/groff/tests/html_works_with_grn_and_eqn.sh
index e0709440f..c0daf9171 100755
--- a/src/roff/groff/tests/html_works_with_grn_and_eqn.sh
+++ b/src/roff/groff/tests/html_works_with_grn_and_eqn.sh
@@ -22,7 +22,7 @@ groff="${abs_top_builddir:-.}/test-groff"
# Keep this list of programs in sync with GROFF_CHECK_GROHTML_PROGRAMS
# in m4/groff.m4.
-for cmd in pnmcrop pnmcut pnmtopng pnmtops psselect
+for cmd in pnmcrop pamcut pnmtopng pnmtops psselect
do
if ! command -v $cmd >/dev/null
then
diff --git a/src/roff/groff/tests/smoke-test_html_device.sh
b/src/roff/groff/tests/smoke-test_html_device.sh
index 36dc50e47..df9709e77 100755
--- a/src/roff/groff/tests/smoke-test_html_device.sh
+++ b/src/roff/groff/tests/smoke-test_html_device.sh
@@ -22,7 +22,7 @@ groff="${abs_top_builddir:-.}/test-groff"
# Keep this list of programs in sync with GROFF_CHECK_GROHTML_PROGRAMS
# in m4/groff.m4.
-for cmd in pnmcrop pnmcut pnmtopng pnmtops psselect
+for cmd in pnmcrop pamcut pnmtopng pnmtops psselect
do
if ! command -v $cmd >/dev/null
then
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 21/30: [grohtml]: Fix Savannah #65960 (s/pnmcut/pamcut/).,
G. Branden Robinson <=