From 2ce9d3b0ac456df77a73342fdf802f2e198c3b4e Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Fri, 14 Aug 2015 22:45:20 +0900 Subject: Issue 4552 / 5: Remove makefiles to convert and install URW++ fonts This commit removes makefiles to convert to OTF and install URW++ fonts. (Century Schoolbook L, Nimbus Sans L, Nimbus Mono L) --- mf/GNUmakefile | 54 +-------------------------------- scripts/auxiliar/pfx2ttf-mono.fontforge | 36 ---------------------- scripts/auxiliar/pfx2ttf.fontforge | 29 ------------------ 3 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 scripts/auxiliar/pfx2ttf-mono.fontforge delete mode 100644 scripts/auxiliar/pfx2ttf.fontforge diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 2cddd187e1..4860f65f6e 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -35,21 +35,6 @@ OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \ SVG_FILES = $(OTF_FILES:%.otf=%.svg) WOFF_FILES = $(OTF_FILES:%.otf=%.woff) -NCSB_OTFS = $(addprefix $(outdir)/,CenturySchL-Ital.otf \ - CenturySchL-BoldItal.otf \ - CenturySchL-Roma.otf \ - CenturySchL-Bold.otf) - -HELV_OTFS = $(addprefix $(outdir)/,NimbusSanL-ReguItal.otf \ - NimbusSanL-BoldItal.otf \ - NimbusSanL-Regu.otf \ - NimbusSanL-Bold.otf) - -COUR_OTFS = $(addprefix $(outdir)/,NimbusMonL-ReguObli.otf \ - NimbusMonL-BoldObli.otf \ - NimbusMonL-Regu.otf \ - NimbusMonL-Bold.otf) - TEXGYRE_OTFS = $(addprefix $(TEXGYRE_DIR)/,$(TEXGYRE_FILES)) LILYPOND_FONTS_CONF = $(outdir)/00-lilypond-fonts.conf \ @@ -88,9 +73,6 @@ $(outdir)/emmentaler-%.genpe: $(buildscript-dir)/gen-emmentaler-scripts $< --dir=$(outdir) --design-size=$(patsubst emmentaler-%.genpe,%,$(notdir $@)) ALL_GEN_FILES = $(ENC_FILES) \ - $(NCSB_OTFS) \ - $(HELV_OTFS) \ - $(COUR_OTFS) \ $(OTF_FILES) \ $(SVG_FILES) \ $(WOFF_FILES) \ @@ -105,7 +87,7 @@ INSTALLATION_OUT_SUFFIXES = 1 2 3 INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf INSTALLATION_OUT_FILES1 = $(OTF_FILES) \ - $(NCSB_OTFS) $(HELV_OTFS) $(COUR_OTFS) $(TEXGYRE_OTFS) + $(TEXGYRE_OTFS) INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES) @@ -181,37 +163,3 @@ local-clean: $(outdir)/fonts.conf: echo ''$(shell cd $(outdir); pwd)'' > $@ - - -$(outdir)/CenturySchL-Roma.otf: $(NCSB_SOURCE_FILES) \ - $(auxscript-dir)/pfx2ttf.fontforge - $(foreach i, $(basename $(NCSB_SOURCE_FILES)), \ - $(FONTFORGE) -script $(auxscript-dir)/pfx2ttf.fontforge \ - $(i).pfb $(i).afm $(outdir)/ && ) true - -$(addprefix $(outdir)/,CenturySchL-Ital.otf \ - CenturySchL-Bold.otf \ - CenturySchL-BoldItal.otf): $(outdir)/CenturySchL-Roma.otf - $(UPDATE_TARGET) - -$(outdir)/NimbusSanL-Regu.otf: $(HELV_SOURCE_FILES) \ - $(auxscript-dir)/pfx2ttf.fontforge - $(foreach i, $(basename $(HELV_SOURCE_FILES)), \ - $(FONTFORGE) -script $(auxscript-dir)/pfx2ttf.fontforge \ - $(i).pfb $(i).afm $(outdir)/ && ) true - -$(addprefix $(outdir)/,NimbusSanL-ReguItal.otf \ - NimbusSanL-Bold.otf \ - NimbusSanL-BoldItal.otf): $(outdir)/NimbusSanL-Regu.otf - $(UPDATE_TARGET) - -$(outdir)/NimbusMonL-Regu.otf: $(COUR_SOURCE_FILES) \ - $(auxscript-dir)/pfx2ttf-mono.fontforge - $(foreach i, $(basename $(COUR_SOURCE_FILES)), \ - $(FONTFORGE) -script $(auxscript-dir)/pfx2ttf-mono.fontforge \ - $(i).pfb $(i).afm $(outdir)/ && ) true - -$(addprefix $(outdir)/,NimbusMonL-ReguObli.otf \ - NimbusMonL-Bold.otf \ - NimbusMonL-BoldObli.otf): $(outdir)/NimbusMonL-Regu.otf - $(UPDATE_TARGET) diff --git a/scripts/auxiliar/pfx2ttf-mono.fontforge b/scripts/auxiliar/pfx2ttf-mono.fontforge deleted file mode 100644 index 7b804949ba..0000000000 --- a/scripts/auxiliar/pfx2ttf-mono.fontforge +++ /dev/null @@ -1,36 +0,0 @@ -Open($1); -MergeKern($2) - - -# The AFM files of `New Century Schoolbook' family as distributed within the -# urw-fonts-1.0.7pre41.tar.bz2 archive contain a bunch of ligatures which -# shouldn't be active by default: -# -# T + M -> trademark -# N + o -> afii61352 -# i + j -> ij -# I + J -> IJ -# -# This font bundle is shipped by Fedora Core 6 and other GNU/Linux -# distributions; we simply remove those ligatures. - -# Monospace font shouldn't have these ligature. -# -# f + i -> fi -# f + l -> fl - -SelectIf("trademark", "trademark", \ - "afii61352", "afii61352", \ - "ij", "ij", \ - "IJ", "IJ", \ - "fi", "fi", \ - "fl", "fl"); -if (Strtol($version) < 20070501) - RemoveATT("Ligature", "*", "*"); -else - RemovePosSub("*"); -endif - -Generate($3 + $fontname + ".otf"); - -# EOF diff --git a/scripts/auxiliar/pfx2ttf.fontforge b/scripts/auxiliar/pfx2ttf.fontforge deleted file mode 100644 index 7d87fae17a..0000000000 --- a/scripts/auxiliar/pfx2ttf.fontforge +++ /dev/null @@ -1,29 +0,0 @@ -Open($1); -MergeKern($2) - - -# The AFM files of `New Century Schoolbook' family as distributed within the -# urw-fonts-1.0.7pre41.tar.bz2 archive contain a bunch of ligatures which -# shouldn't be active by default: -# -# T + M -> trademark -# N + o -> afii61352 -# i + j -> ij -# I + J -> IJ -# -# This font bundle is shipped by Fedora Core 6 and other GNU/Linux -# distributions; we simply remove those ligatures. - -SelectIf("trademark", "trademark", \ - "afii61352", "afii61352", \ - "ij", "ij", \ - "IJ", "IJ"); -if (Strtol($version) < 20070501) - RemoveATT("Ligature", "*", "*"); -else - RemovePosSub("*"); -endif - -Generate($3 + $fontname + ".otf"); - -# EOF -- cgit v1.2.3