Fixed dina-psf

This commit is contained in:
Jan-Bulthuis 2025-02-12 02:17:20 +01:00
parent 86f4a23831
commit 4c04d14d8f
3 changed files with 552 additions and 523 deletions

View File

@ -1,257 +1,257 @@
# Created from the ascii2u table in bdf2psf
U+00A0
U+25A0
U+00B2
U+207F
U+221A
U+00B7
U+2219
U+00B0
U+2248
U+00F7
U+2321
U+2320
U+2264
U+2265
U+00B1
U+2261
U+2229
U+03B5
U+03C6
U+221E
U+03B4
U+03A9
U+0398
U+03A6
U+03C4
U+00B5
U+03C3
U+03A3
U+03C0
U+0393
U+00DF
U+03B1
U+2580
U+2590
U+258C
U+2584
U+2588
U+250C
U+2518
U+256A
U+256B
U+2553
U+2552
U+2558
U+2559
U+2565
U+2564
U+2568
U+2567
U+256C
U+2550
U+2560
U+2566
U+2569
U+2554
U+255A
U+255F
U+255E
U+253C
U+2500
U+251C
U+252C
U+2534
U+2514
U+2510
U+255B
U+255C
U+255D
U+2557
U+2551
U+2563
U+2555
U+2556
U+2562
U+2561
U+2524
U+2502
U+2593
U+2592
U+2591
U+00BB
U+00AB
U+00A1
U+00BC
U+00BD
U+00AC
U+2310
U+00BF
U+00BA
U+00AA
U+00D1
U+00F1
U+00FA
U+00F3
U+00ED
U+00E1
U+0192
U+20A7
U+00A5
U+00A3
U+00A2
U+00DC
U+00D6
U+00FF
U+00F9
U+00FB
U+00F2
U+00F6
U+00F4
U+00C6
U+00E6
U+00C9
U+00C5
U+00C4
U+00EC
U+00EE
U+00EF
U+00E8
U+00EB
U+00EA
U+00E7
U+00E5
U+00E0
U+00E4
U+00E2
U+00E9
U+00FC
U+00C7
U+007F
U+007E
U+007D
U+007C
U+007B
U+007A
U+0079
U+0078
U+0077
U+0076
U+0075
U+0074
U+0073
U+0072
U+0071
U+0070
U+006F
U+006E
U+006D
U+006C
U+006B
U+006A
U+0069
U+0068
U+0067
U+0066
U+0065
U+0064
U+0063
U+0062
U+0061
U+0060
U+005F
U+005E
U+005D
U+005C
U+005B
U+005A
U+0059
U+0058
U+0057
U+0056
U+0055
U+0054
U+0053
U+0052
U+0051
U+0050
U+004F
U+004E
U+004D
U+004C
U+004B
U+004A
U+0049
U+0048
U+0047
U+0046
U+0045
U+0044
U+0043
U+0042
U+0041
U+0040
U+003F
U+003E
U+003D
U+003C
U+003B
U+003A
U+0039
U+0038
U+0037
U+0036
U+0035
U+0034
U+0033
U+0032
U+0031
U+0030
U+002F
U+002E
U+002D
U+002C
U+002B
U+002A
U+0029
U+0028
U+0027
U+0026
U+0025
U+0024
U+0023
U+0022
U+0021
U+0020
U+25bc
U+25b2
U+2194
U+221f
U+2190
U+2192
U+2193
U+2191
U+21a8
U+25ac
U+00a7
U+00b6
U+203c
U+2195
U+25c4
U+25ba
U+263c
U+266b
U+266a
U+2640
U+2642
U+25d9
U+25cb
U+25d8
U+2022
U+2660
U+2663
U+2666
U+2665
U+263b
U+fffd
U+263a
U+fffd
U+263b
U+2665
U+2666
U+2663
U+2660
U+2022
U+25d8
U+25cb
U+25d9
U+2642
U+2640
U+266a
U+266b
U+263c
U+25ba
U+25c4
U+2195
U+203c
U+00b6
U+00a7
U+25ac
U+21a8
U+2191
U+2193
U+2192
U+2190
U+221f
U+2194
U+25b2
U+25bc
U+0020
U+0021
U+0022
U+0023
U+0024
U+0025
U+0026
U+0027
U+0028
U+0029
U+002A
U+002B
U+002C
U+002D
U+002E
U+002F
U+0030
U+0031
U+0032
U+0033
U+0034
U+0035
U+0036
U+0037
U+0038
U+0039
U+003A
U+003B
U+003C
U+003D
U+003E
U+003F
U+0040
U+0041
U+0042
U+0043
U+0044
U+0045
U+0046
U+0047
U+0048
U+0049
U+004A
U+004B
U+004C
U+004D
U+004E
U+004F
U+0050
U+0051
U+0052
U+0053
U+0054
U+0055
U+0056
U+0057
U+0058
U+0059
U+005A
U+005B
U+005C
U+005D
U+005E
U+005F
U+0060
U+0061
U+0062
U+0063
U+0064
U+0065
U+0066
U+0067
U+0068
U+0069
U+006A
U+006B
U+006C
U+006D
U+006E
U+006F
U+0070
U+0071
U+0072
U+0073
U+0074
U+0075
U+0076
U+0077
U+0078
U+0079
U+007A
U+007B
U+007C
U+007D
U+007E
U+007F
U+00C7
U+00FC
U+00E9
U+00E2
U+00E4
U+00E0
U+00E5
U+00E7
U+00EA
U+00EB
U+00E8
U+00EF
U+00EE
U+00EC
U+00C4
U+00C5
U+00C9
U+00E6
U+00C6
U+00F4
U+00F6
U+00F2
U+00FB
U+00F9
U+00FF
U+00D6
U+00DC
U+00A2
U+00A3
U+00A5
U+20A7
U+0192
U+00E1
U+00ED
U+00F3
U+00FA
U+00F1
U+00D1
U+00AA
U+00BA
U+00BF
U+2310
U+00AC
U+00BD
U+00BC
U+00A1
U+00AB
U+00BB
U+2591
U+2592
U+2593
U+2502
U+2524
U+2561
U+2562
U+2556
U+2555
U+2563
U+2551
U+2557
U+255D
U+255C
U+255B
U+2510
U+2514
U+2534
U+252C
U+251C
U+2500
U+253C
U+255E
U+255F
U+255A
U+2554
U+2569
U+2566
U+2560
U+2550
U+256C
U+2567
U+2568
U+2564
U+2565
U+2559
U+2558
U+2552
U+2553
U+256B
U+256A
U+2518
U+250C
U+2588
U+2584
U+258C
U+2590
U+2580
U+03B1
U+00DF
U+0393
U+03C0
U+03A3
U+03C3
U+00B5
U+03C4
U+03A6
U+0398
U+03A9
U+03B4
U+221E
U+03C6
U+03B5
U+2229
U+2261
U+00B1
U+2265
U+2264
U+2320
U+2321
U+00F7
U+2248
U+00B0
U+2219
U+00B7
U+221A
U+207F
U+00B2
U+25A0
U+00A0

