diff options
| author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-11-18 12:40:01 -0600 |
|---|---|---|
| committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-11-18 12:43:45 -0600 |
| commit | bc079f1c0ce073cca5e0bd4be38ae125ae13ff80 (patch) | |
| tree | dacaf35f53bfb9dc22a049ef05d3962f02a3a4d3 /font | |
| parent | cafd4dffd259b37275072745d6731253b83afe90 (diff) | |
| download | groff-git-bc079f1c0ce073cca5e0bd4be38ae125ae13ff80.tar.gz | |
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
Diffstat (limited to 'font')
| -rw-r--r-- | font/devpdf/Foundry.in | 1 | ||||
| -rw-r--r-- | font/devpdf/devpdf.am | 1 | ||||
| -rw-r--r-- | font/devpdf/util/BuildFoundries.pl | 12 |
3 files changed, 3 insertions, 11 deletions
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 { |