[Groff-commit] groff ./ChangeLog font/devps/generate/Makefile ...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/03/25 05:30:41

Modified files:
        .              : ChangeLog 
        font/devps/generate: Makefile 
Added files:
        font/devps/generate: symbolsl.awk zapfdr.sed 

Log message:
        Add rules to generate `symbolsl.afm'.
        
        * fonts/devps/generate/zapfdr.sed,
        fonts/devps/generate/symbolsl.awk: New files.
        
        * fonts/devps/generate/Makefile (symbolfont, PRINTAFM): New
        variables.
        (SS, clean): Updated.
        (freeeuro.afm): Use $(srcdir).
        (symbolsl.afm): New rule.
        (zapfdr.afm): Use zapfdr.sed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.939&tr2=1.940&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/font/devps/generate/Makefile.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/font/devps/generate/symbolsl.awk?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/font/devps/generate/zapfdr.sed?rev=1.1

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.939 groff/ChangeLog:1.940
--- groff/ChangeLog:1.939       Wed Mar 22 20:38:44 2006
+++ groff/ChangeLog     Sat Mar 25 05:30:40 2006
@@ -1,3 +1,17 @@
+2006-03-25  Michail Vidiassov  <address@hidden>
+
+       Add rules to generate `symbolsl.afm'.
+
+       * fonts/devps/generate/zapfdr.sed,
+       fonts/devps/generate/symbolsl.awk: New files.
+
+       * fonts/devps/generate/Makefile (symbolfont, PRINTAFM): New
+       variables.
+       (SS, clean): Updated.
+       (freeeuro.afm): Use $(srcdir).
+       (symbolsl.afm): New rule.
+       (zapfdr.afm): Use zapfdr.sed.
+
 2006-03-22  Dwight Aplevich  <address@hidden>
 
        * src/preproc/pic/pic.y (expr <INT>): Fix code.
Index: groff/font/devps/generate/Makefile
diff -u groff/font/devps/generate/Makefile:1.13 
groff/font/devps/generate/Makefile:1.14
--- groff/font/devps/generate/Makefile:1.13     Sun Jan  8 09:20:06 2006
+++ groff/font/devps/generate/Makefile  Sat Mar 25 05:30:41 2006
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2002, 2003, 2006 Free Software Foundation, Inc.
 #      Written by James Clark (address@hidden)
 #
 # This file is part of groff.
@@ -29,6 +29,13 @@
 # Either long names (eg Times-Roman.afm) or short names (eg timesr.afm)
 # may be used. See the afmname script.
 afmdir=/usr/local/lib/afm
+
+# The symbol font which fits to `Symbol.afm'.  For the creation of
+# `symbolsl.afm' we need the `printafm' script from ghostscript.
+symbolfont=/usr/local/lib/fonts/Symbol.pfb
+
+PRINTAFM=printafm
+
 srcdir=generate
 
 SPECIALFONTS=S
@@ -53,164 +60,177 @@
 
 TR:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Times-Roman.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Times-Roman.afm` $(TEXTMAP) $@
 
 TB:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Times-Bold.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Times-Bold.afm` $(TEXTMAP) $@
 
 TI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) -a 7 \
