gbranden pushed a commit to branch master
in repository groff.
commit 3bde75a958f5f3eea84f1e0098c7b457358792b3
Author: Alexis <[email protected]>
AuthorDate: Sun Mar 17 12:59:51 2024 +0100
[grohtml]: Migrate from psselect(1) to ps2ps(1).
* src/preproc/html/pre-html.cpp (imageList::createPage): Do it.
* src/devices/grohtml/grohtml.1.man (Dependencies): Document the changed
runtime requirement.
* m4/groff.m4 (GROFF_CHECK_GROHTML_PROGRAMS):
* src/roff/groff/tests/html_works_with_grn_and_eqn.sh:
* src/roff/groff/tests/smoke-test_html_device.sh: Check for existence of
`ps2ps` command instead of `psselect`.
Background:
https://lists.gnu.org/archive/html/groff/2023-11/msg00036.html
---
ChangeLog | 12 ++++++++++++
m4/groff.m4 | 2 +-
src/devices/grohtml/grohtml.1.man | 11 ++++++-----
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 +-
6 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 004c20227..7d1f27ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-03-19 Alexis <[email protected]>
+
+ [grohtml]: Migrate from psselect(1) to ps2ps(1).
+
+ * src/preproc/html/pre-html.cpp (imageList::createPage): Do it.
+ * src/devices/grohtml/grohtml.1.man (Dependencies): Document
+ the changed runtime requirement.
+ * m4/groff.m4 (GROFF_CHECK_GROHTML_PROGRAMS):
+ * src/roff/groff/tests/html_works_with_grn_and_eqn.sh:
+ * src/roff/groff/tests/smoke-test_html_device.sh: Check for
+ existence of `ps2ps` command instead of `psselect`.
+
2024-03-18 G. Branden Robinson <[email protected]>
* tmac/doc.tmac (Ar): Don't reset the selected font to its
diff --git a/m4/groff.m4 b/m4/groff.m4
index ebbe60d52..d5f014316 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], [pnmcut], [pnmtopng], [pnmtops], [ps2ps]], [
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 ef617703f..e10091bf2 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -303,11 +303,12 @@ These include the \%Netpbm tools
.IR \%pnmcrop ,
.IR \%pnmcut ,
and
-.IR \%pnmtopng ;
-\%Ghostscript
-.RI ( gs );
-and the \%PSUtils tool
-.IR \%psselect .
+.IR \%pnmtopng
+as well as
+\%Ghostscript's
+.IR \%gs
+and
+.IR \%ps2ps .
.
.
.\" ====================================================================
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index cbcc2ccda..401c275cb 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -918,7 +918,7 @@ int imageList::createPage(int pageno)
fprintf(stderr, "creating page %d\n", pageno);
#endif
- s = make_string("psselect -q -p%d %s %s\n",
+ s = make_string("ps2ps -sPageList=%d %s %s\n",
pageno, psFileName, psPageName);
html_system(s, 1);
assert(strlen(image_gen) > 0);
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..b3b2dc5cd 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 pnmcut pnmtopng pnmtops ps2ps
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..9dbb8f298 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 pnmcut pnmtopng pnmtops ps2ps
do
if ! command -v $cmd >/dev/null
then
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