View File

@ -1,257 +1,257 @@
# Created from the ascii2u table in bdf2psf
0x000 U+00A0
0x001 U+25A0
0x002 U+00B2
0x003 U+207F
0x004 U+221A
0x005 U+00B7
0x006 U+2219
0x007 U+00B0
0x008 U+2248
0x009 U+00F7
0x00a U+2321
0x00b U+2320
0x00c U+2264
0x00d U+2265
0x00e U+00B1
0x00f U+2261
0x010 U+2229
0x011 U+03B5
0x012 U+03C6
0x013 U+221E
0x014 U+03B4
0x015 U+03A9
0x016 U+0398
0x017 U+03A6
0x018 U+03C4
0x019 U+00B5
0x01a U+03C3
0x01b U+03A3
0x01c U+03C0
0x01d U+0393
0x01e U+00DF
0x01f U+03B1
0x020 U+2580
0x021 U+2590
0x022 U+258C
0x023 U+2584
0x024 U+2588
0x025 U+250C
0x026 U+2518
0x027 U+256A
0x028 U+256B
0x029 U+2553
0x02a U+2552
0x02b U+2558
0x02c U+2559
0x02d U+2565
0x02e U+2564
0x02f U+2568
0x030 U+2567
0x031 U+256C
0x032 U+2550
0x033 U+2560
0x034 U+2566
0x035 U+2569
0x036 U+2554
0x037 U+255A
0x038 U+255F
0x039 U+255E
0x03a U+253C
0x03b U+2500
0x03c U+251C
0x03d U+252C
0x03e U+2534
0x03f U+2514
0x040 U+2510
0x041 U+255B
0x042 U+255C
0x043 U+255D
0x044 U+2557
0x045 U+2551
0x046 U+2563
0x047 U+2555
0x048 U+2556
0x049 U+2562
0x04a U+2561
0x04b U+2524
0x04c U+2502
0x04d U+2593
0x04e U+2592
0x04f U+2591
0x050 U+00BB
0x051 U+00AB
0x052 U+00A1
0x053 U+00BC
0x054 U+00BD
0x055 U+00AC
0x056 U+2310
0x057 U+00BF
0x058 U+00BA
0x059 U+00AA
0x05a U+00D1
0x05b U+00F1
0x05c U+00FA
0x05d U+00F3
0x05e U+00ED
0x05f U+00E1
0x060 U+0192
0x061 U+20A7
0x062 U+00A5
0x063 U+00A3
0x064 U+00A2
0x065 U+00DC
0x066 U+00D6
0x067 U+00FF
0x068 U+00F9
0x069 U+00FB
0x06a U+00F2
0x06b U+00F6
0x06c U+00F4
0x06d U+00C6
0x06e U+00E6
0x06f U+00C9
0x070 U+00C5
0x071 U+00C4
0x072 U+00EC
0x073 U+00EE
0x074 U+00EF
0x075 U+00E8
0x076 U+00EB
0x077 U+00EA
0x078 U+00E7
0x079 U+00E5
0x07a U+00E0
0x07b U+00E4
0x07c U+00E2
0x07d U+00E9
0x07e U+00FC
0x07f U+00C7
0x080 U+007F
0x081 U+007E
0x082 U+007D
0x083 U+007C
0x084 U+007B
0x085 U+007A
0x086 U+0079
0x087 U+0078
0x088 U+0077
0x089 U+0076
0x08a U+0075
0x08b U+0074
0x08c U+0073
0x08d U+0072
0x08e U+0071
0x08f U+0070
0x090 U+006F
0x091 U+006E
0x092 U+006D
0x093 U+006C
0x094 U+006B
0x095 U+006A
0x096 U+0069
0x097 U+0068
0x098 U+0067
0x099 U+0066
0x09a U+0065
0x09b U+0064
0x09c U+0063
0x09d U+0062
0x09e U+0061
0x09f U+0060
0x0a0 U+005F
0x0a1 U+005E
0x0a2 U+005D
0x0a3 U+005C
0x0a4 U+005B
0x0a5 U+005A
0x0a6 U+0059
0x0a7 U+0058
0x0a8 U+0057
0x0a9 U+0056
0x0aa U+0055
0x0ab U+0054
0x0ac U+0053
0x0ad U+0052
0x0ae U+0051
0x0af U+0050
0x0b0 U+004F
0x0b1 U+004E
0x0b2 U+004D
0x0b3 U+004C
0x0b4 U+004B
0x0b5 U+004A
0x0b6 U+0049
0x0b7 U+0048
0x0b8 U+0047
0x0b9 U+0046
0x0ba U+0045
0x0bb U+0044
0x0bc U+0043
0x0bd U+0042
0x0be U+0041
0x0bf U+0040
0x0c0 U+003F
0x0c1 U+003E
0x0c2 U+003D
0x0c3 U+003C
0x0c4 U+003B
0x0c5 U+003A
0x0c6 U+0039
0x0c7 U+0038
0x0c8 U+0037
0x0c9 U+0036
0x0ca U+0035
0x0cb U+0034
0x0cc U+0033
0x0cd U+0032
0x0ce U+0031
0x0cf U+0030
0x0d0 U+002F
0x0d1 U+002E
0x0d2 U+002D
0x0d3 U+002C
0x0d4 U+002B
0x0d5 U+002A
0x0d6 U+0029
0x0d7 U+0028
0x0d8 U+0027
0x0d9 U+0026
0x0da U+0025
0x0db U+0024
0x0dc U+0023
0x0dd U+0022
0x0de U+0021
0x0df U+0020
0x0e0 U+25bc
0x0e1 U+25b2
0x0e2 U+2194
0x0e3 U+221f
0x0e4 U+2190
0x0e5 U+2192
0x0e6 U+2193
0x0e7 U+2191
0x0e8 U+21a8
0x0e9 U+25ac
0x0ea U+00a7
0x0eb U+00b6
0x0ec U+203c
0x0ed U+2195
0x0ee U+25c4
0x0ef U+25ba
0x0f0 U+263c
0x0f1 U+266b
0x0f2 U+266a
0x0f3 U+2640
0x0f4 U+2642
0x0f5 U+25d9
0x0f6 U+25cb
0x0f7 U+25d8
0x0f8 U+2022
0x0f9 U+2660
0x0fa U+2663
0x0fb U+2666
0x0fc U+2665
0x0fd U+263b
0x0fe U+263a
0x0ff U+fffd
0x000 U+fffd
0x001 U+263a
0x002 U+263b
0x003 U+2665
0x004 U+2666
0x005 U+2663
0x006 U+2660
0x007 U+2022
0x008 U+25d8
0x009 U+25cb
0x00a U+25d9
0x00b U+2642
0x00c U+2640
0x00d U+266a
0x00e U+266b
0x00f U+263c
0x010 U+25ba
0x011 U+25c4
0x012 U+2195
0x013 U+203c
0x014 U+00b6
0x015 U+00a7
0x016 U+25ac
0x017 U+21a8
0x018 U+2191
0x019 U+2193
0x01a U+2192
0x01b U+2190
0x01c U+221f
0x01d U+2194
0x01e U+25b2
0x01f U+25bc
0x020 U+0020
0x021 U+0021
0x022 U+0022
0x023 U+0023
0x024 U+0024
0x025 U+0025
0x026 U+0026
0x027 U+0027
0x028 U+0028
0x029 U+0029
0x02a U+002A
0x02b U+002B
0x02c U+002C
0x02d U+002D
0x02e U+002E
0x02f U+002F
0x030 U+0030
0x031 U+0031
0x032 U+0032
0x033 U+0033
0x034 U+0034
0x035 U+0035
0x036 U+0036
0x037 U+0037
0x038 U+0038
0x039 U+0039
0x03a U+003A
0x03b U+003B
0x03c U+003C
0x03d U+003D
0x03e U+003E
0x03f U+003F
0x040 U+0040
0x041 U+0041
0x042 U+0042
0x043 U+0043
0x044 U+0044
0x045 U+0045
0x046 U+0046
0x047 U+0047
0x048 U+0048
0x049 U+0049
0x04a U+004A
0x04b U+004B
0x04c U+004C
0x04d U+004D
0x04e U+004E
0x04f U+004F
0x050 U+0050
0x051 U+0051
0x052 U+0052
0x053 U+0053
0x054 U+0054
0x055 U+0055
0x056 U+0056
0x057 U+0057
0x058 U+0058
0x059 U+0059
0x05a U+005A
0x05b U+005B
0x05c U+005C
0x05d U+005D
0x05e U+005E
0x05f U+005F
0x060 U+0060
0x061 U+0061
0x062 U+0062
0x063 U+0063
0x064 U+0064
0x065 U+0065
0x066 U+0066
0x067 U+0067
0x068 U+0068
0x069 U+0069
0x06a U+006A
0x06b U+006B
0x06c U+006C
0x06d U+006D
0x06e U+006E
0x06f U+006F
0x070 U+0070
0x071 U+0071
0x072 U+0072
0x073 U+0073
0x074 U+0074
0x075 U+0075
0x076 U+0076
0x077 U+0077
0x078 U+0078
0x079 U+0079
0x07a U+007A
0x07b U+007B
0x07c U+007C
0x07d U+007D
0x07e U+007E
0x07f U+007F
0x080 U+00C7
0x081 U+00FC
0x082 U+00E9
0x083 U+00E2
0x084 U+00E4
0x085 U+00E0
0x086 U+00E5
0x087 U+00E7
0x088 U+00EA
0x089 U+00EB
0x08a U+00E8
0x08b U+00EF
0x08c U+00EE
0x08d U+00EC
0x08e U+00C4
0x08f U+00C5
0x090 U+00C9
0x091 U+00E6
0x092 U+00C6
0x093 U+00F4
0x094 U+00F6
0x095 U+00F2
0x096 U+00FB
0x097 U+00F9
0x098 U+00FF
0x099 U+00D6
0x09a U+00DC
0x09b U+00A2
0x09c U+00A3
0x09d U+00A5
0x09e U+20A7
0x09f U+0192
0x0a0 U+00E1
0x0a1 U+00ED
0x0a2 U+00F3
0x0a3 U+00FA
0x0a4 U+00F1
0x0a5 U+00D1
0x0a6 U+00AA
0x0a7 U+00BA
0x0a8 U+00BF
0x0a9 U+2310
0x0aa U+00AC
0x0ab U+00BD
0x0ac U+00BC
0x0ad U+00A1
0x0ae U+00AB
0x0af U+00BB
0x0b0 U+2591
0x0b1 U+2592
0x0b2 U+2593
0x0b3 U+2502
0x0b4 U+2524
0x0b5 U+2561
0x0b6 U+2562
0x0b7 U+2556
0x0b8 U+2555
0x0b9 U+2563
0x0ba U+2551
0x0bb U+2557
0x0bc U+255D
0x0bd U+255C
0x0be U+255B
0x0bf U+2510
0x0c0 U+2514
0x0c1 U+2534
0x0c2 U+252C
0x0c3 U+251C
0x0c4 U+2500
0x0c5 U+253C
0x0c6 U+255E
0x0c7 U+255F
0x0c8 U+255A
0x0c9 U+2554
0x0ca U+2569
0x0cb U+2566
0x0cc U+2560
0x0cd U+2550
0x0ce U+256C
0x0cf U+2567
0x0d0 U+2568
0x0d1 U+2564
0x0d2 U+2565
0x0d3 U+2559
0x0d4 U+2558
0x0d5 U+2552
0x0d6 U+2553
0x0d7 U+256B
0x0d8 U+256A
0x0d9 U+2518
0x0da U+250C
0x0db U+2588
0x0dc U+2584
0x0dd U+258C
0x0de U+2590
0x0df U+2580
0x0e0 U+03B1
0x0e1 U+00DF
0x0e2 U+0393
0x0e3 U+03C0
0x0e4 U+03A3
0x0e5 U+03C3
0x0e6 U+00B5
0x0e7 U+03C4
0x0e8 U+03A6
0x0e9 U+0398
0x0ea U+03A9
0x0eb U+03B4
0x0ec U+221E
0x0ed U+03C6
0x0ee U+03B5
0x0ef U+2229
0x0f0 U+2261
0x0f1 U+00B1
0x0f2 U+2265
0x0f3 U+2264
0x0f4 U+2320
0x0f5 U+2321
0x0f6 U+00F7
0x0f7 U+2248
0x0f8 U+00B0
0x0f9 U+2219
0x0fa U+00B7
0x0fb U+221A
0x0fc U+207F
0x0fd U+00B2
0x0fe U+25A0
0x0ff U+00A0

