gbranden pushed a commit to branch master
in repository groff.
commit 55c59df794537b36f57828de2541bd774a17755c
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Apr 4 20:13:28 2024 -0500
Revert "[grohtml]: Migrate from psselect(1) to ps2ps(1)."
This reverts commit 3bde75a958f5f3eea84f1e0098c7b457358792b3.
---
ChangeLog | 12 ------------
m4/groff.m4 | 2 +-
src/devices/grohtml/grohtml.1.man | 9 ++++-----
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, 8 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dce8b81a3..3f29eecea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -148,18 +148,6 @@
inset register pushing and popping logic harder to reason about.
Continues commit 5d2e49f818, 9 August.
-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 d5f014316..ebbe60d52 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], [ps2ps]], [
+ [[pnmcrop], [pnmcut], [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 58aa78104..ef617703f 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -304,11 +304,10 @@ These include the \%Netpbm tools
.IR \%pnmcut ,
and
.IR \%pnmtopng ;
-as well as
-\%Ghostscript's
-.I \%gs
-and
-.IR \%ps2ps .
+\%Ghostscript
+.RI ( gs );
+and the \%PSUtils tool
+.IR \%psselect .
.
.
.\" ====================================================================
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 401c275cb..cbcc2ccda 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("ps2ps -sPageList=%d %s %s\n",
+ s = make_string("psselect -q -p%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 b3b2dc5cd..e0709440f 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 ps2ps
+for cmd in pnmcrop pnmcut 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 9dbb8f298..36dc50e47 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 ps2ps
+for cmd in pnmcrop pnmcut pnmtopng pnmtops psselect
do
if ! command -v $cmd >/dev/null
then
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
