From 48e3a36faf203c4d25e024994f103fce1fcc8fca Mon Sep 17 00:00:00 2001 From: Paul Hardy Date: Sun, 22 Dec 2013 01:53:24 +0000 Subject: [PATCH] unifont-6.3.20131221.tar.gz * ChangeLog: corrected date on last entry from 12-27 to 12-17. * Makefiles: updated date for new release. * font/hexsrc/unifont-base.hex: Modified glyphs to appear better in APL: U+22F8, U+233B, U+233E, U+235B, and U+2364. * font/ttfsrc/Makefile: commented out SetFontNames function calls in fontforge. Not all applications were interpreting that data correctly. For example, in LibreOffice, it listed the font as the foundry name ("GNU") rather than the foundry name plus the font name ("GNU Unifont") or just the font name. That is a bug in LibreOffice, so if such things are fixed in the future then these calls can be re-introduced. * src/hex2bdf: - Rearranged some properties (cosmetic change). - Changed default font name from "unifont" to "Unifont". * src/unigencircles.c: changed subscript from MAXSTRING to MAXSTRING-1 at line 61. --- ChangeLog | 21 ++++++++++++++++++++- Makefile | 2 +- NEWS | 14 ++++++++++++++ font/Makefile | 2 +- font/hexsrc/unifont-base.hex | 10 +++++----- font/ttfsrc/Makefile | 13 ++++++++++--- src/hex2bdf | 7 ++++--- src/unigenwidth.c | 2 +- 8 files changed, 56 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81f6df7..5ee042f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,23 @@ -2013-12-27 Paul Hardy +2013-12-21 Paul Hardy + + * ChangeLog: corrected date on last entry from 12-27 to 12-17. + * Makefiles: updated date for new release. + * font/hexsrc/unifont-base.hex: Modified glyphs to appear better + in APL: U+22F8, U+233B, U+233E, U+235B, and U+2364. + * font/ttfsrc/Makefile: commented out SetFontNames function calls + in fontforge. Not all applications were interpreting that data + correctly. For example, in LibreOffice, it listed the font as + the foundry name ("GNU") rather than the foundry name plus the + font name ("GNU Unifont") or just the font name. That is a bug + in LibreOffice, so if such things are fixed in the future then + these calls can be re-introduced. + * src/hex2bdf: + - Rearranged some properties (cosmetic change). + - Changed default font name from "unifont" to "Unifont". + * src/unigencircles.c: changed subscript from MAXSTRING to + MAXSTRING-1 at line 61. + +2013-12-17 Paul Hardy * doc/Makefile: removed redirection of texi2pdf output. * doc/unifont.pdf: rebuilt file. diff --git a/Makefile b/Makefile index 556f5a6..3b14dee 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SHELL = /bin/sh INSTALL = install -DATE = 20131217 +DATE = 20131221 MAJORVERSION = 6.3 VERSION = $(MAJORVERSION).$(DATE) diff --git a/NEWS b/NEWS index daec938..349d8b5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +2013-12-21: Release 6.3.2013121 + + The default font name that hex2bdf creates has changed from + lower-case "unifont" to "Unifont". + + FontForge's SetFontNames function calls were removed because + not all applications correctly interpreted their settings. + For example, LibreOffice only listed Unifont by the foundry + name ("GNU") rather than foundry + font name ("GNU Unifont") + or just the font name. Those calls are only commented out + so they could easily be re-introduced. + + Some glyphs were changed for better appearance with APL. + 2013-12-17: Release 6.3.20131217 This fixes three bugs: diff --git a/font/Makefile b/font/Makefile index 7499bd9..2ef30bb 100644 --- a/font/Makefile +++ b/font/Makefile @@ -18,7 +18,7 @@ FONTFORGE = fontforge # assembly date of this version # MAJORVERSION = 6.3 -DATE = 20131217 +DATE = 20131221 VERSION = $(MAJORVERSION).$(DATE) COPYRIGHT = "Copyright (C) 2013 Roman Czyborra, Paul Hardy, et al. \ diff --git a/font/hexsrc/unifont-base.hex b/font/hexsrc/unifont-base.hex index 025bdbf..a9c5672 100644 --- a/font/hexsrc/unifont-base.hex +++ b/font/hexsrc/unifont-base.hex @@ -7670,7 +7670,7 @@ 22F5:00000000000007F00800100010001FF010001000080007F00000000000000000 22F6:00001FF0000007F00800100010001FF010001000080007F00000000000000000 22F7:0000007E003E40407E40403E00000000 -22F8:0000000000001FC02000400040007FC04000400020001FC000007FC000000000 +22F8:000000000000003E40407E40403E007E 22F9:0000000000001FC0200040007FC040007FC0400020001FC00000000000000000 22FA:0000000000003F800040002000203FF80020002000403F800000000000000000 22FB:0000000000003F800040002020203FE02020002000403F800000000000000000 @@ -7737,10 +7737,10 @@ 2338:0000007F4141417F41417F41417F0000 2339:0000007F414949417F414949417F0000 233A:0000007F4149556341635549417F0000 -233B:0000007F4141415D555D4141417F0000 +233B:0000007F4141414955554941417F0000 233C:0000007F41415D634141635D417F0000 233D:00000008081C2A4949492A1C08080000 -233E:00000000001C225D555D221C00000000 +233E:00000000001C22495549221C00000000 233F:000000000204040808FF102020400000 2340:000000004020201010FF080404020000 2341:0000007F4143454549515161417F0000 @@ -7769,7 +7769,7 @@ 2358:000000000808080000000000003E0000 2359:00000000000808141422223E003E0000 235A:000000000008142241221408003E0000 -235B:000000000000001C2222221C003E0000 +235B:000000000000001824241800003E0000 235C:00000000001C22414141221C007F0000 235D:000000001C2249554941414141410000 235E:00007F414949494141414141417F0000 @@ -7778,7 +7778,7 @@ 2361:002424007F0808080808080808080000 2362:00242400003E22221414080800000000 2363:0024240000083E1C1400000000000000 -2364:002424000000001C2222221C00000000 +2364:00242400000000182424180000000000 2365:002424000000001C22414141221C0000 2366:00000000494949494949492A1C080000 2367:00000008081F28484848281F08080000 diff --git a/font/ttfsrc/Makefile b/font/ttfsrc/Makefile index 945dde7..bdaf156 100644 --- a/font/ttfsrc/Makefile +++ b/font/ttfsrc/Makefile @@ -9,7 +9,7 @@ COPYRIGHT = "Copyright (C) 2013 Roman Czyborra, Paul Hardy, 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." -VERSION = 6.3.20131217 +VERSION = 6.3.20131221 # # How to build unifont.ttf from GNU Unifont's unifont.hex @@ -62,11 +62,15 @@ merge: echo "Merging all .sfd files" $(FONTFORGE) -script all.pe +# +# Commented out because not all applications correctly interpreted +# the settings: +# +# SetFontNames("UnifontMedium", "GNU", "Unifont", "Medium", $(COPYRIGHT), "$(VERSION)"); \ sfd2ttf: echo "Converting .sfd font into .ttf font" $(FONTFORGE) -lang=ff -c \ 'Open($$1); \ - SetFontNames("UnifontMedium", "GNU", "Unifont", "Medium", $(COPYRIGHT), "$(VERSION)"); \ Generate($$2)' unifont.sfd unifont.ttf \rm -f unifont.hex @@ -88,10 +92,13 @@ sfd2ttf: # does not read the FONT_VERSION property so Paul Hardy added the # the SetFontNames call. # +# Commented out because not all applications correctly interpreted +# the settings: +# +# SetFontNames("","","","","","$(VERSION)"); \ sbit: $(FONTFORGE) -lang=ff -c \ 'New(); \ - SetFontNames("","","","","","$(VERSION)"); \ Import($$1); \ Generate($$2, "ttf"); \ Close()' \ diff --git a/src/hex2bdf b/src/hex2bdf index 7f600e3..18d1d16 100755 --- a/src/hex2bdf +++ b/src/hex2bdf @@ -32,7 +32,7 @@ $result = GetOptions ( ); if (not $font_name) { - $font_name = "unifont"; + $font_name = "Unifont"; } if (not $vpixels) { $vpixels = 16; @@ -48,6 +48,7 @@ while (<>) { chomp; $glyph{$1} = $2 if /(....):(.+)/; } @chars = sort keys %glyph; $nchars = $#chars + 1; + print "STARTFONT 2.1 FONT -gnu-${font_name}-Medium-R-Normal-Sans-${vpixels}-${point_size10}-75-75-c-80-iso10646-1 SIZE $point_size 75 75 @@ -70,12 +71,12 @@ SPACING \"C\" AVERAGE_WIDTH 80 CHARSET_REGISTRY \"ISO10646\" CHARSET_ENCODING \"1\" -FONT_ASCENT 14 -FONT_DESCENT 2 UNDERLINE_POSITION -2 UNDERLINE_THICKNESS 1 CAP_HEIGHT 10 X_HEIGHT 8 +FONT_ASCENT 14 +FONT_DESCENT 2 DEFAULT_CHAR 65533 ENDPROPERTIES CHARS $nchars\n"; diff --git a/src/unigenwidth.c b/src/unigenwidth.c index b12fb64..18bae8f 100644 --- a/src/unigenwidth.c +++ b/src/unigenwidth.c @@ -58,7 +58,7 @@ main (int argc, char **argv) memset (plane0width, 0, 0x10000 * sizeof (char)); - teststring[MAXSTRING] = '\0'; + teststring[MAXSTRING-1] = '\0'; while (fgets (teststring, MAXSTRING-1, infilefp) != NULL) { sscanf (teststring, "%X", &loc); gstart = index (teststring,':') + 1; -- 2.30.0