[groff] 18/20: fix a few recent regressions in the hdtbl examples

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit e5a550400d5d54b502c508392534ec2df70d0b9a
Author: Ingo Schwarze <address@hidden>
Date:   Fri Nov 9 18:18:45 2018 -0500

    fix a few recent regressions in the hdtbl examples
    
        [G. Branden Robinson <address@hidden> committing
        Ingo's fixes.]
    
        * contrib/hdtbl/hdtbl.am: restore the -U flag to the groff(1)
        command because the two fonts examples still use .pso; sorry for
        breaking this in commit c675115cd on Aug 4 20:34:15 2018.  More
        work is needed before this can be dropped.  Issue observed by
        address@hidden
    
        * contrib/hdtbl/examples/common.roff: remove the line
        '.t*pv 1.2 1.2 "" X' which sets a point size and line spacing
        that some of the examples don't work with, most notably fonts_n
        and also color_nested_tables.  Those examples that do want these
        changed settings already contain the line themselves.  This
        problem used to be hidden by a bug and exposed by the bugfix
        commit 305701e8 on Aug 9 22:50:47 2018.  Issue observed by
        gbranden@, fix suggested by Bjarni Ingi Gislason.
    
        * contrib/hdtbl/examples/col_rowspan_colors.roff: When you seed
        a random number generator, you have to do that once at the
        beginning, not inside a tight loop.  In this case, seeding over
        and over again resulted in the famous Elbonian random number
        sequence: 9, 9, 9, 9, 9, 9, 9... - each random number was the
        same as the previous one, resulting in a uniformly coloured
        picture that was supposed to be a patchwork of different
        colours.  Bug exposed by the cleanup commit a519a612 on Aug 9
        23:34:10 2018.  Issue noticed by Bjarni Ingi Gislason.
    
        Also:
    
        * contrib/hdtbl/hdtbl.am: Correct (consistent) misspelling of
        Makefile variable from HDTLB_PFLAG to HDTBL_PFLAG.  These are
        the Heidelberger table macros, not a High-Definition Translation
        Lookaside Buffer.  Or whatever.  This patch (only) by Branden.
    
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 contrib/hdtbl/examples/col_rowspan_colors.roff | 4 ++--
 contrib/hdtbl/examples/common.roff             | 1 -
 contrib/hdtbl/hdtbl.am                         | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/contrib/hdtbl/examples/col_rowspan_colors.roff 
b/contrib/hdtbl/examples/col_rowspan_colors.roff
index 5255678..9a42766 100644
--- a/contrib/hdtbl/examples/col_rowspan_colors.roff
+++ b/contrib/hdtbl/examples/col_rowspan_colors.roff
@@ -25,10 +25,10 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .
 .so \*[sopath]examples/common.roff
 .
-.de color#
-.nr # +1
 .\" Seed the random number generator for reproducible builds.
 .random-seed 131545532 19201711
+.de color#
+.nr # +1
 .random#
 .defcolor c\\n# rgb \\*[#random]
 ..
diff --git a/contrib/hdtbl/examples/common.roff 
b/contrib/hdtbl/examples/common.roff
index f7d1f6e..fa45674 100644
--- a/contrib/hdtbl/examples/common.roff
+++ b/contrib/hdtbl/examples/common.roff
@@ -236,7 +236,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .nr v \n[.v]
 .nr p \n[.p]
 .nr o \n[.o]
-.t*pv 1.2 1.2 "" X
 .nr l 6.6i                             \"      set text width
 .ll \n[t*l]u
 .nr o 2c                               \"      set offset
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index c5e4d38..76d3b73 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -26,11 +26,11 @@ man7_MANS += contrib/hdtbl/groff_hdtbl.7
 
 # Groff command used to generate .ps files
 HDTBL_TFLAG = -M$(hdtbl_srcdir) -M$(hdtbl_builddir)
-HDTLB_PFLAG=-t -p -e
+HDTBL_PFLAG=-t -p -e -U
 HDTBLGROFF = \
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
-  $(GROFFBIN) $(FFLAG) $(TFLAG) $(HDTBL_TFLAG) $(HDTLB_PFLAG)
+  $(GROFFBIN) $(FFLAG) $(TFLAG) $(HDTBL_TFLAG) $(HDTBL_PFLAG)
 
 # Files installed in $(tmacdir).
 # These files are generated with 'strip.sed' from their unstripped source file