From da4db317389517e431ba005197e944f3d4b2195b Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Wed, 31 Dec 2003 15:04:57 +0000 Subject: [PATCH] * src/utils/hpftodit/hpftodit.cpp (dump_tags): Handle posture_tag. * font/devlj4/generate/Makefile (IFLAG): Updated to new units. (FONTS): Add TrueType font families Arial and Times New Roman. (TNRR, TNRB, TNRI, TNRBI, AR, AB, AI, ABI): New targets. * font/devlj4/generate/text.map: Fix Unicode values of `fi' and `fl'. --- ChangeLog | 9 ++++ font/devlj4/generate/Makefile | 95 ++++++++++++++++++++++++++++++++++++++--- font/devlj4/generate/text.map | 4 +- src/utils/hpftodit/hpftodit.cpp | 10 ++++- 4 files changed, 109 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f8ef85a..a863921a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-12-31 Werner LEMBERG + + * src/utils/hpftodit/hpftodit.cpp (dump_tags): Handle posture_tag. + * font/devlj4/generate/Makefile (IFLAG): Updated to new units. + (FONTS): Add TrueType font families Arial and Times New Roman. + (TNRR, TNRB, TNRI, TNRBI, AR, AB, AI, ABI): New targets. + * font/devlj4/generate/text.map: Fix Unicode values of `fi' and + `fl'. + 2003-12-31 Jeff Conrad * test-groff.in (SEP): Quote value. diff --git a/font/devlj4/generate/Makefile b/font/devlj4/generate/Makefile index 855cda58..78801aa5 100644 --- a/font/devlj4/generate/Makefile +++ b/font/devlj4/generate/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1994, 2002 Free Software Foundation, Inc. +# Copyright (C) 1994, 2002, 2003 Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # # This file is part of groff. @@ -18,11 +18,16 @@ # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Directory containing Autofont TFM files. -# The TFM files I used are available for ftp as +# The TFM files used are available for ftp as # # ftp://ftp.hp.com/pub/faxes/software/tfmlj4p.exe # # This is a self-extracting MS-DOS archive (in ZIP format). +# +# Metric files for the Arial and Times New Roman families have been +# replaced with versions which have more glyphs and kerning pairs: +# +# ftp://ftp.ffii.org/pub/groff/contrib/lj4/tfmlj4x.zip # This is set up so you can do # make -f generate/Makefile @@ -31,13 +36,14 @@ AUTOFONT=/usr/local/lib/groff-lj4 HPFTODIT=hpftodit # .05 em -IFLAG=-i 439 +IFLAG=-i 50 SFLAG=-s srcdir=generate TEXTMAP=$(srcdir)/text.map SPECIALMAP=$(srcdir)/special.map FONTS=\ + AB ABI AI AR \ ALBB ALBR \ AOB AOI AOR \ CB CBI CI CR \ @@ -45,120 +51,197 @@ FONTS=\ LGB LGI LGR \ OB OBI OI OR \ TB TBI TI TR \ + TNRB TNRBI TNRI TNRR \ UB UBI UI UR \ UCB UCBI UCI UCR \ CLARENDON CORONET MARIGOLD S all: $(FONTS) +# +# Intellifont +# + +# CG Times TR: $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00086.tfm $(TEXTMAP) $@ +# CG Times Italic TI: $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00084.tfm $(TEXTMAP) $@ +# CG Times Bold TB: $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00083.tfm $(TEXTMAP) $@ +# CG Times Bold Italic TBI: $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00085.tfm $(TEXTMAP) $@ +# Courier CR: $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00064.tfm $(TEXTMAP) $@ +# Courier Italic CI: $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00062.tfm $(TEXTMAP) $@ +# Courier Bold CB: $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00061.tfm $(TEXTMAP) $@ +# Courier Bold Italic CBI: $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00063.tfm $(TEXTMAP) $@ +# Garamond Antiqua GR: $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00068.tfm $(TEXTMAP) $@ +# Garamond Kursiv GI: $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00066.tfm $(TEXTMAP) $@ +# Garamond Halbfett GB: $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00065.tfm $(TEXTMAP) $@ +# Garamond Kursiv Halbfett GBI: $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00067.tfm $(TEXTMAP) $@ +# Omega OR: $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00076.tfm $(TEXTMAP) $@ +# Omega Italic OI: $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00074.tfm $(TEXTMAP) $@ +# Omega Bold OB: $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00073.tfm $(TEXTMAP) $@ +# Omega Bold Italic OBI: $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00075.tfm $(TEXTMAP) $@ +# Univers UR: $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00094.tfm $(TEXTMAP) $@ +# Univers Italic UI: $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00092.tfm $(TEXTMAP) $@ +# Univers Bold UB: $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00088.tfm $(TEXTMAP) $@ +# Univers Bold Italic UBI: $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00093.tfm $(TEXTMAP) $@ +# Univers Condensed UCR: $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00089.tfm $(TEXTMAP) $@ +# Univers Condensed Italic UCI: $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00087.tfm $(TEXTMAP) $@ +# Univers Condensed Bold UCB: $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00090.tfm $(TEXTMAP) $@ +# Univers Condensed Bold Italic UCBI: $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00091.tfm $(TEXTMAP) $@ +# Albertus ALBR: $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00052.tfm $(TEXTMAP) $@ +# Albertus Extrabold ALBB: $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00051.tfm $(TEXTMAP) $@ +# Letter Gothic LGR: $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00071.tfm $(TEXTMAP) $@ -LGB: $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) - $(HPFTODIT) $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) $@ - +# Letter Gothic Italic LGI: $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00070.tfm $(TEXTMAP) $@ +# Letter Gothic Bold +LGB: $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) + $(HPFTODIT) $(AUTOFONT)/9nb00069.tfm $(TEXTMAP) $@ + +# Antique Olive AOR: $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00055.tfm $(TEXTMAP) $@ +# Antique Olive Italic AOI: $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00054.tfm $(TEXTMAP) $@ +# Antique Olive Bold AOB: $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00053.tfm $(TEXTMAP) $@ +# Marigold MARIGOLD: $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00072.tfm $(TEXTMAP) $@ +# Coronet CORONET: $(AUTOFONT)/9nb00077.tfm $(TEXTMAP) $(HPFTODIT) $(IFLAG) $(AUTOFONT)/9nb00077.tfm $(TEXTMAP) $@ +# Clarendon Condensed CLARENDON: $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) $(HPFTODIT) $(AUTOFONT)/9nb00060.tfm $(TEXTMAP) $@ S: $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $(HPFTODIT) $(SFLAG) $(AUTOFONT)/9nb00086.tfm $(SPECIALMAP) $@ +# +# TrueType +# + +# Times New Roman +TNRR: $(AUTOFONT)/tmnr000s.tfm $(TEXTMAP) + $(HPFTODIT) $(AUTOFONT)/tmnr000s.tfm $(TEXTMAP) $@ + +# Times New Roman Italic +TNRI: $(AUTOFONT)/tmni000s.tfm $(TEXTMAP) + $(HPFTODIT) $(IFLAG) $(AUTOFONT)/tmni000s.tfm $(TEXTMAP) $@ + +# Times New Roman Bold +TNRB: $(AUTOFONT)/tmnb000s.tfm $(TEXTMAP) + $(HPFTODIT) $(AUTOFONT)/tmnb000s.tfm $(TEXTMAP) $@ + +# Times New Roman Bold Italic +TNRBI: $(AUTOFONT)/tmnj000s.tfm $(TEXTMAP) + $(HPFTODIT) $(IFLAG) $(AUTOFONT)/tmnj000s.tfm $(TEXTMAP) $@ + +# Arial +AR: $(AUTOFONT)/arlr000s.tfm $(TEXTMAP) + $(HPFTODIT) $(AUTOFONT)/arlr000s.tfm $(TEXTMAP) $@ + +# Arial Italic +AI: $(AUTOFONT)/arli000s.tfm $(TEXTMAP) + $(HPFTODIT) $(IFLAG) $(AUTOFONT)/arli000s.tfm $(TEXTMAP) $@ + +# Arial Bold +AB: $(AUTOFONT)/arlb000s.tfm $(TEXTMAP) + $(HPFTODIT) $(AUTOFONT)/arlb000s.tfm $(TEXTMAP) $@ + +# Arial Bold Italic +ABI: $(AUTOFONT)/arlj000s.tfm $(TEXTMAP) + $(HPFTODIT) $(IFLAG) $(AUTOFONT)/arlj000s.tfm $(TEXTMAP) $@ + + clean: realclean: diff --git a/font/devlj4/generate/text.map b/font/devlj4/generate/text.map index 8355b9e3..c9dd9874 100644 --- a/font/devlj4/generate/text.map +++ b/font/devlj4/generate/text.map @@ -706,8 +706,8 @@ 1036 211E u211E # 1037-1039 ? -1040 F001 fi -1041 F002 fl +1040 FB01 fi +1041 FB02 fl 1042 FB00 ff 1043 FB03 Fi 1044 FB04 Fl diff --git a/src/utils/hpftodit/hpftodit.cpp b/src/utils/hpftodit/hpftodit.cpp index 25d56887..d359c158 100644 --- a/src/utils/hpftodit/hpftodit.cpp +++ b/src/utils/hpftodit/hpftodit.cpp @@ -990,6 +990,13 @@ void dump_tags(File &f) case serif_style_tag: printf(" Serif Style (%u)", tag_info(t).value); break; + case posture_tag: + printf(" Posture (%s)", tag_info(t).value == 0 + ? "Upright" + : tag_info(t).value == 1 + ? "Italic" + : "Alternate Italic"); + break; case max_width_tag: printf(" Maximum Width (%u DU: %.2f em)", tag_info(t).value, em_fract(tag_info(t).value)); @@ -1072,7 +1079,8 @@ void dump_tags(File &f) case left_extent_tag: printf(" Left Extent array"); break; - // both signed and unsigned do exist! + // The type of this tag has changed from SHORT to SIGNED SHORT + // in TFM version 1.3.0. case ascent_tag: printf(" Character Ascent array"); break; -- 2.11.4.GIT