[groff] 01/03: Revert "[gropdf]: Bifurcate test of font availability."

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 3cf8b8fde598eba34537d71723325bb2f59d09c5
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Feb 19 10:22:10 2023 -0600

    Revert "[gropdf]: Bifurcate test of font availability."
    
    This reverts commit 6e001a7f397438d7f09e97155b3c1ec89c1fc855.
    
    Per Deri James, having a Ghostscript executable installed but not a full
    set of PostScript level 2 font files installed (the "base 35" plus
    groff's "EURO") in discoverable places is _not_ a supported groff
    configuration scenario as far as gropdf is concerned.
    
    A test failure is therefore expected in that case.
---
 ChangeLog                                  | 15 --------
 font/devpdf/tests/check-default-foundry.sh | 55 +++++++++++-------------------
 2 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a9cdd6a82..998ce594d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,3 @@
-2023-02-18  G. Branden Robinson <g.branden.robinson@gmail.com>
-
-       * font/devpdf/tests/check-default-foundry.sh: Bifurcate test of
-       font availability.  The Ghostscript executable can be present in
-       the host environment without any Type 1 fonts.  The PDF standard
-       requires that its base 14 be present in the renderer, so groff
-       font descriptions for those 14 fonts (plus groff's "EURO" font)
-       should always be available.  But the remaining fonts from the
-       "Base 35" PostScript level 2 set won't necessarily be, and so
-       their font descriptions won't be, either.  Skip the test rather
-       than failing it in that case, because the Ghostscript executable
-       can have any number of fonts built-in (in "%rom%" as "gs -h"
-       puts it).  We'll need a more sophisticated Autoconf test to
-       discern this scenario from a true failure case.
-
 2023-02-18  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * font/devpdf/Foundry.in: Recognize URW foundry replacements for
diff --git a/font/devpdf/tests/check-default-foundry.sh 
b/font/devpdf/tests/check-default-foundry.sh
index 9e1c729c5..1ddd83d0b 100755
--- a/font/devpdf/tests/check-default-foundry.sh
+++ b/font/devpdf/tests/check-default-foundry.sh
@@ -30,23 +30,7 @@
 
 devpdf_fontbuilddir="${abs_top_builddir:-.}"/font/devpdf
 
-base_fonts='CB
-CBI
-CI
-CR
-EURO
-HB
-HBI
-HI
-HR
-S
-TB
-TBI
-TI
-TR
-ZD'
-
-additional_fonts='AB
+fonts='AB
 ABI
 AI
 AR
@@ -54,10 +38,19 @@ BMB
 BMBI
 BMI
 BMR
+CB
+CBI
+CI
+CR
+EURO
+HB
+HBI
+HI
 HNB
 HNBI
 HNI
 HNR
+HR
 NB
 NBI
 NI
@@ -66,11 +59,17 @@ PB
 PBI
 PI
 PR
-ZCMI'
+S
+TB
+TBI
+TI
+TR
+ZCMI
+ZD'
 
 fail=
 
-for f in $base_fonts
+for f in $fonts
 do
     printf "checking for font description %s...\n" "$f" >&2
     if ! [ -f "$devpdf_fontbuilddir"/"$f" ]
@@ -80,22 +79,6 @@ do
     fi
 done
 
-test -n "$fail" && exit 1 # fail
-
-# The "Base 35" fonts (not including the PDF base 14) are not guaranteed
-# to be present even if the Ghostscript executable is installed.  Skip
-# the test rather than failing if they're not present.
-#
-# TODO: Come up with a more sophisicated Autoconf test to detect this.
-
-for f in $additional_fonts
-do
-    printf "checking for font description %s...\n" "$f" >&2
-    if ! [ -f "$devpdf_fontbuilddir"/"$f" ]
-    then
-        echo "non-base fonts not available; skipping test" >&2
-        exit 77 # skip
-    fi
-done
+test -z "$fail"
 
 # vim:set ai et sw=4 ts=4 tw=72: