Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(46)

Unified Diff: mf/GNUmakefile

Issue 343970043: Allow use of Identity-H CMap and CID versions of Emmentaler
Patch Set: cleanup / change command line / add otfinfo check / etc / change default ps output mode Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « make/lilypond-book-rules.make ('k') | mf/Identity-H » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mf/GNUmakefile
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 6a6475965e3e21f9d0be0502a02e19d738b67f41..73c4f378247bae6725130330ee15ffd82be6e93b 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -22,7 +22,6 @@ PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb)
include $(depth)/make/stepmake.make
-
EXTRA_DIST_FILES += README mf2pt1.mp
STAFF_SIZES = 11 13 14 16 18 20 23 26
@@ -30,6 +29,15 @@ BRACES = a b c d e f g h i
OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf) \
$(outdir)/emmentaler-brace.otf
+CID_OTFS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.cid) \
+ $(outdir)/emmentaler-brace.cid \
+ $(outdir)/texgyreschola-regular.cid \
+ $(outdir)/texgyreschola-bold.cid \
+ $(outdir)/texgyreschola-italic.cid \
+ $(outdir)/texgyreschola-bolditalic.cid
+CID_HELPERS = $(outdir)/TGSR.ps $(outdir)/TGSB.ps \
+ $(outdir)/TGSI.ps $(outdir)/TGSBI.ps \
+ $(outdir)/EMM.ps $(outdir)/EMMB.ps
OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \
$(BRACES:%=$(outdir)/feta-braces-%.otf-table)
SVG_FILES = $(OTF_FILES:%.otf=%.svg)
@@ -75,6 +83,8 @@ $(outdir)/emmentaler-%.genpe: $(buildscript-dir)/gen-emmentaler-scripts
ALL_GEN_FILES = $(ENC_FILES) \
$(OTF_FILES) \
+ $(CID_OTFS) \
+ $(CID_HELPERS) \
$(SVG_FILES) \
$(WOFF_FILES) \
$(LILYPOND_FONTS_CONF)
@@ -84,10 +94,11 @@ ALL_GEN_FILES = $(ENC_FILES) \
INSTALLATION_DIR = $(local_lilypond_datadir)/fonts/source
INSTALLATION_FILES = $(MF_FILES)
-INSTALLATION_OUT_SUFFIXES = 1 2 3
+INSTALLATION_OUT_SUFFIXES = 1 2 3 4
INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf
INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
+ $(CID_OTFS) \
$(TEXGYRE_OTFS) \
$(URWOTF_OTFS)
@@ -97,6 +108,9 @@ INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES)
INSTALLATION_OUT_DIR3 = $(local_lilypond_datadir)/fonts
INSTALLATION_OUT_FILES3 = $(LILYPOND_FONTS_CONF)
+INSTALLATION_OUT_DIR4 = $(local_lilypond_datadir)/fonts/otf
+INSTALLATION_OUT_FILES4 = $(CID_HELPERS)
+
export MFINPUTS := .:$(MFINPUTS)
# A few rules here generate multiple files from one command line. For
@@ -123,6 +137,9 @@ $(outdir)/%.lisp: $(outdir)/%.log $(outdir)/%.tfm
$(outdir)/%.otf-gtable $(outdir)/%.enc: $(outdir)/%.lisp
$(UPDATE_TARGET)
+$(outdir)/Identity-H: $(top-src-dir)/mf/Identity-H
+ ln -s $< $@
+
## Putting pfb here forces all .pfb fonts to be built before
# fontforge starts generating emmentaler-*.* fonts.
$(outdir)/emmentaler-%.otf: $(outdir)/emmentaler-%.genpe \
@@ -134,9 +151,22 @@ $(outdir)/emmentaler-%.otf: $(outdir)/emmentaler-%.genpe \
$(outdir)/parmesan-noteheads%.pfb \
$(outdir)/feta%.otf-table \
$(outdir)/feta%.otf-gtable \
+ $(outdir)/Identity-H \
| pfb
cd $(outdir) && $(FONTFORGE) -script $(notdir $<)
+$(outdir)/emmentaler-%-cid.otf: $(outdir)/emmentaler-%.otf
+ $(UPDATE_TARGET)
+
+$(outdir)/emmentaler-brace-cid.otf: $(outdir)/emmentaler-brace.otf
+ $(UPDATE_TARGET)
+
+$(outdir)/emmentaler-%.cid: $(outdir)/emmentaler-%-cid.otf
+ cd $(outdir) && mv $(notdir $<) $(notdir $@)
trueroad 2018/06/02 02:48:26 Is it necessary to change the file name? I think t
+
+$(outdir)/emmentaler-brace.cid: $(outdir)/emmentaler-brace-cid.otf
+ cd $(outdir) && mv $(notdir $<) $(notdir $@)
+
$(outdir)/emmentaler-%.svg $(outdir)/emmentaler-%.woff: $(outdir)/emmentaler-%.otf
$(UPDATE_TARGET)
@@ -149,6 +179,64 @@ $(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.pe\
$(outdir)/emmentaler-brace.svg $(outdir)/emmentaler-brace.woff: $(outdir)/emmentaler-brace.otf
$(UPDATE_TARGET)
+$(outdir)/texgyreschola-regular.cid: $(TEXGYRE_DIR)/texgyreschola-regular.otf $(outdir)/texgyreschola.pe
+ cd $(outdir) && $(FONTFORGE) -script texgyreschola.pe $(TEXGYRE_DIR)/
+ mv $(outdir)/texgyreschola-regular-cid.otf $(outdir)/texgyreschola-regular.cid
+ mv $(outdir)/texgyreschola-bold-cid.otf $(outdir)/texgyreschola-bold.cid
+ mv $(outdir)/texgyreschola-italic-cid.otf $(outdir)/texgyreschola-italic.cid
+ mv $(outdir)/texgyreschola-bolditalic-cid.otf $(outdir)/texgyreschola-bolditalic.cid
+
+$(outdir)/texgyreschola-bold.cid: $(outdir)/texgyreschola-regular.cid
+ $(UPDATE_TARGET)
+
+$(outdir)/texgyreschola-italic.cid: $(outdir)/texgyreschola-regular.cid
+ $(UPDATE_TARGET)
+
+$(outdir)/texgyreschola-bolditalic.cid: $(outdir)/texgyreschola-regular.cid
+ $(UPDATE_TARGET)
+
+$(outdir)/TGSR.ps: $(TEXGYRE_DIR)/texgyreschola-regular.otf
+ cd $(outdir)
+ otfinfo -u $(TEXGYRE_DIR)/texgyreschola-regular.otf \
+ | grep -v "\.notdef" \
+ | sed -e "s/uni\([[:xdigit:]]*\)[[:space:]]*[[:digit:]]*[[:space:]]*\([[:print:]]*\)/\/TGSR-\2 <\1> def/" \
+ > $(outdir)/TGSR.ps
+
+$(outdir)/TGSB.ps: $(TEXGYRE_DIR)/texgyreschola-bold.otf
+ cd $(outdir)
+ otfinfo -u $(TEXGYRE_DIR)/texgyreschola-bold.otf \
+ | grep -v "\.notdef" \
+ | sed -e "s/uni\([[:xdigit:]]*\)[[:space:]]*[[:digit:]]*[[:space:]]*\([[:print:]]*\)/\/TGSB-\2 <\1> def/" \
+ > $(outdir)/TGSB.ps
+
+$(outdir)/TGSI.ps: $(TEXGYRE_DIR)/texgyreschola-italic.otf
+ cd $(outdir)
+ otfinfo -u $(TEXGYRE_DIR)/texgyreschola-italic.otf \
+ | grep -v "\.notdef" \
+ | sed -e "s/uni\([[:xdigit:]]*\)[[:space:]]*[[:digit:]]*[[:space:]]*\([[:print:]]*\)/\/TGSI-\2 <\1> def/" \
+ > $(outdir)/TGSI.ps
+
+$(outdir)/TGSBI.ps: $(TEXGYRE_DIR)/texgyreschola-bolditalic.otf
+ cd $(outdir)
+ otfinfo -u $(TEXGYRE_DIR)/texgyreschola-bolditalic.otf \
+ | grep -v "\.notdef" \
+ | sed -e "s/uni\([[:xdigit:]]*\)[[:space:]]*[[:digit:]]*[[:space:]]*\([[:print:]]*\)/\/TGSBI-\2 <\1> def/" \
+ > $(outdir)/TGSBI.ps
+
+$(outdir)/EMM.ps: $(outdir)/emmentaler-20.otf
+ cd $(outdir)
+ otfinfo -u $(outdir)/emmentaler-20.otf \
+ | grep -v "\.notdef" \
+ | sed -e "s/uni\([[:xdigit:]]*\)[[:space:]]*[[:digit:]]*[[:space:]]*\([[:print:]]*\)/\/EMM-\2 { <\1> show } def/" \
+ > $(outdir)/EMM.ps
+
+$(outdir)/EMMB.ps: $(outdir)/emmentaler-brace.otf
+ cd $(outdir)
+ otfinfo -u $(outdir)/emmentaler-brace.otf \
+ | grep -v "\.notdef" \
+ | sed -e "s/uni\([[:xdigit:]]*\)[[:space:]]*[[:digit:]]*[[:space:]]*\([[:print:]]*\)/\/EMM-\2 { <\1> show } def/" \
+ > $(outdir)/EMMB.ps
+
default: tree-regen \
$(outdir)/fonts.conf
@@ -157,11 +245,9 @@ default: tree-regen \
tree-regen: $(ALL_GEN_FILES)
${MAKE} -C $(top-build-dir) link-mf-tree
-
local-clean:
rm -f mfplain.mem mfplain.log
rm -f *.tfm *.log
-
$(outdir)/fonts.conf:
echo '<fontconfig><dir>'$(shell cd $(outdir); pwd)'</dir></fontconfig>' > $@
« no previous file with comments | « make/lilypond-book-rules.make ('k') | mf/Identity-H » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b