X-Git-Url: http://git.shiar.net/unifont.git/blobdiff_plain/9b70484c5fbbaa5b73ba7ba24cb2d0c1de5281cd..95e8d0be857e4bf0387fc5174276c1e4ab75ce5b:/font/Makefile

diff --git a/font/Makefile b/font/Makefile
index 7499bd9..39b820b 100644
--- a/font/Makefile
+++ b/font/Makefile
@@ -17,11 +17,12 @@ FONTFORGE = fontforge
 #
 # assembly date of this version
 #
-MAJORVERSION = 6.3
-DATE = 20131217
-VERSION = $(MAJORVERSION).$(DATE)
+UNICODE_VERSION = 7.0
+PKG_REV = 01
+VERSION = $(UNICODE_VERSION).$(PKG_REV)
 
-COPYRIGHT = "Copyright (C) 2013 Roman Czyborra, Paul Hardy, et al.  \
+COPYRIGHT = "Copyright (C) 2014 Roman Czyborra, Paul Hardy, Qianqian Fang, \
+Andrew Miller, et al.  \
 Licensed under the GNU General Public License; either version 2, or \
 (at your option) a later version, with the GNU Font Embedding Exception."
 
@@ -36,21 +37,22 @@ BINDIR = $(CURDIR)/../bin
 # The top-level directory for installing fonts on the system,
 # and the installation directories for PCF and TrueType fonts.
 #
-FONTDEST = $(DESTDIR)/usr/share/fonts
-PCFDEST = $(FONTDEST)/X11/misc
-TTFDEST = $(FONTDEST)/truetype/unifont
+CONSOLEDEST = $(DESTDIR)/usr/share/consolefonts
+FONTDEST    = $(DESTDIR)/usr/share/fonts
+PCFDEST     = $(FONTDEST)/X11/misc
+TTFDEST     = $(FONTDEST)/truetype/unifont
 #
 # destination directory for compiled fonts
 #
 COMPILED_DIR = compiled
 #
-# destination directory for .bmp representation of font
+# destination directory for .png representation of font
 #
-BMPDIR = $(COMPILED_DIR)/bmp
+PNGDIR = $(COMPILED_DIR)/png
 #
 # Directory with original unifont-$(VERSION).hex files
 #
-HEXDIR = hexsrc
+HEXDIR = plane00
 #
 # These are the files for building GNU Unifont with the Qianqian Fang's
 # Wen Quan Yi CJK ideographs.  This version provides complete coverage
@@ -90,12 +92,20 @@ SPACES      = $(HEXDIR)/spaces.hex
 UNIFILES = $(UNIFONTBASE) $(CJK) $(HANGUL) $(SPACES) $(UNASSIGNED) \
 	   $(NONPRINTING) $(PUA)
 
