[groff] 20/21: Revert "[build]: Refactor handling of PDF FreeEuro font."

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit bc079f1c0ce073cca5e0bd4be38ae125ae13ff80
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Nov 18 12:40:01 2022 -0600

    Revert "[build]: Refactor handling of PDF FreeEuro font."
    
    This reverts commit 83004cbf0c8e30bd700f9ef246629ab77de96a7c.
    
    Per request from Deri James.
    https://lists.gnu.org/archive/html/groff-commit/2022-11/msg00094.html
---
 ChangeLog                          | 14 --------------
 doc/doc.am                         |  5 ++---
 font/devpdf/Foundry.in             |  1 +
 font/devpdf/devpdf.am              |  1 -
 font/devpdf/util/BuildFoundries.pl | 12 ++----------
 5 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e4d0372c..aacec52d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -161,20 +161,6 @@
        * tmac/tests/an_adjust-link-text-correctly.sh: Do it.
        * tmac/tmac.am (tmac_TESTS): Run tests.
 
-2022-11-11  G. Branden Robinson <g.branden.robinson@gmail.com>
-
-       [build]: Refactor handling of FreeEuro font for PDF device.
-
-       * font/devpdf/Foundry.in: Drop "EURO" entry from file.
-       * font/devpdf/devpdf.am (font/devpdf/download): Add it here.
-       * font/devpdf/util/BuildFoundries.pl: Add list `base35Fonts` to
-       store the groff font names of the PostScript Level 2 base fonts.
-       (LoadFoundry): ...so that we copy their descriptions (and _only_
-       these) from the `ps` device's font description directory.
-       * doc/doc.am (doc/groff-man-pages.pdf): Declare dependency on
-       "freeeuro.pfa" file in `pdf` device's font description
-       directory.
-
 2022-11-11  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * font/devpdf/devpdf.am: Refactor.
diff --git a/doc/doc.am b/doc/doc.am
index 5498893ea..ad6d591f7 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -248,14 +248,13 @@ man-all: $(GROFF_MAN_PAGES_ALL)
 man-clean:
        $(RM) $(GROFF_MAN_PAGES_ALL)
 
-# Many pages use tbl, a few use eqn, and soelim(1) uses pic.  We also
-# need groff's FreeEuro font so we can embed it.
+# Many pages use tbl, a few use eqn, and soelim(1) uses pic.
 #
 # We embed the fonts (-P-e) to (1) honor the current PDF standard, (2)
 # ensure consistent rendering of the document, and (3) exercise this
 # feature of gropdf.
 doc/groff-man-pages.pdf: $(GROFF_MAN_PAGES_ALL) eqn pic tbl \
-  $(TMAC_PACKAGE_MAN) $(TMAC_PACKAGE_MDOC) font/devpdf/freeeuro.pfa
+  $(TMAC_PACKAGE_MAN) $(TMAC_PACKAGE_MDOC)
        $(GROFF_V)$(DOC_GROFF) -pet -mandoc -rC1 -rCHECKSTYLE=3 \
          -Tpdf -P-e \
          $(GROFF_MAN_PAGES1) \
diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
index 67a91555a..633a0a58d 100644
--- a/font/devpdf/Foundry.in
+++ b/font/devpdf/Foundry.in
@@ -65,6 +65,7 @@ 
TI|Y||||NimbusRoman-Italic.t1!NimbusRoman-Italic!NimbusRomNo9L-ReguItal!n021023l
 
TR|Y||||NimbusRoman-Regular.t1!NimbusRoman-Regular!NimbusRomNo9L-Regu!n021003l.pfb
 
ZCMI|N||||Z003-MediumItalic.t1!Z003-MediumItalic!URWChanceryL-MediItal!z003034l.pfb
 ZD|Y||||D050000L!D050000L.t1!Dingbats!d050000l.pfb
+EURO|N||||*../devps/freeeuro.pfa
 
 # BEGIN URW ============================================================
 
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 0b2b39c33..0114d15e0 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -214,7 +214,6 @@ font/devpdf/download: $(devpdffontmapdata) font/devpdf/DESC 
\
               --strict $(abs_top_builddir)/font/devpdf \
               '$(abs_top_srcdir)/font/devps:$(abs_top_builddir)/font/devps' \
               >>$@.tmp \
-       && printf "\tFreeEuro\tfreeeuro.pfa\n" >>$@.tmp \
        && mv $@.tmp $@
 
 # PDFs to be produced by troff should depend on this stamp file to
diff --git a/font/devpdf/util/BuildFoundries.pl 
b/font/devpdf/util/BuildFoundries.pl
index cdc8573c0..1e7c416cb 100644
--- a/font/devpdf/util/BuildFoundries.pl
+++ b/font/devpdf/util/BuildFoundries.pl
@@ -45,15 +45,6 @@ my $lct=0;
 my $foundry='';        # the default foundry
 my $notFoundFont=0;
 
-# We hard-code the PostScript Level 2 base 35 fonts because we don't
-# want to copy any others from the devps font directory to devpdf's.
-my @base35Fonts = (
-    "AB", "ABI", "AI", "AR", "BMB", "BMBI", "BMI", "BMR", "CB", "CBI",
-    "CI", "CR", "HB", "HBI", "HI", "HNB", "HNBI", "HNI", "HNR", "HR",
-    "NB", "NBI", "NI", "NR", "PB", "PBI", "PI", "PR", "S", "TB", "TBI",
-    "TI", "TR", "ZCMI", "ZD",
-);
-
 if ($check)
 {
     CheckFoundry("Foundry.in");
@@ -124,7 +115,7 @@ sub LoadFoundry
 
            my $gfont=($foundry eq '')?$r[0]:"$foundry-$r[0]";
 
-           if ($r[2] eq '' && grep /^$r[0]$/, @base35Fonts)
+           if ($r[2] eq '')
            {
                # Don't run afmtodit; just copy the groff font
                # description file for grops.
@@ -151,6 +142,7 @@ sub LoadFoundry
                        }
                    }
                    Notice("copied grops font $gfont") if $gotf;
+
                }
                else
                {