[groff] 21/21: Revert "[devpdf]: Do more explicit work and less magic."

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit eac39afe3e7a86f3adbfb02ff5e33bfd69d4c224
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Nov 18 12:41:38 2022 -0600

    Revert "[devpdf]: Do more explicit work and less magic."
    
    This reverts commit 254e13c387a7fdd0267fac697737b5862c0851ad.
    
    Per request from Deri James.
    https://lists.gnu.org/archive/html/groff-commit/2022-11/msg00093.html
---
 ChangeLog             |  19 ---------
 font/devpdf/devpdf.am | 104 ++++----------------------------------------------
 2 files changed, 7 insertions(+), 116 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aacec52d7..b25305f78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -181,25 +181,6 @@
        description files named in these macro expansions will be
        generated too.
 
-2022-11-09  G. Branden Robinson <g.branden.robinson@gmail.com>
-
-       [build]: Do more explicit work and less magic for PDF fonts.
-
-       * font/devpdf/devpdf.am (devpdffont_DATA): Add all of the
-       PostScript Level 2 base 35 font descriptions (from the default
-       foundry).  Also add the "EURO" font description file and the
-       "FreeEuro" PFA and AFM files, making these explicit targets and
-       dependencies.
-       (devpdffont_DATA) [HAVE_URW_FONTS]: Also add the URW foundry's
-       version of the base 35 fonts.
-       (font/devpdf/freeeuro.afm): Add new target, a simple file copy
-       from the devps font directory.
-       (font/devpdf/EURO): Generate font description file
-       from the devps font directory.
-       (font/devpdf/freeeuro.pfa): Add new target, a simple file copy
-       from the devps font directory.
-       (MOSTLYCLEANFILES): Clean freeeuro.{afm,pfa}.
-
 2022-11-09  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/utils/afmtodit/afmtodit.pl: Add new command-line option to
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 0114d15e0..51e83336e 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -24,90 +24,16 @@ GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf \
 ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*`
 MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*`
 
-DEFAULT_BASE35_FONTS = \
-  font/devpdf/AB \
-  font/devpdf/ABI \
-  font/devpdf/AI \
-  font/devpdf/AR \
-  font/devpdf/BMB \
-  font/devpdf/BMBI \
-  font/devpdf/BMI \
-  font/devpdf/BMR \
-  font/devpdf/CB \
-  font/devpdf/CBI \
-  font/devpdf/CI \
-  font/devpdf/CR \
-  font/devpdf/HB \
-  font/devpdf/HBI \
-  font/devpdf/HI \
-  font/devpdf/HNB \
-  font/devpdf/HNBI \
-  font/devpdf/HNI \
-  font/devpdf/HNR \
-  font/devpdf/HR \
-  font/devpdf/NB \
-  font/devpdf/NBI \
-  font/devpdf/NI \
-  font/devpdf/NR \
-  font/devpdf/PB \
-  font/devpdf/PBI \
-  font/devpdf/PI \
-  font/devpdf/PR \
-  font/devpdf/S \
-  font/devpdf/TB \
-  font/devpdf/TBI \
-  font/devpdf/TI \
-  font/devpdf/TR \
-  font/devpdf/ZCMI \
-  font/devpdf/ZD
-
-devpdffontdir = $(fontdir)/devpdf
-devpdffont_DATA = $(DEFAULT_BASE35_FONTS) \
+MOSTLYCLEANFILES += \
+  font/devpdf/download \
   font/devpdf/DESC \
   font/devpdf/Foundry \
-  font/devpdf/EURO \
-  font/devpdf/freeeuro.afm \
-  font/devpdf/freeeuro.pfa
+  font/devpdf/util/BuildFoundries
 
-if HAVE_URW_FONTS
-URW_BASE35_FONTS = \
-  font/devpdf/U-AB \
-  font/devpdf/U-ABI \
-  font/devpdf/U-AI \
-  font/devpdf/U-AR \
-  font/devpdf/U-BMB \
-  font/devpdf/U-BMBI \
-  font/devpdf/U-BMI \
-  font/devpdf/U-BMR \
-  font/devpdf/U-CB \
-  font/devpdf/U-CBI \
-  font/devpdf/U-CI \
-  font/devpdf/U-CR \
-  font/devpdf/U-HB \
-  font/devpdf/U-HBI \
-  font/devpdf/U-HI \
-  font/devpdf/U-HNB \
-  font/devpdf/U-HNBI \
-  font/devpdf/U-HNI \
-  font/devpdf/U-HNR \
-  font/devpdf/U-HR \
-  font/devpdf/U-NB \
-  font/devpdf/U-NBI \
-  font/devpdf/U-NI \
-  font/devpdf/U-NR \
-  font/devpdf/U-PB \
-  font/devpdf/U-PBI \
-  font/devpdf/U-PI \
-  font/devpdf/U-PR \
-  font/devpdf/U-S \
-  font/devpdf/U-TB \
-  font/devpdf/U-TBI \
-  font/devpdf/U-TI \
-  font/devpdf/U-TR \
-  font/devpdf/U-ZCMI \
-  font/devpdf/U-ZD
-devpdffont_DATA += $(URW_BASE35_FONTS)
-endif
+devpdffontdir = $(fontdir)/devpdf
+devpdffont_DATA = \
+  font/devpdf/DESC \
+  font/devpdf/Foundry
 
 devpdffontencdir = $(devpdffontdir)/enc
 devpdffontenc_DATA = font/devpdf/enc/text.enc
@@ -172,22 +98,6 @@ font/devpdf/DESC: $(devpdf_srcdir)/DESC.in
               >>$(top_builddir)/font/devpdf/DESC; \
           fi
 
-MOSTLYCLEANFILES += font/devpdf/freeeuro.afm
-font/devpdf/freeeuro.afm: $(devps_srcdir)/freeeuro.afm
-       $(AM_V_GEN)$(MKDIR_P) $(top_builddir)/font/devpdf \
-       && cp -f $(devps_srcdir)/freeeuro.afm $@
-
-font/devpdf/EURO: font/devpdf/freeeuro.afm
-       $(AM_V_GEN) ./afmtodit -d font/devpdf/DESC -o font/devpdf/EURO \
-         -w 333 font/devpdf/freeeuro.afm font/devpdf/map/symbol.map \
-         EURO
-
-MOSTLYCLEANFILES += font/devpdf/freeeuro.pfa
-font/devpdf/freeeuro.pfa: $(devps_srcdir)/freeeuro.pfa
-       $(AM_V_GEN)$(MKDIR_P) $(top_builddir)/font/devpdf \
-       && cp -f $(devps_srcdir)/freeeuro.pfa $@
-
-MOSTLYCLEANFILES += font/devpdf/Foundry
 font/devpdf/Foundry: $(devpdf_srcdir)/Foundry.in
        $(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf/
 if HAVE_URW_FONTS