View File

@ -27,17 +27,43 @@ pkgs.stdenv.mkDerivation {
# Set the AVERAGE_WIDTH property on the font
sed 's/STARTPROPERTIES 16/STARTPROPERTIES 17\
AVERAGE_WIDTH 70/' ./dina.bdf > ./dina-enc.bdf
AVERAGE_WIDTH 70/' ./dina.bdf > ./dina-mod.bdf
# # Reencode the font from code page CP1252 (Windows) to unicode
# fontforge -lang=ff -c "Open(\"dina-mod.bdf\"); Reencode(\"win\", 1); Reencode(\"iso10646-1\"); Generate(\"dina-enc.bdf\")"
# mv dina-enc-*.bdf dina-enc.bdf
# Reencode the font from code page CP1252 (Windows) to unicode
fontforge -lang=ff -c "Open(\"dina-mod.bdf\"); Reencode(\"win\", 1); Reencode(\"iso10646-1\"); Generate(\"dina-enc.bdf\")"
mv dina-enc-*.bdf dina-enc.bdf
# Create the fontset
head -n 256 ${pkgs.bdf2psf}/share/bdf2psf/fontsets/Uni1.512 > Uni1.256
# Move the artsy characters around
sed -i 's/STARTCHAR uni000E$/STARTCHAR uni2518/' ./dina-enc.bdf
sed -i 's/ENCODING 14$/ENCODING 9496/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni000F$/STARTCHAR uni2514/' ./dina-enc.bdf
sed -i 's/ENCODING 15$/ENCODING 9492/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0010$/STARTCHAR uni250C/' ./dina-enc.bdf
sed -i 's/ENCODING 16$/ENCODING 9484/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0011$/STARTCHAR uni2510/' ./dina-enc.bdf
sed -i 's/ENCODING 17$/ENCODING 9488/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0012$/STARTCHAR uni2500/' ./dina-enc.bdf
sed -i 's/ENCODING 18$/ENCODING 9472/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0013$/STARTCHAR uni2502/' ./dina-enc.bdf
sed -i 's/ENCODING 19$/ENCODING 9474/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0014$/STARTCHAR uni2524/' ./dina-enc.bdf
sed -i 's/ENCODING 20$/ENCODING 9508/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0015$/STARTCHAR uni2534/' ./dina-enc.bdf
sed -i 's/ENCODING 21$/ENCODING 9524/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0016$/STARTCHAR uni251C/' ./dina-enc.bdf
sed -i 's/ENCODING 22$/ENCODING 9500/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0017$/STARTCHAR uni252C/' ./dina-enc.bdf
sed -i 's/ENCODING 23$/ENCODING 9516/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0018$/STARTCHAR uni253C/' ./dina-enc.bdf
sed -i 's/ENCODING 24$/ENCODING 9532/' ./dina-enc.bdf
sed -i 's/STARTCHAR uni0019$/STARTCHAR uni2592/' ./dina-enc.bdf
sed -i 's/ENCODING 25$/ENCODING 9618/' ./dina-enc.bdf
# Create the fontset
cp ${./PC437.256} PC437.256
# # Create the fontset
# head -n 256 ${pkgs.bdf2psf}/share/bdf2psf/fontsets/Uni1.512 > Uni1.256
# # Create the fontset
# cp ${./PC437.256} PC437.256
# Create the equivalents file
touch empty.equivalents
@ -45,18 +71,21 @@ pkgs.stdenv.mkDerivation {
# # Convert the bdf to psf
# bdf2psf --fb ./dina-enc.bdf \
# ${pkgs.bdf2psf}/share/bdf2psf/standard.equivalents \
# ${pkgs.bdf2psf}/share/bdf2psf/fontsets/Lat2.256 \
# 256 ./dina-enc.psfu ./dina.sfm
# ${pkgs.bdf2psf}/share/bdf2psf/fontsets/Uni2.512 \
# 512 ./dina-enc.psfu ./dina.sfm
# Convert the bdf to psf
bdf2psf --fb ./dina-enc.bdf \
./empty.equivalents \
./Uni1.256 \
256 ./dina-enc.psfu ./dina.sfm
${pkgs.bdf2psf}/share/bdf2psf/fontsets/Uni2.512 \
512 ./dina-enc.psfu ./dina.sfm
# Get the font table
psfgettable ./dina-enc.psfu ./dina.table
# # Create the font table
# cp ${./PC437.table} PC437.table
# Add some entries to the font table
# echo "0x0e U+2518" >> ./dina.table
# echo "0x0f U+2514" >> ./dina.table