groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 17/35: [build]: Rename PS->groff glyph name maps (1/4).


From: G. Branden Robinson
Subject: [groff] 17/35: [build]: Rename PS->groff glyph name maps (1/4).
Date: Fri, 15 Jul 2022 23:11:58 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit dc67513c430e5df9b7005649dd208b79aa052c7a
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Jul 10 03:05:31 2022 -0500

    [build]: Rename PS->groff glyph name maps (1/4).
    
    [build]: Name and place PS->groff glyph name maps consistently.
    
    * font/devps/symbolmap: Rename from this...
    * font/devps/generate/symbol.map: ...to this.
    
    * font/devpdf/devpdf.am (font/devpdf/map/symbolmap): Rename target...
      (font/devpdf/map/symbol.map): ...to this.
      (font/devpdf/map/symbol.map): Copy "devps" version of file from its
      new location in the "generate" subdirectory.
    
    * font/devpdf/Foundry.in: Reflect rename.
    
    * font/devps/generate/Makefile (symbolmap): Rename target...
      ($(srcdir)/symbol.map): ...to this.
    
    * font/devps/devps.am (DEVPSGENFILES, EXTRA_DIST):
    * font/devps/generate/Makefile (S, EURO $(SPECIALFONTS), clean):
    * src/utils/afmtodit/afmtodit.1.man: Reflect rename and relocation.
---
 ChangeLog                                     | 23 +++++++++++++++++++++++
 font/devpdf/Foundry.in                        |  2 +-
 font/devpdf/devpdf.am                         |  6 +++---
 font/devps/devps.am                           |  2 +-
 font/devps/generate/Makefile                  | 12 ++++++------
 font/devps/{symbolmap => generate/symbol.map} |  0
 src/utils/afmtodit/afmtodit.1.man             |  4 ++--
 7 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68a86172..f6003afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2022-07-10  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [build]: Name and place PS->groff glyph name maps consistently.
+
+       * font/devps/symbolmap: Rename from this...
+       * font/devps/generate/symbol.map: ...to this.
+
+       * font/devpdf/devpdf.am (font/devpdf/map/symbolmap): Rename
+       target...
+       (font/devpdf/map/symbol.map): ...to this.
+       (font/devpdf/map/symbol.map): Copy "devps" version of file from
+       its new location in the "generate" subdirectory.
+
+       * font/devpdf/Foundry.in: Reflect rename.
+
+       * font/devps/generate/Makefile (symbolmap): Rename target...
+       ($(srcdir)/symbol.map): ...to this.
+
+       * font/devps/devps.am (DEVPSGENFILES, EXTRA_DIST):
+       * font/devps/generate/Makefile (S, EURO $(SPECIALFONTS), clean):
+       * src/utils/afmtodit/afmtodit.1.man: Reflect rename and
+       relocation.
+
 2022-07-10  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/doc.am (doc/ms.ps): Add dependency on "eqn", and call
diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
index 3971ad96..a4cc17f6 100644
--- a/font/devpdf/Foundry.in
+++ b/font/devpdf/Foundry.in
@@ -110,7 +110,7 @@ 
PB|N|r|textmap|text.enc|P052-Bold.t1!P052-Bold!URWPalladioL-Bold!p052004l.pfb
 
PBI|N|i|textmap|text.enc|P052-BoldItalic.t1!P052-BoldItalic!URWPalladioL-BoldItal!p052024l.pfb
 
PI|N|i|textmap|text.enc|P052-Italic.t1!P052-Italic!URWPalladioL-Ital!p052023l.pfb
 PR|N|r|textmap|text.enc|P052-Roman.t1!P052-Roman!URWPalladioL-Roma!p052003l.pfb
-S|N|sr|symbolmap||StandardSymbolsPS.t1!StandardSymbolsPS!StandardSymL!s050000l.pfb
+S|N|sr|symbol.map||StandardSymbolsPS.t1!StandardSymbolsPS!StandardSymL!s050000l.pfb
 
TB|N|r|textmap|text.enc|NimbusRoman-Bold.t1!NimbusRoman-Bold!NimbusRomNo9L-Medi!n021004l.pfb
 
TBI|N|i|textmap|text.enc|NimbusRoman-BoldItalic.t1!NimbusRoman-BoldItalic!NimbusRomNo9L-MediItal!n021024l.pfb
 
TI|N|i|textmap|text.enc|NimbusRoman-Italic.t1!NimbusRoman-Italic!NimbusRomNo9L-ReguItal!n021023l.pfb
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 24461a86..14c15b11 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -43,7 +43,7 @@ DEVPDFFONTMAP_1 = \
   font/devpdf/map/dingbats.map \
   font/devpdf/map/symbolchars \
   font/devpdf/map/textmap
-DEVPDFFONTMAP_2 = font/devpdf/map/symbolmap
+DEVPDFFONTMAP_2 = font/devpdf/map/symbol.map
 devpdffontmap_DATA = $(DEVPDFFONTMAP_1) $(DEVPDFFONTMAP_2)
 
 EXTRA_DIST += \
@@ -58,9 +58,9 @@ font/devpdf/enc/text.enc:
        $(AM_V_at)cp -f $(top_srcdir)/font/devps/text.enc \
          $(top_builddir)/font/devpdf/enc
 
