gbranden pushed a commit to branch master
in repository groff.
commit f524702797b5950622df77359306e03871490202
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed May 6 07:08:23 2026 -0500
Relocate "pdfmom" in source tree.
* src/devices/gropdf/pdfmom.1.man:
* src/devices/gropdf/pdfmom.pl: Rename these...
* src/utils/pdfmom/pdfmom.1.man:
* src/utils/pdfmom/pdfmom.pl: ...to these.
* src/devices/gropdf/gropdf.am: Move pdfmom-related stuff from here...
* src/utils/pdfmom/pdfmom.am: ...into this new file.
* Makefile.am: Include new Automake script.
* doc/doc.am (GROFF_MAN_PAGES1): Update man page location.
* MANIFEST: Update.
Fixes <https://savannah.gnu.org/bugs/?68294>.
---
ChangeLog | 20 +++++++++++
MANIFEST | 1 +
Makefile.am | 1 +
doc/doc.am | 2 +-
src/devices/gropdf/gropdf.am | 18 ++--------
src/{devices/gropdf => utils/pdfmom}/pdfmom.1.man | 0
src/utils/pdfmom/pdfmom.am | 44 +++++++++++++++++++++++
src/{devices/gropdf => utils/pdfmom}/pdfmom.pl | 0
8 files changed, 70 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index af13b628b..adfe8e2e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2026-05-06 G. Branden Robinson <[email protected]>
+
+ Relocate "pdfmom" in source tree.
+
+ * src/devices/gropdf/pdfmom.1.man:
+ * src/devices/gropdf/pdfmom.pl: Rename these...
+ * src/utils/pdfmom/pdfmom.1.man:
+ * src/utils/pdfmom/pdfmom.pl: ...to these.
+
+ * src/devices/gropdf/gropdf.am: Move pdfmom-related stuff from
+ here...
+ * src/utils/pdfmom/pdfmom.am: ...into this new file.
+
+ * Makefile.am: Include new Automake script.
+ * doc/doc.am (GROFF_MAN_PAGES1): Update man page location.
+
+ * MANIFEST: Update.
+
+ Fixes <https://savannah.gnu.org/bugs/?68294>.
+
2026-05-05 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp: Fix code style nits.
diff --git a/MANIFEST b/MANIFEST
index 51d8019f5..cf90d0787 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -122,6 +122,7 @@ This file summarizes the structure of the groff source
distribution.
indxbib Make inverted index for bibliographic databases.
lkbib Search bibliographic databases.
lookbib Interactively search bibliographic databases.
+ pdfmom groff wrapper to perform multi-pass processing as neeed.
pfbtops Translate a PostScript Type 1 font in PFB format to PFA.
tfmtodit Create font description files for TeX DVI device.
xtotroff Create font description files for gxditview.
diff --git a/Makefile.am b/Makefile.am
index 4d475d4e3..e9f1d2269 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -613,6 +613,7 @@ include $(top_srcdir)/src/utils/hpftodit/hpftodit.am
include $(top_srcdir)/src/utils/indxbib/indxbib.am
include $(top_srcdir)/src/utils/lkbib/lkbib.am
include $(top_srcdir)/src/utils/lookbib/lookbib.am
+include $(top_srcdir)/src/utils/pdfmom/pdfmom.am
include $(top_srcdir)/src/utils/pfbtops/pfbtops.am
include $(top_srcdir)/src/utils/tfmtodit/tfmtodit.am
include $(top_srcdir)/src/utils/xtotroff/xtotroff.am
diff --git a/doc/doc.am b/doc/doc.am
index 6cf9db589..631109f1e 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -230,7 +230,7 @@ GROFF_MAN_PAGES1 = \
contrib/mm/mmroff.1 \
src/preproc/eqn/neqn.1 \
src/roff/nroff/nroff.1 \
- src/devices/gropdf/pdfmom.1 \
+ src/utils/pdfmom/pdfmom.1 \
src/utils/pfbtops/pfbtops.1 \
src/preproc/pic/pic.1 \
contrib/pic2graph/pic2graph.1 \
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index e874d3e86..fd425dd7e 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -20,13 +20,11 @@
gropdf_dir = $(top_srcdir)/src/devices/gropdf
-bin_SCRIPTS += gropdf pdfmom
+bin_SCRIPTS += gropdf
EXTRA_DIST += \
src/devices/gropdf/TODO \
src/devices/gropdf/gropdf.pl \
- src/devices/gropdf/pdfmom.pl \
- src/devices/gropdf/gropdf.1.man \
- src/devices/gropdf/pdfmom.1.man
+ src/devices/gropdf/gropdf.1.man
GROPDFTMACFILES = \
tmac/pdf.tmac \
@@ -35,8 +33,7 @@ gropdftmacdir = $(tmacdir)
dist_gropdftmac_DATA = $(GROPDFTMACFILES)
man1_MANS += \
- src/devices/gropdf/gropdf.1 \
- src/devices/gropdf/pdfmom.1
+ src/devices/gropdf/gropdf.1
gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT)
$(AM_V_GEN)$(RM) $@ \
@@ -48,15 +45,6 @@ gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT)
>$@ \
&& chmod +x $@
-pdfmom: $(gropdf_dir)/pdfmom.pl $(SH_DEPS_SED_SCRIPT)
- $(AM_V_GEN)$(RM) $@ \
- && sed -f $(SH_DEPS_SED_SCRIPT) \
- -e "s|[@]VERSION[@]|$(VERSION)|" \
- -e "s|[@]RT_SEP[@]|$(RT_SEP)|" \
- -e "s|[@]PERL[@]|$(PERL)|" $(gropdf_dir)/pdfmom.pl \
- >$@ \
- && chmod +x $@
-
gropdf_TESTS = \
src/devices/gropdf/tests/interpret-grout-correctly.sh \
tmac/tests/pdf_bookmark-starting-with-control-char-works.sh \
diff --git a/src/devices/gropdf/pdfmom.1.man b/src/utils/pdfmom/pdfmom.1.man
similarity index 100%
rename from src/devices/gropdf/pdfmom.1.man
rename to src/utils/pdfmom/pdfmom.1.man
diff --git a/src/utils/pdfmom/pdfmom.am b/src/utils/pdfmom/pdfmom.am
new file mode 100644
index 000000000..51f8857da
--- /dev/null
+++ b/src/utils/pdfmom/pdfmom.am
@@ -0,0 +1,44 @@
+# Copyright 2011-2024 Free Software Foundation, Inc.
+#
+# Written by Deri James <[email protected]>
+# Automake migration by Bertrand Garrigues
+#
+# This file is part of groff, the GNU roff typesetting system.
+#
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# groff is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+pdfmom_dir = $(top_srcdir)/src/utils/pdfmom
+
+bin_SCRIPTS += pdfmom
+EXTRA_DIST += \
+ src/utils/pdfmom/pdfmom.pl \
+ src/utils/pdfmom/pdfmom.1.man
+
+man1_MANS += \
+ src/utils/pdfmom/pdfmom.1
+
+pdfmom: $(pdfmom_dir)/pdfmom.pl $(SH_DEPS_SED_SCRIPT)
+ $(AM_V_GEN)$(RM) $@ \
+ && sed -f $(SH_DEPS_SED_SCRIPT) \
+ -e "s|[@]VERSION[@]|$(VERSION)|" \
+ -e "s|[@]RT_SEP[@]|$(RT_SEP)|" \
+ -e "s|[@]PERL[@]|$(PERL)|" $(pdfmom_dir)/pdfmom.pl \
+ >$@ \
+ && chmod +x $@
+
+# Local Variables:
+# fill-column: 72
+# mode: makefile-automake
+# End:
+# vim: set autoindent filetype=automake textwidth=72:
diff --git a/src/devices/gropdf/pdfmom.pl b/src/utils/pdfmom/pdfmom.pl
similarity index 100%
rename from src/devices/gropdf/pdfmom.pl
rename to src/utils/pdfmom/pdfmom.pl
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
