diff options
Diffstat (limited to 'fonts/mkpsf.pl')
| -rw-r--r-- | fonts/mkpsf.pl | 56 |
1 files changed, 4 insertions, 52 deletions
diff --git a/fonts/mkpsf.pl b/fonts/mkpsf.pl index b6c5532..2ae1f2a 100644 --- a/fonts/mkpsf.pl +++ b/fonts/mkpsf.pl @@ -367,7 +367,7 @@ sub setup_map { # TODO: figure out the Arabic letter mappings. Might need someone who # actually reads Arabic to make sense of them... what I've got is just # a guess. - [ 0x0624, 0xfeb5, 0xfeb6 ], # 0x3c, maybe? + [ 0x0624, 0xFE85, 0xFE86 ], # 0x3c, maybe? [ 0x0634, 0xFEB5, 0xFEB6, 0xFEB8 ], # 0x41 [ 0x0648, 0xFEED, 0xFEEE ], # 0x42 @@ -528,13 +528,13 @@ sub mkfonts { my $scaled_data = shift; my $scale = shift; - open $fh, '>', "$fontname-$px.txt" or die $!; + open $fh, '|-', "perl sorttxtfont.pl > $fontname-$px.txt" or die $!; print $fh psf2txt_header($cnt, $scale); print $fh $_ for(@$scaled_data); close $fh; system("txt2psf $fontname-$px.txt $fontname-$px.psf"); - system("perl dupglyphs.pl $fontname-$px.txt | txt2psf | psf2bdf --defchar=0 --iso10646 --fontname=$fontname-$px | perl ./fixbdf.pl $px > $fontname-$px.bdf"); + system("perl dupglyphs.pl $fontname-$px.txt | perl sorttxtfont.pl | txt2psf | psf2bdf --defchar=0 --iso10646 --fontname=$fontname-$px | perl ./fixbdf.pl $px > $fontname-$px.bdf"); } mkfonts(8, \@scale1, 1); @@ -933,18 +933,6 @@ Bitmap: \ -##--##- \ -------- % -// A with umlaut -Unicode: [00c4]; -Bitmap: \ - --##-##- \ - -------- \ - ---##--- \ - --####-- \ - -##--##- \ - -######- \ - -##--##- \ - -------- -% // A with ring Unicode: [00c5]; Bitmap: \ @@ -982,18 +970,6 @@ Bitmap: \ ---##--- \ --##---- % -// E with grave -Unicode: [00c9]; -Bitmap: \ - --##---- \ - ---##--- \ - -######- \ - -##----- \ - -#####-- \ - -##----- \ - -######- \ - -------- -% // E with circumflex Unicode: [00ca]; Bitmap: \ @@ -1091,19 +1067,7 @@ Bitmap: \ -##--##- \ --####-- \ -------- -% // FIXME: MISSING Ô Õ -// O with umlaut -Unicode: [00d6]; -Bitmap: \ - -##--##- \ - --####-- \ - -##--##- \ - -##--##- \ - -##--##- \ - -##--##- \ - --####-- \ - -------- % // multiplication Unicode: [00d7]; @@ -1143,18 +1107,6 @@ Bitmap: \ -------- // FIXME: MISSING Û % -// U with umlaut -Unicode: [00dc]; -Bitmap: \ - -##--##- \ - -------- \ - -##--##- \ - -##--##- \ - -##--##- \ - -##--##- \ - -######- \ - -------- -% // Y with acute Unicode: [00dd]; Bitmap: \ @@ -1168,7 +1120,7 @@ Bitmap: \ -------- % // capital thorn -Unicode: [00dd]; +Unicode: [00de]; Bitmap: \ -------- \ -##----- \ |