-       `$(AFMNAME) $(afmdir)/Times-Italic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Times-Italic.afm` $(TEXTMAP) $@
 
 TBI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Times-BoldItalic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Times-BoldItalic.afm` $(TEXTMAP) $@
 
 HR:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Helvetica.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Helvetica.afm` $(TEXTMAP) $@
 
 HB:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Helvetica-Bold.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Helvetica-Bold.afm` $(TEXTMAP) $@
 
 HI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Helvetica-Oblique.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Helvetica-Oblique.afm` $(TEXTMAP) $@
 
 HBI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Helvetica-BoldOblique.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Helvetica-BoldOblique.afm` $(TEXTMAP) $@
 
 CR:
        $(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Courier.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Courier.afm` $(TEXTMAP) $@
 
 CB:
        $(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Courier-Bold.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Courier-Bold.afm` $(TEXTMAP) $@
 
 CI:
        $(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Courier-Oblique.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Courier-Oblique.afm` $(TEXTMAP) $@
 
 CBI:
        $(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Courier-BoldOblique.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Courier-BoldOblique.afm` $(TEXTMAP) $@
 
 PR:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Palatino-Roman.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Palatino-Roman.afm` $(TEXTMAP) $@
 
 PB:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Palatino-Bold.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Palatino-Bold.afm` $(TEXTMAP) $@
 
 PI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Palatino-Italic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Palatino-Italic.afm` $(TEXTMAP) $@
 
 PBI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Palatino-BoldItalic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Palatino-BoldItalic.afm` $(TEXTMAP) $@
 
 NR:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/NewCenturySchlbk-Roman.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/NewCenturySchlbk-Roman.afm` $(TEXTMAP) $@
 
 NB:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/NewCenturySchlbk-Bold.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/NewCenturySchlbk-Bold.afm` $(TEXTMAP) $@
 
 NI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/NewCenturySchlbk-Italic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/NewCenturySchlbk-Italic.afm` $(TEXTMAP) $@
 
 NBI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/NewCenturySchlbk-BoldItalic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/NewCenturySchlbk-BoldItalic.afm` $(TEXTMAP) $@
 
 BMR:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Bookman-Light.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Bookman-Light.afm` $(TEXTMAP) $@
 
 BMB:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Bookman-Demi.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Bookman-Demi.afm` $(TEXTMAP) $@
 
 BMI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Bookman-LightItalic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Bookman-LightItalic.afm` $(TEXTMAP) $@
 
 BMBI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Bookman-DemiItalic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Bookman-DemiItalic.afm` $(TEXTMAP) $@
 
 AR:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/AvantGarde-Book.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/AvantGarde-Book.afm` $(TEXTMAP) $@
 
 AB:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/AvantGarde-Demi.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/AvantGarde-Demi.afm` $(TEXTMAP) $@
 
 AI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/AvantGarde-BookOblique.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/AvantGarde-BookOblique.afm` $(TEXTMAP) $@
 
 ABI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/AvantGarde-DemiOblique.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/AvantGarde-DemiOblique.afm` $(TEXTMAP) $@
 
 HNR:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Helvetica-Narrow.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Helvetica-Narrow.afm` $(TEXTMAP) $@
 
 HNB:
        $(AFMTODIT) $(EFLAG) $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/Helvetica-Narrow-Bold.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Helvetica-Narrow-Bold.afm` $(TEXTMAP) $@
 
 HNI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Helvetica-Narrow-Oblique.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Helvetica-Narrow-Oblique.afm` $(TEXTMAP) $@
 
 HNBI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/Helvetica-Narrow-BoldOblique.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/Helvetica-Narrow-BoldOblique.afm` $(TEXTMAP) $@
 
 ZCMI:
        $(AFMTODIT) $(EFLAG) $(IFLAG) \
-       `$(AFMNAME) $(afmdir)/ZapfChancery-MediumItalic.afm` $(TEXTMAP) $@
+         `$(AFMNAME) $(afmdir)/ZapfChancery-MediumItalic.afm` $(TEXTMAP) $@
 
 ZD:
        $(AFMTODIT) -s $(RFLAG) \
-       `$(AFMNAME) $(afmdir)/ZapfDingbats.afm` $(srcdir)/dingbats.map $@
+         `$(AFMNAME) $(afmdir)/ZapfDingbats.afm` $(srcdir)/dingbats.map $@
 
-SS: $(srcdir)/symbolsl.afm
+SS: symbolsl.afm
        $(AFMTODIT) -s -x $(IFLAG) \
-       $(srcdir)/symbolsl.afm $(srcdir)/lgreekmap $@
+         symbolsl.afm $(srcdir)/lgreekmap $@
 
 S: symbol.afm
-       $(AFMTODIT) -s $(RFLAG) symbol.afm symbolmap $@
+       $(AFMTODIT) -s $(RFLAG) \
+         symbol.afm symbolmap $@
 
 ZDR: zapfdr.afm
-       $(AFMTODIT) -s $(RFLAG) zapfdr.afm $(srcdir)/dingbats.rmap $@
+       $(AFMTODIT) -s $(RFLAG) \
+         zapfdr.afm $(srcdir)/dingbats.rmap $@
 
 # the map is just a dummy
 EURO: freeeuro.afm
-       $(AFMTODIT) $(RFLAG) freeeuro.afm symbolmap $@
+       $(AFMTODIT) $(RFLAG) \
+         freeeuro.afm symbolmap $@
 
-freeeuro.afm freeeuro.pfa: generate/freeeuro.sfd
-       fontforge -script generate/sfdtopfa.pe generate/freeeuro.sfd
+freeeuro.afm freeeuro.pfa: $(srcdir)/freeeuro.sfd
+       fontforge -script $(srcdir)/sfdtopfa.pe $(srcdir)/freeeuro.sfd
 
 symbol.afm: $(srcdir)/symbol.sed
        -rm -f $@
        sed -f $(srcdir)/symbol.sed `$(AFMNAME) $(afmdir)/Symbol.afm` >$@
 
-zapfdr.afm:
+symbolsl.afm: $(srcdir)/symbolsl.awk symbolsl.ps
+       -rm -f $@
+       -rm -f Fontmap
+       echo "/Symbol-Slanted (./symbolsl.ps) ;"  > Fontmap
+       echo "/Symbol         ($(symbolfont)) ;" >> Fontmap
+       $(PRINTAFM) Symbol-Slanted > tmp.afm
+       awk -f $(srcdir)/symbolsl.awk -v SYMAFM=`$(AFMNAME) \
+         $(afmdir)/Symbol.afm` tmp.afm >$@
+       -rm -f Fontmap tmp.afm
+
+zapfdr.afm: $(srcdir)/zapfdr.sed
        -rm -f $@
-       sed -e '/^FontName /s/ZapfDingbats/ZapfDingbats-Reverse/' \
+       sed -f $(srcdir)/zapfdr.sed \
          `$(AFMNAME) $(afmdir)/ZapfDingbats.afm` >$@
 
 ZD: $(srcdir)/dingbats.map
@@ -227,7 +247,7 @@
        cat $(TEXTMAP) $(srcdir)/symbolchars >>$@
 
 clean:
-       -rm -f symbolmap symbol.afm zapfdr.afm
+       -rm -f symbolmap symbol.afm symbolsl.afm zapfdr.afm
 
 realclean: clean
        -rm -f $(FONTS)