Hi, I have added the difference between master and my version of "hdtbl.am", and "mixed_pickles.roff"; plus the used "gnu.pdf" file to the attachments.
You need to change the option "-ww" to "-wall" to get rid of extra warnings from the master version.
--- master-groff/groff/contrib/hdtbl/hdtbl.am 2024-11-22 00:03:53.739980152 +0000
+++ groff/contrib/hdtbl/hdtbl.am 2024-11-28 22:54:16.889196764 +0000
@@ -22,7 +22,7 @@ hdtbl_srcdir = $(top_srcdir)/contrib/hdt
man7_MANS += contrib/hdtbl/groff_hdtbl.7
-# Groff command used to generate .ps files
+# Groff command used to generate .dvi, .pdf, and .ps files
HDTBLGROFF = \
GROFF_COMMAND_PREFIX= \
GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
@@ -30,7 +30,7 @@ HDTBLGROFF = \
-dfontpath=$(top_srcdir)/font \
-dsopath=$(hdtbl_srcdir)/ \
-I $(doc_builddir) -I $(doc_srcdir) \
- $(MFLAG) -M$(hdtbl_srcdir) -mhdtbl -t -p -e -U -b -wall
+ $(MFLAG) -M$(hdtbl_srcdir) -mhdtbl -t -p -e -U -b -ww
HDTBLTMACFILES = \
contrib/hdtbl/hdtbl.tmac \
@@ -41,16 +41,26 @@ dist_hdtbltmac_DATA = $(HDTBLTMACFILES)
hdtbl_test_template = contrib/hdtbl/examples/test-hdtbl.sh.in
# Files installed in $(exampledir)/hdtbl. HDTBLEXAMPLEFILES are
-# located in the source tree, while HDTBLPROCESSEDEXAMPLEFILES are
-# generated in the build tree.
+# located in the source tree, while HDTBLPROCESSEDEXAMPLEFILES,
+# HDTBLPROCESSEDEXAMPLEFILESDVI and HDTBLPROCESSEDEXAMPLEFILESPDF
+# are generated in the build tree.
# These files are handled by the '.in.roff' rule.
HDTBLGENFILES = \
contrib/hdtbl/examples/fonts_n.roff \
- contrib/hdtbl/examples/fonts_x.roff
+ contrib/hdtbl/examples/fonts_x.roff \
+ contrib/hdtbl/examples/fonts.dvi_n.roff \
+ contrib/hdtbl/examples/fonts.dvi_x.roff \
+ contrib/hdtbl/examples/fonts.URW_n.roff \
+ contrib/hdtbl/examples/fonts.URW_x.roff
+
EXTRA_DIST += \
contrib/hdtbl/examples/fonts_n.in \
contrib/hdtbl/examples/fonts_x.in \
+ contrib/hdtbl/examples/fonts.dvi_n.in \
+ contrib/hdtbl/examples/fonts.dvi_x.in \
+ contrib/hdtbl/examples/fonts.URW_n.in \
+ contrib/hdtbl/examples/fonts.URW_x.in \
$(hdtbl_test_template)
$(HDTBLPROCESSEDEXAMPLEFILES): $(DEVPSFONTFILES)
@@ -80,16 +90,39 @@ HDTBLPROCESSEDEXAMPLEFILES = \
contrib/hdtbl/examples/rainbow.ps \
contrib/hdtbl/examples/short_reference.ps
+HDTBLPROCESSEDEXAMPLEFILESPDF = \
+ contrib/hdtbl/examples/chess_board.pdf \
+ contrib/hdtbl/examples/color_boxes.pdf \
+ contrib/hdtbl/examples/color_nested_tables.pdf \
+ contrib/hdtbl/examples/color_table_cells.pdf \
+ contrib/hdtbl/examples/color_transitions.pdf \
+ contrib/hdtbl/examples/col_rowspan_colors.pdf \
+ contrib/hdtbl/examples/fonts_n.pdf \
+ contrib/hdtbl/examples/fonts_x.pdf \
+ contrib/hdtbl/examples/fonts.URW_n.pdf \
+ contrib/hdtbl/examples/fonts.URW_x.pdf \
+ contrib/hdtbl/examples/mixed_pickles.pdf \
+ contrib/hdtbl/examples/rainbow.pdf \
+ contrib/hdtbl/examples/short_reference.pdf
+
+HDTBLPROCESSEDEXAMPLEFILESDVI = \
+ contrib/hdtbl/examples/color_boxes.dvi \
+ contrib/hdtbl/examples/fonts.dvi_n.dvi \
+ contrib/hdtbl/examples/fonts.dvi_x.dvi
+
hdtblexampledir = $(exampledir)/hdtbl
dist_hdtblexample_DATA = $(HDTBLEXAMPLEFILES)
nodist_hdtblexample_DATA = \
$(HDTBLGENFILES) \
$(HDTBLPROCESSEDEXAMPLEFILES) \
+ $(HDTBLPROCESSEDEXAMPLEFILESDVI) \
+ $(HDTBLPROCESSEDEXAMPLEFILESPDF) \
$(DOC_GNU_EPS)
$(hdtblexample_DATA): $(HDTBLTMACFILES)
-MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES)
+MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES) \
+ $(HDTBLPROCESSEDEXAMPLEFILESDVI) $(HDTBLPROCESSEDEXAMPLEFILESPDF)
EXTRA_DIST += \
contrib/hdtbl/ChangeLog \
@@ -110,15 +143,30 @@ contrib/hdtbl/examples/test-hdtbl.sh: \
MOSTLYCLEANFILES += $(hdtbl_TESTS)
# Rule to generate ps and roff files
-SUFFIXES += .roff .in .ps
+SUFFIXES += .roff .in .ps .dvi .pdf
.roff.ps:
$(GROFF_V)$(MKDIR_P) `dirname $@` \
&& $(HDTBLGROFF) -Tps $< >$@
+.roff.pdf:
+ $(GROFF_V)$(MKDIR_P) `dirname $@` \
+ && $(HDTBLGROFF) -I $(doc_builddir) -I $(doc_srcdir) -Tpdf \
+ -dfontpath=$(top_builddir)/font \
+ -dsopath=$(hdtbl_srcdir)/ \
+ -mhdtbl $< >$@
+
+.roff.dvi:
+ $(GROFF_V)$(MKDIR_P) `dirname $@` \
+ && $(HDTBLGROFF) -I $(doc_builddir) -I $(doc_srcdir) -Tdvi \
+ -dfontpath=$(top_srcdir)/font \
+ -dsopath=$(hdtbl_srcdir)/ \
+ -mhdtbl $< >$@
+
.in.roff:
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
&& sed -e "s|[@]fontdir[@]|$(fontdir)|" \
+ -e "s|[@]SED[@]|$(SED)|" \
-e "s|[@]EGREP[@]|$(EGREP)|" $< >$@
# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and
@@ -126,13 +174,20 @@ SUFFIXES += .roff .in .ps
$(HDTBLPROCESSEDEXAMPLEFILES): $(DOC_GNU_EPS) groff troff eqn pic tbl \
grops grn soelim font/devps/stamp contrib/hdtbl/examples/common.roff
+# Programs for the DVI fonts
+$(HDTBLPROCESSEDEXAMPLEFILESDVI): $(DOC_GNU_EPS) groff troff tbl \
+ grodvi font/devdvi/stamp contrib/hdtbl/examples/common.roff
+
+# Programs for the PDF files
+$(HDTBLPROCESSEDEXAMPLEFILESPDF): $(DOC_GNU_EPS) groff troff tbl \
+ gropdf font/devpdf/stamp contrib/hdtbl/examples/common.roff
+
uninstall_groffdirs: uninstall-hdtbl-hook
uninstall-hdtbl-hook:
if test -d $(DESTDIR)$(hdtblexampledir); then \
rmdir $(DESTDIR)$(hdtblexampledir); \
fi
-
# Local Variables:
# mode: makefile-automake
# fill-column: 72
--- master-groff/groff/contrib/hdtbl/examples/mixed_pickles.roff 2024-11-22 00:03:53.735980097 +0000
+++ groff/contrib/hdtbl/examples/mixed_pickles.roff 2024-11-28 14:53:49.758360084 +0000
@@ -37,7 +37,8 @@ along with this program. If not, see <h
.br \
EPS Image, eqn Equation, tbl Table, and pic Picture
.
-Call groff with options \-t, \-e, and \-p!
+Call groff with options \-t, \-e, \-p, and \-U!
+.br\" Separate the text from the table
.
.TBL width=90% tal=c csp=.2n cpd=0
. TR
@@ -45,9 +46,16 @@ Call groff with options \-t, \-e, and \-
. TBL width='25% 75%' csp=.5n cpd=.5n hal=c
. TR
. TD hl=d vl=d rowspan=2 bgc=red4 fgc=linen fsz=1.2 fst=HB val=m
-. PSPIC -I -\\n[.l]u gnu.eps
-. sp .5
-. nop eps image with \fI.PSPIC\fP
+. if '\*[.T]'ps' \{\
+. PSPIC -I -\\n[.l]u gnu.eps
+. sp .5
+. nop eps image with \fI.PSPIC\fP
+. \}
+. if '\*[.T]'pdf' \{\
+. PDFPIC -I -\\n[.l]u ../doc/gnu.pdf
+. sp .5
+. nop pdf image with \fI.PDFPIC\fP
+. \}
. TD bgc=linen
.
.EQ
@@ -65,16 +73,17 @@ c c c | c c c
r rI lB | r rI lB.
Bit @ Code @ Warning @ Bit @ Code @ Warning
=
-0 @ 1 @ char @ 10 @ 1024 @ reg
-1 @ 2 @ number @ 11 @ 2048 @ tab
-2 @ 4 @ break @ 12 @ 4096 @ right-brace
-3 @ 8 @ delim @ 13 @ 8192 @ missing
-4 @ 16 @ el @ 14 @ 16384 @ input
-5 @ 32 @ scale @ 15 @ 32768 @ escape
-6 @ 64 @ range @ 16 @ 65536 @ space
-7 @ 128 @ syntax @ 17 @ 131072 @ font
-8 @ 256 @ di @ 18 @ 262144 @ ig
-9 @ 512 @ mac @ 19 @ 524288 @ color
+0 @ 1 @ char @ 11 @ 2048 @ tab
+1 @ 2 @ number @ 12 @ 4096 @ right-brace
+2 @ 4 @ break @ 13 @ 8192 @ missing
+3 @ 8 @ delim @ 14 @ 16384 @ input
+4 @ 16 @ el @ 15 @ 32768 @ escape
+5 @ 32 @ scale @ 16 @ 65536 @ space
+6 @ 64 @ range @ 17 @ 131072 @ font
+7 @ 128 @ syntax @ 18 @ 262144 @ ig
+8 @ 256 @ di @ 19 @ 524288 @ color
+9 @ 512 @ mac @ 20 @ 1048576 @ file
+10 @1024 @ reg @
.TE
.
. sp .5
@@ -83,14 +92,15 @@ Bit @ Code @ Warning @ Bit @ Code @ Warn
. TD colspan=2 bgc=azure2 fgc=blue4
.
.PS
+.\" change length of arrow from 0.42 inches to 0.36 in to fit in a A4 sized page
ellipse "document";
-arrow 0.42;
+arrow 0.36;
box width 0.6 "\fIgpic\/\fP(1)"
-arrow 0.42;
+arrow 0.36;
box width 1.25 "\fIgtbl\/\fP(1) or \fIgeqn\/\fP(1)" "(optional)" dashed;
-arrow 0.42;
+arrow 0.36;
box width 0.65 "\fIgtroff\/\fP(1)";
-arrow 0.42;
+arrow 0.36;
ellipse "PostScript"
.PE
.
gnu.pdf
Description: Adobe PDF document