-font/devpdf/map/symbolmap:
+font/devpdf/map/symbol.map:
        $(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf/map
-       $(AM_V_at)cp -f $(top_srcdir)/font/devps/symbolmap \
+       $(AM_V_at)cp -f $(top_srcdir)/font/devps/generate/symbol.map \
          $(top_builddir)/font/devpdf/map
 
 $(DEVPDFFONTMAP_1):
diff --git a/font/devps/devps.am b/font/devps/devps.am
index 6e59572a..fb1cb2b8 100644
--- a/font/devps/devps.am
+++ b/font/devps/devps.am
@@ -113,6 +113,7 @@ DEVPSGENFILES = \
   font/devps/generate/dingbats.map \
   font/devps/generate/dingbats.rmap \
   font/devps/generate/lgreekmap \
+  font/devps/generate/symbol.map \
   font/devps/generate/symbolchars \
   font/devps/generate/textmap
 DEVPSGENSCRIPTS = \
@@ -123,7 +124,6 @@ dist_devpsgen_DATA = $(DEVPSGENFILES) $(DEVPSGENSCRIPTS)
 
 MOSTLYCLEANFILES += $(DEVPSFONTFILES_GENERATED)
 EXTRA_DIST += \
-  font/devps/symbolmap \
   font/devps/DESC.in  \
   font/devps/prologue.ps \
   font/devps/psstrip.sed \
diff --git a/font/devps/generate/Makefile b/font/devps/generate/Makefile
index 1c8e276d..110d1aa2 100644
--- a/font/devps/generate/Makefile
+++ b/font/devps/generate/Makefile
@@ -245,7 +245,7 @@ SS: $(OUTDIR)/symbolsl.afm
 
 S: symbol.afm
        $(AFMTODIT) -s $(RFLAG) \
-         symbol.afm symbolmap $(OUTDIR)/$@
+         symbol.afm $(srcdir)/symbol.map $(OUTDIR)/$@
 
 ZDR: $(OUTDIR)/zapfdr.afm
        $(AFMTODIT) -s $(RFLAG) \
@@ -254,7 +254,7 @@ ZDR: $(OUTDIR)/zapfdr.afm
 # the map is just a dummy
 EURO: freeeuro.afm
        $(AFMTODIT) $(RFLAG) \
-         freeeuro.afm symbolmap $(OUTDIR)/$@
+         freeeuro.afm $(srcdir)/symbol.map $(OUTDIR)/$@
 
 freeeuro.afm freeeuro.pfa: $(srcdir)/freeeuro.sfd
        fontforge -script $(srcdir)/sfdtopfa.pe $(srcdir)/freeeuro.sfd \
@@ -281,11 +281,11 @@ zapfdr.afm: $(srcdir)/apfdr.sed
 ZD: $(srcdir)/dingbats.map
 ZDR: $(srcdir)/dingbats.rmap
 $(TEXTFONTS): $(TEXTMAP) $(TEXTENC)
-$(SPECIALFONTS): symbolmap
+$(SPECIALFONTS): $(srcdir)/symbol.map
 $(GREEKFONTS): $(srcdir)/lgreekmap
 $(FONTS): $(DESC)
 
-symbolmap: $(TEXTMAP) $(srcdir)/symbolchars
+$(srcdir)/symbol.map: $(TEXTMAP) $(srcdir)/symbolchars
        printf \
          '#\n# This is a list of all predefined groff symbols.\n#\n' \
          > $(OUTDIR)/$@ \
@@ -293,8 +293,8 @@ symbolmap: $(TEXTMAP) $(srcdir)/symbolchars
 
 clean:
        cd $(OUTDIR) \
-         && $(RM) freeeuro.afm freeeuro.pfa symbol.afm symbolmap \
-           symbolsl.afm zapfdr.afm
+         && $(RM) freeeuro.afm freeeuro.pfa symbol.afm \
+           $(srcdir)/symbol.map symbolsl.afm zapfdr.afm
 
 realclean: clean
        cd $(OUTDIR) \
diff --git a/font/devps/symbolmap b/font/devps/generate/symbol.map
similarity index 100%
rename from font/devps/symbolmap
rename to font/devps/generate/symbol.map
diff --git a/src/utils/afmtodit/afmtodit.1.man 
b/src/utils/afmtodit/afmtodit.1.man
index e1b240cd..55c99fd2 100644
--- a/src/utils/afmtodit/afmtodit.1.man
+++ b/src/utils/afmtodit/afmtodit.1.man
@@ -470,10 +470,10 @@ device refers to it.
 .TQ
 .I @FONTDIR@/\:\%devps/\:\%generate/\:\%dingbats.rmap
 .TQ
-.I @FONTDIR@/\:\%devps/\:\%symbolmap
-.TQ
 .I @FONTDIR@/\:\%devps/\:\%generate/\:\%lgreekmap
 .TQ
+.I @FONTDIR@/\:\%devps/\:\%generate/\:\%symbol.map
+.TQ
 .I @FONTDIR@/\:\%devps/\:\%generate/\:\%textmap
 map names in the Adobe Glyph List to
 .I groff



reply via email to

[Prev in Thread] Current Thread [Next in Thread]