+#
+# Planes 1 through 14 (0x0E) are ordinary;
+# Planes 15 (0x0F) and 16 (0x10) are Private Use Area
+#
+UPPER_FILES = plane0[1-E]/*.hex
+
 #
 # Location of the file containing a list of Unicode combining characters.
 #
-COMBINING = ttfsrc/combining.txt
+COMBINING = plane00/bmp-combining.txt
 
-VPATH = hexsrc ttfsrc
+UPPER_COMBINING = plane0[0-E]/*combining*.txt
+
+VPATH = plane00 ttfsrc
 
 #
 # Location of  TTF source directory, where TTF font is built.
@@ -105,10 +115,10 @@ TTFSRC = ttfsrc
 
 all: compiled
 
-compiled: $(UNIFILES) $(COMBINING)
-	make compiled-files
+compiled: $(UNIFILES) $(COMBINING) $(UPPER_FILES) $(UPPER_COMBINING)
+	$(MAKE) compiled-files
 
-compiled-files: pcf bmp ttf bigpic coverage
+compiled-files: pcf psf png ttf csurttf upperttf uppercsurttf bigpic coverage
 	install -p index.html $(COMPILED_DIR)/index.html
 
 #
@@ -118,10 +128,34 @@ hex: distclean
 	if [ ! -d $(COMPILED_DIR) ] ; then \
 	   mkdir -p $(COMPILED_DIR) ; \
 	fi
-	sort $(UNIFILES) >$(COMPILED_DIR)/unifont-$(VERSION).hex
+	sort $(UNIFILES) > $(COMPILED_DIR)/unifont-$(VERSION).hex
 	(cd $(HEXDIR) ; sort *.hex) | \
-	   $(BINDIR)/unigencircles ttfsrc/combining.txt hexsrc/nonprinting.hex \
+	  egrep -v "^FFF[EF]" | \
+	   $(BINDIR)/unigencircles $(COMBINING) plane00/nonprinting.hex \
 	   > $(COMPILED_DIR)/unifont_sample-$(VERSION).hex
+	sort plane00csur/*.hex $(UNIFILES) \
+	   > $(COMPILED_DIR)/unifont_csur-$(VERSION).hex
+	sort $(UPPER_FILES) \
+	   > $(COMPILED_DIR)/unifont_upper-$(VERSION).hex
+	sort plane0[1-F]/*.hex plane0[1-F]csur/*.hex \
+	   > $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).hex
+	sort $(UPPER_COMBINING) > $(COMPILED_DIR)/upper_combining.txt
+	sort plane0[1-F]/plane*-nonprinting.hex \
+	   > $(COMPILED_DIR)/upper_nonprinting.hex
+	sort plane0[1-F]/*.hex | egrep -v "^..FFF[EF]" | \
+	   $(BINDIR)/unigencircles $(COMPILED_DIR)/upper_combining.txt \
+	   $(COMPILED_DIR)/upper_nonprinting.hex \
+	   > $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).hex
+	# Create a .hex file with all CSUR glyphs, without combining circles
+	sort plane??csur/*.hex \
+	   > $(COMPILED_DIR)/unifont_all_csur-$(VERSION).hex
+	# Create a .hex file with all CSUR glyphs, with combining circles
+	sort plane??csur/*combining.txt > $(COMPILED_DIR)/csur_combining.txt
+	$(BINDIR)/unigencircles \
+	     $(COMPILED_DIR)/csur_combining.txt \
+	     plane00/nonprinting.hex \
+	   < $(COMPILED_DIR)/unifont_all_csur-$(VERSION).hex \
+	   > $(COMPILED_DIR)/unifont_csur_sample-$(VERSION).hex
 
 #
 # Build a BDF font file from the final .hex file.
@@ -142,6 +176,34 @@ bdf: hex
 	   > $(COMPILED_DIR)/unifont_sample-$(VERSION).bdf
 	gzip -f -9 <$(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
 	           >$(COMPILED_DIR)/unifont_sample-$(VERSION).bdf.gz
+	# Font with ConScript Unicode Registry (CSUR) glyphs added
+	$(BINDIR)/hex2bdf --font "Unifont CSUR" \
+	   --version "$(VERSION)" --copyright $(COPYRIGHT) \
+	     $(COMPILED_DIR)/unifont_csur-$(VERSION).hex \
+	   > $(COMPILED_DIR)/unifont_csur-$(VERSION).bdf
+	gzip -f -9 <$(COMPILED_DIR)/unifont_csur-$(VERSION).bdf \
+	           >$(COMPILED_DIR)/unifont_csur-$(VERSION).bdf.gz
+	# Font with glyphs above Plane 0
+	$(BINDIR)/hex2bdf --font "Unifont Upper" \
+	   --version "$(VERSION)" --copyright $(COPYRIGHT) \
+	     $(COMPILED_DIR)/unifont_upper-$(VERSION).hex \
+	   > $(COMPILED_DIR)/unifont_upper-$(VERSION).bdf
+	gzip -f -9 <$(COMPILED_DIR)/unifont_upper-$(VERSION).bdf \
+	           >$(COMPILED_DIR)/unifont_upper-$(VERSION).bdf.gz
+	# Font with glyphs above Plane 0 with CSUR glyphs above Plane 0
+	$(BINDIR)/hex2bdf --font "Unifont Upper CSUR" \
+	   --version "$(VERSION)" --copyright $(COPYRIGHT) \
+	     $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).hex \
+	   > $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).bdf
+	gzip -f -9 <$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).bdf \
+	           >$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).bdf.gz
+	# Font with glyphs above Plane 0 with combining circles added
+	$(BINDIR)/hex2bdf --font "Unifont Upper Sample" \
+	   --version "$(VERSION)" --copyright $(COPYRIGHT) \
+	     $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).hex \
+	   > $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).bdf
+	gzip -f -9 <$(COMPILED_DIR)/unifont_upper_sample-$(VERSION).bdf \
+	           >$(COMPILED_DIR)/unifont_upper_sample-$(VERSION).bdf.gz
 
 #
 # Build a PCF font file from the final .hex file.
@@ -153,6 +215,30 @@ pcf: bdf
 	bdftopcf <$(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
 	         >$(COMPILED_DIR)/unifont_sample-$(VERSION).pcf
 	gzip -f -9 $(COMPILED_DIR)/unifont_sample-$(VERSION).pcf
+	bdftopcf <$(COMPILED_DIR)/unifont_csur-$(VERSION).bdf \
+	         >$(COMPILED_DIR)/unifont_csur-$(VERSION).pcf
+	gzip -f -9 $(COMPILED_DIR)/unifont_csur-$(VERSION).pcf
+	bdftopcf <$(COMPILED_DIR)/unifont_upper-$(VERSION).bdf \
+	         >$(COMPILED_DIR)/unifont_upper-$(VERSION).pcf
+	gzip -f -9 $(COMPILED_DIR)/unifont_upper-$(VERSION).pcf
+	bdftopcf <$(COMPILED_DIR)/unifont_upper_sample-$(VERSION).bdf \
+	         >$(COMPILED_DIR)/unifont_upper_sample-$(VERSION).pcf
+	gzip -f -9 $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).pcf
+	bdftopcf <$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).bdf \
+	         >$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).pcf
+	gzip -f -9 $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).pcf
+
+#
+# Make the PSF (console) font for APL (A Programming Language).
+#
+psf: bdf
+	bdf2psf --fb \
+	   $(COMPILED_DIR)/unifont-$(VERSION).bdf \
+	   psf/apl-equivalents.txt \
+	   psf/unifont-apl.txt \
+	   512 \
+	   $(COMPILED_DIR)/Unifont-APL8x16-$(VERSION).psf
+	gzip -f -9 $(COMPILED_DIR)/Unifont-APL8x16-$(VERSION).psf
 
 #
 # Print coverage of scripts in Basic Multilingual Plane in .txt file.
@@ -179,26 +265,70 @@ pagecount: $(COMPILED_DIR)/unifont-$(VERSION).hex $(BINDIR)/unipagecount
 		        > $(COMPILED_DIR)/pagecount.html
 
 #
-# Create the .bmp (Windows Bitmap) graphics versions of the glyphs.
+# Create the .png (Portable Network Graphics) versions of the glyphs.
 #
-bmp: hex $(BINDIR)/unihex2bmp
-	if [ ! -d $(BMPDIR) ] ; then \
-	   mkdir -p $(BMPDIR) ; \
+png: hex $(BINDIR)/unihex2png
+	if [ ! -d $(PNGDIR) ] ; then \
+	   mkdir -p $(PNGDIR) ; \
+	fi
+	if [ ! -d $(PNGDIR)/plane00 ] ; then \
+	   mkdir -p $(PNGDIR)/plane00 ; \
+	fi
+	for i in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
+	   for j in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
+	      $(BINDIR)/unihex2png -p 00$$i$$j \
+	         -i $(COMPILED_DIR)/unifont_sample-$(VERSION).hex \
+	         -o $(PNGDIR)/plane00/uni00$$i$$j.png ; \
+	   done ; \
+	done
+	if [ ! -d $(PNGDIR)/plane01 ] ; then \
+	   mkdir -p $(PNGDIR)/plane01 ; \
+	fi
+	for i in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
+	   for j in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
+	      $(BINDIR)/unihex2png -p 01$$i$$j \
+	         -i $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).hex \
+	         -o $(PNGDIR)/plane01/uni01$$i$$j.png ; \
+	   done ; \
+	done
+	if [ ! -d $(PNGDIR)/plane0E ] ; then \
+	   mkdir -p $(PNGDIR)/plane0E ; \
+	fi
+	for i in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
+	   for j in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
+	      $(BINDIR)/unihex2png -p 0E$$i$$j \
+	         -i $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).hex \
+	         -o $(PNGDIR)/plane0E/uni0E$$i$$j.png ; \
+	   done ; \
+	done
+	if [ ! -d $(PNGDIR)/csur ] ; then \
+	   mkdir -p $(PNGDIR)/csur ; \
 	fi
+	for i in E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA DB EB EC ED EE EF \
+	         F0 F1 F2 F3 F4 F5 F6 F7 F8 ; do \
+	      $(BINDIR)/unihex2png -p 00$$i \
+	         -i $(COMPILED_DIR)/unifont_csur_sample-$(VERSION).hex \
+	         -o $(PNGDIR)/csur/uni00$$i.png ; \
+	   done ; \
+	done
 	for i in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
 	   for j in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do \
-	      $(BINDIR)/unihex2bmp -p$$i$$j \
-	         -i$(COMPILED_DIR)/unifont_sample-$(VERSION).hex \
-	         -o$(BMPDIR)/uni$$i$$j.bmp ; \
+	      $(BINDIR)/unihex2png -p 0F$$i$$j \
+	         -i $(COMPILED_DIR)/unifont_csur_sample-$(VERSION).hex \
+	         -o $(PNGDIR)/csur/uni0F$$i$$j.png ; \
 	   done ; \
-	done ; \
-	echo "Done creating $(BMPDIR)"
+	done
+	echo "Done creating $(PNGDIR)"
 
 #
 # Build one bitmap of the entire Unifont as a 4096 x 16 grid.
+# Use all the .hex files in $(HEXDIR) so we add the contents of
+# omit.hex (FFFE & FFFF).  Those two glyphs aren't included in the
+# unifont_sample font because they cause problems with MS Windows,
+# but we can put them in the picture.
 #
 bigpic: $(COMPILED_DIR)/unifont_sample-$(VERSION).hex
-	cat $(COMPILED_DIR)/unifont_sample-$(VERSION).hex | \
+	sort -u $(HEXDIR)/*.hex | \
 	   $(BINDIR)/unifontpic -d120 > $(COMPILED_DIR)/unifont-$(VERSION).bmp
 
 #
@@ -209,22 +339,95 @@ bigpic: $(COMPILED_DIR)/unifont_sample-$(VERSION).hex
 #
 
 ttf:
-	# First copy the ordinary version, to make a TrueType font.
+	# First, copy the ordinary version, to make a TrueType font.
 	install -p \
 		$(COMPILED_DIR)/unifont-$(VERSION).hex \
 		$(TTFSRC)/unifont.hex
-	# Second copy unifont_sample.bdf, to make an SBIT font.
 	install -p \
-		$(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
-		$(TTFSRC)/unifont_sample.bdf
-	cd $(TTFSRC) ; make && make clean
+		$(HEXDIR)/bmp-combining.txt \
+		$(TTFSRC)/combining.txt
+	cd $(TTFSRC) ; \
+	   $(MAKE) FONTFILE="unifont" COMBINING="combining" \
+		FONTNAME="Unifont" PSNAME="Unifont"
 	mv $(TTFSRC)/unifont.sfd $(COMPILED_DIR)/unifont-$(VERSION).sfd 
 	mv $(TTFSRC)/unifont.ttf \
 		$(COMPILED_DIR)/unifont-$(VERSION).ttf 
+	# Second, copy unifont_sample.bdf, to make an SBIT font.
+	install -p \
+		$(COMPILED_DIR)/unifont_sample-$(VERSION).bdf \
+		$(TTFSRC)/unifont_sample.bdf
+	cd $(TTFSRC) ; \
+	   $(MAKE) sbit FONTFILE="unifont_sample" COMBINING="" \
+		FONTNAME="Unifont Sample" PSNAME="UnifontSample"
 	mv $(TTFSRC)/unifont_sample.ttf \
 		$(COMPILED_DIR)/unifont_sample-$(VERSION).ttf 
-	gzip -f -9 $(COMPILED_DIR)/unifont-$(VERSION).sfd 
 
+#
+# Now build the ConScript Unicode Registry PUA font.
+#
+csurttf:
+	install -p \
+		$(COMPILED_DIR)/unifont_csur-$(VERSION).hex \
+		$(TTFSRC)/unifont_csur.hex
+	sort -u plane00csur/csur-combining.txt $(HEXDIR)/bmp-combining.txt \
+		> $(TTFSRC)/combining_csur.txt
+	cd $(TTFSRC) ; \
+	   $(MAKE) outline FONTFILE="unifont_csur" COMBINING="combining_csur" \
+		FONTNAME="Unifont CSUR" PSNAME="UnifontCSUR"
+	mv $(TTFSRC)/unifont_csur.sfd \
+		$(COMPILED_DIR)/unifont_csur-$(VERSION).sfd 
+	mv $(TTFSRC)/unifont_csur.ttf \
+		$(COMPILED_DIR)/unifont_csur-$(VERSION).ttf 
+	gzip -f -9 $(COMPILED_DIR)/unifont_csur-$(VERSION).sfd 
+
+#
+# Now build the ConScript Unicode Registry PUA font.
+#
+upperttf:
+	# First, copy the ordinary version, to make a TrueType font.
+	install -p \
+		$(COMPILED_DIR)/unifont_upper-$(VERSION).hex \
+		$(TTFSRC)/unifont_upper.hex
+	sort -u $(UPPER_COMBINING) > $(TTFSRC)/combining_upper.txt
+	cd $(TTFSRC) ; \
+	   $(MAKE) outline FONTFILE="unifont_upper" COMBINING="combining_upper" \
+		FONTNAME="Unifont Upper" PSNAME="UnifontUpper"
+	mv $(TTFSRC)/unifont_upper.sfd \
+		$(COMPILED_DIR)/unifont_upper-$(VERSION).sfd 
+	mv $(TTFSRC)/unifont_upper.ttf \
+		$(COMPILED_DIR)/unifont_upper-$(VERSION).ttf 
+	gzip -f -9 $(COMPILED_DIR)/unifont_upper-$(VERSION).sfd 
+	# Second, copy unifont_upper_sample.bdf, to make an SBIT font.
+	install -p \
+		$(COMPILED_DIR)/unifont_upper_sample-$(VERSION).bdf \
+		$(TTFSRC)/unifont_upper_sample.bdf
+	cd $(TTFSRC) ; \
+	   $(MAKE) sbit FONTFILE="unifont_upper_sample" COMBINING="" \
+		FONTNAME="Unifont Upper Sample" PSNAME="UnifontUpperSample"
+	mv $(TTFSRC)/unifont_upper_sample.ttf \
+		$(COMPILED_DIR)/unifont_upper_sample-$(VERSION).ttf 
+
+
+
+#
+# ConScript Unicode Registry PUA font beyond Plane 0.
+#
+uppercsurttf:
+	install -p \
+		$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).hex \
+		$(TTFSRC)/unifont_upper_csur.hex
+	sort -u plane0[1-F]/*combining*.txt plane0[1-F]csur/*combining*.txt \
+		> $(TTFSRC)/combining_upper_csur.txt
+	cd $(TTFSRC) ; \
+	   $(MAKE) outline FONTFILE="unifont_upper_csur" COMBINING="combining_upper_csur" \
+		FONTNAME="Unifont Upper CSUR" PSNAME="UnifontUpperCSUR"
+	mv $(TTFSRC)/unifont_upper_csur.sfd \
+		$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).sfd 
+	mv $(TTFSRC)/unifont_upper_csur.ttf \
+		$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).ttf 
+	gzip -f -9 $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).sfd 
+
+#
 #
 # Copy the newly created files from $(COMPILED_DIR) to the precompiled/
 # directory.  This has to be called manually, because the precompiled/
@@ -236,13 +439,28 @@ precompiled: all
 	install -m0644 -p $(COMPILED_DIR)/unifont-$(VERSION).hex \
 	                  $(COMPILED_DIR)/unifont-$(VERSION).bdf.gz \
 	                  $(COMPILED_DIR)/unifont-$(VERSION).pcf.gz \
+	                  $(COMPILED_DIR)/Unifont-APL8x16-$(VERSION).psf.gz \
 	                  $(COMPILED_DIR)/unifont-$(VERSION).ttf \
+	                  $(COMPILED_DIR)/unifont_csur-$(VERSION).pcf.gz \
+	                  $(COMPILED_DIR)/unifont_csur-$(VERSION).ttf \
 	                  $(COMPILED_DIR)/unifont_sample-$(VERSION).hex \
 	                  $(COMPILED_DIR)/unifont_sample-$(VERSION).bdf.gz \
 	                  $(COMPILED_DIR)/unifont_sample-$(VERSION).pcf.gz \
 	                  $(COMPILED_DIR)/unifont_sample-$(VERSION).ttf \
 	                  $(COMPILED_DIR)/coverage.txt \
 	                  $(COMPILED_DIR)/unifont-$(VERSION).bmp \
+	                  $(COMPILED_DIR)/unifont_upper-$(VERSION).hex \
+	                  $(COMPILED_DIR)/unifont_upper-$(VERSION).bdf.gz \
+	                  $(COMPILED_DIR)/unifont_upper-$(VERSION).pcf.gz \
+	                  $(COMPILED_DIR)/unifont_upper-$(VERSION).ttf \
+	                  $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).hex \
+	                  $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).bdf.gz \
+	                  $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).pcf.gz \
+	                  $(COMPILED_DIR)/unifont_upper_sample-$(VERSION).ttf \
+	                  $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).hex \
+	                  $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).bdf.gz \
+	                  $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).pcf.gz \
+	                  $(COMPILED_DIR)/unifont_upper_csur-$(VERSION).ttf \
 	   precompiled
 
 #
@@ -267,25 +485,37 @@ install:
 	   echo "Fatal Error: CURDIR not defined -- define in Makefile." ; \
 	   exit 1 ; \
 	fi
+	$(INSTALL) -m0755 -d $(CONSOLEDEST)
 	$(INSTALL) -m0755 -d $(PCFDEST)
 	$(INSTALL) -m0755 -d $(TTFDEST)
 	if [ ! -d $(COMPILED_DIR) ] ; then \
+	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/Unifont-APL8x16-$(VERSION).psf.gz $(CONSOLEDEST)/Unifont-APL8x16.psf.gz ; \
 	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont-$(VERSION).pcf.gz $(PCFDEST)/unifont.pcf.gz ; \
 	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont_sample-$(VERSION).pcf.gz $(PCFDEST)/unifont_sample.pcf.gz ; \
-	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont-$(VERSION).ttf    $(TTFDEST)/unifont.ttf ; \
-	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont_sample-$(VERSION).ttf    $(TTFDEST)/unifont_sample.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont_csur-$(VERSION).pcf.gz     $(PCFDEST)/unifont_csur.pcf.gz ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont-$(VERSION).ttf             $(TTFDEST)/unifont.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont_sample-$(VERSION).ttf      $(TTFDEST)/unifont_sample.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont_csur-$(VERSION).ttf        $(TTFDEST)/unifont_csur.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont_upper-$(VERSION).ttf       $(TTFDEST)/unifont_upper.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/precompiled/unifont_upper_csur-$(VERSION).ttf  $(TTFDEST)/unifont_upper_csur.ttf ; \
 	else \
+	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/Unifont-APL8x16-$(VERSION).psf.gz $(CONSOLEDEST)/Unifont-APL8x16.psf.gz ; \
 	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont-$(VERSION).pcf.gz $(PCFDEST)/unifont.pcf.gz ; \
-	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont_sample-$(VERSION).pcf.gz $(PCFDEST)/unifont_sample.pcf.gz ; \
-	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont-$(VERSION).ttf    $(TTFDEST)/unifont.ttf ; \
-	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont_sample-$(VERSION).ttf    $(TTFDEST)/unifont_sample.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont_sample-$(VERSION).pcf.gz    $(PCFDEST)/unifont_sample.pcf.gz ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont_csur-$(VERSION).pcf.gz      $(PCFDEST)/unifont_csur.pcf.gz ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont-$(VERSION).ttf              $(TTFDEST)/unifont.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont_sample-$(VERSION).ttf       $(TTFDEST)/unifont_sample.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont_csur-$(VERSION).ttf         $(TTFDEST)/unifont_csur.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont_upper-$(VERSION).ttf        $(TTFDEST)/unifont_upper.ttf ; \
+	   $(INSTALL) -m0644 -p $(CURDIR)/$(COMPILED_DIR)/unifont_upper_csur-$(VERSION).ttf   $(TTFDEST)/unifont_upper_csur.ttf ; \
 	fi
 
 clean:
-	\rm -rf $(COMPILED_DIR)/bmp
+	\rm -rf $(COMPILED_DIR)/png
 	\rm -f $(COMPILED_DIR)/unifont-$(VERSION).hex
 	\rm -f $(COMPILED_DIR)/unifont-$(VERSION).bdf
 	\rm -f $(COMPILED_DIR)/unifont-$(VERSION).bdf.gz
+	\rm -f $(COMPILED_DIR)/unifont-$(VERSION).sfd.gz
 	\rm -f *~
 
 #
@@ -298,4 +528,5 @@ distclean:
 	\rm -f *~
 	\rm -rf .DS* ._.DS*
 
-.PHONY: all hex bdf pcf coverage pagecount bmp bigpic ttf precompiled install clean distclean 
+.PHONY: all hex bdf pcf coverage pagecount png bigpic csurttf upper ttf \
+	precompiled install clean distclean